Browse Source

Fix detection of monitoring outputs.

Georgi Chorbadzhiyski 9 years ago
parent
commit
822ef3bb37
3 changed files with 5 additions and 5 deletions
  1. 2
    2
      cmd.c
  2. 1
    1
      data.h
  3. 2
    2
      display.c

+ 2
- 2
cmd.c View File

169
 				d->device.num_video_processing_units = strtoul(p, NULL, 10);
169
 				d->device.num_video_processing_units = strtoul(p, NULL, 10);
170
 			if ((p = parse_text(line, "Video outputs: ")))
170
 			if ((p = parse_text(line, "Video outputs: ")))
171
 				d->outputs.num = strtoul(p, NULL, 10);
171
 				d->outputs.num = strtoul(p, NULL, 10);
172
-			if ((p = parse_text(line, "Video monitoring output: ")))
173
-				d->device.num_video_monitoring_outputs = strtoul(p, NULL, 10);
172
+			if ((p = parse_text(line, "Video monitoring outputs: ")))
173
+				d->mon_outputs.num = strtoul(p, NULL, 10);
174
 			if ((p = parse_text(line, "Serial ports: ")))
174
 			if ((p = parse_text(line, "Serial ports: ")))
175
 				d->device.num_serial_ports = strtoul(p, NULL, 10);
175
 				d->device.num_serial_ports = strtoul(p, NULL, 10);
176
 			break;
176
 			break;

+ 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_video_monitoring_outputs;
30
 	unsigned int	num_serial_ports;
29
 	unsigned int	num_serial_ports;
31
 };
30
 };
32
 
31
 
58
 	struct device_desc		device;
57
 	struct device_desc		device;
59
 	struct port_set			inputs;
58
 	struct port_set			inputs;
60
 	struct port_set			outputs;
59
 	struct port_set			outputs;
60
+	struct port_set			mon_outputs;
61
 };
61
 };
62
 
62
 
63
 extern int debug;
63
 extern int debug;

+ 2
- 2
display.c View File

48
 		printf("  | %-26s | %-26u |\n", "Serial ports", d->device.num_serial_ports);
48
 		printf("  | %-26s | %-26u |\n", "Serial ports", d->device.num_serial_ports);
49
 	if (d->device.num_video_processing_units)
49
 	if (d->device.num_video_processing_units)
50
 		printf("  | %-26s | %-26u |\n", "Video processing units", d->device.num_video_processing_units);
50
 		printf("  | %-26s | %-26u |\n", "Video processing units", d->device.num_video_processing_units);
51
-	if (d->device.num_video_monitoring_outputs)
52
-		printf("  | %-26s | %-26u |\n", "Video monitoring outputs", d->device.num_video_monitoring_outputs);
51
+	if (d->mon_outputs.num)
52
+		printf("  | %-26s | %-26u |\n", "Video monitoring outputs", d->mon_outputs.num);
53
 	printf_line(len);
53
 	printf_line(len);
54
 	printf("\n");
54
 	printf("\n");
55
 }
55
 }

Loading…
Cancel
Save