Add support for serial ports (names, routing, locks and directions).

ChangeLog

@@ -1,6 +1,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.
 
 2014-11-30 : Version 0.4
  * Add videohubctrl(1) man page.

README

@@ -52,6 +52,7 @@ Commands:
  --list-vinputs             | List device video inputs.
  --list-voutputs            | List device video outputs.
  --list-moutputs            | List device monitoring outputs.
+ --list-serial              | List device serial ports.
 
 Video inputs configuration:
  --vi-name <in_X> <name>    | Set video input port X name.
@@ -68,6 +69,14 @@ Monitoring outputs configuration:
  --mo-lock <mout_X>         | Lock monitoring port X.
  --mo-unlock <mout_X>       | Unlock monitoring port X.
 
+Serial ports configuration:
+ --se-name <ser_X> <name>   | Set serial port X name.
+ --se-route <ser_X> <ser_Y> | Connect serial X to 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.
+                            . <dir> can be 'auto', 'in' or 'out'.
+
 Misc options:
  -T --test-input <file>     | Read commands from <file>.
  -d --debug                 | Increase logging verbosity.
@@ -156,6 +165,7 @@ Device info
   | Protocol                   | 2.4                        |
   | Video inputs               | 16                         |
   | Video outputs              | 16                         |
+  | Serial ports               | 8                          |
   | Video monitoring outputs   | 4                          |
   -----------------------------------------------------------
 
@@ -215,6 +225,20 @@ Monitoring outputs
   |  4 |   | Monitor 4                | Windows 4 HD             |
   ----------------------------------------------------------------
 
+Serial ports
+  ---------------------------------------------------------------
+  | ## | x | Dir  | Serial port        | Connected serial   | s |
+  ---------------------------------------------------------------
+  |  1 | O |   in | Serial Ctrl 1      | Deck 3             | 4 |
+  |  2 |   | auto | Serial Ctrl 2      | Deck 4             | 4 |
+  |  3 | L |  out | Deck 3             |                    | 4 |
+  |  4 |   | auto | Deck 4             |                    | 4 |
+  |  5 |   | auto | Serial 5           |                    |   |
+  |  6 |   | auto | Serial 6           |                    |   |
+  |  7 |   |   in | Serial 7           |                    | x |
+  |  8 |   |  out | Serial 8           |                    | x |
+  ---------------------------------------------------------------
+
 |----------------------------------------------------------------------|
 
 
@@ -247,6 +271,25 @@ Video outputs Legend
  Column 5 (s)  - Port status /type/. Same format as in input ports.
 
 
