aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/caiaq/caiaq-device.h
diff options
context:
space:
mode:
Diffstat (limited to 'sound/usb/caiaq/caiaq-device.h')
-rw-r--r--sound/usb/caiaq/caiaq-device.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/usb/caiaq/caiaq-device.h b/sound/usb/caiaq/caiaq-device.h
index 79bc5be2df7a..685761279f1a 100644
--- a/sound/usb/caiaq/caiaq-device.h
+++ b/sound/usb/caiaq/caiaq-device.h
@@ -7,7 +7,7 @@
7 7
8#define USB_PID_RIGKONTROL2 0x1969 8#define USB_PID_RIGKONTROL2 0x1969
9#define USB_PID_RIGKONTROL3 0x1940 9#define USB_PID_RIGKONTROL3 0x1940
10#define USB_PID_KORECONTROLLER 0x4711 10#define USB_PID_KORECONTROLLER 0x4711
11#define USB_PID_AK1 0x0815 11#define USB_PID_AK1 0x0815
12#define USB_PID_AUDIO8DJ 0x1978 12#define USB_PID_AUDIO8DJ 0x1978
13 13
@@ -62,7 +62,7 @@ struct snd_usb_caiaqdev {
62 struct urb **data_urbs_in; 62 struct urb **data_urbs_in;
63 struct urb **data_urbs_out; 63 struct urb **data_urbs_out;
64 struct snd_usb_caiaq_cb_info *data_cb_info; 64 struct snd_usb_caiaq_cb_info *data_cb_info;
65 65
66 unsigned char ep1_in_buf[EP1_BUFSIZE]; 66 unsigned char ep1_in_buf[EP1_BUFSIZE];
67 unsigned char ep1_out_buf[EP1_BUFSIZE]; 67 unsigned char ep1_out_buf[EP1_BUFSIZE];
68 unsigned char midi_out_buf[EP1_BUFSIZE]; 68 unsigned char midi_out_buf[EP1_BUFSIZE];
@@ -72,7 +72,7 @@ struct snd_usb_caiaqdev {
72 wait_queue_head_t ep1_wait_queue; 72 wait_queue_head_t ep1_wait_queue;
73 wait_queue_head_t prepare_wait_queue; 73 wait_queue_head_t prepare_wait_queue;
74 int spec_received, audio_parm_answer; 74 int spec_received, audio_parm_answer;
75 75
76 char vendor_name[CAIAQ_USB_STR_LEN]; 76 char vendor_name[CAIAQ_USB_STR_LEN];
77 char product_name[CAIAQ_USB_STR_LEN]; 77 char product_name[CAIAQ_USB_STR_LEN];
78 char serial[CAIAQ_USB_STR_LEN]; 78 char serial[CAIAQ_USB_STR_LEN];
@@ -93,8 +93,10 @@ struct snd_usb_caiaqdev {
93 /* Linux input */ 93 /* Linux input */
94#ifdef CONFIG_SND_USB_CAIAQ_INPUT 94#ifdef CONFIG_SND_USB_CAIAQ_INPUT
95 struct input_dev *input_dev; 95 struct input_dev *input_dev;
96 char phys[64]; /* physical device path */
97 unsigned short keycode[10];
96#endif 98#endif
97 99
98 /* ALSA */ 100 /* ALSA */
99 struct snd_pcm *pcm; 101 struct snd_pcm *pcm;
100 struct snd_pcm_hardware pcm_info; 102 struct snd_pcm_hardware pcm_info;