summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward O'Callaghan <funfunctor@folklore1984.net>2016-08-29 21:29:56 +1000
committerEdward O'Callaghan <funfunctor@folklore1984.net>2016-09-19 21:51:05 +1000
commitc3a19c67da0584bbf62586daed1015f1ad174bcd (patch)
tree7492cf4f4b8809bda0227021cf523a53ced2f300
parent3be7988674ab33565700a37b210f502563d932e6 (diff)
input/joystick: Add Thrustmaster XT support to xpad
Add Thrustmaster XT variants as Xbox ONE controller vendor. This is required to make the following GP XID: * (044f:0xb664) gamepads work. Other 'vid:pid' possible candidate pairs are: * (044f:0xb65d) * (044f:0xb669) however no local hardware was available to test with. Signed-off-by: Edward O'Callaghan <funfunctor@folklore1984.net>
-rw-r--r--drivers/input/joystick/xpad.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 83af17ad0f1f..6855bbfd7c3b 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -138,6 +138,7 @@ static const struct xpad_device {
{ 0x045e, 0x0719, "Xbox 360 Wireless Receiver", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W },
{ 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX },
{ 0x044f, 0xb326, "Thrustmaster Gamepad GP XID", 0, XTYPE_XBOX360 },
+ { 0x044f, 0xb664, "Thrustmaster XT Racing Wheel", 0, XTYPE_XBOXONE },
{ 0x046d, 0xc21d, "Logitech Gamepad F310", 0, XTYPE_XBOX360 },
{ 0x046d, 0xc21e, "Logitech Gamepad F510", 0, XTYPE_XBOX360 },
{ 0x046d, 0xc21f, "Logitech Gamepad F710", 0, XTYPE_XBOX360 },
@@ -311,6 +312,7 @@ static const signed short xpad_abs_triggers[] = {
static struct usb_device_id xpad_table[] = {
{ USB_INTERFACE_INFO('X', 'B', 0) }, /* X-Box USB-IF not approved class */
XPAD_XBOX360_VENDOR(0x044f), /* Thrustmaster X-Box 360 controllers */
+ XPAD_XBOXONE_VENDOR(0x044f), /* Thrustmaster X-Box One controllers */
XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */
XPAD_XBOXONE_VENDOR(0x045e), /* Microsoft X-Box One controllers */
XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */