Browse Source

Create single structure that describes device port.

Georgi Chorbadzhiyski 9 years ago
parent
commit
cf8d47510a
1 changed files with 4 additions and 9 deletions
  1. 4
    9
      data.h

+ 4
- 9
data.h View File

@@ -40,19 +40,14 @@ enum port_lock {
40 40
 	PORT_LOCKED_OTHER,
41 41
 };
42 42
 
43
-struct input_desc {
43
+struct port {
44 44
 	char			name[MAX_NAME_LEN];
45 45
 	// Port statuses are supported only by Universal Videohub
46 46
 	// The statuses (actually they are connection types) are:
47 47
 	//    BNC, Optical or None /missing port/
48 48
 	char			status[8];
49
-};
50
-
51
-struct output_desc {
52
-	enum port_lock	lock;
53
-	char			name[MAX_NAME_LEN];
54 49
 	unsigned int	routed_to;
55
-	char			status[8];
50
+	enum port_lock	lock;
56 51
 };
57 52
 
58 53
 struct videohub_data {
@@ -60,8 +55,8 @@ struct videohub_data {
60 55
 	char					*dev_port;
61 56
 	int						dev_fd;
62 57
 	struct device_desc		device;
63
-	struct input_desc		inputs[MAX_INPUTS];
64
-	struct output_desc		outputs[MAX_OUTPUTS];
58
+	struct port				inputs[MAX_INPUTS];
59
+	struct port				outputs[MAX_OUTPUTS];
65 60
 };
66 61
 
67 62
 extern int debug;

Loading…
Cancel
Save