All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] snd_usb_caiaq: add support for "Session I/O" interface
@ 2008-05-08 11:26 Daniel Mack
  2008-05-08 11:47 ` Daniel Mack
  2008-05-08 13:46 ` Takashi Iwai
  0 siblings, 2 replies; 3+ messages in thread
From: Daniel Mack @ 2008-05-08 11:26 UTC (permalink / raw)
  To: alsa-devel

[-- Attachment #1: Type: text/plain, Size: 139 bytes --]

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


[-- Attachment #2: alsa-usb-caiaq-1.3.8.diff --]
[-- Type: text/x-diff, Size: 2265 bytes --]

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

Signed-off-by: Daniel Mack <daniel@caiaq.de>

diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
index 9351b8a..f917ef4 100644
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig
@@ -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.
diff --git a/sound/usb/caiaq/caiaq-device.c b/sound/usb/caiaq/caiaq-device.c
index e97d8b2..8ae5134 100644
--- a/sound/usb/caiaq/caiaq-device.c
+++ b/sound/usb/caiaq/caiaq-device.c
@@ -42,14 +42,15 @@
 #endif
 
 MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
-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 */ }
 };
 
diff --git a/sound/usb/caiaq/caiaq-device.h b/sound/usb/caiaq/caiaq-device.h
index 9382d13..99e8a07 100644
--- a/sound/usb/caiaq/caiaq-device.h
+++ b/sound/usb/caiaq/caiaq-device.h
@@ -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

[-- Attachment #3: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] snd_usb_caiaq: add support for "Session I/O" interface
  2008-05-08 11:26 [PATCH] snd_usb_caiaq: add support for "Session I/O" interface Daniel Mack
@ 2008-05-08 11:47 ` Daniel Mack
  2008-05-08 13:46 ` Takashi Iwai
  1 sibling, 0 replies; 3+ messages in thread
From: Daniel Mack @ 2008-05-08 11:47 UTC (permalink / raw)
  To: alsa-devel

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

On Thu, May 08, 2008 at 01:26:13PM +0200, Daniel Mack wrote:
> 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


[-- Attachment #2: alsa-usb-caiaq-1.3.8.diff --]
[-- Type: text/x-diff, Size: 2383 bytes --]

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

Signed-off-by: Daniel Mack <daniel@caiaq.de>

diff --git a/sound/usb/caiaq/caiaq-audio.c b/sound/usb/caiaq/caiaq-audio.c
index 24970a5..b3a6033 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)
 	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;
diff --git a/sound/usb/caiaq/caiaq-device.c b/sound/usb/caiaq/caiaq-device.c
index e97d8b2..8ae5134 100644
--- a/sound/usb/caiaq/caiaq-device.c
+++ b/sound/usb/caiaq/caiaq-device.c
@@ -42,14 +42,15 @@
 #endif
 
 MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
-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 */ }
 };
 
diff --git a/sound/usb/caiaq/caiaq-device.h b/sound/usb/caiaq/caiaq-device.h
index 9382d13..99e8a07 100644
--- a/sound/usb/caiaq/caiaq-device.h
+++ b/sound/usb/caiaq/caiaq-device.h
@@ -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

[-- Attachment #3: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] snd_usb_caiaq: add support for "Session I/O" interface
  2008-05-08 11:26 [PATCH] snd_usb_caiaq: add support for "Session I/O" interface Daniel Mack
  2008-05-08 11:47 ` Daniel Mack
@ 2008-05-08 13:46 ` Takashi Iwai
  1 sibling, 0 replies; 3+ messages in thread
From: Takashi Iwai @ 2008-05-08 13:46 UTC (permalink / raw)
  To: Daniel Mack; +Cc: alsa-devel

At Thu, 8 May 2008 13:26:13 +0200,
Daniel Mack wrote:
> 
> Hi,
> 
> this patch adds support for "Session I/O".

Thanks, applied your second patch to ALSA tree now.

> 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

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-05-08 13:46 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-08 11:26 [PATCH] snd_usb_caiaq: add support for "Session I/O" interface Daniel Mack
2008-05-08 11:47 ` Daniel Mack
2008-05-08 13:46 ` Takashi Iwai

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.