Add configuration commands.

Add support for setting video input/output names, video output locking
and video output routing.

ChangeLog

@@ -4,6 +4,8 @@ xxxx-xx-xx : Version next
  * Rename -h parameter (help) to -H.
  * Rename -s parameter (host) to -h.
  * Change output formatting to better show port locks and numbers.
+ * Add support for setting video input/output names, video output locking
+   and video output routing.
 
 2014-11-27 : Version 0.2
  * Fix port routing. Previously it was reversed and incorrect.

README

@@ -90,6 +90,17 @@ Commands:
  -i --info                  | Show device info (default command).
  -m --monitor               | Show real time monitor for config changes.
 
+Configuration:
+ --vi-name <in_X> <name>    | Set input <name> to input port X.
+ --vo-name <out_X> <name>   | Set output <name> to output port X.
+
+ --vo-route <out_X> <in_Y>  | Connect output port X to input port Y.
+
+ --vo-lock <out_X>          | Lock output port X.
+ --vo-unlock <out_X>        | Unlock output port X.
+
+  NOTE: For <in_X/out_X/in_Y> you may use port number or port name.
+
 
 Example usage
 =============

TODO

@@ -1,3 +1,2 @@
-- Add commands to set labels, routing and locking.
 - Create man page.
 - Add support for all Videohub commands described in the docs.

cmd.c

@@ -302,3 +302,102 @@ int parse_text_buffer(struct videohub_data *data, char *cmd_buffer) {
 	free(bcopy);
 	return ok_commands;
 }
+
+// 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 < MIN(d->device.num_video_outputs, ARRAY_SIZE(d->outputs)); i++) {
+		if (streq(name, d->outputs[i].name)) {
+			return i + 1;
+		}
+	}
+	return 0;
+}
+
+static int search_video_input_name(struct videohub_data *d, char *name) {
+	unsigned int i;
+	for(i = 0; i < MIN(d->device.num_video_inputs, ARRAY_SIZE(d->inputs)); i++) {
+		if (streq(name, d->inputs[i].name)) {
+			return i + 1;
+		}
+	}
+	return 0;
+}
+
+// Return 0 on error, number otherwise if it can parse the whole input
+static unsigned int my_atoi(char *txt) {
+	char *endptr = NULL;
+	if (!txt)
+		return 0;
+	unsigned int ret = strtoul(txt, &endptr, 10);
+	if (endptr == txt || *endptr)
+		return 0;
+	return ret;
+}
+
+void prepare_cmd_entry(struct videohub_data *d, struct vcmd_entry *e) {
+	e->port_no1 = my_atoi(e->param1);
+	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) {
+			e->port_no1 = search_video_input_name(d, e->param1);
+			if (!e->port_no1)
+				die("Unknown input port number/name: %s", e->param1);
+		}
+		break;
+	case CMD_OUTPUT_LABELS:
+	case CMD_VIDEO_OUTPUT_LOCKS:
+		if (e->port_no1 == 0 || e->port_no1 > d->device.num_video_outputs) {
+			e->port_no1 = search_video_output_name(d, e->param1);
+			if (!e->port_no1)
+				die("Unknown output port number/name: %s", e->param1);
+			e->locked_other = d->outputs[e->port_no1 - 1].locked_other;
+		} else {
+			e->locked_other = d->outputs[e->port_no1 - 1].locked_other;
+		}
+		break;
+	case CMD_VIDEO_OUTPUT_ROUTING:
+		if (e->port_no1 == 0 || e->port_no1 > d->device.num_video_outputs) {
+			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) {
+			e->port_no2 = search_video_input_name(d, e->param2);
+			if (!e->port_no2)
+				die("Unknown input port number/name: %s", e->param2);
+		}
+		break;
+	case CMD_PROTOCOL_PREAMBLE:
+	case CMD_VIDEOHUB_DEVICE:
+	case CMD_PING:
+	case CMD_ACK:
+	case CMD_NAK:
+		break;
+	}
+}
+
+void format_cmd_text(struct vcmd_entry *e, char *buf, unsigned int bufsz) {
+	switch (e->cmd) {
+	case CMD_INPUT_LABELS:
+	case CMD_OUTPUT_LABELS:
+		snprintf(buf, bufsz, "%s:\n%u %s\n\n", get_cmd_text(e->cmd),
+			e->port_no1 - 1, e->param2);
+		break;
+	case CMD_VIDEO_OUTPUT_LOCKS:
+		snprintf(buf, bufsz, "%s:\n%u %s\n\n", get_cmd_text(e->cmd),
+			e->port_no1 - 1, e->do_lock ? "O" : (e->locked_other ? "F" : "U"));
+		break;
+	case CMD_VIDEO_OUTPUT_ROUTING:
+		snprintf(buf, bufsz, "%s:\n%u %u\n\n", get_cmd_text(e->cmd),
+			e->port_no1 - 1, e->port_no2 - 1);
+		break;
+	case CMD_PROTOCOL_PREAMBLE:
+	case CMD_VIDEOHUB_DEVICE:
+	case CMD_PING:
+	case CMD_ACK:
+	case CMD_NAK:
+		break;
+	}
+}

