Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-31 23:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

HID: Add support for Holtek gaming mouse 04d9:a04a

Browse Source 
This mouse is sold as Tracer Sniper TRM-503, NOVA Gaming Slider X200 and
Zalman ZM-GM1, and reports too high usage maximum and logical maximum
(like 04d9:a067, but its report descriptor is different). This patch
adds its USB ID and fixes the report descriptor in the same way.

Note: I don't actually have such a mouse to test, I took the report
descriptor posted at https://bugzilla.novell.com/show_bug.cgi?id=774676,
compared it to the one from 04d9:a067 and changed the offsets
accordingly (all numbers minus 9, since it is 9 bytes shorter, and the
difference is before the values that need changing). That Surely Works™.

Signed-off-by: Christian Ohm <chr.ohm@gmx.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Christian Ohm 2013-05-21 01:31:09 +02:00 committed by Jiri Kosina
parent 41de326eaf
commit d4f5189052
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/hid/Kconfig
View File

@ -232,6 +232,8 @@ config HID_HOLTEK
- Holtek On Line Grip based game controller - Holtek On Line Grip based game controller
- Trust GXT 18 Gaming Keyboard - Trust GXT 18 Gaming Keyboard
- Sharkoon Drakonia / Perixx MX-2000 gaming mice - Sharkoon Drakonia / Perixx MX-2000 gaming mice
- Tracer Sniper TRM-503 / NOVA Gaming Slider X200 /
Zalman ZM-GM1
config HOLTEK_FF config HOLTEK_FF
bool "Holtek On Line Grip force feedback support" bool "Holtek On Line Grip force feedback support"

28
drivers/hid/hid-holtek-mouse.c
View File

@ -23,8 +23,10 @@
* excessively large number of consumer usages (2^15), which is more than * excessively large number of consumer usages (2^15), which is more than
* HID_MAX_USAGES. This prevents proper parsing of the report descriptor. * HID_MAX_USAGES. This prevents proper parsing of the report descriptor.
* *
* This driver fixes the report descriptor for USB ID 04d9:a067, sold as * This driver fixes the report descriptor for:
* Sharkoon Drakonia and Perixx MX-2000. * - USB ID 04d9:a067, sold as Sharkoon Drakonia and Perixx MX-2000
* - USB ID 04d9:a04a, sold as Tracer Sniper TRM-503, NOVA Gaming Slider X200
* and Zalman ZM-GM1
*/ */
static __u8 *holtek_mouse_report_fixup(struct hid_device *hdev, __u8 *rdesc, static __u8 *holtek_mouse_report_fixup(struct hid_device *hdev, __u8 *rdesc,
@ -35,11 +37,23 @@ static __u8 *holtek_mouse_report_fixup(struct hid_device *hdev, __u8 *rdesc,
if (intf->cur_altsetting->desc.bInterfaceNumber == 1) { if (intf->cur_altsetting->desc.bInterfaceNumber == 1) {
/* Change usage maximum and logical maximum from 0x7fff to /* Change usage maximum and logical maximum from 0x7fff to
* 0x2fff, so they don't exceed HID_MAX_USAGES */ * 0x2fff, so they don't exceed HID_MAX_USAGES */
if (*rsize >= 122 && rdesc[115] == 0xff && rdesc[116] == 0x7f switch (hdev->product) {
&& rdesc[120] == 0xff && rdesc[121] == 0x7f) { case USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067:
hid_info(hdev, "Fixing up report descriptor\n"); if (*rsize >= 122 && rdesc[115] == 0xff && rdesc[116] == 0x7f
rdesc[116] = rdesc[121] = 0x2f; && rdesc[120] == 0xff && rdesc[121] == 0x7f) {
hid_info(hdev, "Fixing up report descriptor\n");
rdesc[116] = rdesc[121] = 0x2f;
}
break;
case USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A:
if (*rsize >= 113 && rdesc[106] == 0xff && rdesc[107] == 0x7f
&& rdesc[111] == 0xff && rdesc[112] == 0x7f) {
hid_info(hdev, "Fixing up report descriptor\n");
rdesc[107] = rdesc[112] = 0x2f;
}
break;
} }
} }
return rdesc; return rdesc;
} }
@ -47,6 +61,8 @@ static __u8 *holtek_mouse_report_fixup(struct hid_device *hdev, __u8 *rdesc,
static const struct hid_device_id holtek_mouse_devices[] = { static const struct hid_device_id holtek_mouse_devices[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT,
USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067) }, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067) },
{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT,
USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A) },
{ } { }
}; };
MODULE_DEVICE_TABLE(hid, holtek_mouse_devices); MODULE_DEVICE_TABLE(hid, holtek_mouse_devices);

1
drivers/hid/hid-ids.h
View File

@ -441,6 +441,7 @@
#define USB_VENDOR_ID_HOLTEK_ALT 0x04d9 #define USB_VENDOR_ID_HOLTEK_ALT 0x04d9
#define USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD 0xa055 #define USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD 0xa055
#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067 0xa067 #define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067 0xa067
#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A 0xa04a
#define USB_VENDOR_ID_IMATION 0x0718 #define USB_VENDOR_ID_IMATION 0x0718
#define USB_DEVICE_ID_DISC_STAKKA 0xd000 #define USB_DEVICE_ID_DISC_STAKKA 0xd000