Add support for clearing serial port connections.

ChangeLog

@@ -2,7 +2,8 @@
 xxxx-xx-xx : Version 0.5-dev
  * Add missing documentation for --list-moutputs parameter.
  * Add support for serial ports (names, routing, locks and directions),
-    --se-name, --se-input, --se-lock, --se-unlock and --se-dir.
+    --se-name, --se-connect, --se-clear, --se-lock, --se-unlock,
+    --se-dir and --list-serial.
 
 2014-11-30 : Version 0.4
  * Add videohubctrl(1) man page.

README

@@ -71,7 +71,8 @@ Monitoring outputs configuration:
 
 Serial ports configuration:
  --se-name <ser_X> <name>   | Set serial port X name.
- --se-input <ser_X> <ser_Y> | Connect serial X to serial Y.
+ --se-connect <ser_X> <ser_Y> | Connect serial X to serial Y.
+ --se-clear <ser_X>         | Disconnect serial port X from serial Y.
  --se-lock <ser_X>          | Lock serial port X.
  --se-unlock <ser_X>        | Unlock serial port X.
  --se-dir <ser_X> <dir>     | Set serial port X direction.

cmd.c

@@ -344,8 +344,14 @@ void prepare_cmd_entry(struct videohub_data *d, struct vcmd_entry *e) {
 		}
 	}
 
+	// Allow port_noX to be used as index into ->port[]
+	e->port_no1 -= 1;
+	e->port_no2 -= 1;
+	if (e->clear_port)
+		e->port_no2 = NO_PORT;
+
 	if (e->cmd->type == PARSE_LOCK) {
-		e->lock = s_port->port[e->port_no1 - 1].lock;
+		e->lock = s_port->port[e->port_no1].lock;
 	}
 }
 
@@ -371,19 +377,19 @@ void format_cmd_text(struct vcmd_entry *e, char *buf, unsigned int bufsz) {
 	switch (e->cmd->type) {
 	case PARSE_LABEL:
 		snprintf(buf, bufsz, "%s:\n%u %s\n\n", videohub_commands_text[e->cmd->cmd],
-			e->port_no1 - 1, e->param2);
+			e->port_no1, e->param2);
 		break;
 	case PARSE_LOCK:
 		snprintf(buf, bufsz, "%s:\n%u %s\n\n", videohub_commands_text[e->cmd->cmd],
-			e->port_no1 - 1, e->do_lock ? "O" : (e->lock == PORT_LOCKED_OTHER ? "F" : "U"));
+			e->port_no1, e->do_lock ? "O" : (e->lock == PORT_LOCKED_OTHER ? "F" : "U"));
 		break;
 	case PARSE_ROUTE:
-		snprintf(buf, bufsz, "%s:\n%u %u\n\n", videohub_commands_text[e->cmd->cmd],
-			e->port_no1 - 1, e->port_no2 - 1);
+		snprintf(buf, bufsz, "%s:\n%u %d\n\n", videohub_commands_text[e->cmd->cmd],
+			e->port_no1, (e->port_no2 == NO_PORT ? -1 : (int)e->port_no2));
 		break;
 	case PARSE_DIR:
 		snprintf(buf, bufsz, "%s:\n%u %s\n\n", videohub_commands_text[e->cmd->cmd],
-			e->port_no1 - 1, dir2cmd(e->direction));
+			e->port_no1, dir2cmd(e->direction));
 		break;
 	default: break;
 	}
@@ -398,7 +404,7 @@ void show_cmd(struct videohub_data *d, struct vcmd_entry *e) {
 		printf("%srename %s %d \"%s\" to \"%s\"\n",
 			prefix,
 			e->cmd->port_id1,
-			e->port_no1, s_port->port[e->port_no1 - 1].name,
+			e->port_no1 + 1, s_port->port[e->port_no1].name,
 			e->param2
 		);
 		break;
@@ -407,23 +413,41 @@ void show_cmd(struct videohub_data *d, struct vcmd_entry *e) {
 			prefix,
 			e->do_lock ? "lock" : (e->lock == PORT_LOCKED_OTHER ? "force unlock" : "unlock"),
 			e->cmd->port_id1,
-			e->port_no1, s_port->port[e->port_no1 - 1].name
+			e->port_no1 + 1, s_port->port[e->port_no1].name
 		);
 		break;
 	case PARSE_ROUTE:
+		if (e->port_no2 == NO_PORT) {
+			printf("%sdisconnect %s %d \"%s\"\n",
+				prefix,
+				e->cmd->port_id1,
+				e->port_no1 + 1, s_port->port[e->port_no1].name
+			);
+			break;
+		}
+		if (e->cmd->cmd == CMD_SERIAL_PORT_ROUTING) {
+			printf("%sconnect %s %d \"%s\" to %s %d \"%s\"\n",
+				prefix,
+				e->cmd->port_id1,
+				e->port_no1 + 1, s_port->port[e->port_no1].name,
+				e->cmd->port_id2,
+				e->port_no2 + 1, d_port->port [e->port_no2].name
+			);
+			break;
+		}
 		printf("%sset %s %d \"%s\" to read from %s %d \"%s\"\n",
 			prefix,
 			e->cmd->port_id1,
-			e->port_no1, s_port->port[e->port_no1 - 1].name,
+			e->port_no1 + 1, s_port->port[e->port_no1].name,
 			e->cmd->port_id2,
-			e->port_no2, d_port->port [e->port_no2 - 1].name
+			e->port_no2 + 1, d_port->port [e->port_no2].name
 		);
 		break;
 	case PARSE_DIR:
 		printf("%sset %s %d \"%s\" direction to %s\n",
 			prefix,
 			e->cmd->port_id1,
-			e->port_no1, s_port->port[e->port_no1 - 1].name,
+			e->port_no1 + 1, s_port->port[e->port_no1].name,
 			dir2txt(e->direction)
 		);
 		break;

cmd.h

@@ -73,6 +73,7 @@ struct vcmd_entry {
 	bool			do_lock;
 	enum port_lock	lock;
 	enum serial_dir	direction;
+	bool			clear_port;
 };
 
 void prepare_cmd_entry(struct videohub_data *d, struct vcmd_entry *e);

test/run

@@ -58,6 +58,10 @@ videohubctrl --test-input test/input-00.txt \
 	--se-dir 6 in \
 	--se-dir 7 out \
 	--se-dir 8 out --se-dir 8 auto \
+	--se-input 4 5 \
+	--se-input 6 7 \
+	--se-clear 4 \
+	--se-clear "Serial 6" \
 $@ &> test/test-04.out
 check test/test-04 "Test multiple configuration commands"
 

test/test-03.ok

@@ -62,8 +62,8 @@ videohub: set monitoring output 1 "Monitor 1" to read from video input 1 "Window
 videohub: set monitoring output 2 "Monitor 2" to read from video input 2 "Windows 2"
 videohub: set monitoring output 3 "Monitor 3" to read from video input 3 "Windows 3"
 videohub: set monitoring output 4 "Monitor 4" to read from video input 4 "Windows 4 HD"
-videohub: set serial 1 "Serial Ctrl 1" to read from serial 3 "Deck 3"
-videohub: set serial 2 "Serial Ctrl 2" to read from serial 4 "Deck 4"
+videohub: connect serial 1 "Serial Ctrl 1" to serial 3 "Deck 3"
+videohub: connect serial 2 "Serial Ctrl 2" to serial 4 "Deck 4"
 videohub: set serial 1 "Serial Ctrl 1" direction to IN (Workstation)
 videohub: set serial 2 "Serial Ctrl 2" direction to AUTO
 videohub: set serial 3 "Deck 3" direction to OUT (Deck)

test/test-04.ok

@@ -20,11 +20,15 @@ videohub: rename serial 1 "Serial Ctrl 1" to "Ren Ctrl 1"
 videohub: rename serial 3 "Deck 3" to "Ren Deck 3"
 videohub: unlock serial 1 "Ren Ctrl 1"
 videohub: lock serial 2 "Serial Ctrl 2"
-videohub: set serial 2 "Serial Ctrl 2" to read from serial 1 "Ren Ctrl 1"
+videohub: connect serial 2 "Serial Ctrl 2" to serial 1 "Ren Ctrl 1"
 videohub: set serial 6 "Serial 6" direction to IN (Workstation)
 videohub: set serial 7 "Serial 7" direction to OUT (Deck)
 videohub: set serial 8 "Serial 8" direction to OUT (Deck)
 videohub: set serial 8 "Serial 8" direction to AUTO
+videohub: connect serial 4 "Deck 4" to serial 5 "Serial 5"
+videohub: connect serial 6 "Serial 6" to serial 7 "Serial 7"
+videohub: disconnect serial 4 "Deck 4"
+videohub: disconnect serial 6 "Serial 6"
 Device info
   -----------------------------------------------------------
   | Device address             | sdi-matrix                 |

videohubctrl.1

@@ -129,8 +129,12 @@ else the port would be forcefully unlocked.
 \fB\-\-se\-name\fR <ser_X> <name>
 Set serial port X name.
 .TP
-\fB\-\-se\-input\fR <ser_X> <ser_Y>
-Connect serial port X to serial port Y.
+\fB\-\-se\-connect\fR <ser_X> <ser_Y>
+Connect serial port X to serial port Y. This option have two aliases \fB\-\-se\-input\fR
+and \fB\-\-se\-route\fR.
+.TP
+\fB\-\-se\-clear\fR <ser_X>
+Disconnect serial port X from serial port Y.
 .TP
 \fB\-\-se\-lock\fR <ser_X>
 Lock serial port X.

videohubctrl.c

@@ -78,10 +78,12 @@ static const struct option long_options[] = {
 	{ "mo-unlock",			required_argument, NULL, 3004 },
 	{ "se-name",			required_argument, NULL, 4001 },
 	{ "se-input",			required_argument, NULL, 4002 },
+	{ "se-connect",			required_argument, NULL, 4002 }, // Alias of --se-input
 	{ "se-route",			required_argument, NULL, 4002 }, // Alias of --se-input
 	{ "se-lock",			required_argument, NULL, 4003 },
 	{ "se-unlock",			required_argument, NULL, 4004 },
 	{ "se-dir",				required_argument, NULL, 4005 },
+	{ "se-clear",			required_argument, NULL, 4006 },
 	{ 0, 0, 0, 0 }
 };
 
@@ -125,7 +127,8 @@ static void show_help(struct videohub_data *data) {
 	printf("\n");
 	printf("Serial ports configuration:\n");
 	printf(" --se-name <ser_X> <name>   | Set serial port X name.\n");
-	printf(" --se-input <ser_X> <ser_Y> | Connect serial X to serial Y.\n");
+	printf(" --se-connect <ser_X> <ser_Y> | Connect serial X to serial Y.\n");
+	printf(" --se-clear <ser_X>         | Disconnect serial port X from serial Y.\n");
 	printf(" --se-lock <ser_X>          | Lock serial port X.\n");
 	printf(" --se-unlock <ser_X>        | Unlock serial port X.\n");
 	printf(" --se-dir <ser_X> <dir>     | Set serial port X direction.\n");
@@ -169,6 +172,16 @@ static void parse_cmd2(int argc, char **argv, enum vcmd vcmd) {
 	num_parsed_cmds++;
 }
 
+static void parse_cmd2s(int argc, char **argv, enum vcmd vcmd) {
+	check_num_parsed_cmds();
+	struct vcmd_entry *c = &parsed_cmds.entry[num_parsed_cmds];
+	c->cmd = &videohub_commands[vcmd];
+	c->param1 = optarg;
+	c->param2 = "1"; // Fake
+	c->clear_port = true;
+	num_parsed_cmds++;
+}
+
 static void parse_cmd1(int argc, char **argv, enum vcmd vcmd, bool do_lock) {
 	check_num_parsed_cmds();
 	struct vcmd_entry *c = &parsed_cmds.entry[num_parsed_cmds];
@@ -247,6 +260,7 @@ static void parse_options(struct videohub_data *data, int argc, char **argv) {
 			case 4003: parse_cmd1(argc, argv, CMD_SERIAL_PORT_LOCKS, true); break; // --se-lock
 			case 4004: parse_cmd1(argc, argv, CMD_SERIAL_PORT_LOCKS, false); break; // --se-unlock
 			case 4005: parse_cmd2(argc, argv, CMD_SERIAL_PORT_DIRECTIONS); break; // --se-dir
+			case 4006: parse_cmd2s(argc, argv, CMD_SERIAL_PORT_ROUTING); break; // --se-clear
 			case 'H': // --help
 				show_help(data);
 				exit(EXIT_SUCCESS);