cmd.h

@@ -30,4 +30,17 @@ enum vcmd {
 bool parse_command(struct videohub_data *d, char *cmd);
 int parse_text_buffer(struct videohub_data *data, char *cmd_buffer);
 
+struct vcmd_entry {
+	enum vcmd		cmd;
+	char			*param1;
+	char			*param2;
+	unsigned int	port_no1;
+	unsigned int	port_no2;
+	bool			do_lock;
+	bool			locked_other;
+};
+
+void prepare_cmd_entry(struct videohub_data *d, struct vcmd_entry *e);
+void format_cmd_text(struct vcmd_entry *e, char *buf, unsigned int bufsz);
+
 #endif

data.h

@@ -19,6 +19,8 @@
 #define MAX_OUTPUTS 288
 #define MAX_NAME_LEN 64
 
+#define MAX_RUN_CMDS (MAX_INPUTS + (MAX_OUTPUTS * 2))
+
 struct device_desc {
 	bool			dev_present;
 	bool			needs_fw_update;

videohubctrl.c

@@ -42,6 +42,11 @@ static const struct option long_options[] = {
 	{ "version",			no_argument,       NULL, 'V' },
 	{ "info",				no_argument,       NULL, 'i' },
 	{ "monitor",			no_argument,       NULL, 'm' },
+	{ "vi-name",			required_argument, NULL, 1001 },
+	{ "vo-name",			required_argument, NULL, 1002 },
+	{ "vo-route",			required_argument, NULL, 1011 },
+	{ "vo-lock",			required_argument, NULL, 1021 },
+	{ "vo-unlock",			required_argument, NULL, 1022 },
 	{ 0, 0, 0, 0 }
 };
 
@@ -63,10 +68,27 @@ static void show_help(struct videohub_data *data) {
 	printf(" -i --info                  | Show device info (default command).\n");
 	printf(" -m --monitor               | Show real time monitor for config changes.\n");
 	printf("\n");
+	printf("Configuration:\n");
+	printf(" --vi-name <in_X> <name>    | Set input <name> to input port X.\n");
+	printf(" --vo-name <out_X> <name>   | Set output <name> to output port X.\n");
+	printf("\n");
+	printf(" --vo-route <out_X> <in_Y>  | Connect output port X to input port Y.\n");
+	printf("\n");
+	printf(" --vo-lock <out_X>          | Lock output port X.\n");
+	printf(" --vo-unlock <out_X>        | Unlock output port X.\n");
+	printf("\n");
+	printf("  NOTE: For <in_X/out_X/in_Y> you may use port number or port name.\n");
+	printf("\n");
 }
 
+static int num_parsed_cmds = 0;
+static struct run_cmds {
+	struct vcmd_entry	entry[MAX_RUN_CMDS];
+} parsed_cmds;
+
 static void parse_options(struct videohub_data *data, int argc, char **argv) {
 	int j, err = 0;
+	struct vcmd_entry *c = &parsed_cmds.entry[0];
 	// Set defaults
 	data->dev_port = "9990";
 	while ((j = getopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
@@ -93,6 +115,36 @@ static void parse_options(struct videohub_data *data, int argc, char **argv) {
 			case 'm': // --monitor
 				show_monitor = 1;
 				break;
+			case 1001: // --vi-name
+			case 1002: // --vo-name
+			case 1011: // --vi-route
+			case 1012: // --vo-route
+				if (num_parsed_cmds == ARRAY_SIZE(parsed_cmds.entry))
+					die("No more than %u commands are supported.", num_parsed_cmds);
+				if (optind == argc || argv[optind - 1][0] == '-' || argv[optind][0] == '-') {
+					fprintf(stderr, "%s: option '%s' requires two arguments\n", argv[0], argv[optind - 2]);
+					exit(EXIT_FAILURE);
+				}
+				switch (j) {
+				case 1001: c->cmd = CMD_INPUT_LABELS; break; // --vi-name
+				case 1002: c->cmd = CMD_OUTPUT_LABELS; break; // --vo-name
+				case 1011: c->cmd = CMD_VIDEO_OUTPUT_ROUTING; break; // --vo-route
+				}
+				c->param1 = argv[optind - 1];
+				c->param2 = argv[optind];
+				c->param1 = argv[optind - 1];
+				c->param2 = argv[optind];
+				c = &parsed_cmds.entry[++num_parsed_cmds];
+				break;
+			case 1021: // --vo-lock
+			case 1022: // --vo-unlock
+				if (num_parsed_cmds == ARRAY_SIZE(parsed_cmds.entry))
+					die("No more than %u commands are supported.", num_parsed_cmds);
+				c->cmd = CMD_VIDEO_OUTPUT_LOCKS;
+				c->param1 = argv[optind - 1];
+				c->do_lock = (j == 1021);
+				c = &parsed_cmds.entry[++num_parsed_cmds];
+				break;
 			case 'H': // --help
 				show_help(data);
 				exit(EXIT_SUCCESS);
@@ -199,7 +251,31 @@ int main(int argc, char **argv) {
 		die("The device supports %d outputs. Recompile the program with more MAX_OUTPUTS (currently %d)\n",
 			data->device.num_video_outputs, MAX_OUTPUTS);
 
-	if (show_monitor) {
+	if (num_parsed_cmds) {
+		unsigned int i;
+		for (i = 0; i < ARRAY_SIZE(parsed_cmds.entry); i++) {
+			struct vcmd_entry *ve = &parsed_cmds.entry[i];
+			if (!ve->param1)
+				continue;
+			prepare_cmd_entry(data, &parsed_cmds.entry[i]);
+		}
+
+		//print_device_settings(data);
+		for (i = 0; i < ARRAY_SIZE(parsed_cmds.entry); i++) {
+			char cmd_buffer[1024];
+			struct vcmd_entry *ve = &parsed_cmds.entry[i];
+			if (!ve->param1)
+				continue;
+			format_cmd_text(ve, cmd_buffer, sizeof(cmd_buffer));
+			if (strlen(cmd_buffer)) {
+				printf("%s", cmd_buffer);
+				fdwrite(data->dev_fd, cmd_buffer, strlen(cmd_buffer));
+			}
+		}
+		//usleep(100000);
+		//read_device_command_stream(data);
+		//print_device_settings(data);
+	} else if (show_monitor) {
 		while (1) {
 			printf("\e[2J\e[H"); // Clear screen
 			printf("%s\n", program_id);