diff mbox series

[v1,1/1] Input: xpad - add support for MSI Claw A1M

Message ID 20241010232020.3292284-4-uejji@uejji.net (mailing list archive)
State New
Headers show
Series [v1,1/1] Input: xpad - add support for MSI Claw A1M | expand

Commit Message

John Edwards Oct. 10, 2024, 11:09 p.m. UTC
Add MSI Claw A1M controller to xpad_device match table when in xinput mode.
Add MSI VID as XPAD_XBOX360_VENDOR.

Signed-off-by: John Edwards <uejji@uejji.net>
Reviewed-by: Derek J. Clark <derekjohn.clark@gmail.com>
---
 drivers/input/joystick/xpad.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Christopher Snowhill Oct. 11, 2024, 11:28 a.m. UTC | #1
On Thu Oct 10, 2024 at 4:09 PM PDT, John Edwards wrote:
> Add MSI Claw A1M controller to xpad_device match table when in xinput mode.
> Add MSI VID as XPAD_XBOX360_VENDOR.
>
> Signed-off-by: John Edwards <uejji@uejji.net>
> Reviewed-by: Derek J. Clark <derekjohn.clark@gmail.com>

As a once contributor to the Xbox360 wireless driver, who also happened
to botch the SoB address and missed a CC from GKH later...

Reviewed-by: Christopher Snowhill <kode54@gmail.com>

Also, feel free to be the first to submit a hw-probe of the machine,
since there's no MSI Claw reporting at this time. Guess not many people
would be interested in running Linux on a machine that didn't yet have
working controller support. Thanks for that. :D

