Merge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream' into...
authorJiri Kosina <jkosina@suse.cz>
Thu, 4 Jul 2013 13:02:26 +0000 (15:02 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 4 Jul 2013 13:02:26 +0000 (15:02 +0200)
Conflicts:
drivers/hid/hid-core.c

12 files changed:
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-huion.c [new file with mode: 0644]
drivers/hid/hid-hyperv.c
drivers/hid/hid-ids.h
drivers/hid/hid-input.c
drivers/hid/hid-kye.c
drivers/hid/hid-multitouch.c
drivers/hid/hid-ps3remote.c [deleted file]
drivers/hid/hid-roccat.c
drivers/hid/hid-sony.c

index b93e299..e25fb98 100644 (file)
@@ -250,6 +250,12 @@ config HOLTEK_FF
          Say Y here if you have a Holtek On Line Grip based game controller
          and want to have force feedback support for it.
 
+config HID_HUION
+       tristate "Huion tablets"
+       depends on USB_HID
+       ---help---
+       Support for Huion 580 tablet.
+
 config HID_KEYTOUCH
        tristate "Keytouch HID devices"
        depends on HID
@@ -571,15 +577,6 @@ config HID_PRIMAX
        Support for Primax devices that are not fully compliant with the
        HID standard.
 
-config HID_PS3REMOTE
-       tristate "Sony PS3 BD Remote Control"
-       depends on HID
-       ---help---
-       Support for the Sony PS3 Blue-ray Disk Remote Control and Logitech
-       Harmony Adapter for PS3, which connect over Bluetooth.
-
-       Support for the 6-axis controllers is provided by HID_SONY.
-
 config HID_ROCCAT
        tristate "Roccat device support"
        depends on USB_HID
@@ -604,12 +601,17 @@ config HID_SAMSUNG
        Support for Samsung InfraRed remote control or keyboards.
 
 config HID_SONY
-       tristate "Sony PS3 controller"
+       tristate "Sony PS2/3 accessories"
        depends on USB_HID
+       depends on NEW_LEDS
+       depends on LEDS_CLASS
        ---help---
-       Support for Sony PS3 6-axis controllers.
+       Support for
 
-       Support for the Sony PS3 BD Remote is provided by HID_PS3REMOTE.
+         * Sony PS3 6-axis controllers
+         * Buzz controllers
+         * Sony PS3 Blue-ray Disk Remote Control (Bluetooth)
+         * Logitech Harmony adapter for Sony Playstation 3 (Bluetooth)
 
 config HID_SPEEDLINK
        tristate "Speedlink VAD Cezanne mouse support"
index 7a0340a..ffd0d98 100644 (file)
@@ -54,6 +54,7 @@ obj-$(CONFIG_HID_GYRATION)    += hid-gyration.o
 obj-$(CONFIG_HID_HOLTEK)       += hid-holtek-kbd.o
 obj-$(CONFIG_HID_HOLTEK)       += hid-holtek-mouse.o
 obj-$(CONFIG_HID_HOLTEK)       += hid-holtekff.o
+obj-$(CONFIG_HID_HUION)                += hid-huion.o
 obj-$(CONFIG_HID_HYPERV_MOUSE) += hid-hyperv.o
 obj-$(CONFIG_HID_ICADE)                += hid-icade.o
 obj-$(CONFIG_HID_KENSINGTON)   += hid-kensington.o
@@ -94,7 +95,6 @@ hid-picolcd-y                 += hid-picolcd_debugfs.o
 endif
 
 obj-$(CONFIG_HID_PRIMAX)       += hid-primax.o
-obj-$(CONFIG_HID_PS3REMOTE)    += hid-ps3remote.o
 obj-$(CONFIG_HID_ROCCAT)       += hid-roccat.o hid-roccat-common.o \
        hid-roccat-arvo.o hid-roccat-isku.o hid-roccat-kone.o \
        hid-roccat-koneplus.o hid-roccat-konepure.o hid-roccat-kovaplus.o \
index b29c956..e39dac6 100644 (file)
@@ -1293,7 +1293,7 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i
 
        if (hdrv && hdrv->raw_event && hid_match_report(hid, report)) {
                ret = hdrv->raw_event(hid, report, data, size);
-               if (ret != 0) {
+               if (ret < 0) {
                        ret = ret < 0 ? ret : 0;
                        goto unlock;
                }
@@ -1588,10 +1588,12 @@ static const struct hid_device_id hid_have_special_driver[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD) },
        { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A) },
        { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_580) },
        { HID_USB_DEVICE(USB_VENDOR_ID_JESS2, USB_DEVICE_ID_JESS2_COLOR_RUMBLE_PAD) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ION, USB_DEVICE_ID_ICADE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KEYTOUCH, USB_DEVICE_ID_KEYTOUCH_IEC) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_I405X) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X) },
@@ -1684,6 +1686,8 @@ static const struct hid_device_id hid_have_special_driver[] = {
        { 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_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_BUZZ_CONTROLLER) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_BDREMOTE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
        { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER) },
@@ -2046,6 +2050,8 @@ static const struct hid_device_id hid_ignore_list[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1006) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1007) },
        { HID_USB_DEVICE(USB_VENDOR_ID_IMATION, USB_DEVICE_ID_DISC_STAKKA) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_JABRA, USB_DEVICE_ID_JABRA_SPEAK_410) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_JABRA, USB_DEVICE_ID_JABRA_SPEAK_510) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KWORLD, USB_DEVICE_ID_KWORLD_RADIO_FM700) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_GPEN_560) },
