Fix routing information.

The routing was completely reversed and buggy. It should be done by
output instead it was done by input.

ChangeLog

@@ -1,4 +1,7 @@
 |-----------------------------------------------------------------------|
+xxxx-xx-xx : Version 0.2 - dev
+ * Fix port routing. Previously it was reversed and incorrect.
+
 2014-11-26 : Version 0.1
  * Initial vesion with support for showing Videohub configuration
 |-----------------------------------------------------------------------|

README

@@ -117,19 +117,19 @@ Serial ports: 0
 ----------------------------------------------------------------------
 |  # | x | Input name                  | Output name                 |
 ----------------------------------------------------------------------
-|  1 | L | Windows 1                   | Enc1 3                      |
+|  1 | L | Windows 3                   | Enc1 1                      |
 |  2 | L | Windows 2                   | Enc1 2                      |
-|  3 | L | Windows 3                   | Enc1 1                      |
-|  4 | L | Windows 4 HD                | Enc1 1                      |
+|  3 | L | Windows 1                   | Enc1 3                      |
+|  4 | L | Windows 1                   | Enc1 4                      |
 |  5 |   | Input 5                     | Output 5                    |
 |  6 |   | Input 6                     | Output 6                    |
 |  7 |   | Input 7                     | Output 7                    |
 |  8 |   | Input 8                     | Output 8                    |
-|  9 | L | Input 9                     | Enc1 4                      |
-| 10 |   | Input 10                    | Enc1 4                      |
+|  9 | L | Windows 4 HD                | Enc2 1                      |
+| 10 |   | Windows 4 HD                | Output 10                   |
 | 11 |   | Input 11                    | Output 11                   |
-| 12 | L | DPlay1                      | Output 13                   |
-| 13 | L | DPlay2                      | Denc                        |
+| 12 | L | DPlay2                      | Denc                        |
+| 13 | L | DPlay1                      | Output 13                   |
 | 14 |   | Input 14                    | Output 14                   |
 | 15 |   | Input 15                    | Output 15                   |
 | 16 |   | Loopback                    | Loopback                    |

cmd.c

@@ -258,7 +258,7 @@ bool parse_command(struct videohub_data *data, char *cmd) {
 			if (valid_slot) {
 				unsigned int dest_pos = strtoul(slot_data, NULL, 10);
 				if (dest_pos < ARRAY_SIZE(data->outputs))
-					data->inputs[slot_pos].routed_to = dest_pos;
+					data->outputs[slot_pos].routed_to = dest_pos;
 			}
 			break;
 

data.h

@@ -34,11 +34,11 @@ struct device_desc {
 struct input_desc {
 	char			name[MAX_NAME_LEN];
 	bool			locked;
-	unsigned int	routed_to;
 };
 
 struct output_desc {
 	char			name[MAX_NAME_LEN];
+	unsigned int	routed_to;
 };
 
 struct videohub_data {

videohubctrl.c

@@ -135,8 +135,8 @@ static void print_device_settings(struct videohub_data *d) {
 		printf("| %2d | %c | %-27s | %-27s |\n",
 			i + 1,
 			d->inputs[i].locked ? 'L' : ' ',
-			d->inputs[i].name,
-			d->outputs[d->inputs[i].routed_to].name
+			d->inputs[d->outputs[i].routed_to].name,
+			d->outputs[i].name
 		);
 	}
 	printf_line(70);