diff mbox series

[v5] Input: Add "Select" button to Microsoft Xbox One controller.

Message ID 20210414021201.2462114-1-lzye@google.com
State Accepted
Commit 0b1d6c8c00157cbfcf343925c4de81af0187a7b7
Headers show
Series [v5] Input: Add "Select" button to Microsoft Xbox One controller. | expand

Commit Message

Chris Ye April 14, 2021, 2:12 a.m. UTC 
Add "Select" button input capability and input event mapping for
Microsoft Xbox One controller. From product site this is also referred as
"Share" button.
Fixed Microsoft Xbox One controller select button not working under USB
connection.

Signed-off-by: Chris Ye <lzye@google.com>
---
 drivers/input/joystick/xpad.c | 6 ++++++
 1 file changed, 6 insertions(+)

-- 
2.31.1.295.g9ea45b61b8-goog

Comments

Chris Ye May 5, 2021, 4:57 p.m. UTC | #1 
Hi Bastien,
      Can you please take a look at the patch v5, which has restored
the same tab formatting?
Thanks! Regards,
Chris

On Tue, Apr 13, 2021 at 7:12 PM Chris Ye <lzye@google.com> wrote:
>

> Add "Select" button input capability and input event mapping for

> Microsoft Xbox One controller. From product site this is also referred as

> "Share" button.

> Fixed Microsoft Xbox One controller select button not working under USB

> connection.

>

> Signed-off-by: Chris Ye <lzye@google.com>

> ---

>  drivers/input/joystick/xpad.c | 6 ++++++

>  1 file changed, 6 insertions(+)

>

> diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c

> index 9f0d07dcbf06..cfbf1747b205 100644

> --- a/drivers/input/joystick/xpad.c

> +++ b/drivers/input/joystick/xpad.c

> @@ -79,6 +79,7 @@

>  #define MAP_DPAD_TO_BUTTONS            (1 << 0)

>  #define MAP_TRIGGERS_TO_BUTTONS                (1 << 1)

>  #define MAP_STICKS_TO_NULL             (1 << 2)

> +#define MAP_SELECT_BUTTON              (1 << 3)

>  #define DANCEPAD_MAP_CONFIG    (MAP_DPAD_TO_BUTTONS |                  \

>                                 MAP_TRIGGERS_TO_BUTTONS | MAP_STICKS_TO_NULL)

>

> @@ -130,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, 0x0b12, "Microsoft Xbox One X pad", MAP_SELECT_BUTTON, XTYPE_XBOXONE },

>         { 0x046d, 0xc21d, "Logitech Gamepad F310", 0, XTYPE_XBOX360 },

>         { 0x046d, 0xc21e, "Logitech Gamepad F510", 0, XTYPE_XBOX360 },

>         { 0x046d, 0xc21f, "Logitech Gamepad F710", 0, XTYPE_XBOX360 },

> @@ -862,6 +864,8 @@ static void xpadone_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char

>         /* menu/view buttons */

>         input_report_key(dev, BTN_START,  data[4] & 0x04);

>         input_report_key(dev, BTN_SELECT, data[4] & 0x08);

> +       if (xpad->mapping & MAP_SELECT_BUTTON)

> +               input_report_key(dev, KEY_RECORD, data[22] & 0x01);

>

>         /* buttons A,B,X,Y */

>         input_report_key(dev, BTN_A,    data[4] & 0x10);

> @@ -1672,6 +1676,8 @@ static int xpad_init_input(struct usb_xpad *xpad)