+Serial ports Legend
+===================
+
+ Column 1 (##)  - Serial port number
+ Column 2 (x)   - Serial port lock status
+ Column 3 (Dir) - Serial port direction.
+                   in   - Input/Control (Workstation) port
+                   out  - Output/Slave (Deck) port
+                   auto - Automatic in/out
+ Column 4       - Serial port name
+ Column 5       - Which serial port is connected here.
+ Column 5 (s)   - Port status /type/. Same format as in input ports.
+                     - Empty means that the device do not support port
+                       status.
+                   x - The port type is "None". This means that the
+                       port is not installed.
+                   4 - The port type is "RS422".
+
+
 Development
 ===========
 

cmd.c

@@ -31,6 +31,11 @@ const char *videohub_commands_text[NUM_COMMANDS] = {
 	[CMD_MONITORING_OUTPUT_LABELS]  = "MONITORING OUTPUT LABELS",
 	[CMD_MONITORING_OUTPUT_LOCKS]   = "MONITORING OUTPUT LOCKS",
 	[CMD_MONITORING_OUTPUT_ROUTING] = "VIDEO MONITORING OUTPUT ROUTING",
+	[CMD_SERIAL_PORT_LABELS]     = "SERIAL PORT LABELS",
+	[CMD_SERIAL_PORT_ROUTING]    = "SERIAL PORT ROUTING",
+	[CMD_SERIAL_PORT_LOCKS]      = "SERIAL PORT LOCKS",
+	[CMD_SERIAL_PORT_STATUS]     = "SERIAL PORT STATUS",
+	[CMD_SERIAL_PORT_DIRECTIONS] = "SERIAL PORT DIRECTIONS",
 	[CMD_PING]                 = "PING",
 	[CMD_ACK]                  = "ACK",
 	[CMD_NAK]                  = "NAK",
@@ -90,6 +95,33 @@ struct videohub_commands videohub_commands[NUM_COMMANDS] = {
 		.port_id2 = "video input",
 		.opt_prefix = "mo",
 	},
+	[CMD_SERIAL_PORT_LABELS]  = { .cmd = CMD_SERIAL_PORT_LABELS, .type = PARSE_LABEL,
+		.ports1 = OFS(serial),
+		.port_id1 = "serial",
+		.opt_prefix = "se",
+	},
+	[CMD_SERIAL_PORT_LOCKS]   = { .cmd = CMD_SERIAL_PORT_LOCKS  , .type = PARSE_LOCK,
+		.ports1 = OFS(serial),
+		.port_id1 = "serial",
+		.opt_prefix = "se",
+	},
+	[CMD_SERIAL_PORT_ROUTING] = { .cmd = CMD_SERIAL_PORT_ROUTING, .type = PARSE_ROUTE,
+		.ports1 = OFS(serial),
+		.ports2 = OFS(serial),
+		.port_id1 = "serial",
+		.port_id2 = "serial",
+		.opt_prefix = "se",
+	},
+	[CMD_SERIAL_PORT_STATUS]  = { .cmd = CMD_SERIAL_PORT_STATUS , .type = PARSE_STATUS,
+		.ports1 = OFS(serial),
+		.port_id1 = "serial",
+		.opt_prefix = "se",
+	},
+	[CMD_SERIAL_PORT_DIRECTIONS] = { .cmd = CMD_SERIAL_PORT_DIRECTIONS, .type = PARSE_DIR,
+		.ports1 = OFS(serial),
+		.port_id1 = "serial",
+		.opt_prefix = "se",
+	},
 	[CMD_PING]                 = { .cmd = CMD_PING                , .type = PARSE_NONE },
 	[CMD_ACK]                  = { .cmd = CMD_ACK                 , .type = PARSE_NONE },
 	[CMD_NAK]                  = { .cmd = CMD_NAK                 , .type = PARSE_NONE },
@@ -167,6 +199,11 @@ bool parse_command(struct videohub_data *d, char *cmd) {
 		case PARSE_STATUS:
 			snprintf(s_port->port[port_num].status, sizeof(s_port->port[port_num].status), "%s", port_data);
 			break;
+		case PARSE_DIR:
+			s_port->port[port_num].direction = DIR_AUTO;
+			if (streq("control", port_data)) s_port->port[port_num].direction = DIR_CONTROL;
+			if (streq("slave", port_data))   s_port->port[port_num].direction = DIR_SLAVE;
+			break;
 		case PARSE_ROUTE:
 			dest_port_num = strtoul(port_data, NULL, 10);
 			if (dest_port_num + 1 > d_port->num) {
@@ -175,6 +212,7 @@ bool parse_command(struct videohub_data *d, char *cmd) {
 				continue;
 			}
 			s_port->port[port_num].routed_to = dest_port_num;
+			s_port->port[port_num].routed_to_set = true;
 			break;
 		case PARSE_LOCK:
 			switch (port_data[0]) {
@@ -295,6 +333,24 @@ void prepare_cmd_entry(struct videohub_data *d, struct vcmd_entry *e) {
 	}
 }
 
+static char *dir2cmd(enum serial_dir dir) {
+	switch (dir) {
+	case DIR_CONTROL: return "control";
+	case DIR_SLAVE  : return "slave";
+	case DIR_AUTO   : return "auto";
+	}
+	return "auto";
+}
+
+static char *dir2txt(enum serial_dir dir) {
+	switch (dir) {
+	case DIR_CONTROL: return "IN (Workstation)";
+	case DIR_SLAVE  : return "OUT (Deck)";
+	case DIR_AUTO   : return "AUTO";
+	}
+	return "AUTO";
+}
+
 void format_cmd_text(struct vcmd_entry *e, char *buf, unsigned int bufsz) {
 	switch (e->cmd->type) {
 	case PARSE_LABEL:
@@ -309,6 +365,10 @@ void format_cmd_text(struct vcmd_entry *e, char *buf, unsigned int bufsz) {
 		snprintf(buf, bufsz, "%s:\n%u %u\n\n", videohub_commands_text[e->cmd->cmd],
 			e->port_no1 - 1, e->port_no2 - 1);
 		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));
+		break;
 	default: break;
 	}
 }
@@ -343,6 +403,14 @@ void show_cmd(struct videohub_data *d, struct vcmd_entry *e) {
 			e->port_no2, d_port->port [e->port_no2 - 1].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,
+			dir2txt(e->direction)
+		);
+		break;
 	default: break;
 	}
 }

cmd.h

@@ -15,7 +15,7 @@
 
 #include <stdbool.h>
 
-#define NUM_COMMANDS 14
+#define NUM_COMMANDS 19
 
 enum vcmd {
 	CMD_PROTOCOL_PREAMBLE,
@@ -29,6 +29,11 @@ enum vcmd {
 	CMD_MONITORING_OUTPUT_LABELS,
 	CMD_MONITORING_OUTPUT_LOCKS,
 	CMD_MONITORING_OUTPUT_ROUTING,
+	CMD_SERIAL_PORT_LABELS,
+	CMD_SERIAL_PORT_LOCKS,
+	CMD_SERIAL_PORT_ROUTING,
+	CMD_SERIAL_PORT_STATUS,
+	CMD_SERIAL_PORT_DIRECTIONS,
 	CMD_PING,
 	CMD_ACK,
 	CMD_NAK = (NUM_COMMANDS - 1),
@@ -41,6 +46,7 @@ enum cmd_flags {
 	PARSE_STATUS, /* Parse [port_num] [port_status] */
 	PARSE_ROUTE,  /* Parse [port_num] [dest_port] */
 	PARSE_LOCK,   /* Parse [port_num] [dest_slot] */
+	PARSE_DIR,    /* Parse [port_num] [port_direction]  - for serial ports */
 };
 
 struct videohub_commands {
@@ -66,6 +72,7 @@ struct vcmd_entry {
 	unsigned int	port_no2;
 	bool			do_lock;
 	enum port_lock	lock;
+	enum serial_dir	direction;
 };
 
 void prepare_cmd_entry(struct videohub_data *d, struct vcmd_entry *e);

data.h

@@ -34,13 +34,27 @@ enum port_lock {
 	PORT_LOCKED_OTHER,
 };
 
+enum serial_dir {
+	DIR_CONTROL,
+	DIR_SLAVE,
+	DIR_AUTO,
+};
+
 struct port {
 	char			name[MAX_NAME_LEN];
 	// Port statuses are supported only by Universal Videohub
 	// The statuses (actually they are connection types) are:
-	//    BNC, Optical or None /missing port/
+	//  BNC, Optical or None /missing port/ - for input/output
+	//  RS422, None                         - for serial ports
 	char			status[8];
+	// For serial ports.
+	// The values are:
+	//    control - In (Workstation)
+	//      slave - Out (Deck)
+	//       auto - Automatic
+	enum serial_dir	direction;
 	unsigned int	routed_to;
+	bool			routed_to_set; // For serial ports
 	enum port_lock	lock;
 };
 

display.c

@@ -31,6 +31,7 @@ static char format_status(char *status) {
 	if (streq(status, "BNC"))     return 'B';
 	if (streq(status, "Optical")) return 'o';
 	if (streq(status, "None"))    return 'x';
+	if (streq(status, "RS422"))   return '4'; // For serial ports
 	return '?';
 }
 
@@ -145,6 +146,42 @@ void print_device_monitoring_outputs(struct videohub_data *d) {
 	printf("\n");
 }
 
+static char *dir2opt(enum serial_dir dir) {
+	switch (dir) {
+	case DIR_CONTROL: return "in";
+	case DIR_SLAVE  : return "out";
+	case DIR_AUTO   : return "auto";
+	}
+	return "auto";
+}
+
+void print_device_serial_ports(struct videohub_data *d) {
+	unsigned char port_seen[MAX_PORTS];
+	unsigned int i, len = 63;
+	if (!d->serial.num)
+		return;
+	memset(port_seen, 0, sizeof(port_seen));
+	printf("Serial ports\n");
+	printf_line(len);
+	printf("  | ## | x | Dir  | %-18s | %-18s | s |\n", "Serial port", "Connected serial");
+	printf_line(len);
+	for(i = 0; i < d->serial.num; i++) {
+		printf("  | %2d | %c | %4s | %-18s | %-18s | %c |\n",
+			i + 1,
+			port_lock_symbol(d->serial.port[i].lock),
+			dir2opt(d->serial.port[i].direction),
+			d->serial.port[i].name,
+			(d->serial.port[i].routed_to_set && !port_seen[d->serial.port[i].routed_to]
+				? d->serial.port[d->serial.port[i].routed_to].name
+				: ""),
+			format_status(d->serial.port[i].status)
+		);
+		port_seen[d->serial.port[i].routed_to]++;
+	}
+	printf_line(len);
+	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];
@@ -156,6 +193,8 @@ static void __print_opt(struct videohub_data *d, enum vcmd vcmd) {
 			printf("  --%s-name %2d \"%s\" \\\n", p, i + 1, s_port->port[i].name);
 			break;
 		case PARSE_ROUTE:
+			if (v->cmd == CMD_SERIAL_PORT_ROUTING && !s_port->port[i].routed_to_set)
+				continue;
 			printf("  --%s-input %2d %2d \\\n", p, i + 1, s_port->port[i].routed_to + 1);
 			break;
 		case PARSE_LOCK:
@@ -166,6 +205,10 @@ static void __print_opt(struct videohub_data *d, enum vcmd vcmd) {
 			} else {
 				printf("  --%s-unlock %2d%s\n", p, i + 1, last ? " \\" : "");
 			}
+			break;
+		case PARSE_DIR:
+			printf("  --%s-dir %2d %s \\\n", p, i + 1, dir2opt(s_port->port[i].direction));
+			break;
 		default: break;
 		}
 	}
@@ -182,6 +225,10 @@ void print_device_backup(struct videohub_data *d) {
 		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_DIR)
+			__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);

display.h

@@ -17,6 +17,7 @@ void print_device_info(struct videohub_data *d);
 void print_device_video_inputs(struct videohub_data *d);
 void print_device_video_outputs(struct videohub_data *d);
 void print_device_monitoring_outputs(struct videohub_data *d);
+void print_device_serial_ports(struct videohub_data *d);
 
 void print_device_backup(struct videohub_data *d);
 

test/input-00.txt

@@ -9,7 +9,7 @@ Video inputs: 16
 Video processing units: 0
 Video outputs: 16
 Video monitoring outputs: 4
-Serial ports: 0
+Serial ports: 8
 
 INPUT LABELS:
 0 Windows 1
@@ -125,3 +125,41 @@ MONITORING OUTPUT LOCKS:
 1 O
 2 L
 3 U
+
+SERIAL PORT LABELS:
+0 Serial Ctrl 1
+1 Serial Ctrl 2
+2 Deck 3
+3 Deck 4
+4 Serial 5
+5 Serial 6
+6 Serial 7
+7 Serial 8
+
+SERIAL PORT ROUTING:
+0 2
+1 3
+
+SERIAL PORT LOCKS:
+0 O
+1 U
+2 L
+3 U
+
+SERIAL PORT STATUS:
+0 RS422
+1 RS422
+2 RS422
+3 RS422
+6 None
+7 None
+
+SERIAL PORT DIRECTIONS:
+0 control
+1 auto
+2 slave
+3 auto
+4 auto
+5 auto
+6 control
+7 slave

test/input-03.txt

@@ -9,7 +9,7 @@ Video inputs: 16
 Video processing units: 0
 Video outputs: 16
 Video monitoring outputs: 4
-Serial ports: 0
+Serial ports: 8
 
 VIDEO INPUT STATUS:
 0 BNC
@@ -35,3 +35,11 @@ VIDEO OUTPUT STATUS:
 13 Optical
 14 Optical
 15 Optical
+
+SERIAL PORT STATUS:
+0 RS422
+1 RS422
+2 RS422
+3 RS422
+6 None
+7 None

test/run

@@ -50,6 +50,14 @@ videohubctrl --test-input test/input-00.txt \
 	--mo-lock 4 \
 	--mo-name 3 "Loopback" \
 	--mo-input 3 16 \
+	--se-name 1 "Ren Ctrl 1" \
+	--se-name "Deck 3" "Ren Deck 3" \
+	--se-unlock 1 \
+	--se-lock 2 \
+	--se-input 2 1 \
+	--se-dir 6 in \
+	--se-dir 7 out \
+	--se-dir 8 out --se-dir 8 auto \
 $@ &> test/test-04.out
 check test/test-04 "Test multiple configuration commands"
 
@@ -81,6 +89,14 @@ check test/test-05 "Test if --backup restored correct config."
 ./videohubctrl --test-input test/input-00.txt --mo-lock "Output 18"                  $@ &>> test/test-06.out
 ./videohubctrl --test-input test/input-00.txt --mo-unlock 18                         $@ &>> test/test-06.out
 ./videohubctrl --test-input test/input-00.txt --mo-unlock "Output 18"                $@ &>> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --se-name 18          "Test Serial 18" $@ &>> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --se-name "Serial 18" "Test Serial 18" $@ &>> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --se-lock 18                           $@ &>> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --se-lock "Serial 18"                  $@ &>> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --se-unlock 18                         $@ &>> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --se-unlock "Serial 18"                $@ &>> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --se-dir 1 err-dir                     $@ &>> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --se-dir "Serial 5" err-dir            $@ &>> test/test-06.out
 check test/test-06 "Test errors on commands with invalid ports."
 
 videohubctrl --test-input test/input-00.txt --list-device $@ &> test/test-07.out
@@ -106,3 +122,6 @@ check test/test-14 "Test buggy input"
 
 videohubctrl --test-input test/input-00.txt --list-moutputs $@ &> test/test-15.out
 check test/test-15 "Test --list-moutputs option output"
+
+videohubctrl --test-input test/input-00.txt --list-serial $@ &> test/test-16.out
+check test/test-16 "Test --list-serial option output"

test/test-01.ok

@@ -7,6 +7,7 @@ Device info
   | Protocol                   | 2.4                        |
   | Video inputs               | 16                         |
   | Video outputs              | 16                         |
+  | Serial ports               | 8                          |
   | Video monitoring outputs   | 4                          |
   -----------------------------------------------------------
 
@@ -66,3 +67,17 @@ Monitoring outputs
   |  4 |   | Monitor 4                | Windows 4 HD             |
   ----------------------------------------------------------------
 
+Serial ports
+  ---------------------------------------------------------------
+  | ## | x | Dir  | Serial port        | Connected serial   | s |
+  ---------------------------------------------------------------
+  |  1 | O |   in | Serial Ctrl 1      | Deck 3             | 4 |
+  |  2 |   | auto | Serial Ctrl 2      | Deck 4             | 4 |
+  |  3 | L |  out | Deck 3             |                    | 4 |
+  |  4 |   | auto | Deck 4             |                    | 4 |
+  |  5 |   | auto | Serial 5           |                    |   |
+  |  6 |   | auto | Serial 6           |                    |   |
+  |  7 |   |   in | Serial 7           |                    | x |
+  |  8 |   |  out | Serial 8           |                    | x |
+  ---------------------------------------------------------------
+

test/test-02.ok

@@ -35,6 +35,14 @@ videohubctrl \
   --mo-name  2 "Monitor 2" \
   --mo-name  3 "Monitor 3" \
   --mo-name  4 "Monitor 4" \
+  --se-name  1 "Serial Ctrl 1" \
+  --se-name  2 "Serial Ctrl 2" \
+  --se-name  3 "Deck 3" \
+  --se-name  4 "Deck 4" \
+  --se-name  5 "Serial 5" \
+  --se-name  6 "Serial 6" \
+  --se-name  7 "Serial 7" \
+  --se-name  8 "Serial 8" \
   --vo-input  1  3 \
   --vo-input  2  2 \
   --vo-input  3  1 \
@@ -55,6 +63,16 @@ videohubctrl \
   --mo-input  2  2 \
   --mo-input  3  3 \
   --mo-input  4  4 \
+  --se-input  1  3 \
+  --se-input  2  4 \
+  --se-dir  1 in \
+  --se-dir  2 auto \
+  --se-dir  3 out \
+  --se-dir  4 auto \
+  --se-dir  5 auto \
+  --se-dir  6 auto \
+  --se-dir  7 in \
+  --se-dir  8 out \
   --vo-unlock  1 --vo-lock  1 \
   --vo-unlock  2 --vo-lock  2 \
   --vo-unlock  3 --vo-lock  3 \
@@ -75,4 +93,12 @@ videohubctrl \
   --mo-unlock  2 --mo-lock  2 \
   --mo-unlock  3 --mo-lock  3 \
   --mo-unlock  4
+  --se-unlock  1 --se-lock  1 \
+  --se-unlock  2 \
+  --se-unlock  3 --se-lock  3 \
+  --se-unlock  4 \
+  --se-unlock  5 \
+  --se-unlock  6 \
+  --se-unlock  7 \
+  --se-unlock  8
 

test/test-03.ok

@@ -34,6 +34,14 @@ videohub: rename monitoring output 1 "" to "Monitor 1"
 videohub: rename monitoring output 2 "" to "Monitor 2"
 videohub: rename monitoring output 3 "" to "Monitor 3"
 videohub: rename monitoring output 4 "" to "Monitor 4"
+videohub: rename serial 1 "" to "Serial Ctrl 1"
+videohub: rename serial 2 "" to "Serial Ctrl 2"
+videohub: rename serial 3 "" to "Deck 3"
+videohub: rename serial 4 "" to "Deck 4"
+videohub: rename serial 5 "" to "Serial 5"
+videohub: rename serial 6 "" to "Serial 6"
+videohub: rename serial 7 "" to "Serial 7"
+videohub: rename serial 8 "" to "Serial 8"
 videohub: set video output 1 "Enc1 1" to read from video input 3 "Windows 3"
 videohub: set video output 2 "Enc1 2" to read from video input 2 "Windows 2"
 videohub: set video output 3 "Enc1 3" to read from video input 1 "Windows 1"
@@ -54,6 +62,16 @@ 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: 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)
+videohub: set serial 4 "Deck 4" direction to AUTO
+videohub: set serial 5 "Serial 5" direction to AUTO
+videohub: set serial 6 "Serial 6" direction to AUTO
+videohub: set serial 7 "Serial 7" direction to IN (Workstation)
+videohub: set serial 8 "Serial 8" direction to OUT (Deck)
 videohub: unlock video output 1 "Enc1 1"
 videohub: lock video output 1 "Enc1 1"
 videohub: unlock video output 2 "Enc1 2"
@@ -84,6 +102,16 @@ videohub: lock monitoring output 2 "Monitor 2"
 videohub: unlock monitoring output 3 "Monitor 3"
 videohub: lock monitoring output 3 "Monitor 3"
 videohub: unlock monitoring output 4 "Monitor 4"
+videohub: unlock serial 1 "Serial Ctrl 1"
+videohub: lock serial 1 "Serial Ctrl 1"
+videohub: unlock serial 2 "Serial Ctrl 2"
+videohub: unlock serial 3 "Deck 3"
+videohub: lock serial 3 "Deck 3"
+videohub: unlock serial 4 "Deck 4"
+videohub: unlock serial 5 "Serial 5"
+videohub: unlock serial 6 "Serial 6"
+videohub: unlock serial 7 "Serial 7"
+videohub: unlock serial 8 "Serial 8"
 Device info
   -----------------------------------------------------------
   | Device address             | sdi-matrix                 |
@@ -93,6 +121,7 @@ Device info
   | Protocol                   | 2.4                        |
   | Video inputs               | 16                         |
   | Video outputs              | 16                         |
+  | Serial ports               | 8                          |
   | Video monitoring outputs   | 4                          |
   -----------------------------------------------------------
 
@@ -152,3 +181,17 @@ Monitoring outputs
   |  4 |   | Monitor 4                | Windows 4 HD             |
   ----------------------------------------------------------------
 
+Serial ports
+  ---------------------------------------------------------------
+  | ## | x | Dir  | Serial port        | Connected serial   | s |
+  ---------------------------------------------------------------
+  |  1 | O |   in | Serial Ctrl 1      | Deck 3             | 4 |
+  |  2 |   | auto | Serial Ctrl 2      | Deck 4             | 4 |
+  |  3 | O |  out | Deck 3             |                    | 4 |
+  |  4 |   | auto | Deck 4             |                    | 4 |
+  |  5 |   | auto | Serial 5           |                    |   |
+  |  6 |   | auto | Serial 6           |                    |   |
+  |  7 |   |   in | Serial 7           |                    | x |
+  |  8 |   |  out | Serial 8           |                    | x |
+  ---------------------------------------------------------------
+

test/test-04.ok

@@ -16,6 +16,15 @@ videohub: unlock monitoring output 2 "Monitor 2"
 videohub: lock monitoring output 4 "Decklink"
 videohub: rename monitoring output 3 "Monitor 3" to "Loopback"
 videohub: set monitoring output 3 "Loopback" to read from video input 16 "Loopback"
+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: 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
 Device info
   -----------------------------------------------------------
   | Device address             | sdi-matrix                 |
@@ -25,6 +34,7 @@ Device info
   | Protocol                   | 2.4                        |
   | Video inputs               | 16                         |
   | Video outputs              | 16                         |
+  | Serial ports               | 8                          |
   | Video monitoring outputs   | 4                          |
   -----------------------------------------------------------
 
@@ -85,3 +95,17 @@ Monitoring outputs
   |  4 | O | Decklink                 | Windows 4 HighDef        |
   ----------------------------------------------------------------
 
+Serial ports
+  ---------------------------------------------------------------
+  | ## | x | Dir  | Serial port        | Connected serial   | s |
+  ---------------------------------------------------------------
+  |  1 |   |   in | Ren Ctrl 1         | Ren Deck 3         | 4 |
+  |  2 | O | auto | Serial Ctrl 2      | Ren Ctrl 1         | 4 |
+  |  3 | L |  out | Ren Deck 3         |                    | 4 |
+  |  4 |   | auto | Deck 4             |                    | 4 |
+  |  5 |   | auto | Serial 5           |                    |   |
+  |  6 |   |   in | Serial 6           |                    |   |
+  |  7 |   |  out | Serial 7           |                    | x |
+  |  8 |   | auto | Serial 8           |                    | x |
+  ---------------------------------------------------------------
+

test/test-05.ok

@@ -7,6 +7,7 @@ Device info
   | Protocol                   | 2.4                        |
   | Video inputs               | 16                         |
   | Video outputs              | 16                         |
+  | Serial ports               | 8                          |
   | Video monitoring outputs   | 4                          |
   -----------------------------------------------------------
 
@@ -66,3 +67,17 @@ Monitoring outputs
   |  4 |   | Monitor 4                | Windows 4 HD             |
   ----------------------------------------------------------------
 
+Serial ports
+  ---------------------------------------------------------------
+  | ## | x | Dir  | Serial port        | Connected serial   | s |
+  ---------------------------------------------------------------
+  |  1 | O |   in | Serial Ctrl 1      | Deck 3             | 4 |
+  |  2 |   | auto | Serial Ctrl 2      | Deck 4             | 4 |
+  |  3 | O |  out | Deck 3             |                    | 4 |
+  |  4 |   | auto | Deck 4             |                    | 4 |
+  |  5 |   | auto | Serial 5           |                    |   |
+  |  6 |   | auto | Serial 6           |                    |   |
+  |  7 |   |   in | Serial 7           |                    | x |
+  |  8 |   |  out | Serial 8           |                    | x |
+  ---------------------------------------------------------------
+

test/test-06.ok

@@ -22,3 +22,11 @@ ERROR: Unknown monitoring output port number/name: 18
 ERROR: Unknown monitoring output port number/name: Output 18
 ERROR: Unknown monitoring output port number/name: 18
 ERROR: Unknown monitoring output port number/name: Output 18
+ERROR: Unknown serial port number/name: 18
+ERROR: Unknown serial port number/name: Serial 18
+ERROR: Unknown serial port number/name: 18
+ERROR: Unknown serial port number/name: Serial 18
+ERROR: Unknown serial port number/name: 18
+ERROR: Unknown serial port number/name: Serial 18
+ERROR: Invalid serial port direction 'err-dir'. Allowed are: in, out, auto.
+ERROR: Invalid serial port direction 'err-dir'. Allowed are: in, out, auto.

test/test-07.ok

@@ -7,6 +7,7 @@ Device info
   | Protocol                   | 2.4                        |
   | Video inputs               | 16                         |
   | Video outputs              | 16                         |
+  | Serial ports               | 8                          |
   | Video monitoring outputs   | 4                          |
   -----------------------------------------------------------
 

test/test-16.ok

@@ -0,0 +1,14 @@
+Serial ports
+  ---------------------------------------------------------------
+  | ## | x | Dir  | Serial port        | Connected serial   | s |
+  ---------------------------------------------------------------
+  |  1 | O |   in | Serial Ctrl 1      | Deck 3             | 4 |
+  |  2 |   | auto | Serial Ctrl 2      | Deck 4             | 4 |
+  |  3 | L |  out | Deck 3             |                    | 4 |
+  |  4 |   | auto | Deck 4             |                    | 4 |
+  |  5 |   | auto | Serial 5           |                    |   |
+  |  6 |   | auto | Serial 6           |                    |   |
+  |  7 |   |   in | Serial 7           |                    | x |
+  |  8 |   |  out | Serial 8           |                    | x |
+  ---------------------------------------------------------------
+

videohubctrl.1

@@ -76,6 +76,11 @@ in \fB\-\-list\-vinputs\fR option).
 Display device monitoring outputs. Port numbers, names, locking status and
 which input is routed to a given output. The locking statuses are the
 same as video input and output ports.
