Add list_for_each_entry_continue routine

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

diff --git a/lib/pb-protocol/pb-protocol.h b/lib/pb-protocol/pb-protocol.h
index 7b557d667c206cdc71ab69c5bf875048fa7c869b..972f8f192cafab6aa5e1e3704217383de7f95345 100644 (file)
--- a/lib/pb-protocol/pb-protocol.h
+++ b/lib/pb-protocol/pb-protocol.h
@@ -3,6 +3,8 @@
 
 #include <stdint.h>
 
+#include <list/list.h>
+
 #define PB_SOCKET_PATH "/tmp/petitboot.ui"
 
 #define PB_PROTOCOL_MAX_PAYLOAD_SIZE 4096
@@ -24,34 +26,45 @@ struct device {
        char *description;
        char *icon_file;
 
-       struct boot_option {
-               char *id;
-               char *name;
-               char *description;
-               char *icon_file;
-               char *boot_image_file;
-               char *initrd_file;
-               char *boot_args;
-       } *options;
-       int n_options;
+       struct list boot_options;
+
+       void *ui_info;
 };
 
-int pb_protocol_device_len(struct device *dev);
+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;
+};
+
+int pb_protocol_device_len(const struct device *dev);
+int pb_protocol_device_cmp(const struct device *a, const struct device *b);
+
+int pb_protocol_boot_option_cmp(const struct boot_option *a,
+       const struct boot_option *b);
 
 int pb_protocol_serialise_string(char *pos, const char *str);
 char *pb_protocol_deserialise_string(void *ctx,
-               struct pb_protocol_message *message);
+               const struct pb_protocol_message *message);
 
-int pb_protocol_serialise_device(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_write_message(int fd, struct pb_protocol_message *message);
 
 struct pb_protocol_message *pb_protocol_create_message(void *ctx,
-               int action, int payload_len);
+               enum pb_protocol_action action, int payload_len);
 
 struct pb_protocol_message *pb_protocol_read_message(void *ctx, int fd);
 
 struct device *pb_protocol_deserialise_device(void *ctx,
-               struct pb_protocol_message *message);
+               const struct pb_protocol_message *message);
 
 #endif /* _PB_PROTOCOL_H */