diff options
Diffstat (limited to 'sound/usb/usx2y/usbus428ctldefs.h')
-rw-r--r-- | sound/usb/usx2y/usbus428ctldefs.h | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/sound/usb/usx2y/usbus428ctldefs.h b/sound/usb/usx2y/usbus428ctldefs.h index 6af16438d2c7..b864e7e262e5 100644 --- a/sound/usb/usx2y/usbus428ctldefs.h +++ b/sound/usb/usx2y/usbus428ctldefs.h | |||
@@ -51,7 +51,7 @@ enum E_In84{ | |||
51 | #define T_NULL 0x80 | 51 | #define T_NULL 0x80 |
52 | 52 | ||
53 | 53 | ||
54 | struct us428_ctls{ | 54 | struct us428_ctls { |
55 | unsigned char Fader[9]; | 55 | unsigned char Fader[9]; |
56 | unsigned char Transport; | 56 | unsigned char Transport; |
57 | unsigned char Modifier; | 57 | unsigned char Modifier; |
@@ -63,46 +63,42 @@ struct us428_ctls{ | |||
63 | unsigned char Wheel[5]; | 63 | unsigned char Wheel[5]; |
64 | }; | 64 | }; |
65 | 65 | ||
66 | typedef struct us428_ctls us428_ctls_t; | 66 | struct us428_setByte { |
67 | |||
68 | typedef struct us428_setByte{ | ||
69 | unsigned char Offset, | 67 | unsigned char Offset, |
70 | Value; | 68 | Value; |
71 | }us428_setByte_t; | 69 | }; |
72 | 70 | ||
73 | enum { | 71 | enum { |
74 | eLT_Volume = 0, | 72 | eLT_Volume = 0, |
75 | eLT_Light | 73 | eLT_Light |
76 | }; | 74 | }; |
77 | 75 | ||
78 | typedef struct usX2Y_volume { | 76 | struct usX2Y_volume { |
79 | unsigned char Channel, | 77 | unsigned char Channel, |
80 | LH, | 78 | LH, |
81 | LL, | 79 | LL, |
82 | RH, | 80 | RH, |
83 | RL; | 81 | RL; |
84 | } usX2Y_volume_t; | 82 | }; |
85 | 83 | ||
86 | struct us428_lights{ | 84 | struct us428_lights { |
87 | us428_setByte_t Light[7]; | 85 | struct us428_setByte Light[7]; |
88 | }; | 86 | }; |
89 | typedef struct us428_lights us428_lights_t; | ||
90 | 87 | ||
91 | typedef struct { | 88 | struct us428_p4out { |
92 | char type; | 89 | char type; |
93 | union { | 90 | union { |
94 | usX2Y_volume_t vol; | 91 | struct usX2Y_volume vol; |
95 | us428_lights_t lights; | 92 | struct us428_lights lights; |
96 | } val; | 93 | } val; |
97 | } us428_p4out_t; | 94 | }; |
98 | 95 | ||
99 | #define N_us428_ctl_BUFS 16 | 96 | #define N_us428_ctl_BUFS 16 |
100 | #define N_us428_p4out_BUFS 16 | 97 | #define N_us428_p4out_BUFS 16 |
101 | struct us428ctls_sharedmem{ | 98 | struct us428ctls_sharedmem{ |
102 | us428_ctls_t CtlSnapShot[N_us428_ctl_BUFS]; | 99 | struct us428_ctls CtlSnapShot[N_us428_ctl_BUFS]; |
103 | int CtlSnapShotDiffersAt[N_us428_ctl_BUFS]; | 100 | int CtlSnapShotDiffersAt[N_us428_ctl_BUFS]; |
104 | int CtlSnapShotLast, CtlSnapShotRed; | 101 | int CtlSnapShotLast, CtlSnapShotRed; |
105 | us428_p4out_t p4out[N_us428_p4out_BUFS]; | 102 | struct us428_p4out p4out[N_us428_p4out_BUFS]; |
106 | int p4outLast, p4outSent; | 103 | int p4outLast, p4outSent; |
107 | }; | 104 | }; |
108 | typedef struct us428ctls_sharedmem us428ctls_sharedmem_t; | ||