2022-09-08 18:13:12

by Nate Yocom

Subject: [PATCH v6 2/5] Input: joystick: xpad: Add X-Box Adaptive XBox button

Adaptive controller sets 0x02 bit for this button, all others set 0x01
so presence of either is used for BTN_MODE.

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

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index c8b38bb73d34..dff0d099d416 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -858,7 +858,7 @@ static void xpadone_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char
if (data[1] == 0x30)
xpadone_ack_mode_report(xpad, data[2]);

- input_report_key(dev, BTN_MODE, data[4] & 0x01);
+ input_report_key(dev, BTN_MODE, data[4] & 0x03);
input_sync(dev);
return;
}
--
2.30.2

2022-09-28 07:27:41

by Mattijs Korpershoek

Subject: Re: [PATCH v6 2/5] Input: joystick: xpad: Add X-Box Adaptive XBox button

Hi Nate,

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

> Adaptive controller sets 0x02 bit for this button, all others set 0x01
> so presence of either is used for BTN_MODE.
>
> Signed-off-by: Nate Yocom <[email protected]>
> Tested-by: Bastien Nocera <[email protected]>

This does not applies properly anymore on dtor/next [1] because of
90c9978959da ("Input: xpad - refactor using BIT() macro") and
e23c69e33248 ("Input: xpad - add support for XBOX One Elite paddles")

With that, please add:

Reviewed-by: Mattijs Korpershoek <[email protected]

> ---
> drivers/input/joystick/xpad.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
> index c8b38bb73d34..dff0d099d416 100644
> --- a/drivers/input/joystick/xpad.c
> +++ b/drivers/input/joystick/xpad.c
> @@ -858,7 +858,7 @@ static void xpadone_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char
> if (data[1] == 0x30)
> xpadone_ack_mode_report(xpad, data[2]);
>
> - input_report_key(dev, BTN_MODE, data[4] & 0x01);
> + input_report_key(dev, BTN_MODE, data[4] & 0x03);
> input_sync(dev);
> return;
> }
> --
> 2.30.2