* Re: [PATCH 1/1] hid-saitek: Quirk for Saitek R.A.T.7 works with R.A.T.9 too
2014-11-04 18:49 ` [PATCH 1/1] hid-saitek: Quirk " Ville Aakko
@ 2014-11-04 19:20 ` Ville Aakko
2014-11-05 14:15 ` Jiri Kosina
0 siblings, 1 reply; 5+ messages in thread
From: Ville Aakko @ 2014-11-04 19:20 UTC (permalink / raw)
To: Harald Brinkmann; +Cc: jkosina, linux-input, trivial
From: Ville Aakko <ville.aakko@gmail.com>
I have tested HID quirk for Saitek R.A.T.7 with my R.A.T. 9. It works fine for me. Attached patch makes the necessary changes to use the quirk on the R.A.T.9 too, and necessary Kconfig changes too.
I have stylized the Kconfig option name to include Mad Catz in the option name, as (at least some of) the devices are marketed under Mad Catz brand.
Signed-off-by: Ville Aakko <ville.aakko@gmail.com>
---
Sorry, the previous patch was malformed (sorry about the noise). This one should apply cleanly.
Cheers!
diff -uprN linux-3.17.2/drivers/hid/Kconfig linux-3.17.2-rat9/drivers/hid/Kconfig
--- linux-3.17.2/drivers/hid/Kconfig 2014-10-30 18:43:25.000000000 +0200
+++ linux-3.17.2-rat9/drivers/hid/Kconfig 2014-11-04 20:23:58.165740493 +0200
@@ -618,7 +618,7 @@ config HID_ROCCAT
support for its special functionalities.
config HID_SAITEK
- tristate "Saitek non-fully HID-compliant devices"
+ tristate "Saitek (Mad Catz) non-fully HID-compliant devices"
depends on HID
---help---
Support for Saitek devices that are not fully compliant with the
@@ -626,6 +626,7 @@ config HID_SAITEK
Supported devices:
- PS1000 Dual Analog Pad
+ - R.A.T.9 Gaming Mouse
- R.A.T.7 Gaming Mouse
- M.M.O.7 Gaming Mouse
diff -uprN linux-3.17.2/drivers/hid/hid-core.c linux-3.17.2-rat9/drivers/hid/hid-core.c
--- linux-3.17.2/drivers/hid/hid-core.c 2014-10-30 18:43:25.000000000 +0200
+++ linux-3.17.2-rat9/drivers/hid/hid-core.c 2014-11-04 20:20:21.765611510 +0200
@@ -1904,6 +1904,7 @@ static const struct hid_device_id hid_ha
{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_PS1000) },
{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RAT7) },
{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_MMO7) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_RAT9) },
#endif
{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) },
diff -uprN linux-3.17.2/drivers/hid/hid-ids.h linux-3.17.2-rat9/drivers/hid/hid-ids.h
--- linux-3.17.2/drivers/hid/hid-ids.h 2014-10-30 18:43:25.000000000 +0200
+++ linux-3.17.2-rat9/drivers/hid/hid-ids.h 2014-11-04 20:20:21.765611510 +0200
@@ -613,6 +613,7 @@
#define USB_VENDOR_ID_MADCATZ 0x0738
#define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540
+#define USB_DEVICE_ID_MADCATZ_RAT9 0x1709
#define USB_VENDOR_ID_MCC 0x09db
#define USB_DEVICE_ID_MCC_PMD1024LS 0x0076
diff -uprN linux-3.17.2/drivers/hid/hid-saitek.c linux-3.17.2-rat9/drivers/hid/hid-saitek.c
--- linux-3.17.2/drivers/hid/hid-saitek.c 2014-10-30 18:43:25.000000000 +0200
+++ linux-3.17.2-rat9/drivers/hid/hid-saitek.c 2014-11-04 20:27:10.966164105 +0200
@@ -7,7 +7,7 @@
* (This module is based on "hid-ortek".)
* Copyright (c) 2012 Andreas Hübner
*
- * R.A.T.7, M.M.O.7 (USB gaming mice):
+ * R.A.T.7, R.A.T.9, M.M.O.7 (USB gaming mice):
* Fixes the mode button which cycles through three constantly pressed
* buttons. All three press events are mapped to one button and the
* missing release event is generated immediately.
@@ -179,6 +179,8 @@ static const struct hid_device_id saitek
.driver_data = SAITEK_FIX_PS1000 },
{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RAT7),
.driver_data = SAITEK_RELEASE_MODE_RAT7 },
+ { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_RAT9),
+ .driver_data = SAITEK_RELEASE_MODE_RAT7 },
{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_MMO7),
.driver_data = SAITEK_RELEASE_MODE_MMO7 },
{ }
--
Ville Aakko <ville.aakko@gmail.com> kirjoitti 4.11.2014 kello 20.49:
> From: Ville Aakko <ville.aakko@gmail.com>
>
> I have tested HID quirk for Saitek R.A.T.7 with my R.A.T. 9. It works fine for me. Attached patch makes the necessary changes to use the quirk on the R.A.T.9 too, and necessary Kconfig changes too.
>
> I have stylized the Kconfig option name to include Mad Catz in the option name, as (at least some of) the devices are marketed under Mad Catz brand.
>
> Signed-off-by: Ville Aakko <ville.aakko@gmail.com>
> ---
> Hi, another try on sending the patch! (the patch follows in body, with intact whitespace I hope:)
>
> No one else has tested this, but it seems quite trivial to me. (original commit 37c492c8f6a99870551fe2964b2dfce5d9e87375; " HID: quirk for Saitek RAT7 and MMO7 mices' mode button ”).
>
> As for the company name, Saitek is a subsidiary of Mad Catz (see http://en.wikipedia.org/wiki/Saitek). The mice are marketed under Mad Catz brand, but there may be historical reasons (unclear to me) why the module is called hid-saitek, however.
>
> Cheers!
>
> diff -uprN linux-3.17.2/drivers/hid/Kconfig linux-3.17.2-rat9/drivers/hid/Kconfig
> --- linux-3.17.2/drivers/hid/Kconfig 2014-10-30 18:43:25.000000000 +0200
> +++ linux-3.17.2-rat9/drivers/hid/Kconfig 2014-11-04 20:23:58.165740493 +0200
> @@ -618,7 +618,7 @@ config HID_ROCCAT
> support for its special functionalities.
>
> config HID_SAITEK
> - tristate "Saitek non-fully HID-compliant devices"
> + tristate "Saitek (Mad Catz) non-fully HID-compliant devices"
> depends on HID
> ---help---
> Support for Saitek devices that are not fully compliant with the
> @@ -626,6 +626,7 @@ config HID_SAITEK
>
> Supported devices:
> - PS1000 Dual Analog Pad
> + - R.A.T.9 Gaming Mouse
> - R.A.T.7 Gaming Mouse
> - M.M.O.7 Gaming Mouse
>
> diff -uprN linux-3.17.2/drivers/hid/hid-core.c linux-3.17.2-rat9/drivers/hid/hid-core.c
> --- linux-3.17.2/drivers/hid/hid-core.c 2014-10-30 18:43:25.000000000 +0200
> +++ linux-3.17.2-rat9/drivers/hid/hid-core.c 2014-11-04 20:20:21.765611510 +0200
> @@ -1904,6 +1904,7 @@ static const struct hid_device_id hid_ha
> { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_PS1000) },
> { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RAT7) },
> { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_MMO7) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_RAT9) },
> #endif
> { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
> { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) },
> diff -uprN linux-3.17.2/drivers/hid/hid-ids.h linux-3.17.2-rat9/drivers/hid/hid-ids.h
> --- linux-3.17.2/drivers/hid/hid-ids.h 2014-10-30 18:43:25.000000000 +0200
> +++ linux-3.17.2-rat9/drivers/hid/hid-ids.h 2014-11-04 20:20:21.765611510 +0200
> @@ -613,6 +613,7 @@
>
> #define USB_VENDOR_ID_MADCATZ 0x0738
> #define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540
> +#define USB_DEVICE_ID_MADCATZ_RAT9 0x1709
>
> #define USB_VENDOR_ID_MCC 0x09db
> #define USB_DEVICE_ID_MCC_PMD1024LS 0x0076
> diff -uprN linux-3.17.2/drivers/hid/hid-saitek.c linux-3.17.2-rat9/drivers/hid/hid-saitek.c
> --- linux-3.17.2/drivers/hid/hid-saitek.c 2014-10-30 18:43:25.000000000 +0200
> +++ linux-3.17.2-rat9/drivers/hid/hid-saitek.c 2014-11-04 20:27:10.966164105 +0200
> @@ -7,7 +7,7 @@
> * (This module is based on "hid-ortek".)
> * Copyright (c) 2012 Andreas Hübner
> *
> - * R.A.T.7, M.M.O.7 (USB gaming mice):
> + * R.A.T.7, R.A.T.9, M.M.O.7 (USB gaming mice):
> * Fixes the mode button which cycles through three constantly pressed
> * buttons. All three press events are mapped to one button and the
> * missing release event is generated immediately.
> @@ -179,6 +179,8 @@ static const struct hid_device_id saitek
> .driver_data = SAITEK_FIX_PS1000 },
> { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RAT7),
> .driver_data = SAITEK_RELEASE_MODE_RAT7 },
> + { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_RAT9),
> + .driver_data = SAITEK_RELEASE_MODE_RAT7 },
> { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_MMO7),
> .driver_data = SAITEK_RELEASE_MODE_MMO7 },
> { }
> ---
>
>
> Harald Brinkmann <hbrinkmann@braincalibration.de> kirjoitti 4.11.2014 kello 3.01:
>
>> On 11/02/2014 03:37 PM, Ville Aakko wrote:
>>> p.s. I have never submitted patches, I apologize if I have done something in a
>>> wrong way! Should I have added / updated the description in the comments?
>>
>> I think you should update linux/drivers/hid/Kconfig and add the R.A.T.9
>> to the list of supported devices in the HID_SAITEK section.
>>
>> --
>> Cheers,
>> Harald
>
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 5+ messages in thread