HID: add USB ID for Alienware Dual Compatible Game Pad in hid-pl

Commit Message

Kenney Phillis April 8, 2011, 12:25 a.m. UTC

Add support for 187c:0600 device into hid-pl driver. This device has
the values in separate fields and resembles devices handled by hid-zpff.
---
drivers/hid/hid-core.c |    1 +
drivers/hid/hid-ids.h  |    3 +++
drivers/hid/hid-pl.c   |    5 +++++
3 files changed, 9 insertions(+), 0 deletions(-)

.driver_data = 1 }, /* Twin USB Joystick */
{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON,
USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR),

Patch

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index e968776..d7cb7aa 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1290,6 +1290,7 @@  static const struct hid_device_id
hid_have_special_driver[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) },
{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) },
{ HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ALIENWARE,
USB_DEVICE_ID_ALIENWARE_GAMEPAD) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_ATV_IRCONTROL) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_MIGHTYMOUSE) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 65ac53d..c0bda19 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -58,6 +58,9 @@ 
#define USB_VENDOR_ID_ALCOR 0x058f
#define USB_DEVICE_ID_ALCOR_USBRS232 0x9720

+#define USB_VENDOR_ID_ALIENWARE 0x187c
+#define USB_DEVICE_ID_ALIENWARE_GAMEPAD 0x0600
+
#define USB_VENDOR_ID_ALPS 0x0433
#define USB_DEVICE_ID_IBM_GAMEPAD 0x1101

diff --git a/drivers/hid/hid-pl.c b/drivers/hid/hid-pl.c
index 06e5300..46d117d 100644
--- a/drivers/hid/hid-pl.c
+++ b/drivers/hid/hid-pl.c
@@ -14,6 +14,9 @@ 
  *  0e8f:0003 "GASIA USB Gamepad"
  *   - another version of the König gamepad
  *
+ *  187c:0600 "Alienware Dual Compatible Game Pad"
+ *   - USB/PS2 Game Controller with Alienware branding.
+ *
  *  Copyright (c) 2007, 2009 Anssi Hannula <[e-mail]>
  */

@@ -201,6 +204,8 @@  err:
}

static const struct hid_device_id pl_devices[] = {
+ { HID_USB_DEVICE(USB_VENDOR_ID_ALIENWARE,
USB_DEVICE_ID_ALIENWARE_GAMEPAD) },
+ /* Alienware Dual Compatible */
{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON,
USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR),