From: Pavel Rojtberg <rojtberg@gmail.com>
To: linux-input@vger.kernel.org, dmitry.torokhov@gmail.com,
gregkh@linuxfoundation.org
Subject: Re: [PATCH] Input: xpad - add multiple supported devices
Date: Fri, 31 Jan 2025 17:50:53 +0100 [thread overview]
Message-ID: <95f1f209-4b97-417b-b0f6-2245458fa1f5@gmail.com> (raw)
In-Reply-To: <20250123175404.23254-1-rojtberg@gmail.com>
Am 23.01.25 um 18:54 schrieb Pavel Rojtberg:
> From: Pavel Rojtberg <rojtberg@gmail.com>
>
> This is based on multiple commits at https://github.com/paroj/xpad
> that had bouncing email addresses and were not signed off.
>
> Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>
> ---
> drivers/input/joystick/xpad.c | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
> diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
> index b434a465bf72..0399fbf33835 100644
> --- a/drivers/input/joystick/xpad.c
> +++ b/drivers/input/joystick/xpad.c
> @@ -140,6 +140,7 @@ static const struct xpad_device {
> { 0x044f, 0x0f00, "Thrustmaster Wheel", 0, XTYPE_XBOX },
> { 0x044f, 0x0f03, "Thrustmaster Wheel", 0, XTYPE_XBOX },
> { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX },
> + { 0x044f, 0xd01e, "ThrustMaster, Inc. ESWAP X 2 ELDEN RING EDITION", 0, XTYPE_XBOXONE },
> { 0x044f, 0x0f10, "Thrustmaster Modena GT Wheel", 0, XTYPE_XBOX },
> { 0x044f, 0xb326, "Thrustmaster Gamepad GP XID", 0, XTYPE_XBOX360 },
> { 0x045e, 0x0202, "Microsoft X-Box pad v1 (US)", 0, XTYPE_XBOX },
> @@ -177,6 +178,7 @@ static const struct xpad_device {
> { 0x06a3, 0x0200, "Saitek Racing Wheel", 0, XTYPE_XBOX },
> { 0x06a3, 0x0201, "Saitek Adrenalin", 0, XTYPE_XBOX },
> { 0x06a3, 0xf51a, "Saitek P3600", 0, XTYPE_XBOX360 },
> + { 0x0738, 0x4503, "Mad Catz Racing Wheel", 0, XTYPE_XBOXONE },
> { 0x0738, 0x4506, "Mad Catz 4506 Wireless Controller", 0, XTYPE_XBOX },
> { 0x0738, 0x4516, "Mad Catz Control Pad", 0, XTYPE_XBOX },
> { 0x0738, 0x4520, "Mad Catz Control Pad Pro", 0, XTYPE_XBOX },
> @@ -238,6 +240,7 @@ static const struct xpad_device {
> { 0x0e6f, 0x0146, "Rock Candy Wired Controller for Xbox One", 0, XTYPE_XBOXONE },
> { 0x0e6f, 0x0147, "PDP Marvel Xbox One Controller", 0, XTYPE_XBOXONE },
> { 0x0e6f, 0x015c, "PDP Xbox One Arcade Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE },
> + { 0x0e6f, 0x015d, "PDP Mirror's Edge Official Wired Controller for Xbox One", XTYPE_XBOXONE },
> { 0x0e6f, 0x0161, "PDP Xbox One Controller", 0, XTYPE_XBOXONE },
> { 0x0e6f, 0x0162, "PDP Xbox One Controller", 0, XTYPE_XBOXONE },
> { 0x0e6f, 0x0163, "PDP Xbox One Controller", 0, XTYPE_XBOXONE },
> @@ -276,12 +279,15 @@ static const struct xpad_device {
> { 0x0f0d, 0x0078, "Hori Real Arcade Pro V Kai Xbox One", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE },
> { 0x0f0d, 0x00c5, "Hori Fighting Commander ONE", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE },
> { 0x0f0d, 0x00dc, "HORIPAD FPS for Nintendo Switch", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
> + { 0x0f0d, 0x0152, "Hori Racing Wheel Overdrive for Xbox Series X", 0, XTYPE_XBOXONE },
> + { 0x0f0d, 0x0151, "Hori Racing Wheel Overdrive for Xbox Series X", 0, XTYPE_XBOXONE },
> { 0x0f30, 0x010b, "Philips Recoil", 0, XTYPE_XBOX },
> { 0x0f30, 0x0202, "Joytech Advanced Controller", 0, XTYPE_XBOX },
> { 0x0f30, 0x8888, "BigBen XBMiniPad Controller", 0, XTYPE_XBOX },
> { 0x102c, 0xff0c, "Joytech Wireless Advanced Controller", 0, XTYPE_XBOX },
> { 0x1038, 0x1430, "SteelSeries Stratus Duo", 0, XTYPE_XBOX360 },
> { 0x1038, 0x1431, "SteelSeries Stratus Duo", 0, XTYPE_XBOX360 },
> + { 0x10f5, 0x7005, "Turtle Beach Recon Controller", 0, XTYPE_XBOXONE },
> { 0x11c9, 0x55f0, "Nacon GC-100XF", 0, XTYPE_XBOX360 },
> { 0x11ff, 0x0511, "PXN V900", 0, XTYPE_XBOX360 },
> { 0x1209, 0x2882, "Ardwiino Controller", 0, XTYPE_XBOX360 },
> @@ -366,6 +372,7 @@ static const struct xpad_device {
> { 0x24c6, 0x5510, "Hori Fighting Commander ONE (Xbox 360/PC Mode)", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
> { 0x24c6, 0x551a, "PowerA FUSION Pro Controller", 0, XTYPE_XBOXONE },
> { 0x24c6, 0x561a, "PowerA FUSION Controller", 0, XTYPE_XBOXONE },
> + { 0x24c6, 0x581a, "ThrustMaster XB1 Classic Controller", 0, XTYPE_XBOXONE },
> { 0x24c6, 0x5b00, "ThrustMaster Ferrari 458 Racing Wheel", 0, XTYPE_XBOX360 },
> { 0x24c6, 0x5b02, "Thrustmaster, Inc. GPX Controller", 0, XTYPE_XBOX360 },
> { 0x24c6, 0x5b03, "Thrustmaster Ferrari 458 Racing Wheel", 0, XTYPE_XBOX360 },
> @@ -376,8 +383,10 @@ static const struct xpad_device {
> { 0x294b, 0x3404, "Snakebyte GAMEPAD RGB X", 0, XTYPE_XBOXONE },
> { 0x2dc8, 0x2000, "8BitDo Pro 2 Wired Controller fox Xbox", 0, XTYPE_XBOXONE },
> { 0x2dc8, 0x3106, "8BitDo Ultimate Wireless / Pro 2 Wired Controller", 0, XTYPE_XBOX360 },
> + { 0x2dc8, 0x3109, "8BitDo Ultimate Wireless Bluetooth", 0, XTYPE_XBOX360 },
> { 0x2dc8, 0x310a, "8BitDo Ultimate 2C Wireless Controller", 0, XTYPE_XBOX360 },
> { 0x2e24, 0x0652, "Hyperkin Duke X-Box One pad", 0, XTYPE_XBOXONE },
> + { 0x2e95, 0x0504, "SCUF Gaming Controller", MAP_SELECT_BUTTON, XTYPE_XBOXONE },
> { 0x31e3, 0x1100, "Wooting One", 0, XTYPE_XBOX360 },
> { 0x31e3, 0x1200, "Wooting Two", 0, XTYPE_XBOX360 },
> { 0x31e3, 0x1210, "Wooting Lekker", 0, XTYPE_XBOX360 },
> @@ -385,9 +394,14 @@ static const struct xpad_device {
> { 0x31e3, 0x1230, "Wooting Two HE (ARM)", 0, XTYPE_XBOX360 },
> { 0x31e3, 0x1300, "Wooting 60HE (AVR)", 0, XTYPE_XBOX360 },
> { 0x31e3, 0x1310, "Wooting 60HE (ARM)", 0, XTYPE_XBOX360 },
> + { 0x3285, 0x0603, "Nacon Pro Compact controller for Xbox", 0, XTYPE_XBOXONE },
> { 0x3285, 0x0607, "Nacon GC-100", 0, XTYPE_XBOX360 },
> + { 0x3285, 0x0614, "Nacon Pro Compact", 0, XTYPE_XBOXONE },
> + { 0x3285, 0x0662, "Nacon Revolution5 Pro", 0, XTYPE_XBOX360 },
> + { 0x3285, 0x0663, "Nacon Evol-X", 0, XTYPE_XBOXONE },
> { 0x3537, 0x1004, "GameSir T4 Kaleid", 0, XTYPE_XBOX360 },
> { 0x3767, 0x0101, "Fanatec Speedster 3 Forceshock Wheel", 0, XTYPE_XBOX },
> + { 0x413d, 0x2104, "Black Shark Green Ghost Gamepad", 0, XTYPE_XBOX360 },
> { 0xffff, 0xffff, "Chinese-made Xbox Controller", 0, XTYPE_XBOX },
> { 0x0000, 0x0000, "Generic X-Box pad", 0, XTYPE_UNKNOWN }
> };
> @@ -486,6 +500,7 @@ static const struct usb_device_id xpad_table[] = {
> XPAD_XBOX360_VENDOR(0x03f0), /* HP HyperX Xbox 360 controllers */
> XPAD_XBOXONE_VENDOR(0x03f0), /* HP HyperX Xbox One controllers */
> XPAD_XBOX360_VENDOR(0x044f), /* Thrustmaster Xbox 360 controllers */
> + XPAD_XBOXONE_VENDOR(0x044f), /* Thrustmaster Xbox One controllers */
> XPAD_XBOX360_VENDOR(0x045e), /* Microsoft Xbox 360 controllers */
> XPAD_XBOXONE_VENDOR(0x045e), /* Microsoft Xbox One controllers */
> XPAD_XBOX360_VENDOR(0x046d), /* Logitech Xbox 360-style controllers */
> @@ -532,10 +547,13 @@ static const struct usb_device_id xpad_table[] = {
> XPAD_XBOXONE_VENDOR(0x2dc8), /* 8BitDo Pro 2 Wired Controller for Xbox */
> XPAD_XBOXONE_VENDOR(0x2e24), /* Hyperkin Duke Xbox One pad */
> XPAD_XBOX360_VENDOR(0x2f24), /* GameSir controllers */
> + XPAD_XBOXONE_VENDOR(0x2e95), /* SCUF Gaming Controller */
> XPAD_XBOX360_VENDOR(0x31e3), /* Wooting Keyboards */
> XPAD_XBOX360_VENDOR(0x3285), /* Nacon GC-100 */
> + XPAD_XBOXONE_VENDOR(0x3285), /* Nacon Evol-X */
> XPAD_XBOX360_VENDOR(0x3537), /* GameSir Controllers */
> XPAD_XBOXONE_VENDOR(0x3537), /* GameSir Controllers */
> + XPAD_XBOX360_VENDOR(0x413d), /* Black Shark Green Ghost Controller */
> { }
> };
>
> @@ -688,7 +706,9 @@ static const struct xboxone_init_packet xboxone_init_packets[] = {
> XBOXONE_INIT_PKT(0x045e, 0x0b00, xboxone_s_init),
> XBOXONE_INIT_PKT(0x045e, 0x0b00, extra_input_packet_init),
> XBOXONE_INIT_PKT(0x0e6f, 0x0000, xboxone_pdp_led_on),
> + XBOXONE_INIT_PKT(0x20d6, 0xa01a, xboxone_pdp_led_on),
> XBOXONE_INIT_PKT(0x0e6f, 0x0000, xboxone_pdp_auth),
> + XBOXONE_INIT_PKT(0x20d6, 0xa01a, xboxone_pdp_auth),
> XBOXONE_INIT_PKT(0x24c6, 0x541a, xboxone_rumblebegin_init),
> XBOXONE_INIT_PKT(0x24c6, 0x542a, xboxone_rumblebegin_init),
> XBOXONE_INIT_PKT(0x24c6, 0x543a, xboxone_rumblebegin_init),
are there any further changes that need to be made here?
next prev parent reply other threads:[~2025-01-31 16:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-23 17:54 [PATCH] Input: xpad - add multiple supported devices Pavel Rojtberg
2025-01-31 16:50 ` Pavel Rojtberg [this message]
2025-02-01 8:02 ` Greg KH
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=95f1f209-4b97-417b-b0f6-2245458fa1f5@gmail.com \
--to=rojtberg@gmail.com \
--cc=dmitry.torokhov@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-input@vger.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).