diff mbox series

Input: xpad - Add support for another USB ID of Nacon GC-100

Message ID 20211015192051.5196-1-michael@michaelcullen.name (mailing list archive)
State Accepted
Commit 3378a07daa6cdd11e042797454c706d1c69f9ca6
Headers show
Series Input: xpad - Add support for another USB ID of Nacon GC-100 | expand

Commit Message

Michael Cullen Oct. 15, 2021, 7:20 p.m. UTC
The Nacon GX100XF is already mapped, but it seems there is a Nacon
GC-100 (identified as NC5136Wht PCGC-100WHITE though I believe other
colours exist) with a different USB ID when in XInput mode.

Signed-off-by: Michael Cullen <michael@michaelcullen.name>
---
 drivers/input/joystick/xpad.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Dmitry Torokhov Oct. 16, 2021, 5:26 a.m. UTC | #1
On Fri, Oct 15, 2021 at 09:20:51PM +0200, Michael Cullen wrote:
> The Nacon GX100XF is already mapped, but it seems there is a Nacon
> GC-100 (identified as NC5136Wht PCGC-100WHITE though I believe other
> colours exist) with a different USB ID when in XInput mode.
> 
> Signed-off-by: Michael Cullen <michael@michaelcullen.name>

Applied, thank you.
diff mbox series

Patch

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index d69d7657ab12..dc74c355012b 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -332,6 +332,7 @@  static const struct xpad_device {
 	{ 0x24c6, 0x5b03, "Thrustmaster Ferrari 458 Racing Wheel", 0, XTYPE_XBOX360 },
 	{ 0x24c6, 0x5d04, "Razer Sabertooth", 0, XTYPE_XBOX360 },
 	{ 0x24c6, 0xfafe, "Rock Candy Gamepad for Xbox 360", 0, XTYPE_XBOX360 },
+	{ 0x3285, 0x0607, "Nacon GC-100", 0, XTYPE_XBOX360 },
 	{ 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 }
@@ -449,6 +450,7 @@  static const struct usb_device_id xpad_table[] = {
 	XPAD_XBOXONE_VENDOR(0x24c6),		/* PowerA Controllers */
 	XPAD_XBOXONE_VENDOR(0x2e24),		/* Hyperkin Duke X-Box One pad */
 	XPAD_XBOX360_VENDOR(0x2f24),		/* GameSir Controllers */
+	XPAD_XBOX360_VENDOR(0x3285),		/* Nacon GC-100 */
 	{ }
 };