X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=d3174af7994cc8937fd1ca1df9d92948f0ba5238;hb=293fca73b2fe077e7780c1a42216a3db41a6e737;hp=ded35eb5a1f5888b01374ac028fe9af2d68f2d0b;hpb=bd06734362bb727b09b943688d9b69aa0a84590d;p=petitboot

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index ded35eb..d3174af 100644
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -2,6 +2,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <asm/byteorder.h>
 
@@ -177,7 +178,8 @@ 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->boot_args) +
+		sizeof(opt->is_default);
 }
 
 int pb_protocol_boot_len(const struct boot_command *boot)
@@ -188,6 +190,14 @@ int pb_protocol_boot_len(const struct boot_command *boot)
 		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)
 {
@@ -218,6 +228,9 @@ int pb_protocol_serialise_boot_option(const struct boot_option *opt,
 	pos += pb_protocol_serialise_string(pos, opt->initrd_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;
 
@@ -240,6 +253,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;
@@ -393,6 +426,10 @@ int pb_protocol_deserialise_boot_option(struct boot_option *opt,
 	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:
@@ -426,3 +463,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;
+}