diff mbox series

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

Message ID 20210413010252.2255812-1-lzye@google.com
State Superseded
Headers show
Series [v4] Input: Add "Select" button to Microsoft Xbox One controller. | expand

Commit Message

Chris Ye April 13, 2021, 1:02 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 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

-- 
2.31.1.295.g9ea45b61b8-goog

Comments

Bastien Nocera April 13, 2021, 12:34 p.m. UTC | #1 
On Tue, 2021-04-13 at 01:02 +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>

> ---

>  drivers/input/joystick/xpad.c | 8 +++++++-

>  1 file changed, 7 insertions(+), 1 deletion(-)

> 

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

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

> index 9f0d07dcbf06..99cb8bb78570 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);

> @@ -1669,9 +1673,11 @@ static int xpad_init_input(struct usb_xpad

> *xpad)

>  

>         /* set up model-specific ones */

>         if (xpad->xtype == XTYPE_XBOX360 || xpad->xtype ==

> XTYPE_XBOX360W ||

> -           xpad->xtype == XTYPE_XBOXONE) {

> +               xpad->xtype == XTYPE_XBOXONE) {


Why the indentation change here?

>                 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]);
Chris Ye April 14, 2021, 4:41 a.m. UTC | #2 
That line was using tab + 4 spaces on the left and was reformatted to
use 2 tabs.
If you don't like it I've uploaded patch v5 not touching that line.


On Tue, Apr 13, 2021 at 5:34 AM Bastien Nocera <hadess@hadess.net> wrote:
>

> On Tue, 2021-04-13 at 01:02 +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>

> > ---

> >  drivers/input/joystick/xpad.c | 8 +++++++-

> >  1 file changed, 7 insertions(+), 1 deletion(-)

> >

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

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

> > index 9f0d07dcbf06..99cb8bb78570 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);

> > @@ -1669,9 +1673,11 @@ static int xpad_init_input(struct usb_xpad

> > *xpad)

> >

> >         /* set up model-specific ones */

> >         if (xpad->xtype == XTYPE_XBOX360 || xpad->xtype ==

> > XTYPE_XBOX360W ||

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

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

>

> Why the indentation change here?

>

> >                 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]);

>

>
Chris Ye May 21, 2021, 1:32 a.m. UTC | #3 
Hi Bastien,
  Please check v5 for the patch let me know if you still have any comment.
Thanks!
Chris

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

> That line was using tab + 4 spaces on the left and was reformatted to

> use 2 tabs.

> If you don't like it I've uploaded patch v5 not touching that line.

>

>

> On Tue, Apr 13, 2021 at 5:34 AM Bastien Nocera <hadess@hadess.net> wrote:

> >

> > On Tue, 2021-04-13 at 01:02 +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>

> > > ---

> > >  drivers/input/joystick/xpad.c | 8 +++++++-

> > >  1 file changed, 7 insertions(+), 1 deletion(-)

> > >

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

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

> > > index 9f0d07dcbf06..99cb8bb78570 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);

> > > @@ -1669,9 +1673,11 @@ static int xpad_init_input(struct usb_xpad

> > > *xpad)

> > >

> > >         /* set up model-specific ones */

> > >         if (xpad->xtype == XTYPE_XBOX360 || xpad->xtype ==

> > > XTYPE_XBOX360W ||

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

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

> >

> > Why the indentation change here?

> >

> > >                 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]);

> >

> >
diff mbox series

Patch

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 9f0d07dcbf06..99cb8bb78570 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);
@@ -1669,9 +1673,11 @@  static int xpad_init_input(struct usb_xpad *xpad)
 
 	/* set up model-specific ones */
 	if (xpad->xtype == XTYPE_XBOX360 || xpad->xtype == XTYPE_XBOX360W ||
-	    xpad->xtype == XTYPE_XBOXONE) {
+		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]);