[PATCH v3 00/11] Input: xpad - sync with github fork

[PATCH v3 00/11] Input: xpad - sync with github fork

[Pavel Rojtberg]

From: Pavel Rojtberg <rojtberg@gmail.com>

This updates the list of supported devices as contributed on github.
Compared to v1 bouncing patches were merged into one
with me as the author.
Compared to v2 all checkpatch.pl errors were fixed.
Also one patch with an correct author was incorrectly squashed in v2.

Andrei Ilyashenko (1):
  Input: xpad - add support for Xbox ONE liquid metal controller

Fernando Petros (1):
  Input: xpad - add support for Thrustmaster ESWAP X2 ELDEN RING

Greg Savage (1):
  Input: xpad - add support for PDP Mirror's Edge controller

Jack Greiner (1):
  Input: xpad - add support for wooting two he (arm)

Jocelyne Jones (1):
  Input: xpad - add support for SCUF Instinct

Leonardo Brondani Schenkel (1):
  Input: xpad - improve name of 8BitDo controller 2dc8:3106

Martin Stolpe (1):
  Input: xpad - add USB ID for Nacon Revolution5 Pro

Matheos Mattsson (1):
  Input: xpad - add support for Nacon Evol-X Xbox One Controller

Nilton Perim Neto (1):
  Input: xpad - add unofficial Xbox 360 wireless receiver clone

Pavel Rojtberg (1):
  Input: xpad - add multiple supported devices

Thijs Reus (1):
  Input: xpad - added Turtle Beach Recon support

 drivers/input/joystick/xpad.c | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

-- 
2.43.0

[PATCH v3 01/11] Input: xpad - improve name of 8BitDo controller 2dc8:3106

[Pavel Rojtberg]

From: Leonardo Brondani Schenkel <leonardo@schenkel.net>

8BitDo Pro 2 Wired Controller shares the same USB identifier
(2dc8:3106) as a different device, so amend name to reflect that and
reduce confusion as the user might think the controller was misdetected.

I have personally tested it and I can confirm that Pro 2 Wired will also
not work in XTYPE_XBOXONE mode (buton presses won't register), therefore
XTYPE_XBOX360 remains appropriate.

Signed-off-by: Leonardo Brondani Schenkel <leonardo@schenkel.net>
Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>
---
 drivers/input/joystick/xpad.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index ff9bc87f2f70..8a02b9a5ef79 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -373,7 +373,7 @@ static const struct xpad_device {
 	{ 0x294b, 0x3303, "Snakebyte GAMEPAD BASE X", 0, XTYPE_XBOXONE },
 	{ 0x294b, 0x3404, "Snakebyte GAMEPAD RGB X", 0, XTYPE_XBOXONE },
 	{ 0x2dc8, 0x2000, "8BitDo Pro 2 Wired Controller fox Xbox", 0, XTYPE_XBOXONE },
-	{ 0x2dc8, 0x3106, "8BitDo Pro 2 Wired Controller", 0, XTYPE_XBOX360 },
+	{ 0x2dc8, 0x3106, "8BitDo Ultimate Wireless / Pro 2 Wired Controller", 0, XTYPE_XBOX360 },
 	{ 0x2dc8, 0x310a, "8BitDo Ultimate 2C Wireless Controller", 0, XTYPE_XBOX360 },
 	{ 0x2e24, 0x0652, "Hyperkin Duke X-Box One pad", 0, XTYPE_XBOXONE },
 	{ 0x31e3, 0x1100, "Wooting One", 0, XTYPE_XBOX360 },
-- 
2.43.0

[PATCH v3 02/11] Input: xpad - add support for wooting two he (arm)

[Pavel Rojtberg]

From: Jack Greiner <jack@emoss.org>

Signed-off-by: Jack Greiner <jack@emoss.org>
Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>
---
 drivers/input/joystick/xpad.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 8a02b9a5ef79..ceb08c541b18 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -380,6 +380,7 @@ static const struct xpad_device {
 	{ 0x31e3, 0x1200, "Wooting Two", 0, XTYPE_XBOX360 },
 	{ 0x31e3, 0x1210, "Wooting Lekker", 0, XTYPE_XBOX360 },
 	{ 0x31e3, 0x1220, "Wooting Two HE", 0, XTYPE_XBOX360 },
+	{ 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, 0x0607, "Nacon GC-100", 0, XTYPE_XBOX360 },
-- 
2.43.0

[PATCH v3 03/11] Input: xpad - add support for SCUF Instinct

[Pavel Rojtberg]

From: Jocelyne Jones <bumpycarrot@gmail.com>

Signed-off-by: Jocelyne Jones <bumpycarrot@gmail.com>
Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>
---
 drivers/input/joystick/xpad.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index ceb08c541b18..7985b7a5cf0e 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -376,6 +376,7 @@ static const struct xpad_device {
 	{ 0x2dc8, 0x3106, "8BitDo Ultimate Wireless / Pro 2 Wired Controller", 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 },
@@ -529,6 +530,7 @@ 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_XBOX360_VENDOR(0x3537),		/* GameSir Controllers */
-- 
2.43.0

[PATCH v3 04/11] Input: xpad - add support for Xbox ONE liquid metal controller

[Pavel Rojtberg]

From: Andrei Ilyashenko <andrei.ilyashenko@gmail.com>

I found that my controller wasn't working with this driver.
The LED would light up and it could rumble but was not registering
any button presses or joystick movements. I suspected the problem might
be that it was not being sent some required init packet so I tried
sending the packets being used in xboxone_init_packets and found that
sending xboxone_pdp_auth got the controller working.
At least for my controller xboxone_pdp_led_on was not strictly
necessary but I decided to follow
the same pattern used by the other two controllers.

Signed-off-by: Andrei Ilyashenko <andrei.ilyashenko@gmail.com>
Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>
---
 drivers/input/joystick/xpad.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 7985b7a5cf0e..d1b771457b51 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -687,7 +687,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),
-- 
2.43.0

[PATCH v3 05/11] Input: xpad - add multiple supported devices

[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 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index d1b771457b51..b2716b49d3b6 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -275,6 +275,8 @@ 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 },
@@ -374,6 +376,7 @@ 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 },
@@ -384,9 +387,12 @@ 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 },
 	{ 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 }
 };
