X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=7887fb00cbd19f7bc43216a68ce47a562d3916c8;hp=3953ee1fbd471ef553a6c845674ee9e4aa9aae24;hb=3f06f8808f79f13650394bab80bf96426323a5f8;hpb=d531395a3ff60730238854b127925978f6eab289

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 3953ee1..7887fb0 100644
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -206,7 +206,8 @@ int pb_protocol_boot_len(const struct boot_command *boot)
 		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);
+		4 + optional_strlen(boot->boot_args) +
+		4 + optional_strlen(boot->tty);
 }
 
 int pb_protocol_boot_status_len(const struct boot_status *status)
@@ -226,8 +227,8 @@ int pb_protocol_system_info_len(const struct system_info *sysinfo)
 		4 + 4;
 
 	len +=	4;
-	for (i = 0; i < sysinfo->n_current; i++)
-		len += 4 + optional_strlen(sysinfo->platform_current[i]);
+	for (i = 0; i < sysinfo->n_primary; i++)
+		len += 4 + optional_strlen(sysinfo->platform_primary[i]);
 	len +=	4;
 	for (i = 0; i < sysinfo->n_other; i++)
 		len += 4 + optional_strlen(sysinfo->platform_other[i]);
@@ -310,6 +311,12 @@ int pb_protocol_config_len(const struct config *config)
 
 	len += 4; /* allow_writes */
 
+	len += 4; /* n_tty */
+	for (i = 0; i < config->n_tty; i++)
+		len += 4 + optional_strlen(config->tty_list[i]);
+
+	len += 4 + optional_strlen(config->boot_tty);
+
 	len += 4 + optional_strlen(config->lang);
 
 	return len;
@@ -373,6 +380,7 @@ int pb_protocol_serialise_boot_command(const struct boot_command *boot,
 	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);
+	pos += pb_protocol_serialise_string(pos, boot->tty);
 
 	assert(pos <= buf + buf_len);
 	(void)buf_len;
@@ -409,10 +417,10 @@ int pb_protocol_serialise_system_info(const struct system_info *sysinfo,
 	pos += pb_protocol_serialise_string(pos, sysinfo->type);
 	pos += pb_protocol_serialise_string(pos, sysinfo->identifier);
 
-	*(uint32_t *)pos = __cpu_to_be32(sysinfo->n_current);
+	*(uint32_t *)pos = __cpu_to_be32(sysinfo->n_primary);
 	pos += sizeof(uint32_t);
-	for (i = 0; i < sysinfo->n_current; i++)
-		pos += pb_protocol_serialise_string(pos, sysinfo->platform_current[i]);
+	for (i = 0; i < sysinfo->n_primary; i++)
+		pos += pb_protocol_serialise_string(pos, sysinfo->platform_primary[i]);
 
 	*(uint32_t *)pos = __cpu_to_be32(sysinfo->n_other);
 	pos += sizeof(uint32_t);
@@ -553,6 +561,13 @@ int pb_protocol_serialise_config(const struct config *config,
 	*(uint32_t *)pos = config->allow_writes;
 	pos += 4;
 
+	*(uint32_t *)pos = __cpu_to_be32(config->n_tty);
+	pos += 4;
+	for (i = 0; i < config->n_tty; i++)
+		pos += pb_protocol_serialise_string(pos, config->tty_list[i]);
+
+	pos += pb_protocol_serialise_string(pos, config->boot_tty);
+
 	pos += pb_protocol_serialise_string(pos, config->lang);
 
 	assert(pos <= buf + buf_len);
@@ -770,6 +785,9 @@ int pb_protocol_deserialise_boot_command(struct boot_command *cmd,
 	if (read_string(cmd, &pos, &len, &cmd->boot_args))
 		goto out;
 
+	if (read_string(cmd, &pos, &len, &cmd->tty))
+		goto out;
+
 	rc = 0;
 
 out:
@@ -845,14 +863,14 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo,
 		goto out;
 
 	/* Platform version strings for openpower platforms */
-	if (read_u32(&pos, &len, &sysinfo->n_current))
+	if (read_u32(&pos, &len, &sysinfo->n_primary))
 		goto out;
-	sysinfo->platform_current = talloc_array(sysinfo, char *,
-						sysinfo->n_current);
-	for (i = 0; i < sysinfo->n_current; i++) {
+	sysinfo->platform_primary = talloc_array(sysinfo, char *,
+						sysinfo->n_primary);
+	for (i = 0; i < sysinfo->n_primary; i++) {
 		if (read_string(sysinfo, &pos, &len, &tmp))
 			goto out;
-		sysinfo->platform_current[i] = talloc_strdup(sysinfo, tmp);
+		sysinfo->platform_primary[i] = talloc_strdup(sysinfo, tmp);
 	}
 
 	if (read_u32(&pos, &len, &sysinfo->n_other))
@@ -1069,6 +1087,21 @@ int pb_protocol_deserialise_config(struct config *config,
 		goto out;
 	config->allow_writes = !!tmp;
 
+	if (read_u32(&pos, &len, &config->n_tty))
+		goto out;
+
+	config->tty_list = talloc_array(config, char *, config->n_tty);
+	for (i = 0; i < config->n_tty; i++) {
+		if (read_string(config->tty_list, &pos, &len, &str))
+			goto out;
+		config->tty_list[i] = str;
+	}
+
+	if (read_string(config, &pos, &len, &str))
+		goto out;
+
+	config->boot_tty = str;
+
 	if (read_string(config, &pos, &len, &str))
 		goto out;