On Sun, Apr 17, 2022 at 06:15:24PM +0200, Pavel Rojtberg wrote: > From: Pavel Rojtberg <rojtberg@xxxxxxxxx> > > This is based on multiple commits at https://github.com/paroj/xpad > > Signed-off-by: Jasper Poppe <jgpoppe@xxxxxxxxx> > Signed-off-by: Jeremy Palmer <jpalmer@xxxxxxxxxxxx> > Signed-off-by: Ruineka <ruinairas1992@xxxxxxxxx> > Signed-off-by: Pavel Rojtberg <rojtberg@xxxxxxxxx> > --- > drivers/input/joystick/xpad.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c > index 53126d9..257fc2c 100644 > --- a/drivers/input/joystick/xpad.c > +++ b/drivers/input/joystick/xpad.c > @@ -244,6 +244,7 @@ static const struct xpad_device { > { 0x0f0d, 0x0063, "Hori Real Arcade Pro Hayabusa (USA) Xbox One", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE }, > { 0x0f0d, 0x0067, "HORIPAD ONE", 0, XTYPE_XBOXONE }, > { 0x0f0d, 0x0078, "Hori Real Arcade Pro V Kai Xbox One", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE }, > + { 0x0f0d, 0x00c5, "Hori Fighting Commander ONE", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE }, > { 0x0f30, 0x010b, "Philips Recoil", 0, XTYPE_XBOX }, > { 0x0f30, 0x0202, "Joytech Advanced Controller", 0, XTYPE_XBOX }, > { 0x0f30, 0x8888, "BigBen XBMiniPad Controller", 0, XTYPE_XBOX }, > @@ -260,6 +261,7 @@ static const struct xpad_device { > { 0x1430, 0x8888, "TX6500+ Dance Pad (first generation)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX }, > { 0x1430, 0xf801, "RedOctane Controller", 0, XTYPE_XBOX360 }, > { 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller", 0, XTYPE_XBOX360 }, > + { 0x146b, 0x0604, "Bigben Interactive DAIJA Arcade Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, > { 0x1532, 0x0037, "Razer Sabertooth", 0, XTYPE_XBOX360 }, > { 0x1532, 0x0a00, "Razer Atrox Arcade Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE }, > { 0x1532, 0x0a03, "Razer Wildcat", 0, XTYPE_XBOXONE }, > @@ -325,6 +327,7 @@ 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, 0x551a, "PowerA FUSION Pro Controller", 0, XTYPE_XBOXONE }, > @@ -337,6 +340,8 @@ static const struct xpad_device { > { 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 }, > + { 0x2563, 0x058d, "OneXPlayer Gamepad", 0, XTYPE_XBOX360 }, > + { 0x2dc8, 0x2000, "8BitDo Pro 2 Wired Controller fox Xbox", 0, XTYPE_XBOXONE }, > { 0x0000, 0x0000, "Generic X-Box pad", 0, XTYPE_UNKNOWN } > }; > > @@ -429,9 +434,11 @@ static const struct usb_device_id xpad_table[] = { > { USB_DEVICE(0x0738, 0x4540) }, /* Mad Catz Beat Pad */ > XPAD_XBOXONE_VENDOR(0x0738), /* Mad Catz FightStick TE 2 */ > XPAD_XBOX360_VENDOR(0x07ff), /* Mad Catz GamePad */ > + XPAD_XBOX360_VENDOR(0x0c12), /* Zeroplus X-Box 360 controllers */ > XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */ > XPAD_XBOXONE_VENDOR(0x0e6f), /* 0x0e6f X-Box One controllers */ > XPAD_XBOX360_VENDOR(0x0f0d), /* Hori Controllers */ > + XPAD_XBOX360_VENDOR(0x24c6), /* Hori Controllers */ > XPAD_XBOXONE_VENDOR(0x0f0d), /* Hori Controllers */ > XPAD_XBOX360_VENDOR(0x1038), /* SteelSeries Controllers */ > XPAD_XBOX360_VENDOR(0x11c9), /* Nacon GC100XF */ Why isn't this kept in sorted order? thanks, greg k-h
