X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=31637c611c19993a390bd6e1fe86ff917a96ba58;hp=54dfbf4e1f4e9469f627351268447f426d6afd9e;hb=3ea411971ea7db66c44527aa720d82567b7a1a5a;hpb=dd1b59120f585b2c27d30778e8d81467221a733c

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 54dfbf4..31637c6 100644
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -38,6 +38,14 @@
  * 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,
@@ -175,6 +183,14 @@ int pb_protocol_device_len(const struct device *dev)
 	return len;
 }
 
+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->boot_args);
+}
+
 int pb_protocol_serialise_device(const struct device *dev, char *buf, int buf_len)
 {
 	struct boot_option *opt;
@@ -210,6 +226,23 @@ int pb_protocol_serialise_device(const struct device *dev, char *buf, int buf_le
 	}
 
 	assert(pos <= buf + buf_len);
+	(void)buf_len;
+
+	return 0;
+}
+
+int pb_protocol_serialise_boot_command(const struct boot_command *boot,
+		char *buf, int buf_len)
+{
+	char *pos = buf;
+
+	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->boot_args);
+
+	assert(pos <= buf + buf_len);
+	(void)buf_len;
 
 	return 0;
 }
@@ -371,3 +404,34 @@ out_err:
 	talloc_free(dev);
 	return NULL;
 }
+
+struct boot_command *pb_protocol_deserialise_boot_command(void *ctx,
+		const struct pb_protocol_message *message)
+{
+	struct boot_command *cmd;
+	const char *pos;
+	unsigned int len;
+
+	len = message->payload_len;
+	pos = message->payload;
+
+	cmd = talloc(ctx, struct boot_command);
+
+	if (read_string(cmd, &pos, &len, &cmd->option_id))
+		goto out_err;
+
+	if (read_string(cmd, &pos, &len, &cmd->boot_image_file))
+		goto out_err;
+
+	if (read_string(cmd, &pos, &len, &cmd->initrd_file))
+		goto out_err;
+
+	if (read_string(cmd, &pos, &len, &cmd->boot_args))
+		goto out_err;
+
+	return cmd;
+
+out_err:
+	talloc_free(cmd);
+	return NULL;
+}