Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3e9d5d1 authored by Daniel Mack's avatar Daniel Mack Committed by Jaroslav Kysela
Browse files

[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: default avatarDaniel Mack <daniel@caiaq.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 48008b59

sound/usb/caiaq/caiaq-audio.c

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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 */ }

};

sound/usb/caiaq/caiaq-device.h

+1 −0
Original line number Diff line number Diff line
@@ -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