diff --git a/drivers/hid/hid-huion.c b/drivers/hid/hid-huion.c
new file mode 100644 (file)
index 0000000..cbf4da4
--- /dev/null
@@ -0,0 +1,177 @@
+/*
+ *  HID driver for Huion devices not fully compliant with HID standard
+ *
+ *  Copyright (c) 2013 Martin Rusko
+ */
+
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ */
+
+#include <linux/device.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+#include <linux/usb.h>
+#include "usbhid/usbhid.h"
+
+#include "hid-ids.h"
+
+/* Original Huion 580 report descriptor size */
+#define HUION_580_RDESC_ORIG_SIZE      177
+
+/* Fixed Huion 580 report descriptor */
+static __u8 huion_580_rdesc_fixed[] = {
+       0x05, 0x0D,         /*  Usage Page (Digitizer),             */
+       0x09, 0x02,         /*  Usage (Pen),                        */
+       0xA1, 0x01,         /*  Collection (Application),           */
+       0x85, 0x07,         /*      Report ID (7),                  */
+       0x09, 0x20,         /*      Usage (Stylus),                 */
+       0xA0,               /*      Collection (Physical),          */
+       0x14,               /*          Logical Minimum (0),        */
+       0x25, 0x01,         /*          Logical Maximum (1),        */
+       0x75, 0x01,         /*          Report Size (1),            */
+       0x09, 0x42,         /*          Usage (Tip Switch),         */
+       0x09, 0x44,         /*          Usage (Barrel Switch),      */
+       0x09, 0x46,         /*          Usage (Tablet Pick),        */
+       0x95, 0x03,         /*          Report Count (3),           */
+       0x81, 0x02,         /*          Input (Variable),           */
+       0x95, 0x03,         /*          Report Count (3),           */
+       0x81, 0x03,         /*          Input (Constant, Variable), */
+       0x09, 0x32,         /*          Usage (In Range),           */
+       0x95, 0x01,         /*          Report Count (1),           */
+       0x81, 0x02,         /*          Input (Variable),           */
+       0x95, 0x01,         /*          Report Count (1),           */
+       0x81, 0x03,         /*          Input (Constant, Variable), */
+       0x75, 0x10,         /*          Report Size (16),           */
+       0x95, 0x01,         /*          Report Count (1),           */
+       0xA4,               /*          Push,                       */
+       0x05, 0x01,         /*          Usage Page (Desktop),       */
+       0x65, 0x13,         /*          Unit (Inch),                */
+       0x55, 0xFD,         /*          Unit Exponent (-3),         */
+       0x34,               /*          Physical Minimum (0),       */
+       0x09, 0x30,         /*          Usage (X),                  */
+       0x46, 0x40, 0x1F,   /*          Physical Maximum (8000),    */
+       0x26, 0x00, 0x7D,   /*          Logical Maximum (32000),    */
+       0x81, 0x02,         /*          Input (Variable),           */
+       0x09, 0x31,         /*          Usage (Y),                  */
+       0x46, 0x88, 0x13,   /*          Physical Maximum (5000),    */
+       0x26, 0x20, 0x4E,   /*          Logical Maximum (20000),    */
+       0x81, 0x02,         /*          Input (Variable),           */
+       0xB4,               /*          Pop,                        */
+       0x09, 0x30,         /*          Usage (Tip Pressure),       */
+       0x26, 0xFF, 0x07,   /*          Logical Maximum (2047),     */
+       0x81, 0x02,         /*          Input (Variable),           */
+       0xC0,               /*      End Collection,                 */
+       0xC0                /*  End Collection                      */
+};
+
+static __u8 *huion_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+               unsigned int *rsize)
+{
+       switch (hdev->product) {
+       case USB_DEVICE_ID_HUION_580:
+               if (*rsize == HUION_580_RDESC_ORIG_SIZE) {
+                       rdesc = huion_580_rdesc_fixed;
+                       *rsize = sizeof(huion_580_rdesc_fixed);
+               }
+               break;
+       }
+       return rdesc;
+}
+
+/**
+ * Enable fully-functional tablet mode by reading special string
+ * descriptor.
+ *
+ * @hdev:      HID device
+ *
+ * The specific string descriptor and data were discovered by sniffing
+ * the Windows driver traffic.
+ */
+static int huion_tablet_enable(struct hid_device *hdev)
+{
+       int rc;
+       char buf[22];
+
+       rc = usb_string(hid_to_usb_dev(hdev), 0x64, buf, sizeof(buf));
+       if (rc < 0)
+               return rc;
+
+       return 0;
+}
+
+static int huion_probe(struct hid_device *hdev, const struct hid_device_id *id)
+{
+       int ret;
+       struct usb_interface *intf = to_usb_interface(hdev->dev.parent);
+
+       /* Ignore interfaces 1 (mouse) and 2 (keyboard) for Huion 580 tablet,
+        * as they are not used
+        */
+       switch (id->product) {
+       case USB_DEVICE_ID_HUION_580:
+               if (intf->cur_altsetting->desc.bInterfaceNumber != 0x00)
+                       return -ENODEV;
+               break;
+       }
+
+       ret = hid_parse(hdev);
+       if (ret) {
+               hid_err(hdev, "parse failed\n");
+               goto err;
+       }
+
+       ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
+       if (ret) {
+               hid_err(hdev, "hw start failed\n");
+               goto err;
+       }
+
+       switch (id->product) {
+       case USB_DEVICE_ID_HUION_580:
+               ret = huion_tablet_enable(hdev);
+               if (ret) {
+                       hid_err(hdev, "tablet enabling failed\n");
+                       goto enabling_err;
+               }
+               break;
+       }
+
+       return 0;
+enabling_err:
+       hid_hw_stop(hdev);
+err:
+       return ret;
+}
+
+static int huion_raw_event(struct hid_device *hdev, struct hid_report *report,
+                       u8 *data, int size)
+{
+       /* If this is a pen input report then invert the in-range bit */
+       if (report->type == HID_INPUT_REPORT && report->id == 0x07 && size >= 2)
+               data[1] ^= 0x40;
+
+       return 0;
+}
+
+static const struct hid_device_id huion_devices[] = {
+       { HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_580) },
+       { }
+};
+MODULE_DEVICE_TABLE(hid, huion_devices);
+
+static struct hid_driver huion_driver = {
+       .name = "huion",
+       .id_table = huion_devices,
+       .probe = huion_probe,
+       .report_fixup = huion_report_fixup,
+       .raw_event = huion_raw_event,
+};
+module_hid_driver(huion_driver);
+
+MODULE_AUTHOR("Martin Rusko");
+MODULE_DESCRIPTION("Huion HID driver");
+MODULE_LICENSE("GPL");
index aa3fec0..7132173 100644 (file)
@@ -199,13 +199,11 @@ static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device,
        if (desc->bLength == 0)
                goto cleanup;
 
-       input_device->hid_desc = kzalloc(desc->bLength, GFP_ATOMIC);
+       input_device->hid_desc = kmemdup(desc, desc->bLength, GFP_ATOMIC);
 
        if (!input_device->hid_desc)
                goto cleanup;
 
