diff options
author | Yuri Khan <yurivkhan@gmail.com> | 2012-07-11 03:49:18 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-11 03:54:49 -0400 |
commit | 3ffb62cb9ac2430c2504c6ff9727d0f2476ef0bd (patch) | |
tree | 398d461a43bc4f5845255add1da4722787595ff2 /drivers | |
parent | 3dde22a98e94eb18527f0ff0068fb2fb945e58d4 (diff) |
Input: xpad - handle all variations of Mad Catz Beat Pad
The device should be handled by xpad driver instead of generic HID driver.
Signed-off-by: Yuri Khan <yurivkhan@gmail.com>
Acked-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 3 | ||||
-rw-r--r-- | drivers/input/joystick/xpad.c | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 9a4314bbe41b..054677b3d168 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1917,6 +1917,7 @@ static const struct hid_device_id hid_ignore_list[] = { | |||
1917 | { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MCT) }, | 1917 | { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MCT) }, |
1918 | { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) }, | 1918 | { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) }, |
1919 | { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HEATCONTROL) }, | 1919 | { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HEATCONTROL) }, |
1920 | { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_BEATPAD) }, | ||
1920 | { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS) }, | 1921 | { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS) }, |
1921 | { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) }, | 1922 | { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) }, |
1922 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) }, | 1923 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 8f6ee79208ac..dfd40981c86a 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -512,6 +512,9 @@ | |||
512 | #define USB_DEVICE_ID_CRYSTALTOUCH 0x0006 | 512 | #define USB_DEVICE_ID_CRYSTALTOUCH 0x0006 |
513 | #define USB_DEVICE_ID_CRYSTALTOUCH_DUAL 0x0007 | 513 | #define USB_DEVICE_ID_CRYSTALTOUCH_DUAL 0x0007 |
514 | 514 | ||
515 | #define USB_VENDOR_ID_MADCATZ 0x0738 | ||
516 | #define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540 | ||
517 | |||
515 | #define USB_VENDOR_ID_MCC 0x09db | 518 | #define USB_VENDOR_ID_MCC 0x09db |
516 | #define USB_DEVICE_ID_MCC_PMD1024LS 0x0076 | 519 | #define USB_DEVICE_ID_MCC_PMD1024LS 0x0076 |
517 | #define USB_DEVICE_ID_MCC_PMD1208LS 0x007a | 520 | #define USB_DEVICE_ID_MCC_PMD1208LS 0x007a |
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index fd7a0d5bc94d..0369364092d2 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c | |||
@@ -238,6 +238,7 @@ static struct usb_device_id xpad_table [] = { | |||
238 | XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */ | 238 | XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */ |
239 | XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */ | 239 | XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */ |
240 | XPAD_XBOX360_VENDOR(0x0738), /* Mad Catz X-Box 360 controllers */ | 240 | XPAD_XBOX360_VENDOR(0x0738), /* Mad Catz X-Box 360 controllers */ |
241 | { USB_DEVICE(0x0738, 0x4540) }, /* Mad Catz Beat Pad */ | ||
241 | XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */ | 242 | XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */ |
242 | XPAD_XBOX360_VENDOR(0x12ab), /* X-Box 360 dance pads */ | 243 | XPAD_XBOX360_VENDOR(0x12ab), /* X-Box 360 dance pads */ |
243 | XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */ | 244 | XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */ |