2024-06-07 22:37:57

by Luke Jones

Subject: [PATCH] Input: xpad - add support for ASUS ROG RAIKIRI PRO

Add the VID/PID for ASUS ROG RAIKIRI PRO to
xpad_device and the VID to xpad_table.

Signed-off-by: Luke D. Jones <[email protected]>
---
drivers/hid/hid-ids.h | 1 +
drivers/input/joystick/xpad.c | 1 +
2 files changed, 2 insertions(+)

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 61d2a21affa2..31c522fa4e87 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -209,6 +209,7 @@
#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2 0x19b6
#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD3 0x1a30
#define USB_DEVICE_ID_ASUSTEK_ROG_Z13_LIGHTBAR 0x18c6
+#define USB_DEVICE_ID_ASUSTEK_ROG_RAIKIRI_PAD 0x1abb
#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY 0x1abe
#define USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD 0x196b
#define USB_DEVICE_ID_ASUSTEK_FX503VD_KEYBOARD 0x1869
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 6fadaddb2b90..3a5af0909233 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -209,6 +209,7 @@ static const struct xpad_device {
{ 0x0738, 0xf738, "Super SFIV FightStick TE S", 0, XTYPE_XBOX360 },
{ 0x07ff, 0xffff, "Mad Catz GamePad", 0, XTYPE_XBOX360 },
{ 0x0b05, 0x1a38, "ASUS ROG RAIKIRI", 0, XTYPE_XBOXONE },
+ { 0x0b05, 0x1abb, "ASUS ROG RAIKIRI PRO", 0, XTYPE_XBOXONE },
{ 0x0c12, 0x0005, "Intec wireless", 0, XTYPE_XBOX },
{ 0x0c12, 0x8801, "Nyko Xbox Controller", 0, XTYPE_XBOX },
{ 0x0c12, 0x8802, "Zeroplus Xbox Controller", 0, XTYPE_XBOX },
--
2.45.2

2024-06-07 23:41:32

by Dmitry Torokhov

Subject: Re: [PATCH] Input: xpad - add support for ASUS ROG RAIKIRI PRO

Hi Luke,

On Sat, Jun 08, 2024 at 10:37:22AM +1200, Luke D. Jones wrote:
> Add the VID/PID for ASUS ROG RAIKIRI PRO to
> xpad_device and the VID to xpad_table.
>
> Signed-off-by: Luke D. Jones <[email protected]>
> ---
> drivers/hid/hid-ids.h | 1 +
> drivers/input/joystick/xpad.c | 1 +
> 2 files changed, 2 insertions(+)
>
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index 61d2a21affa2..31c522fa4e87 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -209,6 +209,7 @@
> #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2 0x19b6
> #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD3 0x1a30
> #define USB_DEVICE_ID_ASUSTEK_ROG_Z13_LIGHTBAR 0x18c6
> +#define USB_DEVICE_ID_ASUSTEK_ROG_RAIKIRI_PAD 0x1abb
> #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY 0x1abe
> #define USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD 0x196b
> #define USB_DEVICE_ID_ASUSTEK_FX503VD_KEYBOARD 0x1869

This chunk is not needed, I dropped it and applied the rest.

> diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
> index 6fadaddb2b90..3a5af0909233 100644
> --- a/drivers/input/joystick/xpad.c
> +++ b/drivers/input/joystick/xpad.c
> @@ -209,6 +209,7 @@ static const struct xpad_device {
> { 0x0738, 0xf738, "Super SFIV FightStick TE S", 0, XTYPE_XBOX360 },
> { 0x07ff, 0xffff, "Mad Catz GamePad", 0, XTYPE_XBOX360 },
> { 0x0b05, 0x1a38, "ASUS ROG RAIKIRI", 0, XTYPE_XBOXONE },
> + { 0x0b05, 0x1abb, "ASUS ROG RAIKIRI PRO", 0, XTYPE_XBOXONE },
> { 0x0c12, 0x0005, "Intec wireless", 0, XTYPE_XBOX },
> { 0x0c12, 0x8801, "Nyko Xbox Controller", 0, XTYPE_XBOX },
> { 0x0c12, 0x8802, "Zeroplus Xbox Controller", 0, XTYPE_XBOX },
> --
> 2.45.2
>

Thanks.

--
Dmitry