>             xpad->xtype == XTYPE_XBOXONE) {

>                 for (i = 0; xpad360_btn[i] >= 0; i++)

>                         input_set_capability(input_dev, EV_KEY, xpad360_btn[i]);

> +               if (xpad->mapping & MAP_SELECT_BUTTON)

> +                       input_set_capability(input_dev, EV_KEY, KEY_RECORD);

>         } else {

>                 for (i = 0; xpad_btn[i] >= 0; i++)

>                         input_set_capability(input_dev, EV_KEY, xpad_btn[i]);

> --

> 2.31.1.295.g9ea45b61b8-goog

>
Chris Ye May 12, 2021, 6:21 p.m. UTC | #2 
Hi Benjamin,
     It seems I don't have any further comments on patch v5, do you
think we can land the patch in the next kernel release? Please advise
if there are any further comments.
Thank you!

Regards,
Chris

On Wed, May 5, 2021 at 9:57 AM Chris Ye <lzye@google.com> wrote:
>
> Hi Bastien,
>       Can you please take a look at the patch v5, which has restored
> the same tab formatting?
> Thanks! Regards,
> Chris
>
> On Tue, Apr 13, 2021 at 7:12 PM Chris Ye <lzye@google.com> wrote:
> >
> > Add "Select" button input capability and input event mapping for
> > Microsoft Xbox One controller. From product site this is also referred as
> > "Share" button.
> > Fixed Microsoft Xbox One controller select button not working under USB
> > connection.
> >
> > Signed-off-by: Chris Ye <lzye@google.com>
> > ---
> >  drivers/input/joystick/xpad.c | 6 ++++++
> >  1 file changed, 6 insertions(+)
> >
> > diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
> > index 9f0d07dcbf06..cfbf1747b205 100644
> > --- a/drivers/input/joystick/xpad.c
> > +++ b/drivers/input/joystick/xpad.c
> > @@ -79,6 +79,7 @@
> >  #define MAP_DPAD_TO_BUTTONS            (1 << 0)
> >  #define MAP_TRIGGERS_TO_BUTTONS                (1 << 1)
> >  #define MAP_STICKS_TO_NULL             (1 << 2)
> > +#define MAP_SELECT_BUTTON              (1 << 3)
> >  #define DANCEPAD_MAP_CONFIG    (MAP_DPAD_TO_BUTTONS |                  \
> >                                 MAP_TRIGGERS_TO_BUTTONS | MAP_STICKS_TO_NULL)
> >
> > @@ -130,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, 0x0b12, "Microsoft Xbox One X pad", MAP_SELECT_BUTTON, XTYPE_XBOXONE },
> >         { 0x046d, 0xc21d, "Logitech Gamepad F310", 0, XTYPE_XBOX360 },
> >         { 0x046d, 0xc21e, "Logitech Gamepad F510", 0, XTYPE_XBOX360 },
> >         { 0x046d, 0xc21f, "Logitech Gamepad F710", 0, XTYPE_XBOX360 },
> > @@ -862,6 +864,8 @@ static void xpadone_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char
> >         /* menu/view buttons */
> >         input_report_key(dev, BTN_START,  data[4] & 0x04);
> >         input_report_key(dev, BTN_SELECT, data[4] & 0x08);
> > +       if (xpad->mapping & MAP_SELECT_BUTTON)
> > +               input_report_key(dev, KEY_RECORD, data[22] & 0x01);
> >
> >         /* buttons A,B,X,Y */
> >         input_report_key(dev, BTN_A,    data[4] & 0x10);
> > @@ -1672,6 +1676,8 @@ static int xpad_init_input(struct usb_xpad *xpad)
> >             xpad->xtype == XTYPE_XBOXONE) {
> >                 for (i = 0; xpad360_btn[i] >= 0; i++)
> >                         input_set_capability(input_dev, EV_KEY, xpad360_btn[i]);
> > +               if (xpad->mapping & MAP_SELECT_BUTTON)
> > +                       input_set_capability(input_dev, EV_KEY, KEY_RECORD);
> >         } else {
> >                 for (i = 0; xpad_btn[i] >= 0; i++)
> >                         input_set_capability(input_dev, EV_KEY, xpad_btn[i]);
> > --
> > 2.31.1.295.g9ea45b61b8-goog
> >
Bastien Nocera May 21, 2021, 7:59 a.m. UTC | #3 
On Thu, 2021-05-13 at 23:10 -0700, Chris Ye wrote:
> +Dmitry. 

> 

> On Wed, May 12, 2021 at 11:21 AM Chris Ye <lzye@google.com> wrote:

> > Hi Benjamin,

> >      It seems I don't have any further comments on patch v5, do you

> > think we can land the patch in the next kernel release? Please

> > advise

> > if there are any further comments.

> > Thank you!

> > 

> > Regards,

> > Chris

> > 

> > On Wed, May 5, 2021 at 9:57 AM Chris Ye <lzye@google.com> wrote:

> > > 

> > > Hi Bastien,

> > >        Can you please take a look at the patch v5, which has

> > restored

> > > the same tab formatting?


Patch looks fine to me.

Reviewed-by: Bastien Nocera <hadess@hadess.net>


> > > Thanks! Regards,

> > > Chris

> > > 

> > > On Tue, Apr 13, 2021 at 7:12 PM Chris Ye <lzye@google.com> wrote:

> > > > 

> > > > Add "Select" button input capability and input event mapping

> > > > for

> > > > Microsoft Xbox One controller. From product site this is also

> > referred as

> > > > "Share" button.

> > > > Fixed Microsoft Xbox One controller select button not working

> > under USB

> > > > connection.

> > > > 

> > > > Signed-off-by: Chris Ye <lzye@google.com>

> > > > ---

> > > >   drivers/input/joystick/xpad.c | 6 ++++++

> > > >   1 file changed, 6 insertions(+)

> > > > 

> > > > diff --git a/drivers/input/joystick/xpad.c

> > b/drivers/input/joystick/xpad.c

> > > > index 9f0d07dcbf06..cfbf1747b205 100644

> > > > --- a/drivers/input/joystick/xpad.c

> > > > +++ b/drivers/input/joystick/xpad.c

> > > > @@ -79,6 +79,7 @@

> > > >   #define MAP_DPAD_TO_BUTTONS            (1 << 0)

> > > >   #define MAP_TRIGGERS_TO_BUTTONS                (1 << 1)

> > > >   #define MAP_STICKS_TO_NULL             (1 << 2)

> > > > +#define MAP_SELECT_BUTTON              (1 << 3)

> > > >   #define DANCEPAD_MAP_CONFIG    (MAP_DPAD_TO_BUTTONS |       

> > > >    

> >       \

> > > >                                  MAP_TRIGGERS_TO_BUTTONS |

> > MAP_STICKS_TO_NULL)

