| From 3eee5ec13e87cf593337444ede5c1c60530cf063 Mon Sep 17 00:00:00 2001 |
| From: Silvan Jegen <s.jegen@gmail.com> |
| Date: Thu, 17 Mar 2016 17:15:01 -0700 |
| Subject: Input: xpad - add Mad Catz FightStick TE 2 VID/PID |
| |
| [ Upstream commit d63b0f0c0f19dc8687387ead5a28148dcad1a4b9 ] |
| |
| This adds the VID/PID combination for the Xbox One version of the Mad |
| Catz FightStick TE 2. |
| |
| The functionality that this provides is about on par with what the |
| Windows drivers for the stick manage to deliver. |
| |
| What works: |
| - Digital stick |
| - 6 main buttons |
| - Xbox button |
| - The two buttons on the back |
| - The locking buttons (preventing accidental Xbox button press) |
| |
| What doesn't work: |
| - Two of the main buttons (don't work on Windows either) |
| - The "Haptic" button setting does not have an effect (not sure if it |
| works on Windows) |
| |
| I added the MAP_TRIGGERS_TO_BUTTONS option but in my (limited) testing |
| there was no practical difference with or without. The FightStick does |
| not have triggers though so adding it makes sense. |
| |
| Signed-off-by: Silvan Jegen <s.jegen@gmail.com> |
| Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/input/joystick/xpad.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c |
| index cd1de2851f1d..5f47e062cada 100644 |
| --- a/drivers/input/joystick/xpad.c |
| +++ b/drivers/input/joystick/xpad.c |
| @@ -153,6 +153,7 @@ static const struct xpad_device { |
| { 0x0738, 0x4728, "Mad Catz Street Fighter IV FightPad", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, |
| { 0x0738, 0x4738, "Mad Catz Wired Xbox 360 Controller (SFIV)", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, |
| { 0x0738, 0x4740, "Mad Catz Beat Pad", 0, XTYPE_XBOX360 }, |
| + { 0x0738, 0x4a01, "Mad Catz FightStick TE 2", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE }, |
| { 0x0738, 0x6040, "Mad Catz Beat Pad Pro", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX }, |
| { 0x0738, 0xb726, "Mad Catz Xbox controller - MW2", 0, XTYPE_XBOX360 }, |
| { 0x0738, 0xbeef, "Mad Catz JOYTECH NEO SE Advanced GamePad", XTYPE_XBOX360 }, |
| @@ -305,6 +306,7 @@ static struct usb_device_id xpad_table[] = { |
| 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_XBOXONE_VENDOR(0x0738), /* Mad Catz FightStick TE 2 */ |
| 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 */ |
| -- |
| 2.17.1 |
| |