Make --backup function use generic command types.

cmd.c

@@ -39,19 +39,37 @@ struct videohub_commands videohub_commands[NUM_COMMANDS] = {
 	[CMD_PROTOCOL_PREAMBLE]    = { .cmd = CMD_PROTOCOL_PREAMBLE   , .type = PARSE_CUSTOM },
 	[CMD_VIDEOHUB_DEVICE]      = { .cmd = CMD_VIDEOHUB_DEVICE     , .type = PARSE_CUSTOM },
 	[CMD_INPUT_LABELS]         = { .cmd = CMD_INPUT_LABELS        , .type = PARSE_LABEL,
-		.ports1 = OFS(inputs),  .port_id1 = "video input",  },
+		.ports1 = OFS(inputs),
+		.port_id1 = "video input",
+		.opt_prefix = "vi",
+	},
 	[CMD_OUTPUT_LABELS]        = { .cmd = CMD_OUTPUT_LABELS       , .type = PARSE_LABEL,
-		.ports1 = OFS(outputs), .port_id1 = "video output", },
+		.ports1 = OFS(outputs),
+		.port_id1 = "video output",
+		.opt_prefix = "vo",
+	},
 	[CMD_VIDEO_OUTPUT_LOCKS]   = { .cmd = CMD_VIDEO_OUTPUT_LOCKS  , .type = PARSE_LOCK,
-		.ports1 = OFS(outputs), .port_id1 = "video output",  },
+		.ports1 = OFS(outputs),
+		.port_id1 = "video output",
+		.opt_prefix = "vo",
+	},
 	[CMD_VIDEO_OUTPUT_ROUTING] = { .cmd = CMD_VIDEO_OUTPUT_ROUTING, .type = PARSE_ROUTE,
-		.ports1   = OFS(outputs), .ports2 = OFS(inputs),
-		.port_id1 = "video output",     .port_id2 = "video input",
+		.ports1 = OFS(outputs),
+		.ports2 = OFS(inputs),
+		.port_id1 = "video output",
+		.port_id2 = "video input",
+		.opt_prefix = "vo",
 	},
 	[CMD_VIDEO_INPUT_STATUS]   = { .cmd = CMD_VIDEO_INPUT_STATUS  , .type = PARSE_STATUS,
-		.ports1 = OFS(inputs),  .port_id1 = "video input",   },
+		.ports1 = OFS(inputs),
+		.port_id1 = "video input",
+		.opt_prefix = "vi",
+	},
 	[CMD_VIDEO_OUTPUT_STATUS]  = { .cmd = CMD_VIDEO_OUTPUT_STATUS , .type = PARSE_STATUS,
-		.ports1 = OFS(outputs), .port_id1 = "video output",  },
+		.ports1 = OFS(outputs),
+		.port_id1 = "video output",
+		.opt_prefix = "vo",
+	},
 	[CMD_PING]                 = { .cmd = CMD_PING                , .type = PARSE_NONE },
 	[CMD_ACK]                  = { .cmd = CMD_ACK                 , .type = PARSE_NONE },
 	[CMD_NAK]                  = { .cmd = CMD_NAK                 , .type = PARSE_NONE },

cmd.h

@@ -47,6 +47,7 @@ struct videohub_commands {
 	size_t			ports2;
 	const char		*port_id1;
 	const char		*port_id2;
+	const char		*opt_prefix;
 };
 
 extern struct videohub_commands videohub_commands[NUM_COMMANDS];

display.c

@@ -14,6 +14,7 @@
 #include <string.h>
 
 #include "data.h"
+#include "cmd.h"
 #include "util.h"
 #include "display.h"
 
@@ -124,23 +125,46 @@ void print_device_video_outputs(struct videohub_data *d) {
 	printf("\n");
 }
 
+static void __print_opt(struct videohub_data *d, enum vcmd vcmd) {
+	unsigned int i, last = 0;
+	struct videohub_commands *v = &videohub_commands[vcmd];
+	struct port_set *s_port = !v->ports1 ? NULL : (void *)d + v->ports1;
+	const char *p = v->opt_prefix;
+	for(i = 0; i < s_port->num; i++) {
+		switch (v->type) {
+		case PARSE_LABEL:
+			printf("  --%s-name %2d \"%s\" \\\n", p, i + 1, s_port->port[i].name);
+			break;
+		case PARSE_ROUTE:
+			printf("  --%s-route %2d %2d \\\n", p, i + 1, s_port->port[i].routed_to + 1);
+			break;
+		case PARSE_LOCK:
+			last = i + 1 < s_port->num;
+			if (s_port->port[i].lock != PORT_UNLOCKED) {
+				printf("  --%s-unlock %2d --%s-lock %2d%s\n",
+					p, i + 1, p, i + 1, last ? " \\" : "");
+			} else {
+				printf("  --%s-unlock %2d%s\n", p, i + 1, last ? " \\" : "");
+			}
+		default: break;
+		}
+	}
+}
+
 void print_device_backup(struct videohub_data *d) {
 	unsigned int i;
 	printf("videohubctrl \\\n");
-	for(i = 0; i < d->inputs.num; i++)
-		printf("  --vi-name %2d \"%s\" \\\n", i + 1, d->inputs.port[i].name);
-	for(i = 0; i < d->outputs.num; i++)
-		printf("  --vo-name %2d \"%s\" \\\n", i + 1, d->outputs.port[i].name);
-	for(i = 0; i < d->outputs.num; i++)
-		printf("  --vo-route %2d %2d \\\n", i + 1, d->outputs.port[i].routed_to + 1);
-	for(i = 0; i < d->outputs.num; i++) {
-		if (d->outputs.port[i].lock != PORT_UNLOCKED) {
-			printf("  --vo-unlock %2d --vo-lock %2d%s\n", i + 1, i + 1,
-				i + 1 < d->outputs.num ? " \\" : "");
-		} else {
-			printf("  --vo-unlock %2d%s\n", i + 1,
-				i + 1 < d->outputs.num ? " \\" : "");
-		}
+	for (i = 0; i < NUM_COMMANDS; i++) {
+		if (videohub_commands[i].type == PARSE_LABEL)
+			__print_opt(d, videohub_commands[i].cmd);
+	}
+	for (i = 0; i < NUM_COMMANDS; i++) {
+		if (videohub_commands[i].type == PARSE_ROUTE)
+			__print_opt(d, videohub_commands[i].cmd);
+	}
+	for (i = 0; i < NUM_COMMANDS; i++) {
+		if (videohub_commands[i].type == PARSE_LOCK)
+			__print_opt(d, videohub_commands[i].cmd);
 	}
 	printf("\n");
 }