diff options
author | Daniel Mack <daniel@caiaq.de> | 2008-05-08 09:42:15 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-05-19 07:19:15 -0400 |
commit | f3e9d5d1fd6a164611043c053de585a35d76d6a9 (patch) | |
tree | de6359db4a22dfc774a5d46d3be54abaeac7a4e4 /sound/usb | |
parent | 48008b598bb9cfffbd871512f49d84eb5b885a00 (diff) |
[ALSA] snd_usb_caiaq: add support for 'Session I/O' interface
This patch adds suport for Native Instruments new
'Guitar Rig Session I/O' audio hardware.
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/usb')
-rw-r--r-- | sound/usb/caiaq/caiaq-audio.c | 1 | ||||
-rw-r--r-- | sound/usb/caiaq/caiaq-device.c | 12 | ||||
-rw-r--r-- | sound/usb/caiaq/caiaq-device.h | 1 |
3 files changed, 11 insertions, 3 deletions
diff --git a/sound/usb/caiaq/caiaq-audio.c b/sound/usb/caiaq/caiaq-audio.c index 24970a5c888f..b3a603325835 100644 --- a/sound/usb/caiaq/caiaq-audio.c +++ b/sound/usb/caiaq/caiaq-audio.c | |||
@@ -637,6 +637,7 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev) | |||
637 | switch (dev->chip.usb_id) { | 637 | switch (dev->chip.usb_id) { |
638 | case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AK1): | 638 | case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AK1): |
639 | case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL3): | 639 | case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL3): |
640 | case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_SESSIONIO): | ||
640 | dev->samplerates |= SNDRV_PCM_RATE_88200; | 641 | dev->samplerates |= SNDRV_PCM_RATE_88200; |
641 | dev->samplerates |= SNDRV_PCM_RATE_192000; | 642 | dev->samplerates |= SNDRV_PCM_RATE_192000; |
642 | break; | 643 | break; |
diff --git a/sound/usb/caiaq/caiaq-device.c b/sound/usb/caiaq/caiaq-device.c index a972f77bd785..83175083e50f 100644 --- a/sound/usb/caiaq/caiaq-device.c +++ b/sound/usb/caiaq/caiaq-device.c | |||
@@ -42,14 +42,15 @@ | |||
42 | #endif | 42 | #endif |
43 | 43 | ||
44 | MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>"); | 44 | MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>"); |
45 | MODULE_DESCRIPTION("caiaq USB audio, version 1.3.6"); | 45 | MODULE_DESCRIPTION("caiaq USB audio, version 1.3.8"); |
46 | MODULE_LICENSE("GPL"); | 46 | MODULE_LICENSE("GPL"); |
47 | MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," | 47 | MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," |
48 | "{Native Instruments, RigKontrol3}," | 48 | "{Native Instruments, RigKontrol3}," |
49 | "{Native Instruments, Kore Controller}," | 49 | "{Native Instruments, Kore Controller}," |
50 | "{Native Instruments, Kore Controller 2}," | 50 | "{Native Instruments, Kore Controller 2}," |
51 | "{Native Instruments, Audio Kontrol 1}" | 51 | "{Native Instruments, Audio Kontrol 1}," |
52 | "{Native Instruments, Audio 8 DJ}}"); | 52 | "{Native Instruments, Audio 8 DJ}," |
53 | "{Native Instruments, Session I/O}}"); | ||
53 | 54 | ||
54 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-max */ | 55 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-max */ |
55 | static char* id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* Id for this card */ | 56 | static char* id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* Id for this card */ |
@@ -110,6 +111,11 @@ static struct usb_device_id snd_usb_id_table[] = { | |||
110 | .idVendor = USB_VID_NATIVEINSTRUMENTS, | 111 | .idVendor = USB_VID_NATIVEINSTRUMENTS, |
111 | .idProduct = USB_PID_AUDIO8DJ | 112 | .idProduct = USB_PID_AUDIO8DJ |
112 | }, | 113 | }, |
114 | { | ||
115 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE, | ||
116 | .idVendor = USB_VID_NATIVEINSTRUMENTS, | ||
117 | .idProduct = USB_PID_SESSIONIO | ||
118 | }, | ||
113 | { /* terminator */ } | 119 | { /* terminator */ } |
114 | }; | 120 | }; |
115 | 121 | ||
diff --git a/sound/usb/caiaq/caiaq-device.h b/sound/usb/caiaq/caiaq-device.h index 96a491379c60..f9fbdbae269d 100644 --- a/sound/usb/caiaq/caiaq-device.h +++ b/sound/usb/caiaq/caiaq-device.h | |||
@@ -11,6 +11,7 @@ | |||
11 | #define USB_PID_KORECONTROLLER2 0x4712 | 11 | #define USB_PID_KORECONTROLLER2 0x4712 |
12 | #define USB_PID_AK1 0x0815 | 12 | #define USB_PID_AK1 0x0815 |
13 | #define USB_PID_AUDIO8DJ 0x1978 | 13 | #define USB_PID_AUDIO8DJ 0x1978 |
14 | #define USB_PID_SESSIONIO 0x1915 | ||
14 | 15 | ||
15 | #define EP1_BUFSIZE 64 | 16 | #define EP1_BUFSIZE 64 |
16 | #define CAIAQ_USB_STR_LEN 0xff | 17 | #define CAIAQ_USB_STR_LEN 0xff |