Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ffb62cb authored by Yuri Khan's avatar Yuri Khan Committed by Dmitry Torokhov
Browse files

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: default avatarYuri Khan <yurivkhan@gmail.com>
Acked-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 3dde22a9

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1917,6 +1917,7 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MCT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HEATCONTROL) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_BEATPAD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) },

drivers/hid/hid-ids.h

+3 −0
Original line number Diff line number Diff line
@@ -512,6 +512,9 @@ 
#define USB_DEVICE_ID_CRYSTALTOUCH	0x0006

#define USB_DEVICE_ID_CRYSTALTOUCH_DUAL	0x0007



#define USB_VENDOR_ID_MADCATZ		0x0738

#define USB_DEVICE_ID_MADCATZ_BEATPAD	0x4540



#define USB_VENDOR_ID_MCC		0x09db

#define USB_DEVICE_ID_MCC_PMD1024LS	0x0076

#define USB_DEVICE_ID_MCC_PMD1208LS	0x007a

drivers/input/joystick/xpad.c

+1 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ static struct usb_device_id xpad_table [] = { 
	XPAD_XBOX360_VENDOR(0x045e),		/* Microsoft X-Box 360 controllers */

	XPAD_XBOX360_VENDOR(0x046d),		/* Logitech X-Box 360 style controllers */

	XPAD_XBOX360_VENDOR(0x0738),		/* Mad Catz X-Box 360 controllers */

	{ USB_DEVICE(0x0738, 0x4540) },		/* Mad Catz Beat Pad */

	XPAD_XBOX360_VENDOR(0x0e6f),		/* 0x0e6f X-Box 360 controllers */

	XPAD_XBOX360_VENDOR(0x12ab),		/* X-Box 360 dance pads */

	XPAD_XBOX360_VENDOR(0x1430),		/* RedOctane X-Box 360 controllers */