X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=1d1a84b8901a3069c6a957382b992b395dc7b7f4;hp=6f278c89ac00e24185b8d8071152b3825076b413;hb=c25601a71b0951225691aa2edc389826f7f3836c;hpb=29fbf1a71d8ac7deace11064fff48e7c2c67c178

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 6f278c8..1d1a84b 100644
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -38,8 +38,38 @@
  * action = 0x2: device remove message
  *  payload:
  *   4-byte len, id
+ *
+ * action = 0x3: boot
+ *  payload:
+ *   4-byte len, boot option id
+ *   4-byte len, boot_image_file
+ *   4-byte len, initrd_file
+ *   4-byte len, boot_args
+ *
  */
 
+void pb_protocol_dump_device(const struct device *dev, const char *text,
+	FILE *stream)
+{
+	struct boot_option *opt;
+
+	fprintf(stream, "%snew dev:\n", text);
+	fprintf(stream, "%s\tid:   %s\n", text, dev->id);
+	fprintf(stream, "%s\tname: %s\n", text, dev->name);
+	fprintf(stream, "%s\tdesc: %s\n", text, dev->description);
+	fprintf(stream, "%s\ticon: %s\n", text, dev->icon_file);
+	fprintf(stream, "%s\tboot options:\n", text);
+	list_for_each_entry(&dev->boot_options, opt, list) {
+		fprintf(stream, "%s\t\tid:   %s\n", text, opt->id);
+		fprintf(stream, "%s\t\tname: %s\n", text, opt->name);
+		fprintf(stream, "%s\t\tdesc: %s\n", text, opt->description);
+		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\targs: %s\n", text, opt->boot_args);
+	}
+}
+
 int pb_protocol_device_cmp(const struct device *a, const struct device *b)
 {
 	return !strcmp(a->id, b->id);
@@ -188,6 +218,7 @@ int pb_protocol_serialise_device(const struct device *dev, char *buf, int buf_le
 	}
 
 	assert(pos <= buf + buf_len);
+	(void)buf_len;
 
 	return 0;
 }
@@ -311,6 +342,8 @@ struct device *pb_protocol_deserialise_device(void *ctx,
 	n_options = __be32_to_cpu(*(uint32_t *)pos);
 	pos += sizeof(uint32_t);
 
+	dev->n_options = n_options;
+
 	list_init(&dev->boot_options);
 
 	for (i = 0; i < n_options; i++) {