diff options
author | Daniel Mack <daniel@caiaq.de> | 2010-09-01 04:23:46 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-02-14 11:10:45 -0500 |
commit | df8d81a32fa0309d64726fc62d83cb70adc899e8 (patch) | |
tree | d3d0ac60814b5413ecf39e780df1625a44cf2b9e /sound | |
parent | fea952e5cc23ea94b4677ca20774cdc3cea014e2 (diff) |
ALSA: snd-usb-caiaq: Add support for Traktor Audio 2
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/usb/Kconfig | 1 | ||||
-rw-r--r-- | sound/usb/caiaq/audio.c | 1 | ||||
-rw-r--r-- | sound/usb/caiaq/device.c | 6 | ||||
-rw-r--r-- | sound/usb/caiaq/device.h | 1 |
4 files changed, 9 insertions, 0 deletions
diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig index 0fefdb4021a4..97724d8fa9f6 100644 --- a/sound/usb/Kconfig +++ b/sound/usb/Kconfig | |||
@@ -62,6 +62,7 @@ config SND_USB_CAIAQ | |||
62 | * Native Instruments Audio 2 DJ | 62 | * Native Instruments Audio 2 DJ |
63 | * Native Instruments Audio 4 DJ | 63 | * Native Instruments Audio 4 DJ |
64 | * Native Instruments Audio 8 DJ | 64 | * Native Instruments Audio 8 DJ |
65 | * Native Instruments Traktor Audio 2 | ||
65 | * Native Instruments Guitar Rig Session I/O | 66 | * Native Instruments Guitar Rig Session I/O |
66 | * Native Instruments Guitar Rig mobile | 67 | * Native Instruments Guitar Rig mobile |
67 | * Native Instruments Traktor Kontrol X1 | 68 | * Native Instruments Traktor Kontrol X1 |
diff --git a/sound/usb/caiaq/audio.c b/sound/usb/caiaq/audio.c index 68b97477577b..e411cd323d57 100644 --- a/sound/usb/caiaq/audio.c +++ b/sound/usb/caiaq/audio.c | |||
@@ -805,6 +805,7 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev) | |||
805 | case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO2DJ): | 805 | case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO2DJ): |
806 | case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO4DJ): | 806 | case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO4DJ): |
807 | case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO8DJ): | 807 | case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO8DJ): |
808 | case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORAUDIO2): | ||
808 | dev->samplerates |= SNDRV_PCM_RATE_88200; | 809 | dev->samplerates |= SNDRV_PCM_RATE_88200; |
809 | break; | 810 | break; |
810 | } | 811 | } |
diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c index 6480c3283c05..45bc4a2dc6f0 100644 --- a/sound/usb/caiaq/device.c +++ b/sound/usb/caiaq/device.c | |||
@@ -46,6 +46,7 @@ MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," | |||
46 | "{Native Instruments, Audio 2 DJ}," | 46 | "{Native Instruments, Audio 2 DJ}," |
47 | "{Native Instruments, Audio 4 DJ}," | 47 | "{Native Instruments, Audio 4 DJ}," |
48 | "{Native Instruments, Audio 8 DJ}," | 48 | "{Native Instruments, Audio 8 DJ}," |
49 | "{Native Instruments, Traktor Audio 2}," | ||
49 | "{Native Instruments, Session I/O}," | 50 | "{Native Instruments, Session I/O}," |
50 | "{Native Instruments, GuitarRig mobile}" | 51 | "{Native Instruments, GuitarRig mobile}" |
51 | "{Native Instruments, Traktor Kontrol X1}" | 52 | "{Native Instruments, Traktor Kontrol X1}" |
@@ -140,6 +141,11 @@ static struct usb_device_id snd_usb_id_table[] = { | |||
140 | .idVendor = USB_VID_NATIVEINSTRUMENTS, | 141 | .idVendor = USB_VID_NATIVEINSTRUMENTS, |
141 | .idProduct = USB_PID_TRAKTORKONTROLS4 | 142 | .idProduct = USB_PID_TRAKTORKONTROLS4 |
142 | }, | 143 | }, |
144 | { | ||
145 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE, | ||
146 | .idVendor = USB_VID_NATIVEINSTRUMENTS, | ||
147 | .idProduct = USB_PID_TRAKTORAUDIO2 | ||
148 | }, | ||
143 | { /* terminator */ } | 149 | { /* terminator */ } |
144 | }; | 150 | }; |
145 | 151 | ||
diff --git a/sound/usb/caiaq/device.h b/sound/usb/caiaq/device.h index e3d8a3efb35b..b2b310194ffa 100644 --- a/sound/usb/caiaq/device.h +++ b/sound/usb/caiaq/device.h | |||
@@ -17,6 +17,7 @@ | |||
17 | #define USB_PID_GUITARRIGMOBILE 0x0d8d | 17 | #define USB_PID_GUITARRIGMOBILE 0x0d8d |
18 | #define USB_PID_TRAKTORKONTROLX1 0x2305 | 18 | #define USB_PID_TRAKTORKONTROLX1 0x2305 |
19 | #define USB_PID_TRAKTORKONTROLS4 0xbaff | 19 | #define USB_PID_TRAKTORKONTROLS4 0xbaff |
20 | #define USB_PID_TRAKTORAUDIO2 0x041d | ||
20 | 21 | ||
21 | #define EP1_BUFSIZE 64 | 22 | #define EP1_BUFSIZE 64 |
22 | #define EP4_BUFSIZE 512 | 23 | #define EP4_BUFSIZE 512 |