tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Yuri Khan and committed by
Dmitry Torokhov 3ffb62cb 3dde22a9

+5
+1
drivers/hid/hid-core.c
··· 1917 1917 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MCT) }, 1918 1918 { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) }, 1919 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 1921 { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS) }, 1921 1922 { HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) }, 1922 1923 { HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) },
+3
drivers/hid/hid-ids.h
··· 512 512 #define USB_DEVICE_ID_CRYSTALTOUCH 0x0006 513 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 518 #define USB_VENDOR_ID_MCC 0x09db 516 519 #define USB_DEVICE_ID_MCC_PMD1024LS 0x0076 517 520 #define USB_DEVICE_ID_MCC_PMD1208LS 0x007a
+1
drivers/input/joystick/xpad.c
··· 238 238 XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */ 239 239 XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */ 240 240 XPAD_XBOX360_VENDOR(0x0738), /* Mad Catz X-Box 360 controllers */ 241 + { USB_DEVICE(0x0738, 0x4540) }, /* Mad Catz Beat Pad */ 241 242 XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */ 242 243 XPAD_XBOX360_VENDOR(0x12ab), /* X-Box 360 dance pads */ 243 244 XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */