Skip to contentSkip to conversation

ALSA: snd-usb-caiaq: drop version number

PATCH In review Daniel Mack 2 participants 6 messages Sep 10, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ALSA: snd-usb-caiaq: drop version number

Let git do the job.

---
 sound/usb/caiaq/device.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
sound/usb/caiaq/device.c +1 -1
index cdfb856..da9cb6d 100644
@@ -36,7 +36,7 @@
 #include "input.h"
 
 MODULE_AUTHOR("Daniel Mack <[email protected]>");
-MODULE_DESCRIPTION("caiaq USB audio, version 1.3.21");
+MODULE_DESCRIPTION("caiaq USB audio");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
 			 "{Native Instruments, RigKontrol3},"
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 2/2 ALSA: snd-usb-caiaq: Add support for Traktor Kontrol S4

This patch adds support for the new Traktor Kontrol S4 by Native Instruments. It features a new audio data streaming model, MIDI in and out ports, a huge number of 174 dimmable LEDs, 96 buttons and 46 absolute encoder axis, including some rotary encoders.

All features are supported by the driver now.

Did some code refactoring along the way.

---
 sound/usb/Kconfig         |    2 +
 sound/usb/caiaq/audio.c   |  176 +++++++++++++++++++++++++++++---
 sound/usb/caiaq/control.c |  208 ++++++++++++++++++++++++++++++++++++-
 sound/usb/caiaq/device.c  |    8 ++-
 sound/usb/caiaq/device.h  |    6 +-
 sound/usb/caiaq/input.c   |  248 ++++++++++++++++++++++++++++++++++++++++-----
 6 files changed, 599 insertions(+), 49 deletions(-)
sound/usb/Kconfig +2 -0
index 44d6d2e..112984f 100644
@@ -65,6 +65,7 @@ config SND_USB_CAIAQ
 	    * Native Instruments Guitar Rig Session I/O
 	    * Native Instruments Guitar Rig mobile
 	    * Native Instruments Traktor Kontrol X1
+	    * Native Instruments Traktor Kontrol S4
 
 	   To compile this driver as a module, choose M here: the module
 	   will be called snd-usb-caiaq.
@@ -82,6 +83,7 @@ config SND_USB_CAIAQ_INPUT
 	   * Native Instruments Kore Controller
 	   * Native Instruments Kore Controller 2
 	   * Native Instruments Audio Kontrol 1
+	   * Native Instruments Traktor Kontrol S4
 
 config SND_USB_US122L
 	tristate "Tascam US-122L USB driver"
sound/usb/caiaq/audio.c +161 -15

243 lines not on this page · raw message

sound/usb/caiaq/control.c +203 -5

239 lines not on this page · raw message

sound/usb/caiaq/device.c +7 -1
index da9cb6d..6480c32 100644
@@ -48,7 +48,8 @@ MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
 			 "{Native Instruments, Audio 8 DJ},"
 			 "{Native Instruments, Session I/O},"
 			 "{Native Instruments, GuitarRig mobile}"
-			 "{Native Instruments, Traktor Kontrol X1}");
+			 "{Native Instruments, Traktor Kontrol X1}"
+			 "{Native Instruments, Traktor Kontrol S4}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-max */
 static char* id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* Id for this card */
@@ -134,6 +135,11 @@ static struct usb_device_id snd_usb_id_table[] = {
 		.idVendor =     USB_VID_NATIVEINSTRUMENTS,
 		.idProduct =    USB_PID_TRAKTORKONTROLX1
 	},
+	{
+		.match_flags =  USB_DEVICE_ID_MATCH_DEVICE,
+		.idVendor =     USB_VID_NATIVEINSTRUMENTS,
+		.idProduct =    USB_PID_TRAKTORKONTROLS4
+	},
 	{ /* terminator */ }
 };
 
sound/usb/caiaq/device.h +4 -2
index f1117ec..e3d8a3e 100644
@@ -16,6 +16,7 @@
 #define USB_PID_SESSIONIO		0x1915
 #define USB_PID_GUITARRIGMOBILE		0x0d8d
 #define USB_PID_TRAKTORKONTROLX1	0x2305
+#define USB_PID_TRAKTORKONTROLS4	0xbaff
 
 #define EP1_BUFSIZE 64
 #define EP4_BUFSIZE 512
@@ -99,13 +100,14 @@ struct snd_usb_caiaqdev {
 	struct snd_pcm_substream *sub_capture[MAX_STREAMS];
 
 	/* Controls */
-	unsigned char control_state[64];
+	unsigned char control_state[256];
+	unsigned char ep8_out_buf[2];
 
 	/* Linux input */
 #ifdef CONFIG_SND_USB_CAIAQ_INPUT
 	struct input_dev *input_dev;
 	char phys[64];			/* physical device path */
-	unsigned short keycode[64];
+	unsigned short keycode[128];
 	struct urb *ep4_in_urb;
 	unsigned char ep4_in_buf[EP4_BUFSIZE];
 #endif
sound/usb/caiaq/input.c +222 -26

312 lines not on this page · raw message

Signature · 1 line
1.7.0.4
#2 lore raw

Re: [PATCH 2/2] ALSA: snd-usb-caiaq: Add support for Traktor Kontrol S4

At Fri, 10 Sep 2010 16:12:35 +0800,

Quoted 11 lines · Daniel Mack

This patch adds support for the new Traktor Kontrol S4 by Native Instruments. It features a new audio data streaming model, MIDI in and out ports, a huge number of 174 dimmable LEDs, 96 buttons and 46 absolute encoder axis, including some rotary encoders.

All features are supported by the driver now.

Did some code refactoring along the way.

Got a build error:
sound/usb/caiaq/audio.c: In function ‘snd_usb_caiaq_audio_init’:
sound/usb/caiaq/audio.c:808:28: error: ‘USB_PID_TRAKTORAUDIO2’ undeclared (first use in this function) sound/usb/caiaq/audio.c:808:28: note: each undeclared identifier is reported only once for each function it appears in make[3]: *** [sound/usb/caiaq/audio.o] Error 1

Missing change in device.h?

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

#3 lore raw

PATCH 2/2 ALSA: snd-usb-caiaq: Add support for Traktor Kontrol S4

This patch adds support for the new Traktor Kontrol S4 by Native Instruments. It features a new audio data streaming model, MIDI in and out ports, a huge number of 174 dimmable LEDs, 96 buttons and 46 absolute encoder axis, including some rotary encoders.

All features are supported by the driver now.

Did some code refactoring along the way.

---
 sound/usb/Kconfig         |    2 +
 sound/usb/caiaq/audio.c   |  175 +++++++++++++++++++++++++++++---
 sound/usb/caiaq/control.c |  208 ++++++++++++++++++++++++++++++++++++-
 sound/usb/caiaq/device.c  |    8 ++-
 sound/usb/caiaq/device.h  |    6 +-
 sound/usb/caiaq/input.c   |  248 ++++++++++++++++++++++++++++++++++++++++-----
 6 files changed, 598 insertions(+), 49 deletions(-)
sound/usb/Kconfig +2 -0
index 44d6d2e..112984f 100644
@@ -65,6 +65,7 @@ config SND_USB_CAIAQ
 	    * Native Instruments Guitar Rig Session I/O
 	    * Native Instruments Guitar Rig mobile
 	    * Native Instruments Traktor Kontrol X1
+	    * Native Instruments Traktor Kontrol S4
 
 	   To compile this driver as a module, choose M here: the module
 	   will be called snd-usb-caiaq.
@@ -82,6 +83,7 @@ config SND_USB_CAIAQ_INPUT
 	   * Native Instruments Kore Controller
 	   * Native Instruments Kore Controller 2
 	   * Native Instruments Audio Kontrol 1
+	   * Native Instruments Traktor Kontrol S4
 
 config SND_USB_US122L
 	tristate "Tascam US-122L USB driver"
sound/usb/caiaq/audio.c +160 -15

236 lines not on this page · raw message

sound/usb/caiaq/control.c +203 -5

239 lines not on this page · raw message

sound/usb/caiaq/device.c +7 -1
index da9cb6d..6480c32 100644
@@ -48,7 +48,8 @@ MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
 			 "{Native Instruments, Audio 8 DJ},"
 			 "{Native Instruments, Session I/O},"
 			 "{Native Instruments, GuitarRig mobile}"
-			 "{Native Instruments, Traktor Kontrol X1}");
+			 "{Native Instruments, Traktor Kontrol X1}"
+			 "{Native Instruments, Traktor Kontrol S4}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-max */
 static char* id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* Id for this card */