@@ -535,6 +541,7 @@ static const struct usb_device_id xpad_table[] = {
 	XPAD_XBOX360_VENDOR(0x3285),		/* Nacon GC-100 */
 	XPAD_XBOX360_VENDOR(0x3537),		/* GameSir Controllers */
 	XPAD_XBOXONE_VENDOR(0x3537),		/* GameSir Controllers */
+	XPAD_XBOX360_VENDOR(0x413d),		/* Black Shark Green Ghost Controller */
 	{ }
 };
 
-- 
2.43.0

[PATCH v3 06/11] Input: xpad - add USB ID for Nacon Revolution5 Pro

[Pavel Rojtberg]

From: Martin Stolpe <martin.stolpe@gmail.com>

Signed-off-by: Martin Stolpe <martin.stolpe@gmail.com>
Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>
---
 drivers/input/joystick/xpad.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index b2716b49d3b6..1cd946b26451 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -390,6 +390,7 @@ static const struct xpad_device {
 	{ 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 },
 	{ 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 },
-- 
2.43.0

[PATCH v3 07/11] Input: xpad - added Turtle Beach Recon support

[Pavel Rojtberg]

From: Thijs Reus <thijs.reus@trimplement.com>

from the diff from:
https://www.spinics.net/lists/linux-input/msg75512.html

Signed-off-by: Thijs Reus <thijs.reus@trimplement.com>
Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>
---
 drivers/input/joystick/xpad.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 1cd946b26451..237704b3fab5 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -176,6 +176,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 },
@@ -283,6 +284,7 @@ static const struct xpad_device {
 	{ 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 +368,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 },
-- 
2.43.0

[PATCH v3 08/11] Input: xpad - add support for Nacon Evol-X Xbox One Controller

[Pavel Rojtberg]

From: Matheos Mattsson <matheos.mattsson@gmail.com>

Signed-off-by: Matheos Mattsson <matheos.mattsson@gmail.com>
Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>
---
 drivers/input/joystick/xpad.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 237704b3fab5..18e33e2aeaa7 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -394,6 +394,7 @@ static const struct xpad_device {
 	{ 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 },
@@ -543,6 +544,7 @@ static const struct usb_device_id xpad_table[] = {
 	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 */
-- 
2.43.0

[PATCH v3 09/11] Input: xpad - add support for PDP Mirror's Edge controller

[Pavel Rojtberg]

From: Greg Savage <gsavage13@hotmail.ca>

Signed-off-by: Greg Savage <gsavage13@hotmail.ca>
Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>
---
 drivers/input/joystick/xpad.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 18e33e2aeaa7..509e8681e5dd 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -238,6 +238,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 },
-- 
2.43.0

[PATCH v3 10/11] Input: xpad - add support for Thrustmaster ESWAP X2 ELDEN RING

[Pavel Rojtberg]

From: Fernando Petros <fernandopetros@gmail.com>

Signed-off-by: Fernando Petros <fernandopetros@gmail.com>
Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>
---
 drivers/input/joystick/xpad.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 509e8681e5dd..647c788ec5d1 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 },
@@ -497,6 +498,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 */
-- 
2.43.0

[PATCH v3 11/11] Input: xpad - add unofficial Xbox 360 wireless receiver clone

[Pavel Rojtberg]

From: Nilton Perim Neto <niltonperimneto@gmail.com>

Although it mimics the Microsoft's VendorID, it is in fact a clone.
Taking into account that the original Microsoft Receiver is not being
manufactured anymore, this drive can solve dpad issues encontered by
those who still use the original 360 Wireless controller
but are using a receiver clone.

Signed-off-by: Nilton Perim Neto <niltonperimneto@gmail.com>
Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>
---
 drivers/input/joystick/xpad.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 647c788ec5d1..b0780dfc558b 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -151,6 +151,7 @@ static const struct xpad_device {
 	{ 0x045e, 0x028e, "Microsoft X-Box 360 pad", 0, XTYPE_XBOX360 },
 	{ 0x045e, 0x028f, "Microsoft X-Box 360 pad v2", 0, XTYPE_XBOX360 },
 	{ 0x045e, 0x0291, "Xbox 360 Wireless Receiver (XBOX)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W },
+	{ 0x045e, 0x02a9, "Xbox 360 Wireless Receiver (Unofficial)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W },
 	{ 0x045e, 0x02d1, "Microsoft X-Box One pad", 0, XTYPE_XBOXONE },
 	{ 0x045e, 0x02dd, "Microsoft X-Box One pad (Firmware 2015)", 0, XTYPE_XBOXONE },
 	{ 0x045e, 0x02e3, "Microsoft X-Box One Elite pad", MAP_PADDLES, XTYPE_XBOXONE },
-- 
2.43.0

Re: [PATCH v3 00/11] Input: xpad - sync with github fork

[Pavel Rojtberg]

Am 07.01.25 um 20:28 schrieb Pavel Rojtberg:
> From: Pavel Rojtberg <rojtberg@gmail.com>
> 
> This updates the list of supported devices as contributed on github.
> Compared to v1 bouncing patches were merged into one
> with me as the author.
> Compared to v2 all checkpatch.pl errors were fixed.
> Also one patch with an correct author was incorrectly squashed in v2.
> 
> Andrei Ilyashenko (1):
>   Input: xpad - add support for Xbox ONE liquid metal controller
> 
> Fernando Petros (1):
>   Input: xpad - add support for Thrustmaster ESWAP X2 ELDEN RING
> 
> Greg Savage (1):
>   Input: xpad - add support for PDP Mirror's Edge controller
> 
> Jack Greiner (1):
>   Input: xpad - add support for wooting two he (arm)
> 
> Jocelyne Jones (1):
>   Input: xpad - add support for SCUF Instinct
> 
> Leonardo Brondani Schenkel (1):
>   Input: xpad - improve name of 8BitDo controller 2dc8:3106
> 
> Martin Stolpe (1):
>   Input: xpad - add USB ID for Nacon Revolution5 Pro
> 
> Matheos Mattsson (1):
>   Input: xpad - add support for Nacon Evol-X Xbox One Controller
> 
> Nilton Perim Neto (1):
>   Input: xpad - add unofficial Xbox 360 wireless receiver clone
> 
> Pavel Rojtberg (1):
>   Input: xpad - add multiple supported devices
> 
> Thijs Reus (1):
>   Input: xpad - added Turtle Beach Recon support
> 
>  drivers/input/joystick/xpad.c | 24 +++++++++++++++++++++++-
>  1 file changed, 23 insertions(+), 1 deletion(-)
> 

are there any further changes that need to be made here?

Re: [PATCH v3 08/11] Input: xpad - add support for Nacon Evol-X Xbox One Controller

[Dmitry Torokhov]

Hi Pavel,

On Tue, Jan 07, 2025 at 08:28:27PM +0100, Pavel Rojtberg wrote:
> From: Matheos Mattsson <matheos.mattsson@gmail.com>
> 
> Signed-off-by: Matheos Mattsson <matheos.mattsson@gmail.com>

I checked several patches against the github repository and in github
there are no "Signed-off-by"s from the original authors. I understand
and fully appreciate the desire to credit the original authors, but you
can not add SOBs on their behalf.

I think the best way would be to combine all the changes into one patch
authored by you and give credit to all the people involved in the commit
description.

> Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>
> ---
>  drivers/input/joystick/xpad.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
> index 237704b3fab5..18e33e2aeaa7 100644
> --- a/drivers/input/joystick/xpad.c
> +++ b/drivers/input/joystick/xpad.c
> @@ -394,6 +394,7 @@ static const struct xpad_device {
>  	{ 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 },
> @@ -543,6 +544,7 @@ static const struct usb_device_id xpad_table[] = {
>  	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 */
> -- 
> 2.43.0
> 

Thanks.

-- 
Dmitry

Re: [PATCH v3 11/11] Input: xpad - add unofficial Xbox 360 wireless receiver clone

[Dmitry Torokhov]

On Tue, Jan 07, 2025 at 08:28:30PM +0100, Pavel Rojtberg wrote:
> From: Nilton Perim Neto <niltonperimneto@gmail.com>
> 
> Although it mimics the Microsoft's VendorID, it is in fact a clone.
> Taking into account that the original Microsoft Receiver is not being
> manufactured anymore, this drive can solve dpad issues encontered by
> those who still use the original 360 Wireless controller
> but are using a receiver clone.
> 
> Signed-off-by: Nilton Perim Neto <niltonperimneto@gmail.com>
> Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>

Applied since I saw message from Nilton acknowledging SOB. Thank you!

> ---
>  drivers/input/joystick/xpad.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
> index 647c788ec5d1..b0780dfc558b 100644
> --- a/drivers/input/joystick/xpad.c
> +++ b/drivers/input/joystick/xpad.c
> @@ -151,6 +151,7 @@ static const struct xpad_device {
>  	{ 0x045e, 0x028e, "Microsoft X-Box 360 pad", 0, XTYPE_XBOX360 },
>  	{ 0x045e, 0x028f, "Microsoft X-Box 360 pad v2", 0, XTYPE_XBOX360 },
>  	{ 0x045e, 0x0291, "Xbox 360 Wireless Receiver (XBOX)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W },
> +	{ 0x045e, 0x02a9, "Xbox 360 Wireless Receiver (Unofficial)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W },
>  	{ 0x045e, 0x02d1, "Microsoft X-Box One pad", 0, XTYPE_XBOXONE },
>  	{ 0x045e, 0x02dd, "Microsoft X-Box One pad (Firmware 2015)", 0, XTYPE_XBOXONE },
>  	{ 0x045e, 0x02e3, "Microsoft X-Box One Elite pad", MAP_PADDLES, XTYPE_XBOXONE },
> -- 
> 2.43.0
> 

-- 
Dmitry

Re: [PATCH v3 08/11] Input: xpad - add support for Nacon Evol-X Xbox One Controller

[Dmitry Torokhov]

Hi Matheos,

On Fri, Jan 17, 2025 at 11:25:06PM +0200, Matheos Mattsson wrote:
> Hi,
> 
> Sorry to jump in like this. I am not even sure what kind of "chain" this is
> really,

Pavel sent a chain of multiple patches (of which you were CCed on to
just one I assume), so that's what I was referring to.

> but if we are talking about my SOB I am 100% sure I did in my MR
> description on the xpad github repostitory.

Ah, OK, I see now. I simply cloned the repository and inspected the
commits. Pull requests is something that is only recorded in github and
is not a part of git repository.

> Apologies if this was either the wrong place, or if I am conpletely
> misunderstanding what this is about 😅

Yes, for the kernel development SOB should go into commit message
itself. This way SOBs are part of the source code and its history, not
tied to some infrastructure.

But since I am aware of your SOB now I am applying the patch.

Thank you!

> 
> Regards,
> Matheos
> 
> On Fri, 17 Jan 2025, 19:30 Dmitry Torokhov, <dmitry.torokhov@gmail.com>
> wrote:
> 
> > Hi Pavel,
> >
> > On Tue, Jan 07, 2025 at 08:28:27PM +0100, Pavel Rojtberg wrote:
> > > From: Matheos Mattsson <matheos.mattsson@gmail.com>
> > >
> > > Signed-off-by: Matheos Mattsson <matheos.mattsson@gmail.com>
> >
> > I checked several patches against the github repository and in github
> > there are no "Signed-off-by"s from the original authors. I understand
> > and fully appreciate the desire to credit the original authors, but you
> > can not add SOBs on their behalf.
> >
> > I think the best way would be to combine all the changes into one patch
> > authored by you and give credit to all the people involved in the commit
> > description.
> >
> > > Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>
> > > ---
> > >  drivers/input/joystick/xpad.c | 2 ++
> > >  1 file changed, 2 insertions(+)
> > >
> > > diff --git a/drivers/input/joystick/xpad.c
> > b/drivers/input/joystick/xpad.c
> > > index 237704b3fab5..18e33e2aeaa7 100644
> > > --- a/drivers/input/joystick/xpad.c
> > > +++ b/drivers/input/joystick/xpad.c
> > > @@ -394,6 +394,7 @@ static const struct xpad_device {
> > >       { 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 },
> > > @@ -543,6 +544,7 @@ static const struct usb_device_id xpad_table[] = {
> > >       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 */
> > > --
> > > 2.43.0
> > >
> >
> > Thanks.
> >
> > --
> > Dmitry
> >

-- 
Dmitry

Re: [PATCH v3 08/11] Input: xpad - add support for Nacon Evol-X Xbox One Controller

[Pavel Rojtberg]

Hi Dmitry,

Am 17.01.25 um 18:30 schrieb Dmitry Torokhov:
> Hi Pavel,
> 
> On Tue, Jan 07, 2025 at 08:28:27PM +0100, Pavel Rojtberg wrote:
>> From: Matheos Mattsson <matheos.mattsson@gmail.com>
>>
>> Signed-off-by: Matheos Mattsson <matheos.mattsson@gmail.com>
> 
> I checked several patches against the github repository and in github
> there are no "Signed-off-by"s from the original authors. I understand
> and fully appreciate the desire to credit the original authors, but you
> can not add SOBs on their behalf.
> 
> I think the best way would be to combine all the changes into one patch
> authored by you and give credit to all the people involved in the commit
> description.

sorry for the created confusion. Last time I was told to try sending the
one-liner patches individually for proper attribution:
https://lore.kernel.org/all/Yv46RSWwQDaHqE6f@kroah.com/

I was not aware of the peculiarities of the signed-off procedure.
Therefore I merely requested a real name & email from contributors.

As Matheos clarified some contributors added the signed-off line to
the pull-request and not the commit so I tried fixing this manually.

I will update the PR template and explicitly ask for having
the signed-off line in the commit and will squash commits lacking this
into one when sending updates in the future.

Greetings, Pavel

>> Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>
>> ---
>>  drivers/input/joystick/xpad.c | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
>> index 237704b3fab5..18e33e2aeaa7 100644
>> --- a/drivers/input/joystick/xpad.c
>> +++ b/drivers/input/joystick/xpad.c
>> @@ -394,6 +394,7 @@ static const struct xpad_device {
>>  	{ 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 },
>> @@ -543,6 +544,7 @@ static const struct usb_device_id xpad_table[] = {
>>  	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 */
>> -- 
>> 2.43.0
>>
> 
> Thanks.
> 

Re: [PATCH v3 01/11] Input: xpad - improve name of 8BitDo controller 2dc8:3106

[Dmitry Torokhov]

On Tue, Jan 07, 2025 at 08:28:20PM +0100, Pavel Rojtberg wrote:
> From: Leonardo Brondani Schenkel <leonardo@schenkel.net>
> 
> 8BitDo Pro 2 Wired Controller shares the same USB identifier
> (2dc8:3106) as a different device, so amend name to reflect that and
> reduce confusion as the user might think the controller was misdetected.
> 
> I have personally tested it and I can confirm that Pro 2 Wired will also
> not work in XTYPE_XBOXONE mode (buton presses won't register), therefore
> XTYPE_XBOX360 remains appropriate.
> 
> Signed-off-by: Leonardo Brondani Schenkel <leonardo@schenkel.net>
> Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>

Applied, thank you.Applied, thank you.

Thanks.

-- 
Dmitry

Re: [PATCH v3 02/11] Input: xpad - add support for wooting two he (arm)

[Dmitry Torokhov]

On Tue, Jan 07, 2025 at 08:28:21PM +0100, Pavel Rojtberg wrote:
> From: Jack Greiner <jack@emoss.org>
> 
> Signed-off-by: Jack Greiner <jack@emoss.org>
> Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>

Applied, thank you.

-- 
Dmitry