Skip to contentSkip to conversation

Input: xpad - Add additional HyperX Controller Identifiers

PATCH In review Nguyen, Max 2 participants 4 messages Mar 2, 2024 – Mar 5, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Input: xpad - Add additional HyperX Controller Identifiers

Add additional HyperX device identifiers to xpad_device and xpad_table. Cc: [email protected] Suggested-by: Chris Toledanes<[email protected]>

---

drivers/input/joystick/xpad.c +6 -0
index 7c4b2a5cc1b5..a7e001a1f6dc 100644
@@ -131,6 +131,11 @@ static const struct xpad_device {
 	{ 0x03eb, 0xff01, "Wooting One (Legacy)", 0, XTYPE_XBOX360 },
 	{ 0x03eb, 0xff02, "Wooting Two (Legacy)", 0, XTYPE_XBOX360 },
 	{ 0x03f0, 0x0495, "HyperX Clutch Gladiate", 0, XTYPE_XBOXONE },
+	{ 0x03f0, 0x08B6, "HyperX Clutch Gladiate", 0, XTYPE_XBOXONE },		/* v2 */
+	{ 0x03f0, 0x07A0, "HyperX Clutch Gladiate RGB", 0, XTYPE_XBOXONE },
+	{ 0x03f0, 0x038D, "HyperX Clutch", 0, XTYPE_XBOX360 },			/* wired */
+	{ 0x03f0, 0x048D, "HyperX Clutch", 0, XTYPE_XBOX360 },			/* wireless */
+	{ 0x03f0, 0x09B4, "HyperX Clutch Tanto", 0, XTYPE_XBOXONE },
 	{ 0x044f, 0x0f00, "Thrustmaster Wheel", 0, XTYPE_XBOX },
 	{ 0x044f, 0x0f03, "Thrustmaster Wheel", 0, XTYPE_XBOX },
 	{ 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX },
@@ -464,6 +469,7 @@ static const struct usb_device_id xpad_table[] = {
 	XPAD_XBOX360_VENDOR(0x0079),		/* GPD Win 2 controller */
 	XPAD_XBOX360_VENDOR(0x03eb),		/* Wooting Keyboards (Legacy) */
 	XPAD_XBOXONE_VENDOR(0x03f0),		/* HP HyperX Xbox One controllers */
+	XPAD_XBOX360_VENDOR(0x03f0),		/* HP HyperX Xbox 360 controllers */
 	XPAD_XBOX360_VENDOR(0x044f),		/* Thrustmaster Xbox 360 controllers */
 	XPAD_XBOX360_VENDOR(0x045e),		/* Microsoft Xbox 360 controllers */
 	XPAD_XBOXONE_VENDOR(0x045e),		/* Microsoft Xbox One controllers */
maintainer
#1 lore raw

Hi Max,

Quoted 4 lines · Max

Add additional HyperX device identifiers to xpad_device and xpad_table. Cc:
[email protected] Suggested-by: Chris Toledanes<[email protected]>

Your client messes up patches :(

Quoted 7 lines

---

drivers/input/joystick/xpad.c +0 -0
index 7c4b2a5cc1b5..a7e001a1f6dc 100644

drivers/input/joystick/xpad.c static const struct xpad_device { · line 138

Quoted 8 lines
drivers/input/joystick/xpad.c +5 -0
@@ -131,6 +131,11 @@ static const struct xpad_device {
 	{ 0x03eb, 0xff01, "Wooting One (Legacy)", 0, XTYPE_XBOX360 },
 	{ 0x03eb, 0xff02, "Wooting Two (Legacy)", 0, XTYPE_XBOX360 },
 	{ 0x03f0, 0x0495, "HyperX Clutch Gladiate", 0, XTYPE_XBOXONE },
+	{ 0x03f0, 0x08B6, "HyperX Clutch Gladiate", 0, XTYPE_XBOXONE },		/* v2 */
+	{ 0x03f0, 0x07A0, "HyperX Clutch Gladiate RGB", 0, XTYPE_XBOXONE },
+	{ 0x03f0, 0x038D, "HyperX Clutch", 0, XTYPE_XBOX360 },			/* wired */
+	{ 0x03f0, 0x048D, "HyperX Clutch", 0, XTYPE_XBOX360 },			/* wireless */
+	{ 0x03f0, 0x09B4, "HyperX Clutch Tanto", 0, XTYPE_XBOXONE },

These need to be sorted by VID/PID.

I fixed it up and applied.

Thanks.

Signature · 1 line
Dmitry
#2 lore raw
Quoted 8 lines · Dmitry Torokhov

Hi Max,

Quoted 4 lines · Max

Add additional HyperX device identifiers to xpad_device and xpad_table. Cc:
[email protected] Suggested-by: Chris Toledanes<[email protected]>

Your client messes up patches :(

Sorry about that... I tried to submit through a different client. I will submit through my previous method next time.

Quoted 18 lines
Quoted 8 lines

---

drivers/input/joystick/xpad.c +0 -0
index 7c4b2a5cc1b5..a7e001a1f6dc 100644

drivers/input/joystick/xpad.c static const struct xpad_device { · line 138

Quoted 8 lines
drivers/input/joystick/xpad.c +5 -0
@@ -131,6 +131,11 @@ static const struct xpad_device {
  	{ 0x03eb, 0xff01, "Wooting One (Legacy)", 0, XTYPE_XBOX360 },
  	{ 0x03eb, 0xff02, "Wooting Two (Legacy)", 0, XTYPE_XBOX360 },
  	{ 0x03f0, 0x0495, "HyperX Clutch Gladiate", 0, XTYPE_XBOXONE },
+	{ 0x03f0, 0x08B6, "HyperX Clutch Gladiate", 0, XTYPE_XBOXONE },		/* v2 */
+	{ 0x03f0, 0x07A0, "HyperX Clutch Gladiate RGB", 0, XTYPE_XBOXONE },
+	{ 0x03f0, 0x038D, "HyperX Clutch", 0, XTYPE_XBOX360 },			/* wired */
+	{ 0x03f0, 0x048D, "HyperX Clutch", 0, XTYPE_XBOX360 },			/* wireless */
+	{ 0x03f0, 0x09B4, "HyperX Clutch Tanto", 0, XTYPE_XBOXONE },

These need to be sorted by VID/PID.

Quoted 3 lines

I fixed it up and applied.

Thanks.

Can you help explain the sort? Do the VID/PIDs need to be in sequential order?

maintainer
#3 lore raw
Quoted 31 lines · Max
Quoted 8 lines · Dmitry Torokhov

Hi Max,

Quoted 4 lines · Max

Add additional HyperX device identifiers to xpad_device and xpad_table. Cc:
[email protected] Suggested-by: Chris Toledanes<[email protected]>

Your client messes up patches :(

Sorry about that... I tried to submit through a different client. I will submit through my previous method next time.

Quoted 18 lines
Quoted 8 lines

---

drivers/input/joystick/xpad.c +0 -0
index 7c4b2a5cc1b5..a7e001a1f6dc 100644

drivers/input/joystick/xpad.c static const struct xpad_device { · line 138

Quoted 8 lines
drivers/input/joystick/xpad.c +5 -0
@@ -131,6 +131,11 @@ static const struct xpad_device {
  	{ 0x03eb, 0xff01, "Wooting One (Legacy)", 0, XTYPE_XBOX360 },
  	{ 0x03eb, 0xff02, "Wooting Two (Legacy)", 0, XTYPE_XBOX360 },
  	{ 0x03f0, 0x0495, "HyperX Clutch Gladiate", 0, XTYPE_XBOXONE },
+	{ 0x03f0, 0x08B6, "HyperX Clutch Gladiate", 0, XTYPE_XBOXONE },		/* v2 */
+	{ 0x03f0, 0x07A0, "HyperX Clutch Gladiate RGB", 0, XTYPE_XBOXONE },
+	{ 0x03f0, 0x038D, "HyperX Clutch", 0, XTYPE_XBOX360 },			/* wired */
+	{ 0x03f0, 0x048D, "HyperX Clutch", 0, XTYPE_XBOX360 },			/* wireless */
+	{ 0x03f0, 0x09B4, "HyperX Clutch Tanto", 0, XTYPE_XBOXONE },

These need to be sorted by VID/PID.

Quoted 5 lines
Quoted 3 lines

I fixed it up and applied.

Thanks.

Can you help explain the sort? Do the VID/PIDs need to be in sequential order?

Yes, to easier see if someone is adding a duplicate, potentially with a [slightly] different name. So 0x03f0, 0x07A0 should come before 0x03f0, 0x08B6, etc.

Thanks.

Signature · 1 line
Dmitry