diff options
author | Daniel Mack <daniel@caiaq.de> | 2010-03-22 08:13:37 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-03-22 11:10:41 -0400 |
commit | 6da7a2aa899f75116e1a62cef78c358ada9878b7 (patch) | |
tree | 64099b4ea88f717623ec720293727e5048a9bd37 /sound/usb/caiaq/device.c | |
parent | fc8aa7b16a5fcfe9c6d0be9bb587f1fcedd9145f (diff) |
ALSA: usb/caiaq: Add support for Traktor Kontrol X1
This device does not have audio controllers and backlit buttons only.
Input data is handled over a dedicated USB endpoint.
All functions are supported by the driver now.
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/caiaq/device.c')
-rw-r--r-- | sound/usb/caiaq/device.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c index a3f02dd97440..08ee2545830e 100644 --- a/sound/usb/caiaq/device.c +++ b/sound/usb/caiaq/device.c | |||
@@ -46,7 +46,8 @@ MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," | |||
46 | "{Native Instruments, Audio 4 DJ}," | 46 | "{Native Instruments, Audio 4 DJ}," |
47 | "{Native Instruments, Audio 8 DJ}," | 47 | "{Native Instruments, Audio 8 DJ}," |
48 | "{Native Instruments, Session I/O}," | 48 | "{Native Instruments, Session I/O}," |
49 | "{Native Instruments, GuitarRig mobile}"); | 49 | "{Native Instruments, GuitarRig mobile}" |
50 | "{Native Instruments, Traktor Kontrol X1}"); | ||
50 | 51 | ||
51 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-max */ | 52 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-max */ |
52 | static char* id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* Id for this card */ | 53 | static char* id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* Id for this card */ |
@@ -127,6 +128,11 @@ static struct usb_device_id snd_usb_id_table[] = { | |||
127 | .idVendor = USB_VID_NATIVEINSTRUMENTS, | 128 | .idVendor = USB_VID_NATIVEINSTRUMENTS, |
128 | .idProduct = USB_PID_AUDIO2DJ | 129 | .idProduct = USB_PID_AUDIO2DJ |
129 | }, | 130 | }, |
131 | { | ||
132 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE, | ||
133 | .idVendor = USB_VID_NATIVEINSTRUMENTS, | ||
134 | .idProduct = USB_PID_TRAKTORKONTROLX1 | ||
135 | }, | ||
130 | { /* terminator */ } | 136 | { /* terminator */ } |
131 | }; | 137 | }; |
132 | 138 | ||