Create struct port_set which contains a set of ports.

cmd.c

@@ -105,7 +105,7 @@ bool parse_command(struct videohub_data *data, char *cmd) {
 			slot_data[0] = '\0'; // Separate slot_pos from slot_data
 			slot_data++;
 			slot_pos = strtoul(line, NULL, 10);
-			if (slot_pos + 1 > data->device.num_video_outputs) {
+			if (slot_pos + 1 > data->outputs.num) {
 				q("WARNING: %s - invalid slot %u\n", v->txt, slot_pos);
 				continue;
 			}
@@ -113,7 +113,7 @@ bool parse_command(struct videohub_data *data, char *cmd) {
 
 		if (v->flags & PARSE_SLOT_DEST) {
 			dest_pos = strtoul(slot_data, NULL, 10);
-			if (dest_pos + 1 > data->device.num_video_inputs) {
+			if (dest_pos + 1 > data->inputs.num) {
 				q("WARNING: %s - invalid dest %u\n", v->txt, dest_pos);
 				continue;
 			}
@@ -139,13 +139,13 @@ bool parse_command(struct videohub_data *data, char *cmd) {
 				snprintf(data->device.unique_id, sizeof(data->device.unique_id) , "%s", p);
 
 			if ((p = parse_text(line, "Video inputs: ")))
-				data->device.num_video_inputs = strtoul(p, NULL, 10);
+				data->inputs.num = strtoul(p, NULL, 10);
 
 			if ((p = parse_text(line, "Video processing units: ")))
 				data->device.num_video_processing_units = strtoul(p, NULL, 10);
 
 			if ((p = parse_text(line, "Video outputs: ")))
-				data->device.num_video_outputs = strtoul(p, NULL, 10);
+				data->outputs.num = strtoul(p, NULL, 10);
 
 			if ((p = parse_text(line, "Video monitoring output: ")))
 				data->device.num_video_monitoring_outputs = strtoul(p, NULL, 10);
@@ -155,31 +155,31 @@ bool parse_command(struct videohub_data *data, char *cmd) {
 			break;
 
 		case CMD_INPUT_LABELS:
-			snprintf(data->inputs[slot_pos].name, sizeof(data->inputs[slot_pos].name), "%s", slot_data);
+			snprintf(data->inputs.port[slot_pos].name, sizeof(data->inputs.port[slot_pos].name), "%s", slot_data);
 			break;
 
 		case CMD_OUTPUT_LABELS:
-			snprintf(data->outputs[slot_pos].name, sizeof(data->outputs[slot_pos].name), "%s", slot_data);
+			snprintf(data->outputs.port[slot_pos].name, sizeof(data->outputs.port[slot_pos].name), "%s", slot_data);
 			break;
 
 		case CMD_VIDEO_INPUT_STATUS:
-			snprintf(data->inputs[slot_pos].status, sizeof(data->inputs[slot_pos].status), "%s", slot_data);
+			snprintf(data->inputs.port[slot_pos].status, sizeof(data->inputs.port[slot_pos].status), "%s", slot_data);
 			break;
 
 		case CMD_VIDEO_OUTPUT_STATUS:
-			snprintf(data->outputs[slot_pos].status, sizeof(data->outputs[slot_pos].status), "%s", slot_data);
+			snprintf(data->outputs.port[slot_pos].status, sizeof(data->outputs.port[slot_pos].status), "%s", slot_data);
 			break;
 
 		case CMD_VIDEO_OUTPUT_LOCKS:
 			switch (slot_data[0]) {
-			case 'O': data->outputs[slot_pos].lock = PORT_LOCKED; break;
-			case 'L': data->outputs[slot_pos].lock = PORT_LOCKED_OTHER; break;
-			default : data->outputs[slot_pos].lock = PORT_UNLOCKED; break;
+			case 'O': data->outputs.port[slot_pos].lock = PORT_LOCKED; break;
+			case 'L': data->outputs.port[slot_pos].lock = PORT_LOCKED_OTHER; break;
+			default : data->outputs.port[slot_pos].lock = PORT_UNLOCKED; break;
 			}
 			break;
 
 		case CMD_VIDEO_OUTPUT_ROUTING:
-			data->outputs[slot_pos].routed_to = dest_pos;
+			data->outputs.port[slot_pos].routed_to = dest_pos;
 
 		case CMD_PING:
 		case CMD_ACK:
@@ -221,8 +221,8 @@ int parse_text_buffer(struct videohub_data *data, char *cmd_buffer) {
 // Try to find input/output with certain name, return 0 on not found, pos + 1 is found
 static int search_video_output_name(struct videohub_data *d, char *name) {
 	unsigned int i;
-	for(i = 0; i < d->device.num_video_outputs; i++) {
-		if (streq(name, d->outputs[i].name)) {
+	for(i = 0; i < d->outputs.num; i++) {
+		if (streq(name, d->outputs.port[i].name)) {
 			return i + 1;
 		}
 	}
@@ -231,8 +231,8 @@ static int search_video_output_name(struct videohub_data *d, char *name) {
 
 static int search_video_input_name(struct videohub_data *d, char *name) {
 	unsigned int i;
-	for(i = 0; i < d->device.num_video_inputs; i++) {
-		if (streq(name, d->inputs[i].name)) {
+	for(i = 0; i < d->inputs.num; i++) {
+		if (streq(name, d->inputs.port[i].name)) {
 			return i + 1;
 		}
 	}
@@ -255,7 +255,7 @@ void prepare_cmd_entry(struct videohub_data *d, struct vcmd_entry *e) {
 	e->port_no2 = my_atoi(e->param2);
 	switch (e->cmd) {
 	case CMD_INPUT_LABELS:
-		if (e->port_no1 == 0 || e->port_no1 > d->device.num_video_inputs) {
+		if (e->port_no1 == 0 || e->port_no1 > d->inputs.num) {
 			e->port_no1 = search_video_input_name(d, e->param1);
 			if (!e->port_no1)
 				die("Unknown input port number/name: %s", e->param1);
@@ -263,20 +263,20 @@ void prepare_cmd_entry(struct videohub_data *d, struct vcmd_entry *e) {
 		break;
 	case CMD_OUTPUT_LABELS:
 	case CMD_VIDEO_OUTPUT_LOCKS:
-		if (e->port_no1 == 0 || e->port_no1 > d->device.num_video_outputs) {
+		if (e->port_no1 == 0 || e->port_no1 > d->outputs.num) {
 			e->port_no1 = search_video_output_name(d, e->param1);
 			if (!e->port_no1)
 				die("Unknown output port number/name: %s", e->param1);
 		}
-		e->lock = d->outputs[e->port_no1 - 1].lock;
+		e->lock = d->outputs.port[e->port_no1 - 1].lock;
 		break;
 	case CMD_VIDEO_OUTPUT_ROUTING:
-		if (e->port_no1 == 0 || e->port_no1 > d->device.num_video_outputs) {
+		if (e->port_no1 == 0 || e->port_no1 > d->outputs.num) {
 			e->port_no1 = search_video_output_name(d, e->param1);
 			if (!e->port_no1)
 				die("Unknown output port number/name: %s", e->param1);
 		}
-		if (e->port_no2 == 0 || e->port_no2 > d->device.num_video_inputs) {
+		if (e->port_no2 == 0 || e->port_no2 > d->inputs.num) {
 			e->port_no2 = search_video_input_name(d, e->param2);
 			if (!e->port_no2)
 				die("Unknown input port number/name: %s", e->param2);
@@ -328,14 +328,14 @@ void show_cmd(struct videohub_data *d, struct vcmd_entry *e) {
 	case CMD_INPUT_LABELS:
 		printf("%srename video input %d - \"%s\" to \"%s\"\n",
 			prefix,
-			e->port_no1, d->inputs[e->port_no1 - 1].name,
+			e->port_no1, d->inputs.port[e->port_no1 - 1].name,
 			e->param2
 		);
 		break;
 	case CMD_OUTPUT_LABELS:
 		printf("%srename video output %d - \"%s\" to \"%s\"\n",
 			prefix,
-			e->port_no1, d->outputs[e->port_no1 - 1].name,
+			e->port_no1, d->outputs.port[e->port_no1 - 1].name,
 			e->param2
 		);
 		break;
@@ -343,14 +343,14 @@ void show_cmd(struct videohub_data *d, struct vcmd_entry *e) {
 		printf("%s%s video output %d - \"%s\"\n",
 			prefix,
 			e->do_lock ? "lock" : (e->lock == PORT_LOCKED_OTHER ? "force unlock" : "unlock"),
-			e->port_no1, d->outputs[e->port_no1 - 1].name
+			e->port_no1, d->outputs.port[e->port_no1 - 1].name
 		);
 		break;
 	case CMD_VIDEO_OUTPUT_ROUTING:
 		printf("%sset video output %d \"%s\" to read from input %d \"%s\"\n",
 			prefix,
-			e->port_no1, d->outputs[e->port_no1 - 1].name,
-			e->port_no2, d->inputs [e->port_no2 - 1].name
+			e->port_no1, d->outputs.port[e->port_no1 - 1].name,
+			e->port_no2, d->inputs.port [e->port_no2 - 1].name
 		);
 		break;
 	case CMD_VIDEO_INPUT_STATUS:

data.h

@@ -15,11 +15,9 @@
 
 #include <stdbool.h>
 
-#define MAX_INPUTS 288
-#define MAX_OUTPUTS 288
-#define MAX_NAME_LEN 64
-
-#define MAX_RUN_CMDS (MAX_INPUTS + (MAX_OUTPUTS * 2))
+#define MAX_PORTS 288
+#define MAX_NAME_LEN 32
+#define MAX_RUN_CMDS (288 * 5)
 
 struct device_desc {
 	bool			dev_present;
@@ -27,9 +25,7 @@ struct device_desc {
 	char			protocol_ver[16];
 	char			model_name[MAX_NAME_LEN];
 	char			unique_id[MAX_NAME_LEN];
-	unsigned int	num_video_inputs;
 	unsigned int	num_video_processing_units;
-	unsigned int	num_video_outputs;
 	unsigned int	num_video_monitoring_outputs;
 	unsigned int	num_serial_ports;
 };
@@ -50,13 +46,18 @@ struct port {
 	enum port_lock	lock;
 };
 
+struct port_set {
+	unsigned int	num;
+	struct port		port[MAX_PORTS];
+};
+
 struct videohub_data {
 	char					*dev_host;
 	char					*dev_port;
 	int						dev_fd;
 	struct device_desc		device;
-	struct port				inputs[MAX_INPUTS];
-	struct port				outputs[MAX_OUTPUTS];
+	struct port_set			inputs;
+	struct port_set			outputs;
 };
 
 extern int debug;

display.c

@@ -42,8 +42,8 @@ void print_device_info(struct videohub_data *d) {
 	printf("  | %-26s | %-26s |\n", "Model name", d->device.model_name);
 	printf("  | %-26s | %-26s |\n", "Unique ID", d->device.unique_id);
 	printf("  | %-26s | %-26s |\n", "Protocol", d->device.protocol_ver);
-	printf("  | %-26s | %-26u |\n", "Video inputs", d->device.num_video_inputs);
-	printf("  | %-26s | %-26u |\n", "Video outputs", d->device.num_video_outputs);
+	printf("  | %-26s | %-26u |\n", "Video inputs", d->inputs.num);
+	printf("  | %-26s | %-26u |\n", "Video outputs", d->outputs.num);
 	if (d->device.num_serial_ports)
 		printf("  | %-26s | %-26u |\n", "Serial ports", d->device.num_serial_ports);
 	if (d->device.num_video_processing_units)
@@ -56,36 +56,36 @@ void print_device_info(struct videohub_data *d) {
 
 void print_device_video_inputs(struct videohub_data *d) {
 	unsigned int i, r, len = 68;
-	if (!d->device.num_video_inputs)
+	if (!d->inputs.num)
 		return;
 	printf("Video inputs\n");
 	printf_line(len);
 	printf("  | ## | %-24s | n | %-24s | s |\n", "Video input name", "Routed to output");
 	printf_line(len);
-	for(i = 0; i < d->device.num_video_inputs; i++) {
+	for(i = 0; i < d->inputs.num; i++) {
 		unsigned int num_outputs = 0, routed_to = 0;
-		for(r = 0; r < d->device.num_video_outputs; r++) {
-			if (d->outputs[r].routed_to == i) {
+		for(r = 0; r < d->outputs.num; r++) {
+			if (d->outputs.port[r].routed_to == i) {
 				num_outputs++;
 				if (num_outputs == 1)
 					routed_to = r; // The first output
 			}
 		}
-		printf("  | %2d | %-24s | %d | ", i + 1, d->inputs[i].name,
+		printf("  | %2d | %-24s | %d | ", i + 1, d->inputs.port[i].name,
 			 num_outputs);
 		if (num_outputs == 0) {
-			printf("%-24s | %c |\n", "-", format_status(d->inputs[i].status));
+			printf("%-24s | %c |\n", "-", format_status(d->inputs.port[i].status));
 		} else {
-			printf("%-24s | %c |\n", d->outputs[routed_to].name, format_status(d->inputs[i].status));
+			printf("%-24s | %c |\n", d->outputs.port[routed_to].name, format_status(d->inputs.port[i].status));
 			bool first_skipped = false;
-			for(r = 0; r < d->device.num_video_outputs; r++) {
-				if (d->outputs[r].routed_to == i) {
+			for(r = 0; r < d->outputs.num; r++) {
+				if (d->outputs.port[r].routed_to == i) {
 					if (!first_skipped) {
 						first_skipped = true;
 						continue;
 					}
 					printf("  | %2s | %-24s | %s | %-24s | %c |\n",
-						" ", " ", " ", d->outputs[r].name, ' ');
+						" ", " ", " ", d->outputs.port[r].name, ' ');
 				}
 			}
 		}
@@ -105,19 +105,19 @@ static char port_lock_symbol(enum port_lock p) {
 
 void print_device_video_outputs(struct videohub_data *d) {
 	unsigned int i, len = 68;
-	if (!d->device.num_video_outputs)
+	if (!d->outputs.num)
 		return;
 	printf("Video outputs\n");
 	printf_line(len);
 	printf("  | ## | x | %-24s | %-24s | s |\n", "Video output name", "Connected video input");
 	printf_line(len);
-	for(i = 0; i < d->device.num_video_outputs; i++) {
+	for(i = 0; i < d->outputs.num; i++) {
 		printf("  | %2d | %c | %-24s | %-24s | %c |\n",
 			i + 1,
-			port_lock_symbol(d->outputs[i].lock),
-			d->outputs[i].name,
-			d->inputs[d->outputs[i].routed_to].name,
-			format_status(d->outputs[i].status)
+			port_lock_symbol(d->outputs.port[i].lock),
+			d->outputs.port[i].name,
+			d->inputs.port[d->outputs.port[i].routed_to].name,
+			format_status(d->outputs.port[i].status)
 		);
 	}
 	printf_line(len);
@@ -127,19 +127,19 @@ void print_device_video_outputs(struct videohub_data *d) {
 void print_device_backup(struct videohub_data *d) {
 	unsigned int i;
 	printf("videohubctrl \\\n");
-	for(i = 0; i < d->device.num_video_inputs; i++)
-		printf("  --vi-name %2d \"%s\" \\\n", i + 1, d->inputs[i].name);
-	for(i = 0; i < d->device.num_video_outputs; i++)
-		printf("  --vo-name %2d \"%s\" \\\n", i + 1, d->outputs[i].name);
-	for(i = 0; i < d->device.num_video_outputs; i++)
-		printf("  --vo-route %2d %2d \\\n", i + 1, d->outputs[i].routed_to + 1);
-	for(i = 0; i < d->device.num_video_outputs; i++) {
-		if (d->outputs[i].lock != PORT_UNLOCKED) {
+	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->device.num_video_outputs ? " \\" : "");
+				i + 1 < d->outputs.num ? " \\" : "");
 		} else {
 			printf("  --vo-unlock %2d%s\n", i + 1,
-				i + 1 < d->device.num_video_outputs ? " \\" : "");
+				i + 1 < d->outputs.num ? " \\" : "");
 		}
 	}
 	printf("\n");

videohubctrl.c

@@ -221,6 +221,12 @@ static void parse_options(struct videohub_data *data, int argc, char **argv) {
 	d("Device address: %s:%s\n", data->dev_host, data->dev_port);
 }
 
+static void check_number_of_ports(struct port_set *p) {
+	if (p->num > ARRAY_SIZE(p->port))
+		die("The device supports %d ports. Increase MAX_PORTS (%lu) and recompile the program.",
+			p->num, ARRAY_SIZE(p->port));
+}
+
 static int read_device_command_stream(struct videohub_data *d) {
 	int ret, ncommands = 0;
 	char buf[8192 + 1];
@@ -270,13 +276,8 @@ int main(int argc, char **argv) {
 		die("Device reports that it is not present.");
 	}
 
-	if (data->device.num_video_inputs > ARRAY_SIZE(data->inputs))
-		die("Device supports %d inputs. Recompile the program with more MAX_INPUTS (currently %d)",
-			data->device.num_video_inputs, MAX_INPUTS);
-
-	if (data->device.num_video_outputs > ARRAY_SIZE(data->outputs))
-		die("Device supports %d outputs. Recompile the program with more MAX_OUTPUTS (currently %d)\n",
-			data->device.num_video_outputs, MAX_OUTPUTS);
+	check_number_of_ports(&data->inputs);
+	check_number_of_ports(&data->outputs);
 
 	if (num_parsed_cmds) {
 		unsigned int i;