-       memcpy(input_device->hid_desc, desc, desc->bLength);
-
        input_device->report_desc_size = desc->desc[0].wDescriptorLength;
        if (input_device->report_desc_size == 0) {
                input_device->dev_info_status = -EINVAL;
index a9fcb9e..c5aea29 100644 (file)
 #define USB_DEVICE_ID_CYPRESS_BARCODE_4        0xed81
 #define USB_DEVICE_ID_CYPRESS_TRUETOUCH        0xc001
 
+#define USB_VENDOR_ID_DATA_MODUL       0x7374
+#define USB_VENDOR_ID_DATA_MODUL_EASYMAXTOUCH  0x1201
+
 #define USB_VENDOR_ID_DEALEXTREAME     0x10c5
 #define USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701        0x819a
 
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E      0x725e
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7262      0x7262
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B      0x726b
-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72AA      0x72aa
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1      0x72a1
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72AA      0x72aa
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72C4      0x72c4
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72D0      0x72d0
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72FA      0x72fa
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302      0x7302
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7349      0x7349
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_73F7      0x73f7
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001      0xa001
-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224      0x7224
-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72D0      0x72d0
-#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72C4      0x72c4
 
 #define USB_VENDOR_ID_ELECOM           0x056e
 #define USB_DEVICE_ID_ELECOM_BM084     0x0061
 #define USB_DEVICE_ID_UGCI_FLYING      0x0020
 #define USB_DEVICE_ID_UGCI_FIGHTING    0x0030
 
+#define USB_VENDOR_ID_HUION            0x256c
+#define USB_DEVICE_ID_HUION_580                0x006e
+
 #define USB_VENDOR_ID_IDEACOM          0x1cb6
 #define USB_DEVICE_ID_IDEACOM_IDC6650  0x6650
 #define USB_DEVICE_ID_IDEACOM_IDC6651  0x6651
 #define USB_VENDOR_ID_IRTOUCHSYSTEMS   0x6615
 #define USB_DEVICE_ID_IRTOUCH_INFRARED_USB     0x0070
 
+#define USB_VENDOR_ID_JABRA            0x0b0e
+#define USB_DEVICE_ID_JABRA_SPEAK_410  0x0412
+#define USB_DEVICE_ID_JABRA_SPEAK_510  0x0420
+
 #define USB_VENDOR_ID_JESS             0x0c45
 #define USB_DEVICE_ID_JESS_YUREX       0x1010
 
 
 #define USB_VENDOR_ID_KYE              0x0458
 #define USB_DEVICE_ID_KYE_ERGO_525V    0x0087
+#define USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE 0x0138
 #define USB_DEVICE_ID_KYE_GPEN_560     0x5003
 #define USB_DEVICE_ID_KYE_EASYPEN_I405X        0x5010
 #define USB_DEVICE_ID_KYE_MOUSEPEN_I608X       0x5011
 #define USB_DEVICE_ID_SONY_PS3_BDREMOTE                0x0306
 #define USB_DEVICE_ID_SONY_PS3_CONTROLLER      0x0268
 #define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER       0x042f
+#define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER             0x0002
+#define USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER    0x1000
 
 #define USB_VENDOR_ID_SOUNDGRAPH       0x15c2
 #define USB_DEVICE_ID_SOUNDGRAPH_IMON_FIRST    0x0034
index c526a3c..7480799 100644 (file)
@@ -1042,9 +1042,14 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
 
        /*
         * Ignore out-of-range values as per HID specification,
-        * section 5.10 and 6.2.25
+        * section 5.10 and 6.2.25.
+        *
+        * The logical_minimum < logical_maximum check is done so that we
+        * don't unintentionally discard values sent by devices which
+        * don't specify logical min and max.
         */
        if ((field->flags & HID_MAIN_ITEM_VARIABLE) &&
+           (field->logical_minimum < field->logical_maximum) &&
            (value < field->logical_minimum ||
             value > field->logical_maximum)) {
                dbg_hid("Ignoring out-of-range value %x\n", value);
index 6af90db..1e2ee2a 100644 (file)
@@ -314,6 +314,25 @@ static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc,
                        *rsize = sizeof(easypen_m610x_rdesc_fixed);
                }
                break;
+       case USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE:
+               /*
+                * the fixup that need to be done:
+                *   - change Usage Maximum in the Comsumer Control
+                *     (report ID 3) to a reasonable value
+                */
+               if (*rsize >= 135 &&
+                       /* Usage Page (Consumer Devices) */
+                       rdesc[104] == 0x05 && rdesc[105] == 0x0c &&
+                       /* Usage (Consumer Control) */
+                       rdesc[106] == 0x09 && rdesc[107] == 0x01 &&
+                       /*   Usage Maximum > 12287 */
+                       rdesc[114] == 0x2a && rdesc[116] > 0x2f) {
+                       hid_info(hdev,
+                                "fixing up Genius Gila Gaming Mouse "
+                                "report descriptor\n");
+                       rdesc[116] = 0x2f;
+               }
+               break;
        }
        return rdesc;
 }
@@ -407,6 +426,8 @@ static const struct hid_device_id kye_devices[] = {
                                USB_DEVICE_ID_KYE_MOUSEPEN_I608X) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KYE,
                                USB_DEVICE_ID_KYE_EASYPEN_M610X) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_KYE,
+                               USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE) },
        { }
 };
 MODULE_DEVICE_TABLE(hid, kye_devices);
index d39a5ce..cb0e361 100644 (file)
@@ -1111,6 +1111,11 @@ static const struct hid_device_id mt_devices[] = {
                HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS,
                        USB_DEVICE_ID_CYPRESS_TRUETOUCH) },
 
+       /* Data Modul easyMaxTouch */
+       { .driver_data = MT_CLS_DEFAULT,
+               MT_USB_DEVICE(USB_VENDOR_ID_DATA_MODUL,
+                       USB_VENDOR_ID_DATA_MODUL_EASYMAXTOUCH) },
+
        /* eGalax devices (resistive) */
        { .driver_data = MT_CLS_EGALAX,
                MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
@@ -1120,33 +1125,39 @@ static const struct hid_device_id mt_devices[] = {
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E) },
 
        /* eGalax devices (capacitive) */
-       { .driver_data = MT_CLS_EGALAX,
-               MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) },
        { .driver_data = MT_CLS_EGALAX_SERIAL,
                MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7207) },
-       { .driver_data = MT_CLS_EGALAX_SERIAL,
+       { .driver_data = MT_CLS_EGALAX,
                MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E) },
+                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) },
        { .driver_data = MT_CLS_EGALAX_SERIAL,
                MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) },
        { .driver_data = MT_CLS_EGALAX_SERIAL,
                MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A) },
-       { .driver_data = MT_CLS_EGALAX,
+       { .driver_data = MT_CLS_EGALAX_SERIAL,
                MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) },
+                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E) },
        { .driver_data = MT_CLS_EGALAX_SERIAL,
                MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7262) },
+       { .driver_data = MT_CLS_EGALAX,
+               MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) },
        { .driver_data = MT_CLS_EGALAX,
                MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) },
        { .driver_data = MT_CLS_EGALAX_SERIAL,
                MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72AA) },
+       { .driver_data = MT_CLS_EGALAX,
+               HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72C4) },
+       { .driver_data = MT_CLS_EGALAX,
+               HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
+                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72D0) },
        { .driver_data = MT_CLS_EGALAX,
                MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72FA) },
@@ -1162,15 +1173,6 @@ static const struct hid_device_id mt_devices[] = {
        { .driver_data = MT_CLS_EGALAX_SERIAL,
                MT_USB_DEVICE(USB_VENDOR_ID_DWAV,
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) },
-       { .driver_data = MT_CLS_EGALAX,
-               HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) },
-       { .driver_data = MT_CLS_EGALAX,
-               HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72D0) },
-       { .driver_data = MT_CLS_EGALAX,
-               HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
-                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72C4) },
 
        /* Elo TouchSystems IntelliTouch Plus panel */
        { .driver_data = MT_CLS_DUAL_CONTACT_ID,
diff --git a/drivers/hid/hid-ps3remote.c b/drivers/hid/hid-ps3remote.c
deleted file mode 100644 (file)
index f1239d3..0000000
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * HID driver for Sony PS3 BD Remote Control
- *
- * Copyright (c) 2012 David Dillow <dave@thedillows.org>
- * Based on a blend of the bluez fakehid user-space code by Marcel Holtmann
- * and other kernel HID drivers.
- */
-
-/*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-/* NOTE: in order for the Sony PS3 BD Remote Control to be found by
- * a Bluetooth host, the key combination Start+Enter has to be kept pressed
- * for about 7 seconds with the Bluetooth Host Controller in discovering mode.
- *
- * There will be no PIN request from the device.
- */
-
-#include <linux/device.h>
-#include <linux/hid.h>
-#include <linux/module.h>
-
-#include "hid-ids.h"
-
-static __u8 ps3remote_rdesc[] = {
-       0x05, 0x01,          /* GUsagePage Generic Desktop */
-       0x09, 0x05,          /* LUsage 0x05 [Game Pad] */
-       0xA1, 0x01,          /* MCollection Application (mouse, keyboard) */
-
-        /* Use collection 1 for joypad buttons */
-        0xA1, 0x02,         /* MCollection Logical (interrelated data) */
-
-         /* Ignore the 1st byte, maybe it is used for a controller
-          * number but it's not needed for correct operation */
-         0x75, 0x08,        /* GReportSize 0x08 [8] */
-         0x95, 0x01,        /* GReportCount 0x01 [1] */
-         0x81, 0x01,        /* MInput 0x01 (Const[0] Arr[1] Abs[2]) */
-
-         /* Bytes from 2nd to 4th are a bitmap for joypad buttons, for these
-          * buttons multiple keypresses are allowed */
-         0x05, 0x09,        /* GUsagePage Button */
-         0x19, 0x01,        /* LUsageMinimum 0x01 [Button 1 (primary/trigger)] */
-         0x29, 0x18,        /* LUsageMaximum 0x18 [Button 24] */
-         0x14,              /* GLogicalMinimum [0] */
-         0x25, 0x01,        /* GLogicalMaximum 0x01 [1] */
-         0x75, 0x01,        /* GReportSize 0x01 [1] */
-         0x95, 0x18,        /* GReportCount 0x18 [24] */
-         0x81, 0x02,        /* MInput 0x02 (Data[0] Var[1] Abs[2]) */
-
-         0xC0,              /* MEndCollection */
-
-        /* Use collection 2 for remote control buttons */
-        0xA1, 0x02,         /* MCollection Logical (interrelated data) */
-
-         /* 5th byte is used for remote control buttons */
-         0x05, 0x09,        /* GUsagePage Button */
-         0x18,              /* LUsageMinimum [No button pressed] */
-         0x29, 0xFE,        /* LUsageMaximum 0xFE [Button 254] */
-         0x14,              /* GLogicalMinimum [0] */
-         0x26, 0xFE, 0x00,  /* GLogicalMaximum 0x00FE [254] */
-         0x75, 0x08,        /* GReportSize 0x08 [8] */
-         0x95, 0x01,        /* GReportCount 0x01 [1] */
-         0x80,              /* MInput  */
-
-         /* Ignore bytes from 6th to 11th, 6th to 10th are always constant at
-          * 0xff and 11th is for press indication */
-         0x75, 0x08,        /* GReportSize 0x08 [8] */
-         0x95, 0x06,        /* GReportCount 0x06 [6] */
-         0x81, 0x01,        /* MInput 0x01 (Const[0] Arr[1] Abs[2]) */
-
-         /* 12th byte is for battery strength */
-         0x05, 0x06,        /* GUsagePage Generic Device Controls */
-         0x09, 0x20,        /* LUsage 0x20 [Battery Strength] */
-         0x14,              /* GLogicalMinimum [0] */
-         0x25, 0x05,        /* GLogicalMaximum 0x05 [5] */
-         0x75, 0x08,        /* GReportSize 0x08 [8] */
-         0x95, 0x01,        /* GReportCount 0x01 [1] */
-         0x81, 0x02,        /* MInput 0x02 (Data[0] Var[1] Abs[2]) */
-
-         0xC0,              /* MEndCollection */
-
-        0xC0                /* MEndCollection [Game Pad] */
-};
-
-static const unsigned int ps3remote_keymap_joypad_buttons[] = {
-       [0x01] = KEY_SELECT,
-       [0x02] = BTN_THUMBL,            /* L3 */
-       [0x03] = BTN_THUMBR,            /* R3 */
-       [0x04] = BTN_START,
-       [0x05] = KEY_UP,
-       [0x06] = KEY_RIGHT,
-       [0x07] = KEY_DOWN,
-       [0x08] = KEY_LEFT,
-       [0x09] = BTN_TL2,               /* L2 */
-       [0x0a] = BTN_TR2,               /* R2 */
-       [0x0b] = BTN_TL,                /* L1 */
-       [0x0c] = BTN_TR,                /* R1 */
-       [0x0d] = KEY_OPTION,            /* options/triangle */
-       [0x0e] = KEY_BACK,              /* back/circle */
-       [0x0f] = BTN_0,                 /* cross */
-       [0x10] = KEY_SCREEN,            /* view/square */
-       [0x11] = KEY_HOMEPAGE,          /* PS button */
-       [0x14] = KEY_ENTER,
-};
-static const unsigned int ps3remote_keymap_remote_buttons[] = {
-       [0x00] = KEY_1,
-       [0x01] = KEY_2,
-       [0x02] = KEY_3,
-       [0x03] = KEY_4,
-       [0x04] = KEY_5,
-       [0x05] = KEY_6,
-       [0x06] = KEY_7,
-       [0x07] = KEY_8,
-       [0x08] = KEY_9,
-       [0x09] = KEY_0,
-       [0x0e] = KEY_ESC,               /* return */
-       [0x0f] = KEY_CLEAR,
-       [0x16] = KEY_EJECTCD,
-       [0x1a] = KEY_MENU,              /* top menu */
-       [0x28] = KEY_TIME,
-       [0x30] = KEY_PREVIOUS,
-       [0x31] = KEY_NEXT,
-       [0x32] = KEY_PLAY,
-       [0x33] = KEY_REWIND,            /* scan back */
-       [0x34] = KEY_FORWARD,           /* scan forward */
-       [0x38] = KEY_STOP,
-       [0x39] = KEY_PAUSE,
-       [0x40] = KEY_CONTEXT_MENU,      /* pop up/menu */
-       [0x60] = KEY_FRAMEBACK,         /* slow/step back */
-       [0x61] = KEY_FRAMEFORWARD,      /* slow/step forward */
-       [0x63] = KEY_SUBTITLE,
-       [0x64] = KEY_AUDIO,
-       [0x65] = KEY_ANGLE,
-       [0x70] = KEY_INFO,              /* display */
-       [0x80] = KEY_BLUE,
-       [0x81] = KEY_RED,
-       [0x82] = KEY_GREEN,
-       [0x83] = KEY_YELLOW,
-};
-
-static __u8 *ps3remote_fixup(struct hid_device *hdev, __u8 *rdesc,
-                            unsigned int *rsize)
-{
-       *rsize = sizeof(ps3remote_rdesc);
-       return ps3remote_rdesc;
-}
-
-static int ps3remote_mapping(struct hid_device *hdev, struct hid_input *hi,
-                            struct hid_field *field, struct hid_usage *usage,
-                            unsigned long **bit, int *max)
-{
-       unsigned int key = usage->hid & HID_USAGE;
-
-       if ((usage->hid & HID_USAGE_PAGE) != HID_UP_BUTTON)
-               return -1;
-
-       switch (usage->collection_index) {
-       case 1:
-               if (key >= ARRAY_SIZE(ps3remote_keymap_joypad_buttons))
-                       return -1;
-
-               key = ps3remote_keymap_joypad_buttons[key];
-               if (!key)
-                       return -1;
-               break;
-       case 2:
-               if (key >= ARRAY_SIZE(ps3remote_keymap_remote_buttons))
-                       return -1;
-
-               key = ps3remote_keymap_remote_buttons[key];
-               if (!key)
-                       return -1;
-               break;
-       default:
-               return -1;
-       }
-
-       hid_map_usage_clear(hi, usage, bit, max, EV_KEY, key);
-       return 1;
-}
-
-static const struct hid_device_id ps3remote_devices[] = {
-       /* PS3 BD Remote Control */
-       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_BDREMOTE) },
-       /* Logitech Harmony Adapter for PS3 */
-       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_PS3) },
-       { }
-};
-MODULE_DEVICE_TABLE(hid, ps3remote_devices);
-
-static struct hid_driver ps3remote_driver = {
-       .name          = "ps3_remote",
-       .id_table      = ps3remote_devices,
-       .report_fixup  = ps3remote_fixup,
-       .input_mapping = ps3remote_mapping,
-};
-module_hid_driver(ps3remote_driver);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("David Dillow <dave@thedillows.org>, Antonio Ospite <ospite@studenti.unina.it>");
index b59b3df..65c4ccf 100644 (file)
@@ -366,7 +366,7 @@ void roccat_disconnect(int minor)
        mutex_lock(&devices_lock);
        devices[minor] = NULL;
        mutex_unlock(&devices_lock);
-       
+
        if (device->open) {
                hid_hw_close(device->hid);
                wake_up_interruptible(&device->wait);
@@ -426,13 +426,23 @@ static int __init roccat_init(void)
 
        if (retval < 0) {
                pr_warn("can't get major number\n");
-               return retval;
+               goto error;
        }
 
        cdev_init(&roccat_cdev, &roccat_ops);
-       cdev_add(&roccat_cdev, dev_id, ROCCAT_MAX_DEVICES);
+       retval = cdev_add(&roccat_cdev, dev_id, ROCCAT_MAX_DEVICES);
 
+       if (retval < 0) {
+               pr_warn("cannot add cdev\n");
+               goto cleanup_alloc_chrdev_region;
+       }
        return 0;
+
+
+ cleanup_alloc_chrdev_region:
+       unregister_chrdev_region(dev_id, ROCCAT_MAX_DEVICES);
+ error:
+       return retval;
 }
 
 static void __exit roccat_exit(void)
index 312098e..ecbc749 100644 (file)
@@ -1,11 +1,13 @@
 /*
- *  HID driver for some sony "special" devices
+ *  HID driver for Sony / PS2 / PS3 BD devices.
  *
  *  Copyright (c) 1999 Andreas Gal
  *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
  *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
  *  Copyright (c) 2008 Jiri Slaby
- *  Copyright (c) 2006-2008 Jiri Kosina
+ *  Copyright (c) 2012 David Dillow <dave@thedillows.org>
+ *  Copyright (c) 2006-2013 Jiri Kosina
+ *  Copyright (c) 2013 Colin Leitner <colin.leitner@gmail.com>
  */
 
 /*
  * any later version.
  */
 
+/* NOTE: in order for the Sony PS3 BD Remote Control to be found by
+ * a Bluetooth host, the key combination Start+Enter has to be kept pressed
+ * for about 7 seconds with the Bluetooth Host Controller in discovering mode.
+ *
+ * There will be no PIN request from the device.
+ */
+
 #include <linux/device.h>
 #include <linux/hid.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/usb.h>
+#include <linux/leds.h>
 
 #include "hid-ids.h"
 
 #define VAIO_RDESC_CONSTANT     (1 << 0)
 #define SIXAXIS_CONTROLLER_USB  (1 << 1)
 #define SIXAXIS_CONTROLLER_BT   (1 << 2)
+#define BUZZ_CONTROLLER         (1 << 3)
+#define PS3REMOTE              (1 << 4)
 
 static const u8 sixaxis_rdesc_fixup[] = {
        0x95, 0x13, 0x09, 0x01, 0x81, 0x02, 0x95, 0x0C,
@@ -55,10 +67,214 @@ static const u8 sixaxis_rdesc_fixup2[] = {
        0xb1, 0x02, 0xc0, 0xc0,
 };
 
+static __u8 ps3remote_rdesc[] = {
+       0x05, 0x01,          /* GUsagePage Generic Desktop */
+       0x09, 0x05,          /* LUsage 0x05 [Game Pad] */
+       0xA1, 0x01,          /* MCollection Application (mouse, keyboard) */
+
+        /* Use collection 1 for joypad buttons */
+        0xA1, 0x02,         /* MCollection Logical (interrelated data) */
+
+         /* Ignore the 1st byte, maybe it is used for a controller
+          * number but it's not needed for correct operation */
+         0x75, 0x08,        /* GReportSize 0x08 [8] */
+         0x95, 0x01,        /* GReportCount 0x01 [1] */
+         0x81, 0x01,        /* MInput 0x01 (Const[0] Arr[1] Abs[2]) */
+
+         /* Bytes from 2nd to 4th are a bitmap for joypad buttons, for these
+          * buttons multiple keypresses are allowed */
+         0x05, 0x09,        /* GUsagePage Button */
+         0x19, 0x01,        /* LUsageMinimum 0x01 [Button 1 (primary/trigger)] */
+         0x29, 0x18,        /* LUsageMaximum 0x18 [Button 24] */
+         0x14,              /* GLogicalMinimum [0] */
+         0x25, 0x01,        /* GLogicalMaximum 0x01 [1] */
+         0x75, 0x01,        /* GReportSize 0x01 [1] */
+         0x95, 0x18,        /* GReportCount 0x18 [24] */
+         0x81, 0x02,        /* MInput 0x02 (Data[0] Var[1] Abs[2]) */
+
+         0xC0,              /* MEndCollection */
+
+        /* Use collection 2 for remote control buttons */
+        0xA1, 0x02,         /* MCollection Logical (interrelated data) */
+
+         /* 5th byte is used for remote control buttons */
+         0x05, 0x09,        /* GUsagePage Button */
+         0x18,              /* LUsageMinimum [No button pressed] */
+         0x29, 0xFE,        /* LUsageMaximum 0xFE [Button 254] */
+         0x14,              /* GLogicalMinimum [0] */
+         0x26, 0xFE, 0x00,  /* GLogicalMaximum 0x00FE [254] */
+         0x75, 0x08,        /* GReportSize 0x08 [8] */
+         0x95, 0x01,        /* GReportCount 0x01 [1] */
+         0x80,              /* MInput  */
+
+         /* Ignore bytes from 6th to 11th, 6th to 10th are always constant at
+          * 0xff and 11th is for press indication */
+         0x75, 0x08,        /* GReportSize 0x08 [8] */
+         0x95, 0x06,        /* GReportCount 0x06 [6] */
+         0x81, 0x01,        /* MInput 0x01 (Const[0] Arr[1] Abs[2]) */
+
+         /* 12th byte is for battery strength */
+         0x05, 0x06,        /* GUsagePage Generic Device Controls */
+         0x09, 0x20,        /* LUsage 0x20 [Battery Strength] */
+         0x14,              /* GLogicalMinimum [0] */
+         0x25, 0x05,        /* GLogicalMaximum 0x05 [5] */
+         0x75, 0x08,        /* GReportSize 0x08 [8] */
+         0x95, 0x01,        /* GReportCount 0x01 [1] */
+         0x81, 0x02,        /* MInput 0x02 (Data[0] Var[1] Abs[2]) */
+
+         0xC0,              /* MEndCollection */
+
+        0xC0                /* MEndCollection [Game Pad] */
+};
+
+static const unsigned int ps3remote_keymap_joypad_buttons[] = {
+       [0x01] = KEY_SELECT,
+       [0x02] = BTN_THUMBL,            /* L3 */
+       [0x03] = BTN_THUMBR,            /* R3 */
+       [0x04] = BTN_START,
+       [0x05] = KEY_UP,
+       [0x06] = KEY_RIGHT,
+       [0x07] = KEY_DOWN,
+       [0x08] = KEY_LEFT,
+       [0x09] = BTN_TL2,               /* L2 */
+       [0x0a] = BTN_TR2,               /* R2 */
+       [0x0b] = BTN_TL,                /* L1 */
+       [0x0c] = BTN_TR,                /* R1 */
+       [0x0d] = KEY_OPTION,            /* options/triangle */
+       [0x0e] = KEY_BACK,              /* back/circle */
+       [0x0f] = BTN_0,                 /* cross */
+       [0x10] = KEY_SCREEN,            /* view/square */
+       [0x11] = KEY_HOMEPAGE,          /* PS button */
+       [0x14] = KEY_ENTER,
+};
+static const unsigned int ps3remote_keymap_remote_buttons[] = {
+       [0x00] = KEY_1,
+       [0x01] = KEY_2,
+       [0x02] = KEY_3,
+       [0x03] = KEY_4,
+       [0x04] = KEY_5,
+       [0x05] = KEY_6,
+       [0x06] = KEY_7,
+       [0x07] = KEY_8,
+       [0x08] = KEY_9,
+       [0x09] = KEY_0,
+       [0x0e] = KEY_ESC,               /* return */
+       [0x0f] = KEY_CLEAR,
+       [0x16] = KEY_EJECTCD,
+       [0x1a] = KEY_MENU,              /* top menu */
+       [0x28] = KEY_TIME,
+       [0x30] = KEY_PREVIOUS,
+       [0x31] = KEY_NEXT,
+       [0x32] = KEY_PLAY,
+       [0x33] = KEY_REWIND,            /* scan back */
+       [0x34] = KEY_FORWARD,           /* scan forward */
+       [0x38] = KEY_STOP,
+       [0x39] = KEY_PAUSE,
+       [0x40] = KEY_CONTEXT_MENU,      /* pop up/menu */
+       [0x60] = KEY_FRAMEBACK,         /* slow/step back */
+       [0x61] = KEY_FRAMEFORWARD,      /* slow/step forward */
+       [0x63] = KEY_SUBTITLE,
+       [0x64] = KEY_AUDIO,
+       [0x65] = KEY_ANGLE,
+       [0x70] = KEY_INFO,              /* display */
+       [0x80] = KEY_BLUE,
+       [0x81] = KEY_RED,
+       [0x82] = KEY_GREEN,
+       [0x83] = KEY_YELLOW,
+};
+
+static const unsigned int buzz_keymap[] = {
+       /* The controller has 4 remote buzzers, each with one LED and 5
+        * buttons.
+        * 
+        * We use the mapping chosen by the controller, which is:
+        *
+        * Key          Offset
+        * -------------------
+        * Buzz              1
+        * Blue              5
+        * Orange            4
+        * Green             3
+        * Yellow            2
+        *
+        * So, for example, the orange button on the third buzzer is mapped to
+        * BTN_TRIGGER_HAPPY14
+        */
+       [ 1] = BTN_TRIGGER_HAPPY1,
+       [ 2] = BTN_TRIGGER_HAPPY2,
+       [ 3] = BTN_TRIGGER_HAPPY3,
+       [ 4] = BTN_TRIGGER_HAPPY4,
+       [ 5] = BTN_TRIGGER_HAPPY5,
+       [ 6] = BTN_TRIGGER_HAPPY6,
+       [ 7] = BTN_TRIGGER_HAPPY7,
+       [ 8] = BTN_TRIGGER_HAPPY8,
+       [ 9] = BTN_TRIGGER_HAPPY9,
+       [10] = BTN_TRIGGER_HAPPY10,
+       [11] = BTN_TRIGGER_HAPPY11,
+       [12] = BTN_TRIGGER_HAPPY12,
+       [13] = BTN_TRIGGER_HAPPY13,
+       [14] = BTN_TRIGGER_HAPPY14,
+       [15] = BTN_TRIGGER_HAPPY15,
+       [16] = BTN_TRIGGER_HAPPY16,
+       [17] = BTN_TRIGGER_HAPPY17,
+       [18] = BTN_TRIGGER_HAPPY18,
+       [19] = BTN_TRIGGER_HAPPY19,
+       [20] = BTN_TRIGGER_HAPPY20,
+};
+
 struct sony_sc {
        unsigned long quirks;
+
+       void *extra;
 };
 
+struct buzz_extra {
+       int led_state;
+       struct led_classdev *leds[4];
+};
+
+static __u8 *ps3remote_fixup(struct hid_device *hdev, __u8 *rdesc,
+                            unsigned int *rsize)
+{
+       *rsize = sizeof(ps3remote_rdesc);
+       return ps3remote_rdesc;
+}
+
+static int ps3remote_mapping(struct hid_device *hdev, struct hid_input *hi,
+                            struct hid_field *field, struct hid_usage *usage,
+                            unsigned long **bit, int *max)
+{
+       unsigned int key = usage->hid & HID_USAGE;
+
+       if ((usage->hid & HID_USAGE_PAGE) != HID_UP_BUTTON)
+               return -1;
+
+       switch (usage->collection_index) {
+       case 1:
+               if (key >= ARRAY_SIZE(ps3remote_keymap_joypad_buttons))
+                       return -1;
+
+               key = ps3remote_keymap_joypad_buttons[key];
+               if (!key)
+                       return -1;
+               break;
+       case 2:
+               if (key >= ARRAY_SIZE(ps3remote_keymap_remote_buttons))
+                       return -1;
+
+               key = ps3remote_keymap_remote_buttons[key];
+               if (!key)
+                       return -1;
+               break;
+       default:
+               return -1;
+       }
+
+       hid_map_usage_clear(hi, usage, bit, max, EV_KEY, key);
+       return 1;
+}
+
+
 /* Sony Vaio VGX has wrongly mouse pointer declared as constant */
 static __u8 *sony_report_fixup(struct hid_device *hdev, __u8 *rdesc,
                unsigned int *rsize)
@@ -95,6 +311,10 @@ static __u8 *sony_report_fixup(struct hid_device *hdev, __u8 *rdesc,
                *rsize = sizeof(sixaxis_rdesc_fixup2);
                memcpy(rdesc, &sixaxis_rdesc_fixup2, *rsize);
        }
+
+       if (sc->quirks & PS3REMOTE)
+               return ps3remote_fixup(hdev, rdesc, rsize);
+
        return rdesc;
 }
 
