[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-input
Subject:    [PATCH] Input: xpad - sort xpad_device by vendor and product ID
From:       Brenton Simpson <appsforartists () google ! com>
Date:       2024-01-30 23:19:03
Message-ID: 20240130231903.293265-1-appsforartists () google ! com
[Download RAW message or body]

Signed-off-by: Brenton Simpson <appsforartists@google.com>
---
 drivers/input/joystick/xpad.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 7c4b2a5cc1b5..c67f3d65192d 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -127,6 +127,7 @@ static const struct xpad_device {
 	u8 mapping;
 	u8 xtype;
 } xpad_device[] = {
+	/* Please keep this list sorted by vendor and product ID. */
 	{ 0x0079, 0x18d4, "GPD Win 2 X-Box Controller", 0, XTYPE_XBOX360 },
 	{ 0x03eb, 0xff01, "Wooting One (Legacy)", 0, XTYPE_XBOX360 },
 	{ 0x03eb, 0xff02, "Wooting Two (Legacy)", 0, XTYPE_XBOX360 },
@@ -147,9 +148,9 @@ static const struct xpad_device {
 	{ 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 },
-	{ 0x045e, 0x0b00, "Microsoft X-Box One Elite 2 pad", MAP_PADDLES, XTYPE_XBOXONE },
 	{ 0x045e, 0x02ea, "Microsoft X-Box One S pad", 0, XTYPE_XBOXONE },
 	{ 0x045e, 0x0719, "Xbox 360 Wireless Receiver", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W \
}, +	{ 0x045e, 0x0b00, "Microsoft X-Box One Elite 2 pad", MAP_PADDLES, XTYPE_XBOXONE \
},  { 0x045e, 0x0b0a, "Microsoft X-Box Adaptive Controller", MAP_PROFILE_BUTTON, \
XTYPE_XBOXONE },  { 0x045e, 0x0b12, "Microsoft Xbox Series S|X Controller", \
MAP_SELECT_BUTTON, XTYPE_XBOXONE },  { 0x046d, 0xc21d, "Logitech Gamepad F310", 0, \
XTYPE_XBOX360 }, @@ -335,7 +336,6 @@ static const struct xpad_device {
 	{ 0x20d6, 0x2001, "BDA Xbox Series X Wired Controller", 0, XTYPE_XBOXONE },
 	{ 0x20d6, 0x2009, "PowerA Enhanced Wired Controller for Xbox Series X|S", 0, \
XTYPE_XBOXONE },  { 0x20d6, 0x281f, "PowerA Wired Controller For Xbox 360", 0, \
                XTYPE_XBOX360 },
-	{ 0x2e24, 0x0652, "Hyperkin Duke X-Box One pad", 0, XTYPE_XBOXONE },
 	{ 0x24c6, 0x5000, "Razer Atrox Arcade Stick", MAP_TRIGGERS_TO_BUTTONS, \
XTYPE_XBOX360 },  { 0x24c6, 0x5300, "PowerA MINI PROEX Controller", 0, XTYPE_XBOX360 \
},  { 0x24c6, 0x5303, "Xbox Airflo wired controller", 0, XTYPE_XBOX360 },
@@ -350,9 +350,9 @@ static const struct xpad_device {
 	{ 0x24c6, 0x5502, "Hori Fighting Stick VX Alt", MAP_TRIGGERS_TO_BUTTONS, \
XTYPE_XBOX360 },  { 0x24c6, 0x5503, "Hori Fighting Edge", MAP_TRIGGERS_TO_BUTTONS, \
XTYPE_XBOX360 },  { 0x24c6, 0x5506, "Hori SOULCALIBUR V Stick", 0, XTYPE_XBOX360 },
-	{ 0x24c6, 0x5510, "Hori Fighting Commander ONE (Xbox 360/PC Mode)", \
MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },  { 0x24c6, 0x550d, "Hori GEM Xbox \
controller", 0, XTYPE_XBOX360 },  { 0x24c6, 0x550e, "Hori Real Arcade Pro V Kai 360", \
MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, +	{ 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, 0x5b00, \
"ThrustMaster Ferrari 458 Racing Wheel", 0, XTYPE_XBOX360 }, @@ -363,6 +363,7 @@ \
static const struct xpad_device {  { 0x2563, 0x058d, "OneXPlayer Gamepad", 0, \
XTYPE_XBOX360 },  { 0x2dc8, 0x2000, "8BitDo Pro 2 Wired Controller fox Xbox", 0, \
XTYPE_XBOXONE },  { 0x2dc8, 0x3106, "8BitDo Pro 2 Wired Controller", 0, XTYPE_XBOX360 \
}, +	{ 0x2e24, 0x0652, "Hyperkin Duke 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 },
@@ -460,6 +461,9 @@ static const signed short xpad_btn_paddles[] = {
 	{ XPAD_XBOXONE_VENDOR_PROTOCOL((vend), 208) }
 
 static const struct usb_device_id xpad_table[] = {
+	/* Please keep this list sorted by vendor ID.  Because the lines use different
+	 * macros, you may need to sort it by hand.
+	 */
 	{ USB_INTERFACE_INFO('X', 'B', 0) },	/* Xbox USB-IF not-approved class */
 	XPAD_XBOX360_VENDOR(0x0079),		/* GPD Win 2 controller */
 	XPAD_XBOX360_VENDOR(0x03eb),		/* Wooting Keyboards (Legacy) */
-- 
2.43.0.429.g432eaa2c6b-goog


[prev in list] [next in list] [prev in thread] [next in thread]