Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bb9d643 authored by Ville Aakko's avatar Ville Aakko Committed by Jiri Kosina
Browse files

HID: saitek: quirk for Saitek R.A.T.7 works with R.A.T.9 too 



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: default avatarVille Aakko <ville.aakko@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 6354b7e2

drivers/hid/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -629,7 +629,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
@@ -637,6 +637,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

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1906,6 +1906,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ 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) },

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -617,6 +617,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

drivers/hid/hid-saitek.c

+3 −1
Original line number Diff line number Diff line
@@ -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_devices[] = { 
		.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 },

	{ }