discover: Fix boot with initrd error

[petitboot] / lib / pb-protocol / pb-protocol.h

diff --git a/lib/pb-protocol/pb-protocol.h b/lib/pb-protocol/pb-protocol.h
index 888e9b991fdacbbed2594e6de348f6b32e5d4605..6068f05ca7b5ae495d0dc1a50d9ef4e9c6f533a9 100644 (file)
--- a/lib/pb-protocol/pb-protocol.h
+++ b/lib/pb-protocol/pb-protocol.h
@@ -2,8 +2,10 @@
 #define _PB_PROTOCOL_H
 
 #include <stdint.h>
+#include <stdio.h>
 
 #include <list/list.h>
+#include <types/types.h>
 
 #define PB_SOCKET_PATH "/tmp/petitboot.ui"
 
@@ -12,6 +14,7 @@
 enum pb_protocol_action {
        PB_PROTOCOL_ACTION_ADD          = 0x1,
        PB_PROTOCOL_ACTION_REMOVE       = 0x2,
+       PB_PROTOCOL_ACTION_BOOT         = 0x3,
 };
 
 struct pb_protocol_message {
@@ -20,32 +23,10 @@ struct pb_protocol_message {
        char     payload[];
 };
 
-struct device {
-       char *id;
-       char *name;
-       char *description;
-       char *icon_file;
-
-       struct list boot_options;
-
-       void *ui_info;
-};
-
-struct boot_option {
-       char *id;
-       char *name;
-       char *description;
-       char *icon_file;
-       char *boot_image_file;
-       char *initrd_file;
-       char *boot_args;
-
-       struct list_item list;
-
-       void *ui_info;
-};
-
+void pb_protocol_dump_device(const struct device *dev, const char *text,
+       FILE *stream);
 int pb_protocol_device_len(const struct device *dev);
+int pb_protocol_boot_len(const struct boot_command *boot);
 int pb_protocol_device_cmp(const struct device *a, const struct device *b);
 
 int pb_protocol_boot_option_cmp(const struct boot_option *a,
@@ -56,6 +37,8 @@ char *pb_protocol_deserialise_string(void *ctx,
                const struct pb_protocol_message *message);
 
 int pb_protocol_serialise_device(const struct device *dev, char *buf, int buf_len);
+int pb_protocol_serialise_boot_command(const struct boot_command *boot,
+               char *buf, int buf_len);
 
 int pb_protocol_write_message(int fd, struct pb_protocol_message *message);
 
@@ -67,4 +50,7 @@ struct pb_protocol_message *pb_protocol_read_message(void *ctx, int fd);
 struct device *pb_protocol_deserialise_device(void *ctx,
                const struct pb_protocol_message *message);
 
+struct boot_command *pb_protocol_deserialise_boot_command(void *ctx,
+               const struct pb_protocol_message *message);
+
 #endif /* _PB_PROTOCOL_H */