Improve GIP support
Subsystems (2)
v2 cover Improve GIP support
This series contains a new version of the previously submitted "fix PowerA EnWired Controller guide button" patch to make the failure soft instead of hard as well as making sure the interface exists before trying to disable it, as well as a further patch to add (and use) constants for the interface names, based on information gleaned from the xone project.
Vicki Pfau (2):
Input: xpad - Add constants for GIP interface numbers
Input: xpad - fix PowerA EnWired Controller guide button
drivers/input/joystick/xpad.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
Signature · 1 line
2.40.0
PATCH v2 1/2 Input: xpad - Add constants for GIP interface numbers
Wired GIP devices present multiple interfaces with the same USB identification other than the interface number. This adds constants for differentiating two of them and uses them where appropriate
--- drivers/input/joystick/xpad.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/input/joystick/xpad.c +4 -1
@@ -561,6 +561,9 @@ struct xboxone_init_packet {#define GIP_MOTOR_LT BIT(3)#define GIP_MOTOR_ALL (GIP_MOTOR_R | GIP_MOTOR_L | GIP_MOTOR_RT | GIP_MOTOR_LT) +#define GIP_WIRED_INTF_DATA 0 +#define GIP_WIRED_INTF_AUDIO 1 +/* * This packet is required for all Xbox One pads with 2015 * or later firmware installed (or present from the factory).
@@ -2004,7 +2007,7 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id }if (xpad->xtype ==XTYPE_XBOXONE && - intf->cur_altsetting->desc.bInterfaceNumber !=0 ) { + intf->cur_altsetting->desc.bInterfaceNumber !=GIP_WIRED_INTF_DATA ) {/* * The Xbox One controller lists three interfaces all with the * same interface class, subclass and protocol. Differentiate by
Signature · 1 line
2.40.0
Re: [PATCH v2 1/2] Input: xpad - Add constants for GIP interface numbers
Quoted 5 lines · Vicki Pfau
Wired GIP devices present multiple interfaces with the same USB identification other than the interface number. This adds constants for differentiating two of them and uses them where appropriate
Signed-off-by Vicki Pfau <[email protected]>
Applied, thank you.
Signature · 1 line
Dmitry
PATCH v2 2/2 Input: xpad - fix PowerA EnWired Controller guide button
In reply to Vicki PfauThis commit explicitly disables the audio interface the same way the official driver does. This is needed for some controllers, such as the PowerA Enhanced Wired Controller for Series X|S (0x20d6:0x200e) to report the guide button.
--- drivers/input/joystick/xpad.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/input/joystick/xpad.c +10 -0
@@ -1396,6 +1396,16 @@ static int xpad_start_xbox_one(struct usb_xpad *xpad)unsigned long flags;int retval; +if (usb_ifnum_to_if (xpad->udev,GIP_WIRED_INTF_AUDIO )) { +/* Explicitly disable the audio interface. This is needed for some +* controllers, such as the PowerA Enhanced Wired Controller +* for Series X|S (0x20d6:0x200e) to report the guide button */ + retval =usb_set_interface (xpad->udev,GIP_WIRED_INTF_AUDIO ,0 ); +if (retval) +dev_warn (&xpad->dev->dev, +"unable to disable audio interface: %d\n" , retval); + } +spin_lock_irqsave (&xpad->odata_lock, flags);/*
Signature · 1 line
2.40.0
Re: [PATCH v2 2/2] Input: xpad - fix PowerA EnWired Controller guide button
Quoted 5 lines · Vicki Pfau
This commit explicitly disables the audio interface the same way the official driver does. This is needed for some controllers, such as the PowerA Enhanced Wired Controller for Series X|S (0x20d6:0x200e) to report the guide button.
Signed-off-by Vicki Pfau <[email protected]>
Applied, thank you.
Signature · 1 line
Dmitry