public inbox for linux-input@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Input: xpad - Add additional HyperX Controller Identifiers
@ 2024-03-02  2:15 Nguyen, Max
  2024-03-03 22:45 ` Dmitry Torokhov
  0 siblings, 1 reply; 4+ messages in thread
From: Nguyen, Max @ 2024-03-02  2:15 UTC (permalink / raw)
  To: Dmitry Torokhov; +Cc: linux-input

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>
---

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 */


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] Input: xpad - Add additional HyperX Controller Identifiers
  2024-03-02  2:15 [PATCH] Input: xpad - Add additional HyperX Controller Identifiers Nguyen, Max
@ 2024-03-03 22:45 ` Dmitry Torokhov
  2024-03-05  0:43   ` Nguyen, Max
  0 siblings, 1 reply; 4+ messages in thread
From: Dmitry Torokhov @ 2024-03-03 22:45 UTC (permalink / raw)
  To: Nguyen, Max; +Cc: linux-input

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.

-- 
Dmitry

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] Input: xpad - Add additional HyperX Controller Identifiers
  2024-03-03 22:45 ` Dmitry Torokhov
@ 2024-03-05  0:43   ` Nguyen, Max
  2024-03-05  1:04     ` Dmitry Torokhov
  0 siblings, 1 reply; 4+ messages in thread
From: Nguyen, Max @ 2024-03-05  0:43 UTC (permalink / raw)
  To: Dmitry Torokhov; +Cc: linux-input


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?


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] Input: xpad - Add additional HyperX Controller Identifiers
  2024-03-05  0:43   ` Nguyen, Max
@ 2024-03-05  1:04     ` Dmitry Torokhov
  0 siblings, 0 replies; 4+ messages in thread
From: Dmitry Torokhov @ 2024-03-05  1:04 UTC (permalink / raw)
  To: Nguyen, Max; +Cc: linux-input

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.

-- 
Dmitry

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-03-05  1:04 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-02  2:15 [PATCH] Input: xpad - Add additional HyperX Controller Identifiers Nguyen, Max
2024-03-03 22:45 ` Dmitry Torokhov
2024-03-05  0:43   ` Nguyen, Max
2024-03-05  1:04     ` Dmitry Torokhov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox