HID: fold ps3remote driver into generic Sony driver

Let's follow the structure we are trying to keep for most of the
specific HID drivers, and let the separation follow the producing
vendor.
Merge functionality provided by ps3remote driver into hid-sony.

Tested-by: David Dillow <dave@thedillows.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

4 files changed, 185 insertions, 219 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 5bad26ef227a..8280eba43e14 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -561,15 +561,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
@@ -600,11 +591,11 @@ config HID_SONY
         depends on LEDS_CLASS
         ---help---
         Support for
-          
+
           * Sony PS3 6-axis controllers
           * Buzz controllers
-
-        Support for the Sony PS3 BD Remote is provided by HID_PS3REMOTE.
+          * 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"
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 2065694f57ab..833abcf19d68 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -92,7 +92,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 \
diff --git a/drivers/hid/hid-ps3remote.c b/drivers/hid/hid-ps3remote.c
deleted file mode 100644
index f1239d3c5b14..000000000000
--- a/drivers/hid/hid-ps3remote.c
+++ /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>");
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index f1c906176615..ecbc74923d06 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -1,11 +1,12 @@
 /*
- *  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>
  */
 
@@ -16,6 +17,13 @@
  * 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>
@@ -29,6 +37,7 @@
 #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,
@@ -58,6 +67,122 @@ 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.
@@ -108,6 +233,48 @@ struct buzz_extra {
         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)
@@ -144,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;
 }
 
@@ -195,6 +366,9 @@ static int sony_mapping(struct hid_device *hdev, struct hid_input *hi,
                 return 1;
         }
 
+        if (sc->quirks & PS3REMOTE)
+                return ps3remote_mapping(hdev, hi, field, usage, bit, max);
+
         return -1;
 }
 
@@ -527,6 +701,12 @@ static const struct hid_device_id sony_devices[] = {
                 .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);