[PATCH] Input: xpad - three devices added

[PATCH] Input: xpad - three devices added

[Nilton Perim Neto]

Added to the xpad driver the following controllers:
8BitDo SN30 Pro, Hyperkin X91 and Gamesir G7 SE
Also changed the VIDs to better describe them

Signed-off-by: Nilton Perim Neto <niltonperimneto@gmail.com>
---
 drivers/input/joystick/xpad.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index ff9bc87f2f70..58aff8015645 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -374,8 +374,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 Pro 2 Wired Controller", 0, XTYPE_XBOX360 },
+	{ 0x2dc8, 0x6001, "8BitDo SN30 Pro", 0, XTYPE_XBOX360 },
 	{ 0x2dc8, 0x310a, "8BitDo Ultimate 2C Wireless Controller", 0, XTYPE_XBOX360 },
 	{ 0x2e24, 0x0652, "Hyperkin Duke X-Box One pad", 0, XTYPE_XBOXONE },
+	{ 0x2e24, 0x1688, "Hyperkin X91 X-Box One pad", 0, XTYPE_XBOXONE },
 	{ 0x31e3, 0x1100, "Wooting One", 0, XTYPE_XBOX360 },
 	{ 0x31e3, 0x1200, "Wooting Two", 0, XTYPE_XBOX360 },
 	{ 0x31e3, 0x1210, "Wooting Lekker", 0, XTYPE_XBOX360 },
@@ -384,6 +386,7 @@ static const struct xpad_device {
 	{ 0x31e3, 0x1310, "Wooting 60HE (ARM)", 0, XTYPE_XBOX360 },
 	{ 0x3285, 0x0607, "Nacon GC-100", 0, XTYPE_XBOX360 },
 	{ 0x3537, 0x1004, "GameSir T4 Kaleid", 0, XTYPE_XBOX360 },
+	{ 0x3537, 0x1010, "GameSir G7 SE", 0, XTYPE_XBOXONE },
 	{ 0x3767, 0x0101, "Fanatec Speedster 3 Forceshock Wheel", 0, XTYPE_XBOX },
 	{ 0xffff, 0xffff, "Chinese-made Xbox Controller", 0, XTYPE_XBOX },
 	{ 0x0000, 0x0000, "Generic X-Box pad", 0, XTYPE_UNKNOWN }
@@ -522,12 +525,12 @@ static const struct usb_device_id xpad_table[] = {
 	XPAD_XBOXONE_VENDOR(0x24c6),		/* PowerA controllers */
 	XPAD_XBOX360_VENDOR(0x2563),		/* OneXPlayer Gamepad */
 	XPAD_XBOX360_VENDOR(0x260d),		/* Dareu H101 */
-       XPAD_XBOXONE_VENDOR(0x294b),            /* Snakebyte */
+	XPAD_XBOXONE_VENDOR(0x294b),            /* Snakebyte */
 	XPAD_XBOX360_VENDOR(0x2c22),		/* Qanba Controllers */
-	XPAD_XBOX360_VENDOR(0x2dc8),            /* 8BitDo Pro 2 Wired Controller */
-	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_XBOX360_VENDOR(0x2dc8),            /* 8BitDo Controllers */
+	XPAD_XBOXONE_VENDOR(0x2dc8),		/* 8BitDo Controllers */
+	XPAD_XBOXONE_VENDOR(0x2e24),		/* Hyperkin Controllers */
+	XPAD_XBOX360_VENDOR(0x2f24),		/* GameSir Controllers */
 	XPAD_XBOX360_VENDOR(0x31e3),		/* Wooting Keyboards */
 	XPAD_XBOX360_VENDOR(0x3285),		/* Nacon GC-100 */
 	XPAD_XBOX360_VENDOR(0x3537),		/* GameSir Controllers */

-- 
2.48.1

Re: [PATCH] Input: xpad - three devices added

[Greg KH]

On Wed, Jan 22, 2025 at 06:47:07PM -0300, Nilton Perim Neto wrote:
> Added to the xpad driver the following controllers:
> 8BitDo SN30 Pro, Hyperkin X91 and Gamesir G7 SE
> Also changed the VIDs to better describe them

When you say "also" that's a huge hint that this should be broken up
into multiple patches, right?  Renaming an id has nothing to do with
adding a new one.

thanks,

greg k-h

Re: [PATCH] Input: xpad - three devices added

[Dmitry Torokhov]

On Wed, Jan 22, 2025 at 06:47:07PM -0300, Nilton Perim Neto wrote:
> Added to the xpad driver the following controllers:
> 8BitDo SN30 Pro, Hyperkin X91 and Gamesir G7 SE
> Also changed the VIDs to better describe them
> 
> Signed-off-by: Nilton Perim Neto <niltonperimneto@gmail.com>

Applied, thank you.

-- 
Dmitry

Re: [PATCH] Input: xpad - three devices added

[Dmitry Torokhov]

On Thu, Jan 23, 2025 at 07:04:58AM +0100, Greg KH wrote:
> On Wed, Jan 22, 2025 at 06:47:07PM -0300, Nilton Perim Neto wrote:
> > Added to the xpad driver the following controllers:
> > 8BitDo SN30 Pro, Hyperkin X91 and Gamesir G7 SE
> > Also changed the VIDs to better describe them
> 
> When you say "also" that's a huge hint that this should be broken up
> into multiple patches, right?  Renaming an id has nothing to do with
> adding a new one.

It was a bad wording. Vendor macros were not changed, only comments were
updated to reflect the fact that some of the macros cover more than
a single controller. It does not make sense to split this apart.

Thanks.

-- 
Dmitry