2022-09-08 18:57:34

by Nate Yocom

[permalink] [raw]
Subject: [PATCH v6 0/5] Input: joystick: xpad: Add X-Box Adaptive Controller support

Adds support for the X-Box Adaptive Controller, which is protocol
compatible with the XTYPE_XBOXONE support in the driver with two deltas:

- The X-Box button sets 0x02 as its activation ID, where others set
0x01
- The controller has an additional Profile button with 4 active states,
which this change maps to an Axis control with 4 possible values

Patch series adds device to the supported table, adds support for the
Profile button, and adds support for the X-Box button as distinct
changes.

Signed-off-by: Nate Yocom <[email protected]>

Nate Yocom (5):
Input: joystick: xpad: Add X-Box Adaptive support
Input: joystick: xpad: Add X-Box Adaptive XBox button
Input: joystick: xpad: Add ABS_PROFILE to uapi
Input: joystick: xpad: Add ABS_PROFILE to Docs
Input: joystick: xpad: Add X-Box Adaptive Profile button

v2: Fix warning Reported-by: kernel test robot <[email protected]>
v3: Break into multi-part and remove VID/PID check for XBox button
v4: Rename Layer -> Profile as suggested by Bastien Nocera
v5: Add new ABS_PROFILE axis to uapi and use it for the profile button
v6: Add ABS_PROFILE to absolutes array and docs as requested by Dmitry

Documentation/input/event-codes.rst | 6 ++++++
Documentation/input/gamepad.rst | 6 ++++++
drivers/hid/hid-debug.c | 3 ++-
drivers/input/joystick/xpad.c | 15 ++++++++++++++-
include/uapi/linux/input-event-codes.h | 1 +
5 files changed, 29 insertions(+), 2 deletions(-)


base-commit: 26b1224903b3fb66e8aa564868d0d57648c32b15
--
2.30.2


2022-09-08 19:02:44

by Nate Yocom

[permalink] [raw]
Subject: [PATCH v6 5/5] Input: joystick: xpad: Add X-Box Adaptive Profile button

Adds a new quirk for controllers that have a Profile button which has 4
states, reflected as an ABS_PROFILE axis with 4 values.

Signed-off-by: Nate Yocom <[email protected]>
Tested-by: Bastien Nocera <[email protected]>
---
drivers/input/joystick/xpad.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index dff0d099d416..ece38f00dfff 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -80,6 +80,7 @@
#define MAP_TRIGGERS_TO_BUTTONS (1 << 1)
#define MAP_STICKS_TO_NULL (1 << 2)
#define MAP_SELECT_BUTTON (1 << 3)
+#define MAP_PROFILE_BUTTON (1 << 4)
#define DANCEPAD_MAP_CONFIG (MAP_DPAD_TO_BUTTONS | \
MAP_TRIGGERS_TO_BUTTONS | MAP_STICKS_TO_NULL)

@@ -131,7 +132,7 @@ static const struct xpad_device {
{ 0x045e, 0x02e3, "Microsoft X-Box One Elite pad", 0, XTYPE_XBOXONE },
{ 0x045e, 0x02ea, "Microsoft X-Box One S pad", 0, XTYPE_XBOXONE },
{ 0x045e, 0x0719, "Xbox 360 Wireless Receiver", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W },
- { 0x045e, 0x0b0a, "Microsoft X-Box Adaptive Controller", 0, XTYPE_XBOXONE },
+ { 0x045e, 0x0b0a, "Microsoft X-Box Adaptive Controller", MAP_PROFILE_BUTTON, XTYPE_XBOXONE },
{ 0x045e, 0x0b12, "Microsoft Xbox Series S|X Controller", MAP_SELECT_BUTTON, XTYPE_XBOXONE },
{ 0x046d, 0xc21d, "Logitech Gamepad F310", 0, XTYPE_XBOX360 },
{ 0x046d, 0xc21e, "Logitech Gamepad F510", 0, XTYPE_XBOX360 },
@@ -927,6 +928,10 @@ static void xpadone_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char
(__u16) le16_to_cpup((__le16 *)(data + 8)));
}

+ /* Profile button has a value of 0-3, so it is reported as an axis */
+ if (xpad->mapping & MAP_PROFILE_BUTTON)
+ input_report_abs(dev, ABS_PROFILE, data[34]);
+
input_sync(dev);
}

@@ -1623,6 +1628,9 @@ static void xpad_set_up_abs(struct input_dev *input_dev, signed short abs)
case ABS_HAT0Y: /* the d-pad (only if dpad is mapped to axes */
input_set_abs_params(input_dev, abs, -1, 1, 0, 0);
break;
+ case ABS_PROFILE: /* 4 value profile button (such as on XAC) */
+ input_set_abs_params(input_dev, abs, 0, 4, 0, 0);
+ break;
default:
input_set_abs_params(input_dev, abs, 0, 0, 0, 0);
break;
@@ -1715,6 +1723,10 @@ static int xpad_init_input(struct usb_xpad *xpad)
xpad_set_up_abs(input_dev, xpad_abs_triggers[i]);
}

