2018-11-28 02:50:05

by Cameron Gutman

Subject: [PATCH] Input: xpad - quirk all PDP Xbox One gamepads

Since we continue to find tons of new variants [0,1,2,3,4,5,6] that
need the PDP quirk, let's just quirk all devices from PDP.

[0]: https://github.com/paroj/xpad/pull/104
[1]: https://github.com/paroj/xpad/pull/105
[2]: https://github.com/paroj/xpad/pull/108
[3]: https://github.com/paroj/xpad/pull/109
[4]: https://github.com/paroj/xpad/pull/112
[5]: https://github.com/paroj/xpad/pull/115
[6]: https://github.com/paroj/xpad/pull/116

Fixes: e5c9c6a885fa ("Input: xpad - add support for PDP Xbox One controllers")
Cc: [email protected]
Signed-off-by: Cameron Gutman <[email protected]>
---
Dmitry,

This patch applies to your for-linus branch, since another PDP
quirked device was added there.


Regards,
Cameron
---
drivers/input/joystick/xpad.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index d4b9db487b16..cfc8b94527b9 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -480,18 +480,18 @@ static const u8 xboxone_hori_init[] = {
};

/*
- * This packet is required for some of the PDP pads to start
+ * This packet is required for most (all?) of the PDP pads to start
* sending input reports. These pads include: (0x0e6f:0x02ab),
- * (0x0e6f:0x02a4).
+ * (0x0e6f:0x02a4), (0x0e6f:0x02a6).
*/
static const u8 xboxone_pdp_init1[] = {
0x0a, 0x20, 0x00, 0x03, 0x00, 0x01, 0x14
};

