From: Bastien Nocera <hadess@hadess.net>
To: "Chris Ye" <lzye@google.com>,
"Łukasz Patron" <priv.luk@gmail.com>,
"Benjamin Valentin" <benpicco@googlemail.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: Re: [PATCH] [v4] Input: Add "Select" button to Microsoft Xbox One controller.
Date: Tue, 13 Apr 2021 14:34:51 +0200 [thread overview]
Message-ID: <a2be79bcf1ce93096d6843a0856927cda65d4842.camel@hadess.net> (raw)
In-Reply-To: <20210413010252.2255812-1-lzye@google.com>
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]);
next prev parent reply other threads:[~2021-04-13 12:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-13 1:02 [PATCH] [v4] Input: Add "Select" button to Microsoft Xbox One controller Chris Ye
2021-04-13 12:34 ` Bastien Nocera [this message]
2021-04-14 4:41 ` Chris Ye
2021-05-21 1:32 ` 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=a2be79bcf1ce93096d6843a0856927cda65d4842.camel@hadess.net \
--to=hadess@hadess.net \
--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=lzye@google.com \
--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).