+ /* setup profile button as an axis with 4 possible values */
+ if (xpad->mapping & MAP_PROFILE_BUTTON)
+ xpad_set_up_abs(input_dev, ABS_PROFILE);
+
error = xpad_init_ff(xpad);
if (error)
goto err_free_input;
--
2.30.2

2022-09-08 19:12:25

by Nate Yocom

[permalink] [raw]
Subject: [PATCH v6 1/5] Input: joystick: xpad: Add X-Box Adaptive support

Adds correct VID/PID for this XTYPE_XBOXONE compatible controller to
xpad_device[] table.

Signed-off-by: Nate Yocom <[email protected]>
Tested-by: Bastien Nocera <[email protected]>
---
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 18190b529bca..c8b38bb73d34 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -131,6 +131,7 @@ static const struct xpad_device {
{ 0x045e, 0x02e3, "Microsoft X-Box One Elite pad", 0, XTYPE_XBOXONE },
{ 0x045e, 0x02ea, "Microsoft X-Box One S pad", 0, XTYPE_XBOXONE },
{ 0x045e, 0x0719, "Xbox 360 Wireless Receiver", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W },
+ { 0x045e, 0x0b0a, "Microsoft X-Box Adaptive Controller", 0, XTYPE_XBOXONE },
{ 0x045e, 0x0b12, "Microsoft Xbox Series S|X Controller", MAP_SELECT_BUTTON, XTYPE_XBOXONE },
{ 0x046d, 0xc21d, "Logitech Gamepad F310", 0, XTYPE_XBOX360 },
{ 0x046d, 0xc21e, "Logitech Gamepad F510", 0, XTYPE_XBOX360 },
--
2.30.2

2022-09-13 21:55:19

by Nate Yocom

[permalink] [raw]
Subject: Re: [PATCH v6 0/5] Input: joystick: xpad: Add X-Box Adaptive Controller support

On Thu, Sep 08, 2022 at 10:39:25AM -0700, Nate Yocom wrote:
> Adds support for the X-Box Adaptive Controller, which is protocol
> compatible with the XTYPE_XBOXONE support in the driver with two deltas:
>
> - The X-Box button sets 0x02 as its activation ID, where others set
> 0x01
> - The controller has an additional Profile button with 4 active states,
> which this change maps to an Axis control with 4 possible values
>
> Patch series adds device to the supported table, adds support for the
> Profile button, and adds support for the X-Box button as distinct
> changes.
>
> Signed-off-by: Nate Yocom <[email protected]>
>
> Nate Yocom (5):
> Input: joystick: xpad: Add X-Box Adaptive support
> Input: joystick: xpad: Add X-Box Adaptive XBox button
> Input: joystick: xpad: Add ABS_PROFILE to uapi
> Input: joystick: xpad: Add ABS_PROFILE to Docs
> Input: joystick: xpad: Add X-Box Adaptive Profile button
>
> v2: Fix warning Reported-by: kernel test robot <[email protected]>
> v3: Break into multi-part and remove VID/PID check for XBox button
> v4: Rename Layer -> Profile as suggested by Bastien Nocera
> v5: Add new ABS_PROFILE axis to uapi and use it for the profile button
> v6: Add ABS_PROFILE to absolutes array and docs as requested by Dmitry
>
> Documentation/input/event-codes.rst | 6 ++++++
> Documentation/input/gamepad.rst | 6 ++++++
> drivers/hid/hid-debug.c | 3 ++-
> drivers/input/joystick/xpad.c | 15 ++++++++++++++-
> include/uapi/linux/input-event-codes.h | 1 +
> 5 files changed, 29 insertions(+), 2 deletions(-)
>
>
> base-commit: 26b1224903b3fb66e8aa564868d0d57648c32b15
> --
> 2.30.2
>

Dmitry et al, anything else I can do to see this through? Thanks!

- Nate

2022-09-28 02:44:19

by Nate Yocom

[permalink] [raw]
Subject: Re: [PATCH v6 0/5] Input: joystick: xpad: Add X-Box Adaptive Controller support


> On Sep 13, 2022, at 3:46 PM, Nate Yocom <[email protected]> wrote:
>
> On Thu, Sep 08, 2022 at 10:39:25AM -0700, Nate Yocom wrote:
>> Adds support for the X-Box Adaptive Controller, which is protocol
>> compatible with the XTYPE_XBOXONE support in the driver with two deltas:
>>
>> - The X-Box button sets 0x02 as its activation ID, where others set
>> 0x01
>> - The controller has an additional Profile button with 4 active states,
>> which this change maps to an Axis control with 4 possible values
>>
>> Patch series adds device to the supported table, adds support for the
>> Profile button, and adds support for the X-Box button as distinct
>> changes.
>>
>> Signed-off-by: Nate Yocom <[email protected]>
>>
>> Nate Yocom (5):
>> Input: joystick: xpad: Add X-Box Adaptive support
>> Input: joystick: xpad: Add X-Box Adaptive XBox button
>> Input: joystick: xpad: Add ABS_PROFILE to uapi
>> Input: joystick: xpad: Add ABS_PROFILE to Docs
>> Input: joystick: xpad: Add X-Box Adaptive Profile button
>>
>> v2: Fix warning Reported-by: kernel test robot <[email protected]>
>> v3: Break into multi-part and remove VID/PID check for XBox button
>> v4: Rename Layer -> Profile as suggested by Bastien Nocera
>> v5: Add new ABS_PROFILE axis to uapi and use it for the profile button
>> v6: Add ABS_PROFILE to absolutes array and docs as requested by Dmitry
>>
>> Documentation/input/event-codes.rst | 6 ++++++
>> Documentation/input/gamepad.rst | 6 ++++++
>> drivers/hid/hid-debug.c | 3 ++-
>> drivers/input/joystick/xpad.c | 15 ++++++++++++++-
>> include/uapi/linux/input-event-codes.h | 1 +
>> 5 files changed, 29 insertions(+), 2 deletions(-)
>>
>>
>> base-commit: 26b1224903b3fb66e8aa564868d0d57648c32b15
>> --
>> 2.30.2
>>
>
> Dmitry et al, anything else I can do to see this through? Thanks!

Anything missing here? Any chance of getting this in?

2022-09-28 07:27:33

by Mattijs Korpershoek

[permalink] [raw]
Subject: Re: [PATCH v6 1/5] Input: joystick: xpad: Add X-Box Adaptive support

On Thu, Sep 08, 2022 at 10:39, Nate Yocom <[email protected]> wrote:

> Adds correct VID/PID for this XTYPE_XBOXONE compatible controller to
> xpad_device[] table.
>
> Signed-off-by: Nate Yocom <[email protected]>
> Tested-by: Bastien Nocera <[email protected]>

Reviewed-by: Mattijs Korpershoek <[email protected]>

> ---
> 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 18190b529bca..c8b38bb73d34 100644
> --- a/drivers/input/joystick/xpad.c
> +++ b/drivers/input/joystick/xpad.c
> @@ -131,6 +131,7 @@ static const struct xpad_device {
> { 0x045e, 0x02e3, "Microsoft X-Box One Elite pad", 0, XTYPE_XBOXONE },
> { 0x045e, 0x02ea, "Microsoft X-Box One S pad", 0, XTYPE_XBOXONE },
> { 0x045e, 0x0719, "Xbox 360 Wireless Receiver", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W },
> + { 0x045e, 0x0b0a, "Microsoft X-Box Adaptive Controller", 0, XTYPE_XBOXONE },
> { 0x045e, 0x0b12, "Microsoft Xbox Series S|X Controller", MAP_SELECT_BUTTON, XTYPE_XBOXONE },
> { 0x046d, 0xc21d, "Logitech Gamepad F310", 0, XTYPE_XBOX360 },
> { 0x046d, 0xc21e, "Logitech Gamepad F510", 0, XTYPE_XBOX360 },
> --
> 2.30.2

2022-09-29 01:49:09

by Dmitry Torokhov

[permalink] [raw]
Subject: Re: [PATCH v6 0/5] Input: joystick: xpad: Add X-Box Adaptive Controller support

On Thu, Sep 08, 2022 at 10:39:25AM -0700, Nate Yocom wrote:
> Adds support for the X-Box Adaptive Controller, which is protocol
> compatible with the XTYPE_XBOXONE support in the driver with two deltas:
>
> - The X-Box button sets 0x02 as its activation ID, where others set
> 0x01
> - The controller has an additional Profile button with 4 active states,
> which this change maps to an Axis control with 4 possible values
>
> Patch series adds device to the supported table, adds support for the
> Profile button, and adds support for the X-Box button as distinct
> changes.
>
> Signed-off-by: Nate Yocom <[email protected]>
>
> Nate Yocom (5):
> Input: joystick: xpad: Add X-Box Adaptive support
> Input: joystick: xpad: Add X-Box Adaptive XBox button
> Input: joystick: xpad: Add ABS_PROFILE to uapi
> Input: joystick: xpad: Add ABS_PROFILE to Docs
> Input: joystick: xpad: Add X-Box Adaptive Profile button

Combined patches 3 and 4 and applied the lot, thank you.

--
Dmitry