| Message ID | 44ad5ffa-76d8-4046-94ee-2ef171930ed2@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | dd50f771af20fb02b1aecde04fbd085c872a9139 |
| Headers | show |
| Series | Input: xpad - Add additional HyperX Controller Identifiers | expand |
Hi Max, On Fri, Mar 01, 2024 at 06:15:42PM -0800, Nguyen, Max wrote: > Add additional HyperX device identifiers to xpad_device and xpad_table. Cc: > stable@vger.kernel.org Suggested-by: Chris Toledanes<chris.toledanes@hp.com> > Reviewed-by: Carl Ng<carl.ng@hp.com> > Signed-off-by: Max Nguyen<maxwell.nguyen@hp.com> Your client messes up patches :( > --- > > diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c > index 7c4b2a5cc1b5..a7e001a1f6dc 100644 > --- a/drivers/input/joystick/xpad.c > +++ b/drivers/input/joystick/xpad.c > @@ -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.
On 3/3/2024 2:45 PM, Dmitry Torokhov wrote: > Hi Max, > > On Fri, Mar 01, 2024 at 06:15:42PM -0800, Nguyen, Max wrote: >> Add additional HyperX device identifiers to xpad_device and xpad_table. Cc: >> stable@vger.kernel.org Suggested-by: Chris Toledanes<chris.toledanes@hp.com> >> Reviewed-by: Carl Ng<carl.ng@hp.com> >> Signed-off-by: Max Nguyen<maxwell.nguyen@hp.com> > 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. > >> --- >> >> diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c >> index 7c4b2a5cc1b5..a7e001a1f6dc 100644 >> --- a/drivers/input/joystick/xpad.c >> +++ b/drivers/input/joystick/xpad.c >> @@ -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. Can you help explain the sort? Do the VID/PIDs need to be in sequential order?
On Mon, Mar 04, 2024 at 04:43:10PM -0800, Nguyen, Max wrote: > > On 3/3/2024 2:45 PM, Dmitry Torokhov wrote: > > Hi Max, > > > > On Fri, Mar 01, 2024 at 06:15:42PM -0800, Nguyen, Max wrote: > > > Add additional HyperX device identifiers to xpad_device and xpad_table. Cc: > > > stable@vger.kernel.org Suggested-by: Chris Toledanes<chris.toledanes@hp.com> > > > Reviewed-by: Carl Ng<carl.ng@hp.com> > > > Signed-off-by: Max Nguyen<maxwell.nguyen@hp.com> > > 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. > > > > > > --- > > > > > > diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c > > > index 7c4b2a5cc1b5..a7e001a1f6dc 100644 > > > --- a/drivers/input/joystick/xpad.c > > > +++ b/drivers/input/joystick/xpad.c > > > @@ -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. > > 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.
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 7c4b2a5cc1b5..a7e001a1f6dc 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -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 */