X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=bcc7230a0060c062600ed69c66aadfde2cdf2f25;hp=ded35eb5a1f5888b01374ac028fe9af2d68f2d0b;hb=c11bcba9a99e858e618f4d872a5be7d52dcaaa5a;hpb=bd06734362bb727b09b943688d9b69aa0a84590d diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c index ded35eb..bcc7230 100644 --- a/lib/pb-protocol/pb-protocol.c +++ b/lib/pb-protocol/pb-protocol.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include @@ -33,6 +34,7 @@ * 4-byte len, icon_file * 4-byte len, boot_image_file * 4-byte len, initrd_file + * 4-byte len, dtb_file * 4-byte len, boot_args * * action = 0x2: device remove message @@ -44,6 +46,7 @@ * 4-byte len, boot option id * 4-byte len, boot_image_file * 4-byte len, initrd_file + * 4-byte len, dtb_file * 4-byte len, boot_args * */ @@ -66,6 +69,7 @@ void pb_protocol_dump_device(const struct device *dev, const char *text, fprintf(stream, "%s\t\ticon: %s\n", text, opt->icon_file); fprintf(stream, "%s\t\tboot: %s\n", text, opt->boot_image_file); fprintf(stream, "%s\t\tinit: %s\n", text, opt->initrd_file); + fprintf(stream, "%s\t\tdtb: %s\n", text, opt->dtb_file); fprintf(stream, "%s\t\targs: %s\n", text, opt->boot_args); } } @@ -177,7 +181,9 @@ int pb_protocol_boot_option_len(const struct boot_option *opt) 4 + optional_strlen(opt->icon_file) + 4 + optional_strlen(opt->boot_image_file) + 4 + optional_strlen(opt->initrd_file) + - 4 + optional_strlen(opt->boot_args); + 4 + optional_strlen(opt->dtb_file) + + 4 + optional_strlen(opt->boot_args) + + sizeof(opt->is_default); } int pb_protocol_boot_len(const struct boot_command *boot) @@ -185,9 +191,18 @@ int pb_protocol_boot_len(const struct boot_command *boot) return 4 + optional_strlen(boot->option_id) + 4 + optional_strlen(boot->boot_image_file) + 4 + optional_strlen(boot->initrd_file) + + 4 + optional_strlen(boot->dtb_file) + 4 + optional_strlen(boot->boot_args); } +int pb_protocol_boot_status_len(const struct boot_status *status) +{ + return 4 + + 4 + optional_strlen(status->message) + + 4 + optional_strlen(status->detail) + + 4; +} + int pb_protocol_serialise_device(const struct device *dev, char *buf, int buf_len) { @@ -216,8 +231,12 @@ int pb_protocol_serialise_boot_option(const struct boot_option *opt, pos += pb_protocol_serialise_string(pos, opt->icon_file); pos += pb_protocol_serialise_string(pos, opt->boot_image_file); pos += pb_protocol_serialise_string(pos, opt->initrd_file); + pos += pb_protocol_serialise_string(pos, opt->dtb_file); pos += pb_protocol_serialise_string(pos, opt->boot_args); + *(bool *)pos = opt->is_default; + pos += sizeof(bool); + assert(pos <= buf + buf_len); (void)buf_len; @@ -232,6 +251,7 @@ int pb_protocol_serialise_boot_command(const struct boot_command *boot, pos += pb_protocol_serialise_string(pos, boot->option_id); pos += pb_protocol_serialise_string(pos, boot->boot_image_file); pos += pb_protocol_serialise_string(pos, boot->initrd_file); + pos += pb_protocol_serialise_string(pos, boot->dtb_file); pos += pb_protocol_serialise_string(pos, boot->boot_args); assert(pos <= buf + buf_len); @@ -240,6 +260,26 @@ int pb_protocol_serialise_boot_command(const struct boot_command *boot, return 0; } +int pb_protocol_serialise_boot_status(const struct boot_status *status, + char *buf, int buf_len) +{ + char *pos = buf; + + *(uint32_t *)pos = __cpu_to_be32(status->type); + pos += sizeof(uint32_t); + + pos += pb_protocol_serialise_string(pos, status->message); + pos += pb_protocol_serialise_string(pos, status->detail); + + *(uint32_t *)pos = __cpu_to_be32(status->type); + pos += sizeof(uint32_t); + + assert(pos <= buf + buf_len); + (void)buf_len; + + return 0; +} + int pb_protocol_write_message(int fd, struct pb_protocol_message *message) { int total_len, rc; @@ -390,9 +430,16 @@ int pb_protocol_deserialise_boot_option(struct boot_option *opt, if (read_string(opt, &pos, &len, &opt->initrd_file)) goto out; + if (read_string(opt, &pos, &len, &opt->dtb_file)) + goto out; + if (read_string(opt, &pos, &len, &opt->boot_args)) goto out; + if (len < sizeof(bool)) + goto out; + opt->is_default = *(bool *)(pos); + rc = 0; out: @@ -418,6 +465,9 @@ int pb_protocol_deserialise_boot_command(struct boot_command *cmd, if (read_string(cmd, &pos, &len, &cmd->initrd_file)) goto out; + if (read_string(cmd, &pos, &len, &cmd->dtb_file)) + goto out; + if (read_string(cmd, &pos, &len, &cmd->boot_args)) goto out; @@ -426,3 +476,53 @@ int pb_protocol_deserialise_boot_command(struct boot_command *cmd, out: return rc; } + +int pb_protocol_deserialise_boot_status(struct boot_status *status, + const struct pb_protocol_message *message) +{ + unsigned int len; + const char *pos; + int rc = -1; + + len = message->payload_len; + pos = message->payload; + + /* first up, the type enum... */ + if (len < sizeof(uint32_t)) + goto out; + + status->type = __be32_to_cpu(*(uint32_t *)(pos)); + + switch (status->type) { + case BOOT_STATUS_ERROR: + case BOOT_STATUS_INFO: + break; + default: + goto out; + } + + pos += sizeof(uint32_t); + len -= sizeof(uint32_t); + + /* message and detail strings */ + if (read_string(status, &pos, &len, &status->message)) + goto out; + + if (read_string(status, &pos, &len, &status->detail)) + goto out; + + /* and finally, progress */ + if (len < sizeof(uint32_t)) + goto out; + + status->progress = __be32_to_cpu(*(uint32_t *)(pos)); + + /* clamp to 100% */ + if (status->progress > 100) + status->progress = 100; + + rc = 0; + +out: + return rc; +}