X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.h;h=0390f6661fe55e73e5c0035749dea1528d67a5f4;hp=bfa92222606443e6632034c193125d2ad1f45068;hb=6b87c9c7776796c766e3dcbdb32f5d292f7125d5;hpb=dd1b59120f585b2c27d30778e8d81467221a733c

diff --git a/lib/pb-protocol/pb-protocol.h b/lib/pb-protocol/pb-protocol.h
index bfa9222..0390f66 100644
--- a/lib/pb-protocol/pb-protocol.h
+++ b/lib/pb-protocol/pb-protocol.h
@@ -5,14 +5,19 @@
 #include <stdio.h>
 
 #include <list/list.h>
+#include <types/types.h>
 
 #define PB_SOCKET_PATH "/tmp/petitboot.ui"
 
 #define PB_PROTOCOL_MAX_PAYLOAD_SIZE (64 * 1024)
 
 enum pb_protocol_action {
-	PB_PROTOCOL_ACTION_ADD		= 0x1,
-	PB_PROTOCOL_ACTION_REMOVE	= 0x2,
+	PB_PROTOCOL_ACTION_DEVICE_ADD		= 0x1,
+	PB_PROTOCOL_ACTION_BOOT_OPTION_ADD	= 0x2,
+	PB_PROTOCOL_ACTION_DEVICE_REMOVE	= 0x3,
+/*	PB_PROTOCOL_ACTION_BOOT_OPTION_REMOVE	= 0x4, */
+	PB_PROTOCOL_ACTION_BOOT			= 0x5,
+	PB_PROTOCOL_ACTION_STATUS		= 0x6,
 };
 
 struct pb_protocol_message {
@@ -21,35 +26,12 @@ struct pb_protocol_message {
 	char     payload[];
 };
 
-struct device {
-	char *id;
-	char *name;
-	char *description;
-	char *icon_file;
-
-	struct list boot_options;
-
-	int n_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_option_len(const struct boot_option *opt);
+int pb_protocol_boot_len(const struct boot_command *boot);
+int pb_protocol_boot_status_len(const struct boot_status *status);
 int pb_protocol_device_cmp(const struct device *a, const struct device *b);
 
 int pb_protocol_boot_option_cmp(const struct boot_option *a,
@@ -59,7 +41,14 @@ int pb_protocol_serialise_string(char *pos, const char *str);
 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_device(const struct device *dev,
+		char *buf, int buf_len);
+int pb_protocol_serialise_boot_option(const struct boot_option *opt,
+		char *buf, int buf_len);
+int pb_protocol_serialise_boot_command(const struct boot_command *boot,
+		char *buf, int buf_len);
+int pb_protocol_serialise_boot_status(const struct boot_status *status,
+		char *buf, int buf_len);
 
 int pb_protocol_write_message(int fd, struct pb_protocol_message *message);
 
@@ -68,7 +57,16 @@ struct pb_protocol_message *pb_protocol_create_message(void *ctx,
 
 struct pb_protocol_message *pb_protocol_read_message(void *ctx, int fd);
 
-struct device *pb_protocol_deserialise_device(void *ctx,
+int pb_protocol_deserialise_device(struct device *dev,
+		const struct pb_protocol_message *message);
+
+int pb_protocol_deserialise_boot_option(struct boot_option *opt,
+		const struct pb_protocol_message *message);
+
+int pb_protocol_deserialise_boot_command(struct boot_command *cmd,
+		const struct pb_protocol_message *message);
+
+int pb_protocol_deserialise_boot_status(struct boot_status *status,
 		const struct pb_protocol_message *message);
 
 #endif /* _PB_PROTOCOL_H */