> > > > 

> > > > @@ -130,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, 0x0b12, "Microsoft Xbox One X pad",

> > MAP_SELECT_BUTTON, XTYPE_XBOXONE },

> > > >          { 0x046d, 0xc21d, "Logitech Gamepad F310", 0,

> > XTYPE_XBOX360 },

> > > >          { 0x046d, 0xc21e, "Logitech Gamepad F510", 0,

> > XTYPE_XBOX360 },

> > > >          { 0x046d, 0xc21f, "Logitech Gamepad F710", 0,

> > XTYPE_XBOX360 },

> > > > @@ -862,6 +864,8 @@ static void xpadone_process_packet(struct

> > usb_xpad *xpad, u16 cmd, unsigned char

> > > >          /* menu/view buttons */

> > > >          input_report_key(dev, BTN_START,  data[4] & 0x04);

> > > >          input_report_key(dev, BTN_SELECT, data[4] & 0x08);

> > > > +       if (xpad->mapping & MAP_SELECT_BUTTON)

> > > > +               input_report_key(dev, KEY_RECORD, data[22] &

> > 0x01);

> > > > 

> > > >          /* buttons A,B,X,Y */

> > > >          input_report_key(dev, BTN_A,    data[4] & 0x10);

> > > > @@ -1672,6 +1676,8 @@ static int xpad_init_input(struct

> > > > usb_xpad

> > *xpad)

> > > >              xpad->xtype == XTYPE_XBOXONE) {

> > > >                  for (i = 0; xpad360_btn[i] >= 0; i++)

> > > >                          input_set_capability(input_dev,

> > > > EV_KEY,

> > xpad360_btn[i]);

> > > > +               if (xpad->mapping & MAP_SELECT_BUTTON)

> > > > +                       input_set_capability(input_dev, EV_KEY,

> > KEY_RECORD);

> > > >          } else {

> > > >                  for (i = 0; xpad_btn[i] >= 0; i++)

> > > >                          input_set_capability(input_dev,

> > > > EV_KEY,

> > xpad_btn[i]);

> > > > --

> > > > 2.31.1.295.g9ea45b61b8-goog

> > > >
Dmitry Torokhov May 25, 2021, 3:53 a.m. UTC | #4 
On Wed, Apr 14, 2021 at 02:12:01AM +0000, Chris Ye wrote:
> Add "Select" button input capability and input event mapping for

> Microsoft Xbox One controller. From product site this is also referred as

> "Share" button.

> Fixed Microsoft Xbox One controller select button not working under USB

> connection.

> 

> Signed-off-by: Chris Ye <lzye@google.com>


Applied, thank you.

-- 
Dmitry
Chris Ye May 25, 2021, 3:58 a.m. UTC | #5 
Thanks a lot Dmitry!

Regards,
Chris


On Mon, May 24, 2021 at 8:53 PM Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
>

> On Wed, Apr 14, 2021 at 02:12:01AM +0000, Chris Ye wrote:

> > Add "Select" button input capability and input event mapping for

> > Microsoft Xbox One controller. From product site this is also referred as

> > "Share" button.

> > Fixed Microsoft Xbox One controller select button not working under USB

> > connection.

> >

> > Signed-off-by: Chris Ye <lzye@google.com>

>

> Applied, thank you.

>

> --

> Dmitry
diff mbox series

Patch

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 9f0d07dcbf06..cfbf1747b205 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -79,6 +79,7 @@ 
 #define MAP_DPAD_TO_BUTTONS		(1 << 0)
 #define MAP_TRIGGERS_TO_BUTTONS		(1 << 1)
 #define MAP_STICKS_TO_NULL		(1 << 2)
+#define MAP_SELECT_BUTTON		(1 << 3)
 #define DANCEPAD_MAP_CONFIG	(MAP_DPAD_TO_BUTTONS |			\
 				MAP_TRIGGERS_TO_BUTTONS | MAP_STICKS_TO_NULL)
 