+.TP
+\fB\-\-list\-serial\fR
+Display device serial ports. Port numbers, names, locking status, directions
+and how serial ports are routed. The locking statuses are the same as video
+input, output ports and monitoring ports.
 .SH CONFIGURATION COMMANDS
 .PP
 Everywhere where port needs to be set, you can use the port number or the
@@ -117,6 +122,28 @@ Lock monitoring output port X.
 \fB\-\-mo\-unlock\fR <mout_X>
 Unlock monitoring output port X. If the port is locked by somebody
 else the port would be forcefully unlocked.
+.SH SERIAL PORTS CONFIGURATION
+.PP
+.TP
+\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.
+.TP
+\fB\-\-se\-lock\fR <ser_X>
+Lock serial port X.
+.TP
+\fB\-\-se\-unlock\fR <ser_X>
+Unlock serial port X. If the port is locked by somebody else the
+port would be forcefully unlocked.
+.TP
+\fB\-\-se\-dir\fR <set_X> <in|out|auto>
+Set serial port X direction. There are three possible settings for
+each port:
+ \fBin\fR   - input/control/Workstation
+ \fBout\fR  - output/slave/Deck
+ \fBauto\fR - Automatic in/out
 .SH MISC OPTIONS
 .PP
 .TP

videohubctrl.c

