Skip to contentSkip to conversation

snd_usb_caiaq: add support for "Session I/O" interface

PATCH Applied Daniel Mack 2 participants 3 messages May 8, 2008

Subsystems (2)
Sound Native Instruments USB sound interface driver
lore
Share & tools
lore

Daniel Mack

author
#0 lore raw

PATCH 1/1 snd_usb_caiaq: add support for "Session I/O" interface

Hi,

this patch adds support for "Session I/O". As it certainly won't break anything it could still go for 2.6.26, right?

Thanks,
Daniel

This patch adds suport for Native Instruments new
"Guitar Rig Session I/O" audio hardware.

Signed-off-by Daniel Mack <[email protected]>
sound/usb/Kconfig +1 -0
index 9351b8a..f917ef4 100644
@@ -45,6 +45,7 @@ config SND_USB_CAIAQ
 	    * Native Instruments Kore Controller 2
 	    * Native Instruments Audio Kontrol 1
 	    * Native Instruments Audio 8 DJ
+	    * Native Instruments Guitar Rig Session I/O
 
 	   To compile this driver as a module, choose M here: the module
 	   will be called snd-usb-caiaq.
sound/usb/caiaq/caiaq-device.c +9 -3
index e97d8b2..8ae5134 100644
@@ -42,14 +42,15 @@
 #endif
 
 MODULE_AUTHOR("Daniel Mack <[email protected]>");
-MODULE_DESCRIPTION("caiaq USB audio, version 1.3.6");
+MODULE_DESCRIPTION("caiaq USB audio, version 1.3.8");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
 			 "{Native Instruments, RigKontrol3},"
 			 "{Native Instruments, Kore Controller},"
 			 "{Native Instruments, Kore Controller 2},"
-			 "{Native Instruments, Audio Kontrol 1}"
-			 "{Native Instruments, Audio 8 DJ}}");
+			 "{Native Instruments, Audio Kontrol 1},"
+			 "{Native Instruments, Audio 8 DJ},"
+			 "{Native Instruments, Session I/O}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-max */
 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[] = {
 		.idVendor =     USB_VID_NATIVEINSTRUMENTS,
 		.idProduct =    USB_PID_AUDIO8DJ
 	},
+	{
+		.match_flags =  USB_DEVICE_ID_MATCH_DEVICE,
+		.idVendor =     USB_VID_NATIVEINSTRUMENTS,
+		.idProduct =    USB_PID_SESSIONIO
+	},
 	{ /* terminator */ }
 };
sound/usb/caiaq/caiaq-device.h +1 -0
index 9382d13..99e8a07 100644
@@ -11,6 +11,7 @@
 #define USB_PID_KORECONTROLLER2	0x4712
 #define USB_PID_AK1		0x0815
 #define USB_PID_AUDIO8DJ	0x1978
+#define USB_PID_SESSIONIO	0x1915
 
 #define EP1_BUFSIZE 64
 #define CAIAQ_USB_STR_LEN 0xff

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

author
#1 lore raw
Quoted 2 lines · Daniel Mack

this patch adds support for "Session I/O". As it certainly won't break anything it could still go for 2.6.26, right?

Forgot to enable high sample rates for this device in my previous patch. Use the one attached to this mail instead.

Daniel

This patch adds suport for Native Instruments new
"Guitar Rig Session I/O" audio hardware.

Signed-off-by Daniel Mack <[email protected]>
sound/usb/caiaq/caiaq-audio.c +1 -0
index 24970a5..b3a6033 100644
@@ -637,6 +637,7 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev)
 	switch (dev->chip.usb_id) {
 	case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AK1):
 	case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL3):
+	case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_SESSIONIO):
 		dev->samplerates |= SNDRV_PCM_RATE_88200;
 		dev->samplerates |= SNDRV_PCM_RATE_192000;
 		break;
sound/usb/caiaq/caiaq-device.c +9 -3
index e97d8b2..8ae5134 100644
@@ -42,14 +42,15 @@
 #endif
 
 MODULE_AUTHOR("Daniel Mack <[email protected]>");
-MODULE_DESCRIPTION("caiaq USB audio, version 1.3.6");
+MODULE_DESCRIPTION("caiaq USB audio, version 1.3.8");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
 			 "{Native Instruments, RigKontrol3},"
 			 "{Native Instruments, Kore Controller},"
 			 "{Native Instruments, Kore Controller 2},"
-			 "{Native Instruments, Audio Kontrol 1}"
-			 "{Native Instruments, Audio 8 DJ}}");
+			 "{Native Instruments, Audio Kontrol 1},"
+			 "{Native Instruments, Audio 8 DJ},"
+			 "{Native Instruments, Session I/O}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-max */
 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[] = {
 		.idVendor =     USB_VID_NATIVEINSTRUMENTS,
 		.idProduct =    USB_PID_AUDIO8DJ
 	},
+	{
+		.match_flags =  USB_DEVICE_ID_MATCH_DEVICE,
+		.idVendor =     USB_VID_NATIVEINSTRUMENTS,
+		.idProduct =    USB_PID_SESSIONIO
+	},
 	{ /* terminator */ }
 };
sound/usb/caiaq/caiaq-device.h +1 -0
index 9382d13..99e8a07 100644
@@ -11,6 +11,7 @@
 #define USB_PID_KORECONTROLLER2	0x4712
 #define USB_PID_AK1		0x0815
 #define USB_PID_AUDIO8DJ	0x1978
+#define USB_PID_SESSIONIO	0x1915
 
 #define EP1_BUFSIZE 64
 #define CAIAQ_USB_STR_LEN 0xff

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Applied
#2 lore raw
In reply to Daniel Mack

At Thu, 8 May 2008 13:26:13 +0200,

Quoted 4 lines · Daniel Mack

Hi,

this patch adds support for "Session I/O".

Thanks, applied your second patch to ALSA tree now.

Quoted 2 lines

As it certainly won't break
anything it could still go for 2.6.26, right?

No, unfortunately, the merge window was already closed, and 2.6.26-rc1 was released. "rc" stands for "release candidate". It means no new feature but only bug fixes should be applied in principle.

thanks,

Takashi