HID: hid-samsung: add support for Creative Desktop Wireless 6000

Add support for the multimedia buttons of the Creative Desktop Wireless 6000
keyboard/mouse combo which are not currently handled by the default/samsung HID
driver.

Signed-off-by: Don Prince <dhprince-devel@yahoo.co.uk>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 3cf69a0a8b77ed7aa3770a7940d375a06d8acc7b..ac8e12d00c0ff62027cbe89b3505612f59dff144 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -273,7 +273,7 @@ config HID_SAMSUNG
        depends on USB_HID
        default !EMBEDDED
        ---help---
-       Support for Samsung InfraRed remote control.
+       Support for Samsung InfraRed remote control or keyboards.
 
 config HID_SONY
        tristate "Sony" if EMBEDDED

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 7c77c64d3e99b9a8b81d6ee9acfeb4bdd4835081..c625c3419a8c7723589d197b8fd603362513359d 100644 (file)
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1346,6 +1346,7 @@ static const struct hid_device_id hid_blacklist[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },
        { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },
        { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
        { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 30cba94cfb0c92b07682011c392e6a96e7c5be6b..ba071b1aba3ea37cb69719f5ab9077729f511b21 100644 (file)
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -415,6 +415,7 @@
 
 #define USB_VENDOR_ID_SAMSUNG          0x0419
 #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE        0x0001
+#define USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE       0x0600
 
 #define USB_VENDOR_ID_SONY                     0x054c
 #define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE      0x024b

diff --git a/drivers/hid/hid-samsung.c b/drivers/hid/hid-samsung.c
index 510dd134059784845d3e978cfb4e2e8abe94743a..869a5acfc0ba7cc36d840f4156db3f944cd47920 100644 (file)
--- a/drivers/hid/hid-samsung.c
+++ b/drivers/hid/hid-samsung.c
@@ -7,6 +7,18 @@
  *  Copyright (c) 2006-2007 Jiri Kosina
  *  Copyright (c) 2007 Paul Walmsley
  *  Copyright (c) 2008 Jiri Slaby
+ *  Copyright (c) 2010 Don Prince <dhprince.devel@yahoo.co.uk>
+ *
+ *
+ *  This driver supports several HID devices:
+ *
+ *  [0419:0001] Samsung IrDA remote controller (reports as Cypress USB Mouse).
+ *     various hid report fixups for different variants.
+ *
+ *  [0419:0600] Creative Desktop Wireless 6000 keyboard/mouse combo
+ *     several key mappings used from the consumer usage page
+ *     deviate from the USB HUT 1.12 standard.
+ *
  */
 
 /*
@@ -17,14 +29,13 @@
  */
 
 #include <linux/device.h>
+#include <linux/usb.h>
 #include <linux/hid.h>
 #include <linux/module.h>
 
 #include "hid-ids.h"
 
 /*
- * Samsung IrDA remote controller (reports as Cypress USB Mouse).
- *
  * There are several variants for 0419:0001:
  *
  * 1. 184 byte report descriptor
@@ -43,21 +54,21 @@
  * 4. 171 byte report descriptor
  * Report #3 has an array field with logical range 0..1 instead of 1..3.
  */
-static inline void samsung_dev_trace(struct hid_device *hdev,
+static inline void samsung_irda_dev_trace(struct hid_device *hdev,
                unsigned int rsize)
 {
        dev_info(&hdev->dev, "fixing up Samsung IrDA %d byte report "
                        "descriptor\n", rsize);
 }
 
-static void samsung_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+static void samsung_irda_report_fixup(struct hid_device *hdev, __u8 *rdesc,
                unsigned int rsize)
 {
        if (rsize == 184 && rdesc[175] == 0x25 && rdesc[176] == 0x40 &&
                        rdesc[177] == 0x75 && rdesc[178] == 0x30 &&
                        rdesc[179] == 0x95 && rdesc[180] == 0x01 &&
                        rdesc[182] == 0x40) {
-               samsung_dev_trace(hdev, 184);
+               samsung_irda_dev_trace(hdev, 184);
                rdesc[176] = 0xff;
                rdesc[178] = 0x08;
                rdesc[180] = 0x06;
@@ -65,24 +76,87 @@ static void samsung_report_fixup(struct hid_device *hdev, __u8 *rdesc,
        } else
        if (rsize == 203 && rdesc[192] == 0x15 && rdesc[193] == 0x0 &&
                        rdesc[194] == 0x25 && rdesc[195] == 0x12) {
-               samsung_dev_trace(hdev, 203);
+               samsung_irda_dev_trace(hdev, 203);
                rdesc[193] = 0x1;
                rdesc[195] = 0xf;
        } else
        if (rsize == 135 && rdesc[124] == 0x15 && rdesc[125] == 0x0 &&
                        rdesc[126] == 0x25 && rdesc[127] == 0x11) {
-               samsung_dev_trace(hdev, 135);
+               samsung_irda_dev_trace(hdev, 135);
                rdesc[125] = 0x1;
                rdesc[127] = 0xe;
        } else
        if (rsize == 171 && rdesc[160] == 0x15 && rdesc[161] == 0x0 &&
                        rdesc[162] == 0x25 && rdesc[163] == 0x01) {
-               samsung_dev_trace(hdev, 171);
+               samsung_irda_dev_trace(hdev, 171);
                rdesc[161] = 0x1;
                rdesc[163] = 0x3;
        }
 }
 
+#define samsung_kbd_mouse_map_key_clear(c) \
+       hid_map_usage_clear(hi, usage, bit, max, EV_KEY, (c))
+
+static int samsung_kbd_mouse_input_mapping(struct hid_device *hdev,
+       struct hid_input *hi, struct hid_field *field, struct hid_usage *usage,
+       unsigned long **bit, int *max)
+{
+       struct usb_interface *intf = to_usb_interface(hdev->dev.parent);
+       unsigned short ifnum = intf->cur_altsetting->desc.bInterfaceNumber;
+
+       if (1 != ifnum || HID_UP_CONSUMER != (usage->hid & HID_USAGE_PAGE))
+               return 0;
+
+       dbg_hid("samsung wireless keyboard/mouse input mapping event [0x%x]\n",
+               usage->hid & HID_USAGE);
+
+       switch (usage->hid & HID_USAGE) {
+       /* report 2 */
+       case 0x0b5: samsung_kbd_mouse_map_key_clear(KEY_NEXTSONG); break;
+       case 0x0b6: samsung_kbd_mouse_map_key_clear(KEY_PREVIOUSSONG); break;
+       case 0x0b7: samsung_kbd_mouse_map_key_clear(KEY_STOPCD); break;
+       case 0x0cd: samsung_kbd_mouse_map_key_clear(KEY_PLAYPAUSE); break;
+       case 0x0e2: samsung_kbd_mouse_map_key_clear(KEY_MUTE); break;
+       case 0x0e9: samsung_kbd_mouse_map_key_clear(KEY_VOLUMEUP); break;
+       case 0x0ea: samsung_kbd_mouse_map_key_clear(KEY_VOLUMEDOWN); break;
+       case 0x183: samsung_kbd_mouse_map_key_clear(KEY_MEDIA); break;
+       case 0x195: samsung_kbd_mouse_map_key_clear(KEY_EMAIL); break;
+       case 0x196: samsung_kbd_mouse_map_key_clear(KEY_CALC); break;
+       case 0x197: samsung_kbd_mouse_map_key_clear(KEY_COMPUTER); break;
+       case 0x22b: samsung_kbd_mouse_map_key_clear(KEY_SEARCH); break;
+       case 0x22c: samsung_kbd_mouse_map_key_clear(KEY_WWW); break;
+       case 0x22d: samsung_kbd_mouse_map_key_clear(KEY_BACK); break;
+       case 0x22e: samsung_kbd_mouse_map_key_clear(KEY_FORWARD); break;
+       case 0x22f: samsung_kbd_mouse_map_key_clear(KEY_FAVORITES); break;
+       case 0x230: samsung_kbd_mouse_map_key_clear(KEY_REFRESH); break;
+       case 0x231: samsung_kbd_mouse_map_key_clear(KEY_STOP); break;
+       default:
+               return 0;
+       }
+
+       return 1;
+}
+
+static void samsung_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+       unsigned int rsize)
+{
+       if (USB_DEVICE_ID_SAMSUNG_IR_REMOTE == hdev->product)
+               samsung_irda_report_fixup(hdev, rdesc, rsize);
+}
+
+static int samsung_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+       struct hid_field *field, struct hid_usage *usage,
+       unsigned long **bit, int *max)
+{
+       int ret = 0;
+
+       if (USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE == hdev->product)
+               ret = samsung_kbd_mouse_input_mapping(hdev,
+                       hi, field, usage, bit, max);
+
+       return ret;
+}
+
 static int samsung_probe(struct hid_device *hdev,
                const struct hid_device_id *id)
 {
@@ -95,10 +169,12 @@ static int samsung_probe(struct hid_device *hdev,
                goto err_free;
        }
 
-       if (hdev->rsize == 184) {
-               /* disable hidinput, force hiddev */
-               cmask = (cmask & ~HID_CONNECT_HIDINPUT) |
-                       HID_CONNECT_HIDDEV_FORCE;
+       if (USB_DEVICE_ID_SAMSUNG_IR_REMOTE == hdev->product) {
+               if (hdev->rsize == 184) {
+                       /* disable hidinput, force hiddev */
+                       cmask = (cmask & ~HID_CONNECT_HIDINPUT) |
+                               HID_CONNECT_HIDDEV_FORCE;
+               }
        }
 
        ret = hid_hw_start(hdev, cmask);
@@ -114,6 +190,7 @@ err_free:
 
 static const struct hid_device_id samsung_devices[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) },
        { }
 };
 MODULE_DEVICE_TABLE(hid, samsung_devices);
@@ -122,6 +199,7 @@ static struct hid_driver samsung_driver = {
        .name = "samsung",
        .id_table = samsung_devices,
        .report_fixup = samsung_report_fixup,
+       .input_mapping = samsung_input_mapping,
        .probe = samsung_probe,
 };