Browse Source

Preparation for serial commands support.

Georgi Chorbadzhiyski 9 years ago
parent
commit
a331d546b5
4 changed files with 5 additions and 4 deletions
  1. 1
    1
      cmd.c
  2. 1
    1
      data.h
  3. 2
    2
      display.c
  4. 1
    0
      videohubctrl.c

+ 1
- 1
cmd.c View File

210
 			if ((p = parse_text(line, "Video monitoring outputs: ")))
210
 			if ((p = parse_text(line, "Video monitoring outputs: ")))
211
 				d->mon_outputs.num = strtoul(p, NULL, 10);
211
 				d->mon_outputs.num = strtoul(p, NULL, 10);
212
 			if ((p = parse_text(line, "Serial ports: ")))
212
 			if ((p = parse_text(line, "Serial ports: ")))
213
-				d->device.num_serial_ports = strtoul(p, NULL, 10);
213
+				d->serial.num = strtoul(p, NULL, 10);
214
 			break;
214
 			break;
215
 		case CMD_NAK:
215
 		case CMD_NAK:
216
 			ret = false;
216
 			ret = false;

+ 1
- 1
data.h View File

26
 	char			model_name[MAX_NAME_LEN];
26
 	char			model_name[MAX_NAME_LEN];
27
 	char			unique_id[MAX_NAME_LEN];
27
 	char			unique_id[MAX_NAME_LEN];
28
 	unsigned int	num_video_processing_units;
28
 	unsigned int	num_video_processing_units;
29
-	unsigned int	num_serial_ports;
30
 };
29
 };
31
 
30
 
32
 enum port_lock {
31
 enum port_lock {
58
 	struct port_set			inputs;
57
 	struct port_set			inputs;
59
 	struct port_set			outputs;
58
 	struct port_set			outputs;
60
 	struct port_set			mon_outputs;
59
 	struct port_set			mon_outputs;
60
+	struct port_set			serial;
61
 };
61
 };
62
 
62
 
63
 extern int debug;
63
 extern int debug;

+ 2
- 2
display.c View File

45
 	printf("  | %-26s | %-26s |\n", "Protocol", d->device.protocol_ver);
45
 	printf("  | %-26s | %-26s |\n", "Protocol", d->device.protocol_ver);
46
 	printf("  | %-26s | %-26u |\n", "Video inputs", d->inputs.num);
46
 	printf("  | %-26s | %-26u |\n", "Video inputs", d->inputs.num);
47
 	printf("  | %-26s | %-26u |\n", "Video outputs", d->outputs.num);
47
 	printf("  | %-26s | %-26u |\n", "Video outputs", d->outputs.num);
48
-	if (d->device.num_serial_ports)
49
-		printf("  | %-26s | %-26u |\n", "Serial ports", d->device.num_serial_ports);
48
+	if (d->serial.num)
49
+		printf("  | %-26s | %-26u |\n", "Serial ports", d->serial.num);
50
 	if (d->device.num_video_processing_units)
50
 	if (d->device.num_video_processing_units)
51
 		printf("  | %-26s | %-26u |\n", "Video processing units", d->device.num_video_processing_units);
51
 		printf("  | %-26s | %-26u |\n", "Video processing units", d->device.num_video_processing_units);
52
 	if (d->mon_outputs.num)
52
 	if (d->mon_outputs.num)

+ 1
- 0
videohubctrl.c View File

305
 	check_number_of_ports(&data->inputs);
305
 	check_number_of_ports(&data->inputs);
306
 	check_number_of_ports(&data->outputs);
306
 	check_number_of_ports(&data->outputs);
307
 	check_number_of_ports(&data->mon_outputs);
307
 	check_number_of_ports(&data->mon_outputs);
308
+	check_number_of_ports(&data->serial);
308
 
309
 
309
 	if (num_parsed_cmds) {
310
 	if (num_parsed_cmds) {
310
 		unsigned int i;
311
 		unsigned int i;

Loading…
Cancel
Save