X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.h;h=f85052050aa08a59c7b9e0e35227b05ed2fd65eb;hp=2ec264cce26a045ef68582ab5815449cca7a5f05;hb=e79f9f88f59ad3b8a9cf85a37b6c64095b2af0c3;hpb=69c459db80abece18b5557d9b8a8098a88329c28 diff --git a/lib/pb-protocol/pb-protocol.h b/lib/pb-protocol/pb-protocol.h index 2ec264c..f850520 100644 --- a/lib/pb-protocol/pb-protocol.h +++ b/lib/pb-protocol/pb-protocol.h @@ -12,9 +12,17 @@ #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_BOOT = 0x3, + 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, + PB_PROTOCOL_ACTION_CANCEL_DEFAULT = 0x7, + PB_PROTOCOL_ACTION_SYSTEM_INFO = 0x8, + PB_PROTOCOL_ACTION_CONFIG = 0x9, + PB_PROTOCOL_ACTION_REINIT = 0xa, + PB_PROTOCOL_ACTION_ADD_URL = 0xb, }; struct pb_protocol_message { @@ -26,7 +34,12 @@ struct pb_protocol_message { 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_system_info_len(const struct system_info *sysinfo); +int pb_protocol_config_len(const struct config *config); +int pb_protocol_url_len(const char *url); int pb_protocol_device_cmp(const struct device *a, const struct device *b); int pb_protocol_boot_option_cmp(const struct boot_option *a, @@ -36,9 +49,19 @@ 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_serialise_system_info(const struct system_info *sysinfo, + char *buf, int buf_len); +int pb_protocol_serialise_config(const struct config *config, + char *buf, int buf_len); +int pb_protocol_serialise_url(const char *url, char *buf, int buf_len); int pb_protocol_write_message(int fd, struct pb_protocol_message *message); @@ -47,7 +70,21 @@ 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); + +int pb_protocol_deserialise_system_info(struct system_info *sysinfo, + const struct pb_protocol_message *message); + +int pb_protocol_deserialise_config(struct config *config, + const struct pb_protocol_message *message); #endif /* _PB_PROTOCOL_H */