@@ -117,6 +337,41 @@ static int sony_raw_event(struct hid_device *hdev, struct hid_report *report,
        return 0;
 }
 
+static int sony_mapping(struct hid_device *hdev, struct hid_input *hi,
+                       struct hid_field *field, struct hid_usage *usage,
+                       unsigned long **bit, int *max)
+{
+       struct sony_sc *sc = hid_get_drvdata(hdev);
+
+       if (sc->quirks & BUZZ_CONTROLLER) {
+               unsigned int key = usage->hid & HID_USAGE;
+
+               if ((usage->hid & HID_USAGE_PAGE) != HID_UP_BUTTON)
+                       return -1;
+
+               switch (usage->collection_index) {
+               case 1:
+                       if (key >= ARRAY_SIZE(buzz_keymap))
+                               return -1;
+
+                       key = buzz_keymap[key];
+                       if (!key)
+                               return -1;
+                       break;
+               default:
+                       return -1;
+               }
+
+               hid_map_usage_clear(hi, usage, bit, max, EV_KEY, key);
+               return 1;
+       }
+
+       if (sc->quirks & PS3REMOTE)
+               return ps3remote_mapping(hdev, hi, field, usage, bit, max);
+
+       return -1;
+}
+
 /*
  * The Sony Sixaxis does not handle HID Output Reports on the Interrupt EP
  * like it should according to usbhid/hid-core.c::usbhid_output_raw_report()
@@ -192,11 +447,181 @@ static int sixaxis_set_operational_bt(struct hid_device *hdev)
        return hdev->hid_output_raw_report(hdev, buf, sizeof(buf), HID_FEATURE_REPORT);
 }
 
+static void buzz_set_leds(struct hid_device *hdev, int leds)
+{
+       struct list_head *report_list =
+               &hdev->report_enum[HID_OUTPUT_REPORT].report_list;
+       struct hid_report *report = list_entry(report_list->next,
+               struct hid_report, list);
+       __s32 *value = report->field[0]->value;
+
+       value[0] = 0x00;
+       value[1] = (leds & 1) ? 0xff : 0x00;
+       value[2] = (leds & 2) ? 0xff : 0x00;
+       value[3] = (leds & 4) ? 0xff : 0x00;
+       value[4] = (leds & 8) ? 0xff : 0x00;
+       value[5] = 0x00;
+       value[6] = 0x00;
+       hid_hw_request(hdev, report, HID_REQ_SET_REPORT);
+}
+
+static void buzz_led_set_brightness(struct led_classdev *led,
+                                   enum led_brightness value)
+{
+       struct device *dev = led->dev->parent;
+       struct hid_device *hdev = container_of(dev, struct hid_device, dev);
+       struct sony_sc *drv_data;
+       struct buzz_extra *buzz;
+
+       int n;
+
+       drv_data = hid_get_drvdata(hdev);
+       if (!drv_data || !drv_data->extra) {
+               hid_err(hdev, "No device data\n");
+               return;
+       }
+       buzz = drv_data->extra;
+
+       for (n = 0; n < 4; n++) {
+               if (led == buzz->leds[n]) {
+                       int on = !! (buzz->led_state & (1 << n));
+                       if (value == LED_OFF && on) {
+                               buzz->led_state &= ~(1 << n);
+                               buzz_set_leds(hdev, buzz->led_state);
+                       } else if (value != LED_OFF && !on) {
+                               buzz->led_state |= (1 << n);
+                               buzz_set_leds(hdev, buzz->led_state);
+                       }
+                       break;
+               }
+       }
+}
+
+static enum led_brightness buzz_led_get_brightness(struct led_classdev *led)
+{
+       struct device *dev = led->dev->parent;
+       struct hid_device *hdev = container_of(dev, struct hid_device, dev);
+       struct sony_sc *drv_data;
+       struct buzz_extra *buzz;
+
+       int n;
+       int on = 0;
+
+       drv_data = hid_get_drvdata(hdev);
+       if (!drv_data || !drv_data->extra) {
+               hid_err(hdev, "No device data\n");
+               return LED_OFF;
+       }
+       buzz = drv_data->extra;
+
+       for (n = 0; n < 4; n++) {
+               if (led == buzz->leds[n]) {
+                       on = !! (buzz->led_state & (1 << n));
+                       break;
+               }
+       }
+
+       return on ? LED_FULL : LED_OFF;
+}
+
+static int buzz_init(struct hid_device *hdev)
+{
+       struct sony_sc *drv_data;
+       struct buzz_extra *buzz;
+       int n, ret = 0;
+       struct led_classdev *led;
+       size_t name_sz;
+       char *name;
+
+       drv_data = hid_get_drvdata(hdev);
+       BUG_ON(!(drv_data->quirks & BUZZ_CONTROLLER));
+
+       buzz = kzalloc(sizeof(*buzz), GFP_KERNEL);
+       if (!buzz) {
+               hid_err(hdev, "Insufficient memory, cannot allocate driver data\n");
+               return -ENOMEM;
+       }
+       drv_data->extra = buzz;
+
+       /* Clear LEDs as we have no way of reading their initial state. This is
+        * only relevant if the driver is loaded after somebody actively set the
+        * LEDs to on */
+       buzz_set_leds(hdev, 0x00);
+
+       name_sz = strlen(dev_name(&hdev->dev)) + strlen("::buzz#") + 1;
+
+       for (n = 0; n < 4; n++) {
+               led = kzalloc(sizeof(struct led_classdev) + name_sz, GFP_KERNEL);
+               if (!led) {
+                       hid_err(hdev, "Couldn't allocate memory for LED %d\n", n);
+                       goto error_leds;
+               }
+
+               name = (void *)(&led[1]);
+               snprintf(name, name_sz, "%s::buzz%d", dev_name(&hdev->dev), n + 1);
+               led->name = name;
+               led->brightness = 0;
+               led->max_brightness = 1;
+               led->brightness_get = buzz_led_get_brightness;
+               led->brightness_set = buzz_led_set_brightness;
+
+               if (led_classdev_register(&hdev->dev, led)) {
+                       hid_err(hdev, "Failed to register LED %d\n", n);
+                       kfree(led);
+                       goto error_leds;
+               }
+
+               buzz->leds[n] = led;
+       }
+
+       return ret;
+
+error_leds:
+       for (n = 0; n < 4; n++) {
+               led = buzz->leds[n];
+               buzz->leds[n] = NULL;
+               if (!led)
+                       continue;
+               led_classdev_unregister(led);
+               kfree(led);
+       }
+
+       kfree(drv_data->extra);
+       drv_data->extra = NULL;
+       return ret;
+}
+
+static void buzz_remove(struct hid_device *hdev)
+{
+       struct sony_sc *drv_data;
+       struct buzz_extra *buzz;
+       struct led_classdev *led;
+       int n;
+
+       drv_data = hid_get_drvdata(hdev);
+       BUG_ON(!(drv_data->quirks & BUZZ_CONTROLLER));
+
+       buzz = drv_data->extra;
+
+       for (n = 0; n < 4; n++) {
+               led = buzz->leds[n];
+               buzz->leds[n] = NULL;
+               if (!led)
+                       continue;
+               led_classdev_unregister(led);
+               kfree(led);
+       }
+
+       kfree(drv_data->extra);
+       drv_data->extra = NULL;
+}
+
 static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
 {
        int ret;
        unsigned long quirks = id->driver_data;
        struct sony_sc *sc;
+       unsigned int connect_mask = HID_CONNECT_DEFAULT;
 
        sc = kzalloc(sizeof(*sc), GFP_KERNEL);
        if (sc == NULL) {
@@ -213,8 +638,14 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
                goto err_free;
        }
 
-       ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT |
-                       HID_CONNECT_HIDDEV_FORCE);
+       if (sc->quirks & VAIO_RDESC_CONSTANT)
+               connect_mask |= HID_CONNECT_HIDDEV_FORCE;
+       else if (sc->quirks & SIXAXIS_CONTROLLER_USB)
+               connect_mask |= HID_CONNECT_HIDDEV_FORCE;
+       else if (sc->quirks & SIXAXIS_CONTROLLER_BT)
+               connect_mask |= HID_CONNECT_HIDDEV_FORCE;
+
+       ret = hid_hw_start(hdev, connect_mask);
        if (ret) {
                hid_err(hdev, "hw start failed\n");
                goto err_free;
@@ -226,6 +657,8 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
        }
        else if (sc->quirks & SIXAXIS_CONTROLLER_BT)
                ret = sixaxis_set_operational_bt(hdev);
