Input: xpad - Additional controller support
Subsystems (2)
cover Input: xpad - Additional controller support
This series includes two patches: one is a fixed resubmit of a previously reverted patch (first applied as db7220c48d8d), and the other is a simple addition to the VID table for Xbox One controllers.
Sam Lantinga (1):
Input: xpad - Add GameSir VID for Xbox One controllers
Vicki Pfau (1):
Input: xpad - fix support for some third-party controllers
drivers/input/joystick/xpad.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
Signature · 1 line
2.40.1
PATCH 1/2 Input: xpad - fix support for some third-party controllers
Some third-party controllers, such as the HORPIAD FPS for Nintendo Switch and Gamesir-G3w, require a specific packet that the first-party XInput driver sends before it will start sending reports. It's not currently known what this packet does, but since the first-party driver always sends it's unlikely that this could cause issues with existing controllers.
--- drivers/input/joystick/xpad.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
drivers/input/joystick/xpad.c +22 -0
@@ -264,6 +264,7 @@ static const struct xpad_device { { 0x0f0d, 0x0067, "HORIPAD ONE", 0, XTYPE_XBOXONE }, { 0x0f0d, 0x0078, "Hori Real Arcade Pro V Kai Xbox One", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE }, { 0x0f0d, 0x00c5, "Hori Fighting Commander ONE", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE }, + { 0x0f0d, 0x00dc, "HORIPAD FPS for Nintendo Switch", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, { 0x0f30, 0x010b, "Philips Recoil", 0, XTYPE_XBOX }, { 0x0f30, 0x0202, "Joytech Advanced Controller", 0, XTYPE_XBOX }, { 0x0f30, 0x8888, "BigBen XBMiniPad Controller", 0, XTYPE_XBOX },
@@ -1720,6 +1721,27 @@ static int xpad_start_input(struct usb_xpad *xpad)return error; } } +if (xpad->xtype ==XTYPE_XBOX360 ) { +/* +* Some third-party controllers Xbox 360-style controllers +* require this message to finish initialization. +*/ +u8 dummy[20 ]; + + error =usb_control_msg_recv (xpad->udev,0 , +/* bRequest */ 0x01 , +/* bmRequestType */ +USB_TYPE_VENDOR |USB_DIR_IN | +USB_RECIP_INTERFACE , +/* wValue */ 0x100 , +/* wIndex */ 0x00 , + dummy,sizeof (dummy), +25 ,GFP_KERNEL ); +if (error) +dev_warn (&xpad->dev->dev, +"unable to receive magic message: %d\n" , + error); + }return 0 ; }
Signature · 1 line
2.40.1
Re: [PATCH 1/2] Input: xpad - fix support for some third-party controllers
Quoted 8 lines · Vicki Pfau
Some third-party controllers, such as the HORPIAD FPS for Nintendo Switch and Gamesir-G3w, require a specific packet that the first-party XInput driver sends before it will start sending reports. It's not currently known what this packet does, but since the first-party driver always sends it's unlikely that this could cause issues with existing controllers.
Co-authored-by Andrey Smirnov <[email protected]>Signed-off-by Vicki Pfau <[email protected]>
Applied, thank you.
Signature · 1 line
Dmitry
PATCH 2/2 Input: xpad - Add GameSir VID for Xbox One controllers
In reply to Vicki PfauFrom: Sam Lantinga <[email protected]>
--- drivers/input/joystick/xpad.c | 1 + 1 file changed, 1 insertion(+)
drivers/input/joystick/xpad.c +1 -0
@@ -499,6 +499,7 @@ static const struct usb_device_id xpad_table[] = {XPAD_XBOXONE_VENDOR (0x2dc8 ),/* 8BitDo Pro 2 Wired Controller for Xbox */ XPAD_XBOXONE_VENDOR (0x2e24 ),/* Hyperkin Duke Xbox One pad */ XPAD_XBOX360_VENDOR (0x2f24 ),/* GameSir controllers */ +XPAD_XBOXONE_VENDOR (0x3537 ),/* GameSir Controllers */ XPAD_XBOX360_VENDOR (0x31e3 ),/* Wooting Keyboards */ XPAD_XBOX360_VENDOR(0x3285), /* Nacon GC-100 */ { }
Signature · 1 line
2.40.1
Dmitry Torokhov
maintainerRe: [PATCH 2/2] Input: xpad - Add GameSir VID for Xbox One controllers
Quoted 13 lines · Vicki Pfau
From: Sam Lantinga <[email protected]>
Signed-off-by Sam Lantinga <[email protected]>Signed-off-by Vicki Pfau <[email protected]>--- drivers/input/joystick/xpad.c | 1 + 1 file changed, 1 insertion(+)drivers/input/joystick/xpad.c +0
-0
drivers/input/joystick/xpad.c static const struct usb_device_id xpad_table[] = { · line 502
Quoted 4 lines
drivers/input/joystick/xpad.c +1
-0@@ -499,6 +499,7 @@ static const struct usb_device_id xpad_table[] = {XPAD_XBOXONE_VENDOR (0x2dc8 ),/* 8BitDo Pro 2 Wired Controller for Xbox */ XPAD_XBOXONE_VENDOR (0x2e24 ),/* Hyperkin Duke Xbox One pad */ XPAD_XBOX360_VENDOR (0x2f24 ),/* GameSir controllers */ + XPAD_XBOXONE_VENDOR(0x3537), /* GameSir Controllers */
We try to keep this list sorted by vendor ID, so I moved this down and applied.
Quoted 6 lines
drivers/input/joystick/xpad.c +0
-0XPAD_XBOX360_VENDOR (0x31e3 ),/* Wooting Keyboards */ XPAD_XBOX360_VENDOR(0x3285), /* Nacon GC-100 */ { }Signature · 1 line
2.40.1
Thanks.
Signature · 1 line
Dmitry
Hello,
Quoted 4 lines · Vicki Pfau
This series includes two patches: one is a fixed resubmit of a previously reverted patch (first applied as
db7220c48d8d), and the other is a simple addition to the VID table for Xbox One controllers.
Quoted 9 lines
Sam Lantinga (1):
Input: xpad - Add GameSir VID for Xbox One controllersVicki Pfau (1):
Input: xpad - fix support for some third-party controllersdrivers/input/joystick/xpad.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
This series has been radio silent for over three weeks. It includes an easy patch as well as a fixed version of the previously reverted patch I submitted. Is there anything else I need to do? I almost forgot about it, but would like to make sure it's addressed at some point.
Thanks