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.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 4 insertions, 2 deletions

diff --git a/sound/usb/caiaq/device.h b/sound/usb/caiaq/device.h
index f1117ecc84fd..e3d8a3efb35b 100644
--- a/sound/usb/caiaq/device.h
+++ b/sound/usb/caiaq/device.h
@@ -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