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

Commit df8d81a3 authored by Daniel Mack's avatar Daniel Mack Committed by Takashi Iwai
Browse files

ALSA: snd-usb-caiaq: Add support for Traktor Audio 2 



Signed-off-by: default avatarDaniel Mack <daniel@caiaq.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent fea952e5

sound/usb/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ config SND_USB_CAIAQ 
	    * Native Instruments Audio 2 DJ

	    * Native Instruments Audio 4 DJ

	    * Native Instruments Audio 8 DJ

	    * Native Instruments Traktor Audio 2

	    * Native Instruments Guitar Rig Session I/O

	    * Native Instruments Guitar Rig mobile

	    * Native Instruments Traktor Kontrol X1

sound/usb/caiaq/audio.c

+1 −0
Original line number Diff line number Diff line
@@ -805,6 +805,7 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev) 
	case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO2DJ):

	case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO4DJ):

	case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO8DJ):

	case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORAUDIO2):

		dev->samplerates |= SNDRV_PCM_RATE_88200;

		break;

	}

sound/usb/caiaq/device.c

+6 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," 
			 "{Native Instruments, Audio 2 DJ},"

			 "{Native Instruments, Audio 4 DJ},"

			 "{Native Instruments, Audio 8 DJ},"

			 "{Native Instruments, Traktor Audio 2},"

			 "{Native Instruments, Session I/O},"

			 "{Native Instruments, GuitarRig mobile}"

			 "{Native Instruments, Traktor Kontrol X1}"
@@ -140,6 +141,11 @@ static struct usb_device_id snd_usb_id_table[] = { 
		.idVendor =     USB_VID_NATIVEINSTRUMENTS,

		.idProduct =    USB_PID_TRAKTORKONTROLS4

	},

	{

		.match_flags =  USB_DEVICE_ID_MATCH_DEVICE,

		.idVendor =     USB_VID_NATIVEINSTRUMENTS,

		.idProduct =    USB_PID_TRAKTORAUDIO2

	},

	{ /* terminator */ }

};

sound/usb/caiaq/device.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#define USB_PID_GUITARRIGMOBILE		0x0d8d

#define USB_PID_TRAKTORKONTROLX1	0x2305

#define USB_PID_TRAKTORKONTROLS4	0xbaff

#define USB_PID_TRAKTORAUDIO2		0x041d



#define EP1_BUFSIZE 64

#define EP4_BUFSIZE 512