@@ -134,6 +135,11 @@ static struct usb_device_id snd_usb_id_table[] = {
 		.idVendor =     USB_VID_NATIVEINSTRUMENTS,
 		.idProduct =    USB_PID_TRAKTORKONTROLX1
 	},
+	{
+		.match_flags =  USB_DEVICE_ID_MATCH_DEVICE,
+		.idVendor =     USB_VID_NATIVEINSTRUMENTS,
+		.idProduct =    USB_PID_TRAKTORKONTROLS4
+	},
 	{ /* terminator */ }
 };
 
sound/usb/caiaq/device.h +4 -2
index f1117ec..e3d8a3e 100644
@@ -16,6 +16,7 @@
 #define USB_PID_SESSIONIO		0x1915
 #define USB_PID_GUITARRIGMOBILE		0x0d8d
 #define USB_PID_TRAKTORKONTROLX1	0x2305
+#define USB_PID_TRAKTORKONTROLS4	0xbaff
 
 #define EP1_BUFSIZE 64
 #define EP4_BUFSIZE 512
@@ -99,13 +100,14 @@ struct snd_usb_caiaqdev {
 	struct snd_pcm_substream *sub_capture[MAX_STREAMS];
 
 	/* Controls */
-	unsigned char control_state[64];
+	unsigned char control_state[256];
+	unsigned char ep8_out_buf[2];
 
 	/* Linux input */
 #ifdef CONFIG_SND_USB_CAIAQ_INPUT
 	struct input_dev *input_dev;
 	char phys[64];			/* physical device path */
-	unsigned short keycode[64];
+	unsigned short keycode[128];
 	struct urb *ep4_in_urb;
 	unsigned char ep4_in_buf[EP4_BUFSIZE];
 #endif
sound/usb/caiaq/input.c +222 -26

312 lines not on this page · raw message

Signature · 1 line
1.7.0.4
#4 lore raw

Re: [PATCH 2/2] ALSA: snd-usb-caiaq: Add support for Traktor Kontrol S4

In reply to Takashi Iwai
Quoted 14 lines · Takashi Iwai

At Fri, 10 Sep 2010 16:12:35 +0800,

Quoted 11 lines · Daniel Mack

This patch adds support for the new Traktor Kontrol S4 by Native Instruments. It features a new audio data streaming model, MIDI in and out ports, a huge number of 174 dimmable LEDs, 96 buttons and 46 absolute encoder axis, including some rotary encoders.

All features are supported by the driver now.

Did some code refactoring along the way.

Quoted 7 lines

Got a build error:
sound/usb/caiaq/audio.c: In function ‘snd_usb_caiaq_audio_init’:
sound/usb/caiaq/audio.c:808:28: error: ‘USB_PID_TRAKTORAUDIO2’ undeclared (first use in this function) sound/usb/caiaq/audio.c:808:28: note: each undeclared identifier is reported only once for each function it appears in make[3]: *** [sound/usb/caiaq/audio.o] Error 1

Missing change in device.h?

Oops, no. That was just a debug left-over. Sorry for not seeing it.

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

#5 lore raw

Re: [PATCH 2/2] ALSA: snd-usb-caiaq: Add support for Traktor Kontrol S4

At Fri, 10 Sep 2010 11:05:55 +0200,

Quoted 22 lines · Daniel Mack
Quoted 20 lines · Takashi Iwai

At Fri, 10 Sep 2010 16:12:35 +0800,

Quoted 11 lines · Daniel Mack

This patch adds support for the new Traktor Kontrol S4 by Native Instruments. It features a new audio data streaming model, MIDI in and out ports, a huge number of 174 dimmable LEDs, 96 buttons and 46 absolute encoder axis, including some rotary encoders.

All features are supported by the driver now.

Did some code refactoring along the way.

Got a build error:
sound/usb/caiaq/audio.c: In function ‘snd_usb_caiaq_audio_init’:
sound/usb/caiaq/audio.c:808:28: error: ‘USB_PID_TRAKTORAUDIO2’ undeclared (first use in this function) sound/usb/caiaq/audio.c:808:28: note: each undeclared identifier is reported only once for each function it appears in make[3]: *** [sound/usb/caiaq/audio.o] Error 1

Quoted 3 lines
Quoted 1 line

Missing change in device.h?

Oops, no. That was just a debug left-over. Sorry for not seeing it.

OK, applied new patch now.

thanks,

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