@@ -42,6 +42,7 @@ enum list_actions {
 	action_list_vinputs		= (1 << 1),
 	action_list_voutputs	= (1 << 2),
 	action_list_moutputs	= (1 << 3),
+	action_list_serial		= (1 << 4),
 };
 
 static const char *program_id = PROGRAM_NAME " Version: " VERSION " Git: " GIT_VER;
@@ -63,6 +64,7 @@ static const struct option long_options[] = {
 	{ "list-vinputs",		no_argument,       NULL, 902 },
 	{ "list-voutputs",		no_argument,       NULL, 903 },
 	{ "list-moutputs",		no_argument,       NULL, 904 },
+	{ "list-serial",		no_argument,       NULL, 905 },
 	{ "vi-name",			required_argument, NULL, 1001 },
 	{ "vo-name",			required_argument, NULL, 2001 },
 	{ "vo-input",			required_argument, NULL, 2002 },
@@ -74,6 +76,12 @@ static const struct option long_options[] = {
 	{ "mo-route",			required_argument, NULL, 3002 }, // Alias of --mo-input
 	{ "mo-lock",			required_argument, NULL, 3003 },
 	{ "mo-unlock",			required_argument, NULL, 3004 },
+	{ "se-name",			required_argument, NULL, 4001 },
+	{ "se-input",			required_argument, NULL, 4002 },
+	{ "se-route",			required_argument, NULL, 4002 }, // Alias of --mo-input
+	{ "se-lock",			required_argument, NULL, 4003 },
+	{ "se-unlock",			required_argument, NULL, 4004 },
+	{ "se-dir",				required_argument, NULL, 4005 },
 	{ 0, 0, 0, 0 }
 };
 
@@ -98,6 +106,7 @@ static void show_help(struct videohub_data *data) {
 	printf(" --list-vinputs             | List device video inputs.\n");
 	printf(" --list-voutputs            | List device video outputs.\n");
 	printf(" --list-moutputs            | List device monitoring outputs.\n");
+	printf(" --list-serial              | List device serial ports.\n");
 	printf("\n");
 	printf("Video inputs configuration:\n");
 	printf(" --vi-name <in_X> <name>    | Set video input port X name.\n");
@@ -114,6 +123,14 @@ static void show_help(struct videohub_data *data) {
 	printf(" --mo-lock <mout_X>         | Lock monitoring port X.\n");
 	printf(" --mo-unlock <mout_X>       | Unlock monitoring port X.\n");
 	printf("\n");
+	printf("Serial ports configuration:\n");
+	printf(" --se-name <ser_X> <name>   | Set serial port X name.\n");
+	printf(" --se-route <ser_X> <ser_Y> | Connect serial X to 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");
+	printf("                            . <dir> can be 'auto', 'in' or 'out'.\n");
+	printf("\n");
 	printf("Misc options:\n");
 	printf(" -T --test-input <file>     | Read commands from <file>.\n");
 	printf(" -d --debug                 | Increase logging verbosity.\n");
@@ -128,10 +145,14 @@ static struct run_cmds {
 	struct vcmd_entry	entry[MAX_RUN_CMDS];
 } parsed_cmds;
 
+static void check_num_parsed_cmds(void) {
+	if (num_parsed_cmds == ARRAY_SIZE(parsed_cmds.entry))
+		die("No more than %u commands are supported.", num_parsed_cmds);
+}
+
 static void parse_cmd2(int argc, char **argv, enum vcmd vcmd) {
+	check_num_parsed_cmds();
 	struct vcmd_entry *c = &parsed_cmds.entry[num_parsed_cmds];
-	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);
@@ -139,13 +160,18 @@ static void parse_cmd2(int argc, char **argv, enum vcmd vcmd) {
 	c->cmd = &videohub_commands[vcmd];
 	c->param1 = argv[optind - 1];
 	c->param2 = argv[optind];
+	if (vcmd == CMD_SERIAL_PORT_DIRECTIONS) {
+		if (strcasecmp("in", c->param2) == 0)        c->direction = DIR_CONTROL;
+		else if (strcasecmp("out", c->param2) == 0)  c->direction = DIR_SLAVE;
+		else if (strcasecmp("auto", c->param2) == 0) c->direction = DIR_AUTO;
+		else die("Invalid serial port direction '%s'. Allowed are: in, out, auto.", c->param2);
+	}
 	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];
-	if (num_parsed_cmds == ARRAY_SIZE(parsed_cmds.entry))
-		die("No more than %u commands are supported.", num_parsed_cmds);
 	c->cmd = &videohub_commands[vcmd];
 	c->param1 = argv[optind - 1];
 	c->do_lock = do_lock;
@@ -206,6 +232,7 @@ static void parse_options(struct videohub_data *data, int argc, char **argv) {
 			case 902: show_list |= action_list_vinputs; break; // --list-vinputs
 			case 903: show_list |= action_list_voutputs; break; // --list-voutputs
 			case 904: show_list |= action_list_moutputs; break; // --list-moutputs
+			case 905: show_list |= action_list_serial; break; // --list-serial
 			case 1001: parse_cmd2(argc, argv, CMD_INPUT_LABELS); break; // --vi-name
 			case 2001: parse_cmd2(argc, argv, CMD_OUTPUT_LABELS); break; // --vo-name
 			case 2002: parse_cmd2(argc, argv, CMD_VIDEO_OUTPUT_ROUTING); break; // --vo-input
@@ -215,6 +242,11 @@ static void parse_options(struct videohub_data *data, int argc, char **argv) {
 			case 3002: parse_cmd2(argc, argv, CMD_MONITORING_OUTPUT_ROUTING); break; // --mo-route
 			case 3003: parse_cmd1(argc, argv, CMD_MONITORING_OUTPUT_LOCKS, true); break; // --mo-lock
 			case 3004: parse_cmd1(argc, argv, CMD_MONITORING_OUTPUT_LOCKS, false); break; // --mo-unlock
+			case 4001: parse_cmd2(argc, argv, CMD_SERIAL_PORT_LABELS); break; // --se-name
+			case 4002: parse_cmd2(argc, argv, CMD_SERIAL_PORT_ROUTING); break; // --se-route
+			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 'H': // --help
 				show_help(data);
 				exit(EXIT_SUCCESS);
@@ -248,6 +280,7 @@ static void print_device_full(struct videohub_data *d) {
 	print_device_video_inputs(d);
 	print_device_video_outputs(d);
 	print_device_monitoring_outputs(d);
+	print_device_serial_ports(d);
 	fflush(stdout);
 }
 
@@ -353,6 +386,7 @@ int main(int argc, char **argv) {
 		if (show_list & action_list_vinputs)	print_device_video_inputs(data);
 		if (show_list & action_list_voutputs)	print_device_video_outputs(data);
 		if (show_list & action_list_moutputs)	print_device_monitoring_outputs(data);
+		if (show_list & action_list_serial)		print_device_serial_ports(data);
 		fflush(stdout);
 	} else if (show_backup) {
 		print_device_backup(data);