/*
- * This packet is required for some of the PDP pads to start
+ * This packet is required for most (all?) of the PDP pads to start
* sending input reports. These pads include: (0x0e6f:0x02ab),
- * (0x0e6f:0x02a4).
+ * (0x0e6f:0x02a4), (0x0e6f:0x02a6).
*/
static const u8 xboxone_pdp_init2[] = {
0x06, 0x20, 0x00, 0x02, 0x01, 0x00
@@ -527,12 +527,8 @@ static const struct xboxone_init_packet xboxone_init_packets[] = {
XBOXONE_INIT_PKT(0x0e6f, 0x0165, xboxone_hori_init),
XBOXONE_INIT_PKT(0x0f0d, 0x0067, xboxone_hori_init),
XBOXONE_INIT_PKT(0x0000, 0x0000, xboxone_fw2015_init),
- XBOXONE_INIT_PKT(0x0e6f, 0x02ab, xboxone_pdp_init1),
- XBOXONE_INIT_PKT(0x0e6f, 0x02ab, xboxone_pdp_init2),
- XBOXONE_INIT_PKT(0x0e6f, 0x02a4, xboxone_pdp_init1),
- XBOXONE_INIT_PKT(0x0e6f, 0x02a4, xboxone_pdp_init2),
- XBOXONE_INIT_PKT(0x0e6f, 0x02a6, xboxone_pdp_init1),
- XBOXONE_INIT_PKT(0x0e6f, 0x02a6, xboxone_pdp_init2),
+ XBOXONE_INIT_PKT(0x0e6f, 0x0000, xboxone_pdp_init1),
+ XBOXONE_INIT_PKT(0x0e6f, 0x0000, xboxone_pdp_init2),
XBOXONE_INIT_PKT(0x24c6, 0x541a, xboxone_rumblebegin_init),
XBOXONE_INIT_PKT(0x24c6, 0x542a, xboxone_rumblebegin_init),
XBOXONE_INIT_PKT(0x24c6, 0x543a, xboxone_rumblebegin_init),
--
2.19.1

2018-11-29 18:12:32

by Dmitry Torokhov

Subject: Re: [PATCH] Input: xpad - quirk all PDP Xbox One gamepads

On Tue, Nov 27, 2018 at 06:47:10PM -0800, Cameron Gutman wrote:
> Since we continue to find tons of new variants [0,1,2,3,4,5,6] that
> need the PDP quirk, let's just quirk all devices from PDP.
>
> [0]: https://github.com/paroj/xpad/pull/104
> [1]: https://github.com/paroj/xpad/pull/105
> [2]: https://github.com/paroj/xpad/pull/108
> [3]: https://github.com/paroj/xpad/pull/109
> [4]: https://github.com/paroj/xpad/pull/112
> [5]: https://github.com/paroj/xpad/pull/115
> [6]: https://github.com/paroj/xpad/pull/116
>
> Fixes: e5c9c6a885fa ("Input: xpad - add support for PDP Xbox One controllers")
> Cc: [email protected]
> Signed-off-by: Cameron Gutman <[email protected]>

Applied, thank you.

> ---
> Dmitry,
>
> This patch applies to your for-linus branch, since another PDP
> quirked device was added there.
>
>
> Regards,
> Cameron
> ---
> drivers/input/joystick/xpad.c | 16 ++++++----------
> 1 file changed, 6 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
> index d4b9db487b16..cfc8b94527b9 100644
> --- a/drivers/input/joystick/xpad.c
> +++ b/drivers/input/joystick/xpad.c
> @@ -480,18 +480,18 @@ static const u8 xboxone_hori_init[] = {
> };
>
> /*
> - * This packet is required for some of the PDP pads to start
> + * This packet is required for most (all?) of the PDP pads to start
> * sending input reports. These pads include: (0x0e6f:0x02ab),
> - * (0x0e6f:0x02a4).
> + * (0x0e6f:0x02a4), (0x0e6f:0x02a6).
> */
> static const u8 xboxone_pdp_init1[] = {
> 0x0a, 0x20, 0x00, 0x03, 0x00, 0x01, 0x14
> };
>
> /*
> - * This packet is required for some of the PDP pads to start
> + * This packet is required for most (all?) of the PDP pads to start
> * sending input reports. These pads include: (0x0e6f:0x02ab),
> - * (0x0e6f:0x02a4).
> + * (0x0e6f:0x02a4), (0x0e6f:0x02a6).
> */
> static const u8 xboxone_pdp_init2[] = {
> 0x06, 0x20, 0x00, 0x02, 0x01, 0x00
> @@ -527,12 +527,8 @@ static const struct xboxone_init_packet xboxone_init_packets[] = {
> XBOXONE_INIT_PKT(0x0e6f, 0x0165, xboxone_hori_init),
> XBOXONE_INIT_PKT(0x0f0d, 0x0067, xboxone_hori_init),
> XBOXONE_INIT_PKT(0x0000, 0x0000, xboxone_fw2015_init),
> - XBOXONE_INIT_PKT(0x0e6f, 0x02ab, xboxone_pdp_init1),
> - XBOXONE_INIT_PKT(0x0e6f, 0x02ab, xboxone_pdp_init2),
> - XBOXONE_INIT_PKT(0x0e6f, 0x02a4, xboxone_pdp_init1),
> - XBOXONE_INIT_PKT(0x0e6f, 0x02a4, xboxone_pdp_init2),
> - XBOXONE_INIT_PKT(0x0e6f, 0x02a6, xboxone_pdp_init1),
> - XBOXONE_INIT_PKT(0x0e6f, 0x02a6, xboxone_pdp_init2),
> + XBOXONE_INIT_PKT(0x0e6f, 0x0000, xboxone_pdp_init1),
> + XBOXONE_INIT_PKT(0x0e6f, 0x0000, xboxone_pdp_init2),
> XBOXONE_INIT_PKT(0x24c6, 0x541a, xboxone_rumblebegin_init),
> XBOXONE_INIT_PKT(0x24c6, 0x542a, xboxone_rumblebegin_init),
> XBOXONE_INIT_PKT(0x24c6, 0x543a, xboxone_rumblebegin_init),
> --
> 2.19.1
>

--
Dmitry