Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77558d69 authored by Michael Cullen's avatar Michael Cullen Committed by Greg Kroah-Hartman
Browse files

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



commit 3378a07daa6cdd11e042797454c706d1c69f9ca6 upstream.

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: default avatarMichael Cullen <michael@michaelcullen.name>
Link: https://lore.kernel.org/r/20211015192051.5196-1-michael@michaelcullen.name


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e923bce3

drivers/input/joystick/xpad.c

+2 −0
Original line number Diff line number Diff line
@@ -345,6 +345,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 }
@@ -461,6 +462,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 */

	{ }

};