History

Input: xpad - handle all variations of Mad Catz Beat Pad

The device should be handled by xpad driver instead of generic HID driver.

Yuri Khan committed 14 years ago

Commit 3ffb62c1 parent 3dde22a3 files · +5 −0Browse files

Unified · Split

3 files
  1. drivers/hid/hid-core.c +1 −0
  2. drivers/hid/hid-ids.h +3 −0
  3. drivers/input/joystick/xpad.c +1 −0
drivers/hid/hid-core.c+1−0
@@ -1917,6 +1917,7 @@ static const struct hid_device_id hid_ignore_list[] = { · 1916 unmodified lines
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) },
drivers/hid/hid-ids.h+3−0
@@ -512,6 +512,9 @@ · 511 unmodified lines
512#define USB_DEVICE_ID_CRYSTALTOUCH 0x0006512#define USB_DEVICE_ID_CRYSTALTOUCH 0x0006
513#define USB_DEVICE_ID_CRYSTALTOUCH_DUAL 0x0007513#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 0x09db518#define USB_VENDOR_ID_MCC 0x09db
516#define USB_DEVICE_ID_MCC_PMD1024LS 0x0076519#define USB_DEVICE_ID_MCC_PMD1024LS 0x0076
517#define USB_DEVICE_ID_MCC_PMD1208LS 0x007a520#define USB_DEVICE_ID_MCC_PMD1208LS 0x007a
drivers/input/joystick/xpad.c+1−0
@@ -238,6 +238,7 @@ static struct usb_device_id xpad_table [] = { · 237 unmodified lines
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 */