Add support for port statuses (types) reported by Univeral Videohub.

ChangeLog

@@ -5,6 +5,8 @@
  * Display where each input is being routed.
  * Add support for testing the program using pre-recorded commands
    in text file by using -T / --test-input option.
+ * Add support for port statuses (types) which are reported by
+   Universal Videohub.
 
 2014-11-28 : Version 0.3
  * Rename -v / --verbose parameter to -d / --debug.

README

@@ -12,6 +12,7 @@ videohubctrl currently displays and can configure:
   - Video output port names
   - Video output routing
   - Video output locking
+  - Input/Output port statuses
 
 The following features found in bigger Videohub models are currently
 not supported (I don't have the hardware):
@@ -37,10 +38,6 @@ Command line parameters
 videohubctrl is controlled using command line parameters. Here is a list
 of supported command line parameters:
 
-videohubctrl Version: 0.3 Git: 0.3-dirty
-
- Usage: videohubctrl --host <host> [..commands..]
-
 Main options:
  -h --host <host>           | Set device host name.
  -p --port <port_number>    | Set device port (default: 9990).
@@ -154,62 +151,81 @@ Device info
   -----------------------------------------------------------
 
 Video inputs
-  ----------------------------------------------------------------
-  | ## | Video input name         | n | Routed to output         |
-  ----------------------------------------------------------------
-  |  1 | Windows 1                | 2 | Enc1 3                   |
-  |    |                          | . | Enc1 4                   |
-  |  2 | Windows 2                | 1 | Enc1 2                   |
-  |  3 | Windows 3                | 1 | Enc1 1                   |
-  |  4 | Windows 4 HD             | 2 | Output 8                 |
-  |    |                          | . | Enc2 1                   |
-  |  5 | Input 5                  | 1 | Output 5                 |
-  |  6 | Input 6                  | 1 | Output 6                 |
-  |  7 | Input 7                  | 1 | Output 7                 |
-  |  8 | Input 8                  | 0 | -                        |
-  |  9 | Input 9                  | 0 | -                        |
-  | 10 | Input 10                 | 1 | Output 10                |
-  | 11 | Input 11                 | 1 | Output 11                |
-  | 12 | DPlay1                   | 1 | Output 13                |
-  | 13 | DPlay2                   | 1 | Denc                     |
-  | 14 | Input 14                 | 1 | Output 14                |
-  | 15 | Input 15                 | 1 | Output 15                |
-  | 16 | Loopback                 | 1 | Loopback                 |
-  ----------------------------------------------------------------
+  --------------------------------------------------------------------
+  | ## | Video input name         | n | Routed to output         | s |
+  --------------------------------------------------------------------
+  |  1 | Windows 1                | 2 | Enc1 3                   | B |
+  |    |                          |   | Enc1 4                   |   |
+  |  2 | Windows 2                | 1 | Enc1 2                   | B |
+  |  3 | Windows 3                | 1 | Enc1 1                   | B |
+  |  4 | Windows 4 HD             | 2 | Output 8                 | B |
+  |    |                          |   | Enc2 1                   |   |
+  |  5 | Input 5                  | 1 | Output 5                 | o |
+  |  6 | Input 6                  | 1 | Output 6                 | o |
+  |  7 | Input 7                  | 1 | Output 7                 | o |
+  |  8 | Input 8                  | 0 | -                        | o |
+  |  9 | Input 9                  | 0 | -                        |   |
+  | 10 | Input 10                 | 1 | Output 10                |   |
+  | 11 | Input 11                 | 1 | Output 11                |   |
+  | 12 | DPlay1                   | 1 | Output 13                |   |
+  | 13 | DPlay2                   | 1 | Denc                     |   |
+  | 14 | Input 14                 | 1 | Output 14                | x |
+  | 15 | Input 15                 | 1 | Output 15                | x |
+  | 16 | Loopback                 | 1 | Loopback                 |   |
+  --------------------------------------------------------------------
 
 Video outputs
-  ----------------------------------------------------------------
-  | ## | x | Video output name        | Connected video input    |
-  ----------------------------------------------------------------
-  |  1 | L | Enc1 1                   | Windows 3                |
-  |  2 | L | Enc1 2                   | Windows 2                |
-  |  3 | L | Enc1 3                   | Windows 1                |
-  |  4 | L | Enc1 4                   | Windows 1                |
-  |  5 |   | Output 5                 | Input 5                  |
-  |  6 |   | Output 6                 | Input 6                  |
-  |  7 |   | Output 7                 | Input 7                  |
-  |  8 |   | Output 8                 | Windows 4 HD             |
-  |  9 | L | Enc2 1                   | Windows 4 HD             |
-  | 10 |   | Output 10                | Input 10                 |
-  | 11 |   | Output 11                | Input 11                 |
-  | 12 | L | Denc                     | DPlay2                   |
-  | 13 | O | Output 13                | DPlay1                   |
-  | 14 |   | Output 14                | Input 14                 |
-  | 15 |   | Output 15                | Input 15                 |
-  | 16 | O | Loopback                 | Loopback                 |
-  ----------------------------------------------------------------
+  --------------------------------------------------------------------
+  | ## | x | Video output name        | Connected video input    | s |
+  --------------------------------------------------------------------
+  |  1 | L | Enc1 1                   | Windows 3                |   |
+  |  2 | L | Enc1 2                   | Windows 2                |   |
+  |  3 | L | Enc1 3                   | Windows 1                |   |
+  |  4 | L | Enc1 4                   | Windows 1                |   |
+  |  5 |   | Output 5                 | Input 5                  | x |
+  |  6 |   | Output 6                 | Input 6                  | x |
+  |  7 |   | Output 7                 | Input 7                  | x |
+  |  8 |   | Output 8                 | Windows 4 HD             |   |
+  |  9 | L | Enc2 1                   | Windows 4 HD             | B |
+  | 10 |   | Output 10                | Input 10                 | B |
+  | 11 |   | Output 11                | Input 11                 | B |
+  | 12 | L | Denc                     | DPlay2                   | B |
+  | 13 | O | Output 13                | DPlay1                   | o |
+  | 14 |   | Output 14                | Input 14                 | o |
+  | 15 |   | Output 15                | Input 15                 | o |
+  | 16 | O | Loopback                 | Loopback                 | o |
+  --------------------------------------------------------------------
 
 |----------------------------------------------------------------------|
 
+
+Video inputs Legend
+===================
+
+ Column 1 (##) - Input port number
+ Column 2      - Input port names
+ Column 3 (n)  - To how much outputs this input is routed.
+ Column 4      - List of output ports which are connected to this input.
+ Column 5 (s)  - Port status /type/. Universal Videohub's support
+                 BNC/Optical ports and this column shows the port type.
+                     - Empty means that the device do not support port
+                       status.
+                  x  - The port type is "None". This means that the
+                       port is not installed.
+                  B  - The port type is "BNC".
+                  o  - The port type is "Optical".
+
+
 Video outputs Legend
 ====================
 
- Column 1 (##) - Input port number
+ Column 1 (##) - Output port number
  Column 2 (x)  - Output port lock status
                   L - The port is locked by another IP address (user)
                   O - The port is locked by me (from my IP address)
  Column 3      - Output port names
  Column 4      - Which input port is routed to this output
+ Column 5 (s)  - Port status /type/. Same format as in input ports.
 
 
 Development

cmd.c

@@ -28,6 +28,8 @@ static struct videohub_commands {
 	{ CMD_OUTPUT_LABELS,           "OUTPUT LABELS" },
 	{ CMD_VIDEO_OUTPUT_LOCKS,      "VIDEO OUTPUT LOCKS" },
 	{ CMD_VIDEO_OUTPUT_ROUTING,    "VIDEO OUTPUT ROUTING" },
+	{ CMD_VIDEO_INPUT_STATUS,      "VIDEO INPUT STATUS" },
+	{ CMD_VIDEO_OUTPUT_STATUS,     "VIDEO OUTPUT STATUS" },
 	{ CMD_PING,                    "PING" },
 	{ CMD_ACK,                     "ACK" },
 	{ CMD_NAK,                     "NAK" },
@@ -92,6 +94,8 @@ bool parse_command(struct videohub_data *data, char *cmd) {
 		switch (v->cmd) {
 		case CMD_INPUT_LABELS:
 		case CMD_OUTPUT_LABELS:
+		case CMD_VIDEO_INPUT_STATUS:
+		case CMD_VIDEO_OUTPUT_STATUS:
 		case CMD_VIDEO_OUTPUT_LOCKS:
 		case CMD_VIDEO_OUTPUT_ROUTING:
 			slot_data = strchr(line, ' ');
@@ -152,6 +156,16 @@ bool parse_command(struct videohub_data *data, char *cmd) {
 				snprintf(data->outputs[slot_pos].name, sizeof(data->inputs[slot_pos].name), "%s", slot_data);
 			break;
 
+		case CMD_VIDEO_INPUT_STATUS:
+			if (valid_slot)
+				snprintf(data->inputs[slot_pos].status, sizeof(data->inputs[slot_pos].status), "%s", slot_data);
+			break;
+
+		case CMD_VIDEO_OUTPUT_STATUS:
+			if (valid_slot)
+				snprintf(data->outputs[slot_pos].status, sizeof(data->outputs[slot_pos].status), "%s", slot_data);
+			break;
+
 		case CMD_VIDEO_OUTPUT_LOCKS:
 			if (valid_slot) {
 				// L is lock owned by somebody else (set from other IP address)
@@ -279,6 +293,8 @@ void prepare_cmd_entry(struct videohub_data *d, struct vcmd_entry *e) {
 				die("Unknown input port number/name: %s", e->param2);
 		}
 		break;
+	case CMD_VIDEO_INPUT_STATUS:
+	case CMD_VIDEO_OUTPUT_STATUS:
 	case CMD_PROTOCOL_PREAMBLE:
 	case CMD_VIDEOHUB_DEVICE:
 	case CMD_PING:
@@ -306,6 +322,8 @@ void format_cmd_text(struct vcmd_entry *e, char *buf, unsigned int bufsz) {
 		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_VIDEO_INPUT_STATUS:
+	case CMD_VIDEO_OUTPUT_STATUS:
 	case CMD_PROTOCOL_PREAMBLE:
 	case CMD_VIDEOHUB_DEVICE:
 	case CMD_PING:
@@ -346,6 +364,8 @@ void show_cmd(struct videohub_data *d, struct vcmd_entry *e) {
 			e->port_no2, d->inputs [e->port_no2 - 1].name
 		);
 		break;
+	case CMD_VIDEO_INPUT_STATUS:
+	case CMD_VIDEO_OUTPUT_STATUS:
 	case CMD_PROTOCOL_PREAMBLE:
 	case CMD_VIDEOHUB_DEVICE:
 	case CMD_PING:

cmd.h

@@ -22,6 +22,8 @@ enum vcmd {
 	CMD_OUTPUT_LABELS,
 	CMD_VIDEO_OUTPUT_LOCKS,
 	CMD_VIDEO_OUTPUT_ROUTING,
+	CMD_VIDEO_INPUT_STATUS,
+	CMD_VIDEO_OUTPUT_STATUS,
 	CMD_PING,
 	CMD_ACK,
 	CMD_NAK,

data.h

@@ -36,6 +36,10 @@ struct device_desc {
 
 struct input_desc {
 	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/
+	char			status[8];
 };
 
 struct output_desc {
@@ -43,6 +47,7 @@ struct output_desc {
 	unsigned int	routed_to;
 	bool			locked;
 	bool			locked_other;
+	char			status[8];
 };
 
 struct videohub_data {

display.c

@@ -11,8 +11,10 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 
 #include "data.h"
+#include "util.h"
 #include "display.h"
 
 static void printf_line(int len) {
@@ -23,6 +25,14 @@ static void printf_line(int len) {
 	printf("\n");
 }
 
+static char format_status(char *status) {
+	if (!strlen(status))          return ' ';
+	if (streq(status, "BNC"))     return 'B';
+	if (streq(status, "Optical")) return 'o';
+	if (streq(status, "None"))    return 'x';
+	return '?';
+}
+
 void print_device_info(struct videohub_data *d) {
 	int len = 59;
 	printf("Device info\n");
@@ -45,12 +55,12 @@ void print_device_info(struct videohub_data *d) {
 }
 
 void print_device_video_inputs(struct videohub_data *d) {
-	unsigned int i, r, len = 64;
+	unsigned int i, r, len = 68;
 	if (!d->device.num_video_inputs)
 		return;
 	printf("Video inputs\n");
 	printf_line(len);
-	printf("  | ## | %-24s | n | %-24s |\n", "Video input name", "Routed to output");
+	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++) {
 		unsigned int num_outputs = 0, routed_to = 0;
@@ -61,11 +71,12 @@ void print_device_video_inputs(struct videohub_data *d) {
 					routed_to = r; // The first output
 			}
 		}
-		printf("  | %2d | %-24s | %d | ", i + 1, d->inputs[i].name, num_outputs);
+		printf("  | %2d | %-24s | %d | ", i + 1, d->inputs[i].name,
+			 num_outputs);
 		if (num_outputs == 0) {
-			printf("%-24s |\n", "-");
+			printf("%-24s | %c |\n", "-", format_status(d->inputs[i].status));
 		} else {
-			printf("%-24s |\n", d->outputs[routed_to].name);
+			printf("%-24s | %c |\n", d->outputs[routed_to].name, format_status(d->inputs[i].status));
 			bool first_skipped = false;
 			for(r = 0; r < d->device.num_video_outputs; r++) {
 				if (d->outputs[r].routed_to == i) {
@@ -73,7 +84,8 @@ void print_device_video_inputs(struct videohub_data *d) {
 						first_skipped = true;
 						continue;
 					}
-					printf("  | %2s | %-24s | %s | %-24s |\n", " ", " ", ".", d->outputs[r].name);
+					printf("  | %2s | %-24s | %s | %-24s | %c |\n",
+						" ", " ", " ", d->outputs[r].name, ' ');
 				}
 			}
 		}
@@ -83,19 +95,20 @@ void print_device_video_inputs(struct videohub_data *d) {
 }
 
 void print_device_video_outputs(struct videohub_data *d) {
-	unsigned int i, len = 64;
+	unsigned int i, len = 68;
 	if (!d->device.num_video_outputs)
 		return;
 	printf("Video outputs\n");
 	printf_line(len);
-	printf("  | ## | x | %-24s | %-24s |\n", "Video output name", "Connected video input");
+	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++) {
-		printf("  | %2d | %c | %-24s | %-24s |\n",
+		printf("  | %2d | %c | %-24s | %-24s | %c |\n",
 			i + 1,
 			d->outputs[i].locked ? (d->outputs[i].locked_other ? 'L' : 'O') : ' ',
 			d->outputs[i].name,
-			d->inputs[d->outputs[i].routed_to].name
+			d->inputs[d->outputs[i].routed_to].name,
+			format_status(d->outputs[i].status)
 		);
 	}
 	printf_line(len);

vh_test_commands.txt

@@ -82,3 +82,28 @@ VIDEO OUTPUT ROUTING:
 13 13
 14 14
 15 15
+
+VIDEO INPUT STATUS:
+0 BNC
+1 BNC
+2 BNC
+3 BNC
+4 Optical
+5 Optical
+6 Optical
+7 Optical
+13 None
+14 None
+
+VIDEO OUTPUT STATUS:
+4 None
+5 None
+6 None
+8 BNC
+9 BNC
+10 BNC
+11 BNC
+12 Optical
+13 Optical
+14 Optical
+15 Optical

videohubctrl.1

@@ -45,14 +45,32 @@ Show the command line that will restore the device to it's configuration.
 Display main device info including model, number of ports, etc.
 .TP
 \fB\-\-list\-vinputs\fR
-Display device video inputs and their names, how many outputs an input
-is being routed to and a list of the outputs.
+Display device video inputs, port numbers, names, how many outputs an
+input is being routed to, the list of the outputs and the port status
+(type).
+
+The port statuses (type) are reported by Universal Videohub and can be
+these:
+.nf
+     - Empty means that the device do not support port status.
+  x  - The port type is "None". This means that the port is not
+       installed in the device.
+  B  - The port type is "BNC".
+  o  - The port type is "Optical".
+.fi
 .TP
 \fB\-\-list\-voutputs\fR
-Display device video outputs, their names, locking status and which
-input is routed to a given output. There are two locking statuses:
+Display device video outputs, port numbers, names, locking status, which
+input is routed to a given output and the port status (type).
+
+There are two locking statuses:
+.nf
   L - The port is locked by another IP address (user)
   O - The port is locked by me (from my IP address)
+.fi
+
+The port status field (s) have the same format as input ports (described
+in \fB\-\-list\-vinputs\fR option).
 .SH VIDEO INPUT/OUTPUT CONFIGURATION
 .PP
 Everywhere where port number is accepted, you can use the port