* [PATCH 2/3] Input: xpad - fix PowerA EnWired Controller guide button
2023-02-03 2:27 [PATCH 1/3] Input: xpad - Treat Qanba controllers as Xbox360 controllers Vicki Pfau
@ 2023-02-03 2:27 ` Vicki Pfau
2023-03-24 1:29 ` Dmitry Torokhov
2023-02-03 2:27 ` [PATCH 3/3] Input: xpad - add support for 8BitDo Ultimate Wireless controller dongle Vicki Pfau
` (3 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Vicki Pfau @ 2023-02-03 2:27 UTC (permalink / raw)
To: Jiri Kosina, Benjamin Tissoires, linux-input; +Cc: 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 <vi@endrift.com>
---
drivers/input/joystick/xpad.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index bb65c8268963..16bc3cd4c2b7 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -1390,6 +1390,13 @@ static int xpad_start_xbox_one(struct usb_xpad *xpad)
unsigned long flags;
int retval;
+ /* 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, 1, 0);
+ if (retval)
+ return retval;
+
spin_lock_irqsave(&xpad->odata_lock, flags);
/*
--
2.39.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 2/3] Input: xpad - fix PowerA EnWired Controller guide button
2023-02-03 2:27 ` [PATCH 2/3] Input: xpad - fix PowerA EnWired Controller guide button Vicki Pfau
@ 2023-03-24 1:29 ` Dmitry Torokhov
0 siblings, 0 replies; 9+ messages in thread
From: Dmitry Torokhov @ 2023-03-24 1:29 UTC (permalink / raw)
To: Vicki Pfau; +Cc: Jiri Kosina, Benjamin Tissoires, linux-input
On Thu, Feb 02, 2023 at 06:27:57PM -0800, Vicki Pfau wrote:
> 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 <vi@endrift.com>
> ---
> drivers/input/joystick/xpad.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
> index bb65c8268963..16bc3cd4c2b7 100644
> --- a/drivers/input/joystick/xpad.c
> +++ b/drivers/input/joystick/xpad.c
> @@ -1390,6 +1390,13 @@ static int xpad_start_xbox_one(struct usb_xpad *xpad)
> unsigned long flags;
> int retval;
>
> + /* 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 */
Is it guaranteed that there is 2nd interface? Is it always the audio
interface?
> + retval = usb_set_interface(xpad->udev, 1, 0);
> + if (retval)
> + return retval;
> +
> spin_lock_irqsave(&xpad->odata_lock, flags);
>
> /*
> --
> 2.39.1
>
Thanks.
--
Dmitry
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/3] Input: xpad - add support for 8BitDo Ultimate Wireless controller dongle
2023-02-03 2:27 [PATCH 1/3] Input: xpad - Treat Qanba controllers as Xbox360 controllers Vicki Pfau
2023-02-03 2:27 ` [PATCH 2/3] Input: xpad - fix PowerA EnWired Controller guide button Vicki Pfau
@ 2023-02-03 2:27 ` Vicki Pfau
2023-03-24 1:25 ` Dmitry Torokhov
2023-02-10 21:45 ` [PATCH 1/3] Input: xpad - Treat Qanba controllers as Xbox360 controllers Lyude Paul
` (2 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Vicki Pfau @ 2023-02-03 2:27 UTC (permalink / raw)
To: Jiri Kosina, Benjamin Tissoires, linux-input
Cc: Pierre-Loup A. Griffais, Josh Cotton
From: "Pierre-Loup A. Griffais" <pgriffais@valvesoftware.com>
Add the VID and PID of the 8BitDo Ultimate Wireless controller dongle
Signed-off-by: Josh Cotton <jcotton42@outlook.com>
---
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 16bc3cd4c2b7..403b57e8176b 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -359,6 +359,7 @@ static const struct xpad_device {
{ 0x24c6, 0xfafe, "Rock Candy Gamepad for Xbox 360", 0, XTYPE_XBOX360 },
{ 0x2563, 0x058d, "OneXPlayer Gamepad", 0, XTYPE_XBOX360 },
{ 0x2dc8, 0x2000, "8BitDo Pro 2 Wired Controller fox Xbox", 0, XTYPE_XBOXONE },
+ { 0x2dc8, 0x3106, "8BitDo Ultimate Wireless Controller", 0, XTYPE_XBOX360 },
{ 0x31e3, 0x1100, "Wooting One", 0, XTYPE_XBOX360 },
{ 0x31e3, 0x1200, "Wooting Two", 0, XTYPE_XBOX360 },
{ 0x31e3, 0x1210, "Wooting Lekker", 0, XTYPE_XBOX360 },
@@ -494,6 +495,7 @@ static const struct usb_device_id xpad_table[] = {
XPAD_XBOX360_VENDOR(0x260d), /* Dareu H101 */
XPAD_XBOX360_VENDOR(0x2c22), /* Qanba Controllers */
XPAD_XBOXONE_VENDOR(0x2dc8), /* 8BitDo Pro 2 Wired Controller for Xbox */
+ XPAD_XBOX360_VENDOR(0x2dc8), /* 8BitDo Ultimate Wireless Controller */
XPAD_XBOXONE_VENDOR(0x2e24), /* Hyperkin Duke X-Box One pad */
XPAD_XBOX360_VENDOR(0x2f24), /* GameSir Controllers */
XPAD_XBOX360_VENDOR(0x31e3), /* Wooting Keyboards */
--
2.39.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 3/3] Input: xpad - add support for 8BitDo Ultimate Wireless controller dongle
2023-02-03 2:27 ` [PATCH 3/3] Input: xpad - add support for 8BitDo Ultimate Wireless controller dongle Vicki Pfau
@ 2023-03-24 1:25 ` Dmitry Torokhov
0 siblings, 0 replies; 9+ messages in thread
From: Dmitry Torokhov @ 2023-03-24 1:25 UTC (permalink / raw)
To: Vicki Pfau
Cc: Jiri Kosina, Benjamin Tissoires, linux-input,
Pierre-Loup A. Griffais, Josh Cotton
On Thu, Feb 02, 2023 at 06:27:58PM -0800, Vicki Pfau wrote:
> From: "Pierre-Loup A. Griffais" <pgriffais@valvesoftware.com>
>
> Add the VID and PID of the 8BitDo Ultimate Wireless controller dongle
>
> Signed-off-by: Josh Cotton <jcotton42@outlook.com>
Same issue as the first patch regarding attribution.
> ---
> 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 16bc3cd4c2b7..403b57e8176b 100644
> --- a/drivers/input/joystick/xpad.c
> +++ b/drivers/input/joystick/xpad.c
> @@ -359,6 +359,7 @@ static const struct xpad_device {
> { 0x24c6, 0xfafe, "Rock Candy Gamepad for Xbox 360", 0, XTYPE_XBOX360 },
> { 0x2563, 0x058d, "OneXPlayer Gamepad", 0, XTYPE_XBOX360 },
> { 0x2dc8, 0x2000, "8BitDo Pro 2 Wired Controller fox Xbox", 0, XTYPE_XBOXONE },
> + { 0x2dc8, 0x3106, "8BitDo Ultimate Wireless Controller", 0, XTYPE_XBOX360 },
> { 0x31e3, 0x1100, "Wooting One", 0, XTYPE_XBOX360 },
> { 0x31e3, 0x1200, "Wooting Two", 0, XTYPE_XBOX360 },
> { 0x31e3, 0x1210, "Wooting Lekker", 0, XTYPE_XBOX360 },
> @@ -494,6 +495,7 @@ static const struct usb_device_id xpad_table[] = {
> XPAD_XBOX360_VENDOR(0x260d), /* Dareu H101 */
> XPAD_XBOX360_VENDOR(0x2c22), /* Qanba Controllers */
> XPAD_XBOXONE_VENDOR(0x2dc8), /* 8BitDo Pro 2 Wired Controller for Xbox */
> + XPAD_XBOX360_VENDOR(0x2dc8), /* 8BitDo Ultimate Wireless Controller */
> XPAD_XBOXONE_VENDOR(0x2e24), /* Hyperkin Duke X-Box One pad */
> XPAD_XBOX360_VENDOR(0x2f24), /* GameSir Controllers */
> XPAD_XBOX360_VENDOR(0x31e3), /* Wooting Keyboards */
> --
> 2.39.1
>
--
Dmitry
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] Input: xpad - Treat Qanba controllers as Xbox360 controllers
2023-02-03 2:27 [PATCH 1/3] Input: xpad - Treat Qanba controllers as Xbox360 controllers Vicki Pfau
2023-02-03 2:27 ` [PATCH 2/3] Input: xpad - fix PowerA EnWired Controller guide button Vicki Pfau
2023-02-03 2:27 ` [PATCH 3/3] Input: xpad - add support for 8BitDo Ultimate Wireless controller dongle Vicki Pfau
@ 2023-02-10 21:45 ` Lyude Paul
2023-02-10 21:46 ` Lyude Paul
2023-03-23 21:33 ` Lyude Paul
2023-03-24 1:24 ` Dmitry Torokhov
4 siblings, 1 reply; 9+ messages in thread
From: Lyude Paul @ 2023-02-10 21:45 UTC (permalink / raw)
To: Vicki Pfau, Jiri Kosina, Benjamin Tissoires, linux-input
Cc: Pierre-Loup A. Griffais, Cristian Ciocaltea
LGTM. For onlookers curious: the audio interface being disabled here isn't
currently supported in xpad quite yet, but is supported out of tree -
supposedly with plans to eventually merge it into the mainline kernel. So
patch 2/3 here should be fine.
Anyway,
Reviewed-by: Lyude Paul <lyude@redhat.com>
On Thu, 2023-02-02 at 18:27 -0800, Vicki Pfau wrote:
> From: "Pierre-Loup A. Griffais" <pgriffais@valvesoftware.com>
>
> They act that way in PC mode.
>
> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
> ---
> drivers/input/joystick/xpad.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
> index 2959d80f7fdb..bb65c8268963 100644
> --- a/drivers/input/joystick/xpad.c
> +++ b/drivers/input/joystick/xpad.c
> @@ -492,6 +492,7 @@ static const struct usb_device_id xpad_table[] = {
> XPAD_XBOXONE_VENDOR(0x24c6), /* PowerA Controllers */
> XPAD_XBOX360_VENDOR(0x2563), /* OneXPlayer Gamepad */
> XPAD_XBOX360_VENDOR(0x260d), /* Dareu H101 */
> + XPAD_XBOX360_VENDOR(0x2c22), /* Qanba Controllers */
> XPAD_XBOXONE_VENDOR(0x2dc8), /* 8BitDo Pro 2 Wired Controller for Xbox */
> XPAD_XBOXONE_VENDOR(0x2e24), /* Hyperkin Duke X-Box One pad */
> XPAD_XBOX360_VENDOR(0x2f24), /* GameSir Controllers */
--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/3] Input: xpad - Treat Qanba controllers as Xbox360 controllers
2023-02-10 21:45 ` [PATCH 1/3] Input: xpad - Treat Qanba controllers as Xbox360 controllers Lyude Paul
@ 2023-02-10 21:46 ` Lyude Paul
0 siblings, 0 replies; 9+ messages in thread
From: Lyude Paul @ 2023-02-10 21:46 UTC (permalink / raw)
To: Vicki Pfau, Jiri Kosina, Benjamin Tissoires, linux-input
Cc: Pierre-Loup A. Griffais, Cristian Ciocaltea
Almost forgot to mention - the Reviewed-by here is for the whole series, not
just the first patch :)
On Fri, 2023-02-10 at 16:45 -0500, Lyude Paul wrote:
> LGTM. For onlookers curious: the audio interface being disabled here isn't
> currently supported in xpad quite yet, but is supported out of tree -
> supposedly with plans to eventually merge it into the mainline kernel. So
> patch 2/3 here should be fine.
>
> Anyway,
>
> Reviewed-by: Lyude Paul <lyude@redhat.com>
>
> On Thu, 2023-02-02 at 18:27 -0800, Vicki Pfau wrote:
> > From: "Pierre-Loup A. Griffais" <pgriffais@valvesoftware.com>
> >
> > They act that way in PC mode.
> >
> > Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
> > ---
> > drivers/input/joystick/xpad.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
> > index 2959d80f7fdb..bb65c8268963 100644
> > --- a/drivers/input/joystick/xpad.c
> > +++ b/drivers/input/joystick/xpad.c
> > @@ -492,6 +492,7 @@ static const struct usb_device_id xpad_table[] = {
> > XPAD_XBOXONE_VENDOR(0x24c6), /* PowerA Controllers */
> > XPAD_XBOX360_VENDOR(0x2563), /* OneXPlayer Gamepad */
> > XPAD_XBOX360_VENDOR(0x260d), /* Dareu H101 */
> > + XPAD_XBOX360_VENDOR(0x2c22), /* Qanba Controllers */
> > XPAD_XBOXONE_VENDOR(0x2dc8), /* 8BitDo Pro 2 Wired Controller for Xbox */
> > XPAD_XBOXONE_VENDOR(0x2e24), /* Hyperkin Duke X-Box One pad */
> > XPAD_XBOX360_VENDOR(0x2f24), /* GameSir Controllers */
>
--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] Input: xpad - Treat Qanba controllers as Xbox360 controllers
2023-02-03 2:27 [PATCH 1/3] Input: xpad - Treat Qanba controllers as Xbox360 controllers Vicki Pfau
` (2 preceding siblings ...)
2023-02-10 21:45 ` [PATCH 1/3] Input: xpad - Treat Qanba controllers as Xbox360 controllers Lyude Paul
@ 2023-03-23 21:33 ` Lyude Paul
2023-03-24 1:24 ` Dmitry Torokhov
4 siblings, 0 replies; 9+ messages in thread
From: Lyude Paul @ 2023-03-23 21:33 UTC (permalink / raw)
To: Vicki Pfau, Jiri Kosina, Benjamin Tissoires, linux-input,
Dmitry Torokhov
Cc: Pierre-Loup A. Griffais, Cristian Ciocaltea
Hi Dmitry, it looks like this patch series has been sitting for a while now
without getting any kind of feedback. Could you please take a look at this the
next chance you get?
On Thu, 2023-02-02 at 18:27 -0800, Vicki Pfau wrote:
> From: "Pierre-Loup A. Griffais" <pgriffais@valvesoftware.com>
>
> They act that way in PC mode.
>
> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
> ---
> drivers/input/joystick/xpad.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
> index 2959d80f7fdb..bb65c8268963 100644
> --- a/drivers/input/joystick/xpad.c
> +++ b/drivers/input/joystick/xpad.c
> @@ -492,6 +492,7 @@ static const struct usb_device_id xpad_table[] = {
> XPAD_XBOXONE_VENDOR(0x24c6), /* PowerA Controllers */
> XPAD_XBOX360_VENDOR(0x2563), /* OneXPlayer Gamepad */
> XPAD_XBOX360_VENDOR(0x260d), /* Dareu H101 */
> + XPAD_XBOX360_VENDOR(0x2c22), /* Qanba Controllers */
> XPAD_XBOXONE_VENDOR(0x2dc8), /* 8BitDo Pro 2 Wired Controller for Xbox */
> XPAD_XBOXONE_VENDOR(0x2e24), /* Hyperkin Duke X-Box One pad */
> XPAD_XBOX360_VENDOR(0x2f24), /* GameSir Controllers */
--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/3] Input: xpad - Treat Qanba controllers as Xbox360 controllers
2023-02-03 2:27 [PATCH 1/3] Input: xpad - Treat Qanba controllers as Xbox360 controllers Vicki Pfau
` (3 preceding siblings ...)
2023-03-23 21:33 ` Lyude Paul
@ 2023-03-24 1:24 ` Dmitry Torokhov
4 siblings, 0 replies; 9+ messages in thread
From: Dmitry Torokhov @ 2023-03-24 1:24 UTC (permalink / raw)
To: Vicki Pfau
Cc: Jiri Kosina, Benjamin Tissoires, linux-input,
Pierre-Loup A. Griffais, Cristian Ciocaltea
On Thu, Feb 02, 2023 at 06:27:56PM -0800, Vicki Pfau wrote:
> From: "Pierre-Loup A. Griffais" <pgriffais@valvesoftware.com>
>
> They act that way in PC mode.
>
> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Sorry, this patch is a complete mess with regard to the sender, the
author, and the person giving their signed-off-by.
> ---
> drivers/input/joystick/xpad.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
> index 2959d80f7fdb..bb65c8268963 100644
> --- a/drivers/input/joystick/xpad.c
> +++ b/drivers/input/joystick/xpad.c
> @@ -492,6 +492,7 @@ static const struct usb_device_id xpad_table[] = {
> XPAD_XBOXONE_VENDOR(0x24c6), /* PowerA Controllers */
> XPAD_XBOX360_VENDOR(0x2563), /* OneXPlayer Gamepad */
> XPAD_XBOX360_VENDOR(0x260d), /* Dareu H101 */
> + XPAD_XBOX360_VENDOR(0x2c22), /* Qanba Controllers */
> XPAD_XBOXONE_VENDOR(0x2dc8), /* 8BitDo Pro 2 Wired Controller for Xbox */
> XPAD_XBOXONE_VENDOR(0x2e24), /* Hyperkin Duke X-Box One pad */
> XPAD_XBOX360_VENDOR(0x2f24), /* GameSir Controllers */
> --
> 2.39.1
>
Thanks.
--
Dmitry
^ permalink raw reply [flat|nested] 9+ messages in thread