| Message ID | 39428ed7f69bd06e3d93f730ba8f7b7b0a3f6c26.1369083628.git.chr.ohm@gmx.net (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Jiri Kosina |
| Headers | show |
On Tue, 21 May 2013, Christian Ohm wrote: > This mouse is sold as Sharkoon Drakonia and Perixx MX-2000 and reports a > too high usage maximum and logical maximum. This driver fixes the report > descriptor so those values don't exceed HID_MAX_USAGES. > > Signed-off-by: Christian Ohm <chr.ohm@gmx.net> > --- > drivers/hid/Kconfig | 1 + > drivers/hid/Makefile | 1 + > drivers/hid/hid-holtek-mouse.c | 72 ++++++++++++++++++++++++++++++++++++++++ > drivers/hid/hid-ids.h | 1 + > 4 files changed, 75 insertions(+) > create mode 100644 drivers/hid/hid-holtek-mouse.c You also need an entry in hid_have_special_driver[] for the devices in order for the device <-> driver binding work properly. I have applied your patches and fixed that omission.
On Tue, May 21, 2013 at 2:31 AM, Christian Ohm <chr.ohm@gmx.net> wrote: > This mouse is sold as Sharkoon Drakonia and Perixx MX-2000 and reports a > too high usage maximum and logical maximum. This driver fixes the report > descriptor so those values don't exceed HID_MAX_USAGES. Patch is already applied, but I think it worth to go through my nitpicks as well. > +++ b/drivers/hid/hid-holtek-mouse.c > @@ -0,0 +1,72 @@ > +/* > + * HID driver for Holtek gaming mice > + * Copyright (c) 2013 Christian Ohm > + * Heavily inspired by various other HID drivers that adjust the report > + * descriptor. > +*/ > + > +/* There is no need to break comments here. > + * This program is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License as published by the Free > + * Software Foundation; either version 2 of the License, or (at your option) > + * any later version. > + */ > +module_exit(holtek_mouse_exit); > +module_init(holtek_mouse_init); module_hid_driver() instead. -- With Best Regards, Andy Shevchenko -- 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
On Tuesday, 28 May 2013 at 12:20, Jiri Kosina wrote:
> I have applied your patches and fixed that omission.
I see the driver made it into Linus's tree. Thanks for applying, and the
fixes!
Best regards,
Christian Ohm
--
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
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index e7d6a13..d661a41 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -220,6 +220,7 @@ config HID_HOLTEK Support for Holtek based devices: - Holtek On Line Grip based game controller - Trust GXT 18 Gaming Keyboard + - Sharkoon Drakonia / Perixx MX-2000 gaming mice config HOLTEK_FF bool "Holtek On Line Grip force feedback support" diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index b622157..c39bfc4 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -50,6 +50,7 @@ obj-$(CONFIG_HID_ELECOM) += hid-elecom.o obj-$(CONFIG_HID_EZKEY) += hid-ezkey.o obj-$(CONFIG_HID_GYRATION) += hid-gyration.o obj-$(CONFIG_HID_HOLTEK) += hid-holtek-kbd.o +obj-$(CONFIG_HID_HOLTEK) += hid-holtek-mouse.o obj-$(CONFIG_HID_HOLTEK) += hid-holtekff.o obj-$(CONFIG_HID_HYPERV_MOUSE) += hid-hyperv.o obj-$(CONFIG_HID_ICADE) += hid-icade.o diff --git a/drivers/hid/hid-holtek-mouse.c b/drivers/hid/hid-holtek-mouse.c new file mode 100644 index 0000000..f32e29a --- /dev/null +++ b/drivers/hid/hid-holtek-mouse.c @@ -0,0 +1,72 @@ +/* + * HID driver for Holtek gaming mice + * Copyright (c) 2013 Christian Ohm + * Heavily inspired by various other HID drivers that adjust the report + * descriptor. +*/ + +/* + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. + */ + +#include <linux/hid.h> +#include <linux/module.h> +#include <linux/usb.h> + +#include "hid-ids.h" + +/* + * The report descriptor of some Holtek based gaming mice specifies an + * excessively large number of consumer usages (2^15), which is more than + * HID_MAX_USAGES. This prevents proper parsing of the report descriptor. + * + * This driver fixes the report descriptor for USB ID 04d9:a067, sold as + * Sharkoon Drakonia and Perixx MX-2000. + */ + +static __u8 *holtek_mouse_report_fixup(struct hid_device *hdev, __u8 *rdesc, + unsigned int *rsize) +{ + struct usb_interface *intf = to_usb_interface(hdev->dev.parent); + + if (intf->cur_altsetting->desc.bInterfaceNumber == 1) { + /* Change usage maximum and logical maximum from 0x7fff to + * 0x2fff, so they don't exceed HID_MAX_USAGES */ + if (*rsize >= 122 && rdesc[115] == 0xff && rdesc[116] == 0x7f + && rdesc[120] == 0xff && rdesc[121] == 0x7f) { + hid_info(hdev, "Fixing up report descriptor\n"); + rdesc[116] = rdesc[121] = 0x2f; + } + } + return rdesc; +} + +static const struct hid_device_id holtek_mouse_devices[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, + USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067) }, + { } +}; +MODULE_DEVICE_TABLE(hid, holtek_mouse_devices); + +static struct hid_driver holtek_mouse_driver = { + .name = "holtek_mouse", + .id_table = holtek_mouse_devices, + .report_fixup = holtek_mouse_report_fixup, +}; + +static int __init holtek_mouse_init(void) +{ + return hid_register_driver(&holtek_mouse_driver); +} + +static void __exit holtek_mouse_exit(void) +{ + hid_unregister_driver(&holtek_mouse_driver); +} + +module_exit(holtek_mouse_exit); +module_init(holtek_mouse_init); +MODULE_LICENSE("GPL"); diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 160a309..00f7ba9 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -435,6 +435,7 @@ #define USB_VENDOR_ID_HOLTEK_ALT 0x04d9 #define USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD 0xa055 +#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067 0xa067 #define USB_VENDOR_ID_IMATION 0x0718 #define USB_DEVICE_ID_DISC_STAKKA 0xd000
This mouse is sold as Sharkoon Drakonia and Perixx MX-2000 and reports a too high usage maximum and logical maximum. This driver fixes the report descriptor so those values don't exceed HID_MAX_USAGES. Signed-off-by: Christian Ohm <chr.ohm@gmx.net> --- drivers/hid/Kconfig | 1 + drivers/hid/Makefile | 1 + drivers/hid/hid-holtek-mouse.c | 72 ++++++++++++++++++++++++++++++++++++++++ drivers/hid/hid-ids.h | 1 + 4 files changed, 75 insertions(+) create mode 100644 drivers/hid/hid-holtek-mouse.c