+       else if (sc->quirks & BUZZ_CONTROLLER)
+               ret = buzz_init(hdev);
        else
                ret = 0;
 
@@ -242,8 +675,13 @@ err_free:
 
 static void sony_remove(struct hid_device *hdev)
 {
+       struct sony_sc *sc = hid_get_drvdata(hdev);
+
+       if (sc->quirks & BUZZ_CONTROLLER)
+               buzz_remove(hdev);
+
        hid_hw_stop(hdev);
-       kfree(hid_get_drvdata(hdev));
+       kfree(sc);
 }
 
 static const struct hid_device_id sony_devices[] = {
@@ -257,17 +695,30 @@ static const struct hid_device_id sony_devices[] = {
                .driver_data = VAIO_RDESC_CONSTANT },
        { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE),
                .driver_data = VAIO_RDESC_CONSTANT },
+       /* Wired Buzz Controller. Reported as Sony Hub from its USB ID and as
+        * Logitech joystick from the device descriptor. */
+       { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_BUZZ_CONTROLLER),
+               .driver_data = BUZZ_CONTROLLER },
+       { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER),
+               .driver_data = BUZZ_CONTROLLER },
+       /* PS3 BD Remote Control */
+       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_BDREMOTE),
+               .driver_data = PS3REMOTE },
+       /* Logitech Harmony Adapter for PS3 */
+       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_PS3),
+               .driver_data = PS3REMOTE },
        { }
 };
 MODULE_DEVICE_TABLE(hid, sony_devices);
 
 static struct hid_driver sony_driver = {
-       .name = "sony",
-       .id_table = sony_devices,
-       .probe = sony_probe,
-       .remove = sony_remove,
-       .report_fixup = sony_report_fixup,
-       .raw_event = sony_raw_event
+       .name          = "sony",
+       .id_table      = sony_devices,
+       .input_mapping = sony_mapping,
+       .probe         = sony_probe,
+       .remove        = sony_remove,
+       .report_fixup  = sony_report_fixup,
+       .raw_event     = sony_raw_event
 };
 module_hid_driver(sony_driver);