> ---
>  drivers/input/joystick/xpad.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
> index 4eda18f4f..9f44669df 100644
> --- a/drivers/input/joystick/xpad.c
> +++ b/drivers/input/joystick/xpad.c
> @@ -218,6 +218,7 @@ static const struct xpad_device {
>  	{ 0x0c12, 0x8810, "Zeroplus Xbox Controller", 0, XTYPE_XBOX },
>  	{ 0x0c12, 0x9902, "HAMA VibraX - *FAULTY HARDWARE*", 0, XTYPE_XBOX },
>  	{ 0x0d2f, 0x0002, "Andamiro Pump It Up pad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
> +	{ 0x0db0, 0x1901, "Micro Star International Xbox360 Controller for Windows", 0, XTYPE_XBOX360 },
>  	{ 0x0e4c, 0x1097, "Radica Gamester Controller", 0, XTYPE_XBOX },
>  	{ 0x0e4c, 0x1103, "Radica Gamester Reflex", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX },
>  	{ 0x0e4c, 0x2390, "Radica Games Jtech Controller", 0, XTYPE_XBOX },
> @@ -492,6 +493,7 @@ static const struct usb_device_id xpad_table[] = {
>  	XPAD_XBOX360_VENDOR(0x07ff),		/* Mad Catz Gamepad */
>  	XPAD_XBOXONE_VENDOR(0x0b05),		/* ASUS controllers */
>  	XPAD_XBOX360_VENDOR(0x0c12),		/* Zeroplus X-Box 360 controllers */
> +	XPAD_XBOX360_VENDOR(0x0db0),		/* Micro Star International X-Box 360 controllers */
>  	XPAD_XBOX360_VENDOR(0x0e6f),		/* 0x0e6f Xbox 360 controllers */
>  	XPAD_XBOXONE_VENDOR(0x0e6f),		/* 0x0e6f Xbox One controllers */
>  	XPAD_XBOX360_VENDOR(0x0f0d),		/* Hori controllers */
Christopher Snowhill Oct. 11, 2024, 12:59 p.m. UTC | #2
On Thu Oct 10, 2024 at 4:09 PM PDT, John Edwards wrote:
> Add MSI Claw A1M controller to xpad_device match table when in xinput mode.
> Add MSI VID as XPAD_XBOX360_VENDOR.
>
> Signed-off-by: John Edwards <uejji@uejji.net>
> Reviewed-by: Derek J. Clark <derekjohn.clark@gmail.com>

Um, I may have erred with my contribution of a R-b? Do I have to test
the patch on the device in question to review it? If so, I'll just Ack
the patch as looking properly drafted, and applying cleanly. Sorry for
the noise.

> ---
>  drivers/input/joystick/xpad.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
> index 4eda18f4f..9f44669df 100644
> --- a/drivers/input/joystick/xpad.c
> +++ b/drivers/input/joystick/xpad.c
> @@ -218,6 +218,7 @@ static const struct xpad_device {
>  	{ 0x0c12, 0x8810, "Zeroplus Xbox Controller", 0, XTYPE_XBOX },
>  	{ 0x0c12, 0x9902, "HAMA VibraX - *FAULTY HARDWARE*", 0, XTYPE_XBOX },
>  	{ 0x0d2f, 0x0002, "Andamiro Pump It Up pad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
> +	{ 0x0db0, 0x1901, "Micro Star International Xbox360 Controller for Windows", 0, XTYPE_XBOX360 },
>  	{ 0x0e4c, 0x1097, "Radica Gamester Controller", 0, XTYPE_XBOX },
>  	{ 0x0e4c, 0x1103, "Radica Gamester Reflex", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX },
>  	{ 0x0e4c, 0x2390, "Radica Games Jtech Controller", 0, XTYPE_XBOX },
> @@ -492,6 +493,7 @@ static const struct usb_device_id xpad_table[] = {
>  	XPAD_XBOX360_VENDOR(0x07ff),		/* Mad Catz Gamepad */
>  	XPAD_XBOXONE_VENDOR(0x0b05),		/* ASUS controllers */
>  	XPAD_XBOX360_VENDOR(0x0c12),		/* Zeroplus X-Box 360 controllers */
> +	XPAD_XBOX360_VENDOR(0x0db0),		/* Micro Star International X-Box 360 controllers */
>  	XPAD_XBOX360_VENDOR(0x0e6f),		/* 0x0e6f Xbox 360 controllers */
>  	XPAD_XBOXONE_VENDOR(0x0e6f),		/* 0x0e6f Xbox One controllers */
>  	XPAD_XBOX360_VENDOR(0x0f0d),		/* Hori controllers */
Dmitry Torokhov Oct. 18, 2024, 9:35 p.m. UTC | #3
On Thu, Oct 10, 2024 at 11:09:23PM +0000, John Edwards wrote:
> Add MSI Claw A1M controller to xpad_device match table when in xinput mode.
> Add MSI VID as XPAD_XBOX360_VENDOR.
> 
> Signed-off-by: John Edwards <uejji@uejji.net>
> Reviewed-by: Derek J. Clark <derekjohn.clark@gmail.com>

Applied, thank you.
Dmitry Torokhov Oct. 18, 2024, 9:36 p.m. UTC | #4
Hi Christopher,

On Fri, Oct 11, 2024 at 05:59:42AM -0700, Christopher Snowhill wrote:
> On Thu Oct 10, 2024 at 4:09 PM PDT, John Edwards wrote:
> > Add MSI Claw A1M controller to xpad_device match table when in xinput mode.
> > Add MSI VID as XPAD_XBOX360_VENDOR.
> >
> > Signed-off-by: John Edwards <uejji@uejji.net>
> > Reviewed-by: Derek J. Clark <derekjohn.clark@gmail.com>
> 
> Um, I may have erred with my contribution of a R-b? Do I have to test
> the patch on the device in question to review it? If so, I'll just Ack
> the patch as looking properly drafted, and applying cleanly. Sorry for
> the noise.

No, you do not need to test the patch to review it. We have a separate
"Tested-by" tag to signal when a person did test the patch with their
setup.

Thanks.
diff mbox series

Patch

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 4eda18f4f..9f44669df 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -218,6 +218,7 @@  static const struct xpad_device {
 	{ 0x0c12, 0x8810, "Zeroplus Xbox Controller", 0, XTYPE_XBOX },
 	{ 0x0c12, 0x9902, "HAMA VibraX - *FAULTY HARDWARE*", 0, XTYPE_XBOX },
 	{ 0x0d2f, 0x0002, "Andamiro Pump It Up pad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
+	{ 0x0db0, 0x1901, "Micro Star International Xbox360 Controller for Windows", 0, XTYPE_XBOX360 },
 	{ 0x0e4c, 0x1097, "Radica Gamester Controller", 0, XTYPE_XBOX },
 	{ 0x0e4c, 0x1103, "Radica Gamester Reflex", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX },
 	{ 0x0e4c, 0x2390, "Radica Games Jtech Controller", 0, XTYPE_XBOX },
@@ -492,6 +493,7 @@  static const struct usb_device_id xpad_table[] = {
 	XPAD_XBOX360_VENDOR(0x07ff),		/* Mad Catz Gamepad */
 	XPAD_XBOXONE_VENDOR(0x0b05),		/* ASUS controllers */
 	XPAD_XBOX360_VENDOR(0x0c12),		/* Zeroplus X-Box 360 controllers */
+	XPAD_XBOX360_VENDOR(0x0db0),		/* Micro Star International X-Box 360 controllers */
 	XPAD_XBOX360_VENDOR(0x0e6f),		/* 0x0e6f Xbox 360 controllers */
 	XPAD_XBOXONE_VENDOR(0x0e6f),		/* 0x0e6f Xbox One controllers */
 	XPAD_XBOX360_VENDOR(0x0f0d),		/* Hori controllers */