Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

[linux-2.6-omap-h63xx.git] / sound / usb / caiaq / caiaq-input.c

diff --git a/sound/usb/caiaq/caiaq-input.c b/sound/usb/caiaq/caiaq-input.c
index 3acd12db6952ae3e9d4dccb7998f6e94348abead..a1de0c6089573c7f7bc1a700f6a16b9307309523 100644 (file)
--- a/sound/usb/caiaq/caiaq-input.c
+++ b/sound/usb/caiaq/caiaq-input.c
@@ -34,6 +34,8 @@
 static unsigned char keycode_ak1[] =  { KEY_C, KEY_B, KEY_A };
 static unsigned char keycode_rk2[] =  { KEY_1, KEY_2, KEY_3, KEY_4, 
                                        KEY_5, KEY_6, KEY_7 };
+static unsigned char keycode_rk3[] =  { KEY_1, KEY_2, KEY_3, KEY_4,
+                                       KEY_5, KEY_6, KEY_7, KEY_5, KEY_6 };
 
 #define DEG90  (range/2)
 #define DEG180 (range)
@@ -107,7 +109,8 @@ static unsigned int decode_erp(unsigned char a, unsigned char b)
 
 
 static void snd_caiaq_input_read_analog(struct snd_usb_caiaqdev *dev, 
-                                       const char *buf, unsigned int len)
+                                       const unsigned char *buf,
+                                       unsigned int len)
 {
        switch(dev->input_dev->id.product) {
        case USB_PID_RIGKONTROL2:
@@ -116,6 +119,12 @@ static void snd_caiaq_input_read_analog(struct snd_usb_caiaqdev *dev,
                input_report_abs(dev->input_dev, ABS_Z, (buf[2] << 8) |buf[3]);
                input_sync(dev->input_dev);
                break;
+       case USB_PID_RIGKONTROL3:
+               input_report_abs(dev->input_dev, ABS_X, (buf[0] << 8) |buf[1]);
+               input_report_abs(dev->input_dev, ABS_Y, (buf[2] << 8) |buf[3]);
+               input_report_abs(dev->input_dev, ABS_Z, (buf[4] << 8) |buf[5]);
+               input_sync(dev->input_dev);
+               break;
        }
 }
 
@@ -128,7 +137,7 @@ static void snd_caiaq_input_read_erp(struct snd_usb_caiaqdev *dev,
        case USB_PID_AK1:
                i = decode_erp(buf[0], buf[1]);
                input_report_abs(dev->input_dev, ABS_X, i);
-               input_sync(dev->input_dev);     
+               input_sync(dev->input_dev);
                break;
        }
 }
@@ -204,6 +213,20 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev)
                input_set_abs_params(input, ABS_Z, 0, 4096, 0, 10);
                snd_usb_caiaq_set_auto_msg(dev, 1, 10, 0);
                break;
+       case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL3):
+               input->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+               input->absbit[0] = BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_Z);
+               input->keycode = keycode_rk3;
+               input->keycodesize = sizeof(char);
+               input->keycodemax = ARRAY_SIZE(keycode_rk3);
+               for (i=0; i<ARRAY_SIZE(keycode_rk3); i++)
+                       set_bit(keycode_rk3[i], input->keybit);
+
+               input_set_abs_params(input, ABS_X, 0, 1024, 0, 10);
+               input_set_abs_params(input, ABS_Y, 0, 1024, 0, 10);
+               input_set_abs_params(input, ABS_Z, 0, 1024, 0, 10);
+               snd_usb_caiaq_set_auto_msg(dev, 1, 10, 0);
+               break;
        case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AK1):
                input->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
                input->absbit[0] = BIT(ABS_X);
@@ -238,7 +261,6 @@ void snd_usb_caiaq_input_free(struct snd_usb_caiaqdev *dev)
                return;
 
        input_unregister_device(dev->input_dev);
-       input_free_device(dev->input_dev);
        dev->input_dev = NULL;
 }