From: Chris Ye <lzye@google.com>
To: "Łukasz Patron" <priv.luk@gmail.com>,
"Benjamin Valentin" <benpicco@googlemail.com>,
"Chris Ye" <lzye@google.com>, "Lee Jones" <lee.jones@linaro.org>,
"Olivier Crête" <olivier.crete@ocrete.ca>,
"Sanjay Govind" <sanjay.govind9@gmail.com>,
"Andrzej Pietrasiewicz" <andrzej.p@collabora.com>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
trivial@kernel.org, kernel-team@android.com
Subject: [PATCH] [v5] Input: Add "Select" button to Microsoft Xbox One controller.
Date: Wed, 14 Apr 2021 02:12:01 +0000 [thread overview]
Message-ID: <20210414021201.2462114-1-lzye@google.com> (raw)
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
next reply other threads:[~2021-04-14 2:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-14 2:12 Chris Ye [this message]
2021-05-05 16:57 ` [PATCH] [v5] Input: Add "Select" button to Microsoft Xbox One controller Chris Ye
2021-05-12 18:21 ` Chris Ye
[not found] ` <CAFFudd+_FNcjrodzkZ7OgiCdstR=gKRQ3O264AkG37pVkcV9tw@mail.gmail.com>
2021-05-21 7:59 ` Bastien Nocera
2021-05-25 3:53 ` Dmitry Torokhov
2021-05-25 3:58 ` Chris Ye
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210414021201.2462114-1-lzye@google.com \
--to=lzye@google.com \
--cc=andrzej.p@collabora.com \
--cc=benpicco@googlemail.com \
--cc=kernel-team@android.com \
--cc=lee.jones@linaro.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=olivier.crete@ocrete.ca \
--cc=priv.luk@gmail.com \
--cc=sanjay.govind9@gmail.com \
--cc=trivial@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).