@@ -130,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, 0x0b12, "Microsoft Xbox One X pad", MAP_SELECT_BUTTON, XTYPE_XBOXONE },
 	{ 0x046d, 0xc21d, "Logitech Gamepad F310", 0, XTYPE_XBOX360 },
 	{ 0x046d, 0xc21e, "Logitech Gamepad F510", 0, XTYPE_XBOX360 },
 	{ 0x046d, 0xc21f, "Logitech Gamepad F710", 0, XTYPE_XBOX360 },
@@ -862,6 +864,8 @@  static void xpadone_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char
 	/* menu/view buttons */
 	input_report_key(dev, BTN_START,  data[4] & 0x04);
 	input_report_key(dev, BTN_SELECT, data[4] & 0x08);
+	if (xpad->mapping & MAP_SELECT_BUTTON)
+		input_report_key(dev, KEY_RECORD, data[22] & 0x01);
 
 	/* buttons A,B,X,Y */
 	input_report_key(dev, BTN_A,	data[4] & 0x10);
@@ -1672,6 +1676,8 @@  static int xpad_init_input(struct usb_xpad *xpad)
 	    xpad->xtype == XTYPE_XBOXONE) {
 		for (i = 0; xpad360_btn[i] >= 0; i++)
 			input_set_capability(input_dev, EV_KEY, xpad360_btn[i]);
+		if (xpad->mapping & MAP_SELECT_BUTTON)
+			input_set_capability(input_dev, EV_KEY, KEY_RECORD);
 	} else {
 		for (i = 0; xpad_btn[i] >= 0; i++)
 			input_set_capability(input_dev, EV_KEY, xpad_btn[i]);