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

Commit cd9ec30d authored by Johnathon Harris's avatar Johnathon Harris Committed by Jiri Kosina
Browse files

HID: add support for Ortek WKB-2000 

This patch adds a new USB HID driver for the Ortek WKB-2000, working around an
incorrect LogicalMaximum value in the USB resource descriptor.

Tracked by http://bugzilla.kernel.org/show_bug.cgi?id=14787
Bug originally reported by Ubuntu users: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/405390



Signed-off-by: default avatarJohnathon Harris <jmharris@gmail.com>
Tested-by: default avatarDaniel J Blueman <daniel.blueman@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 8b0e58a7

drivers/hid/Kconfig

+7 −0
Original line number Original line Diff line number Diff line
@@ -218,6 +218,13 @@ config HID_NTRIG 
	---help---

	---help---

	Support for N-Trig touch screen.

	Support for N-Trig touch screen.





config HID_ORTEK

	tristate "Ortek" if EMBEDDED

	depends on USB_HID

	default !EMBEDDED

	---help---

	Support for Ortek WKB-2000 wireless keyboard + mouse trackpad.



config HID_PANTHERLORD

config HID_PANTHERLORD

	tristate "Pantherlord support" if EMBEDDED

	tristate "Pantherlord support" if EMBEDDED

	depends on USB_HID

	depends on USB_HID

drivers/hid/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -38,6 +38,7 @@ obj-$(CONFIG_HID_LOGITECH) += hid-logitech.o 
obj-$(CONFIG_HID_MICROSOFT)	+= hid-microsoft.o

obj-$(CONFIG_HID_MICROSOFT)	+= hid-microsoft.o

obj-$(CONFIG_HID_MONTEREY)	+= hid-monterey.o

obj-$(CONFIG_HID_MONTEREY)	+= hid-monterey.o

obj-$(CONFIG_HID_NTRIG)		+= hid-ntrig.o

obj-$(CONFIG_HID_NTRIG)		+= hid-ntrig.o

obj-$(CONFIG_HID_ORTEK)		+= hid-ortek.o

obj-$(CONFIG_HID_QUANTA)	+= hid-quanta.o

obj-$(CONFIG_HID_QUANTA)	+= hid-quanta.o

obj-$(CONFIG_HID_PANTHERLORD)	+= hid-pl.o

obj-$(CONFIG_HID_PANTHERLORD)	+= hid-pl.o

obj-$(CONFIG_HID_PETALYNX)	+= hid-petalynx.o

obj-$(CONFIG_HID_PETALYNX)	+= hid-petalynx.o

drivers/hid/hid-core.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1337,6 +1337,7 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },

drivers/hid/hid-ids.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -363,6 +363,9 @@ 
#define USB_VENDOR_ID_ONTRAK		0x0a07

#define USB_VENDOR_ID_ONTRAK		0x0a07

#define USB_DEVICE_ID_ONTRAK_ADU100	0x0064

#define USB_DEVICE_ID_ONTRAK_ADU100	0x0064





#define USB_VENDOR_ID_ORTEK		0x05a4

#define USB_DEVICE_ID_ORTEK_WKB2000	0x2000



#define USB_VENDOR_ID_PANJIT		0x134c

#define USB_VENDOR_ID_PANJIT		0x134c





#define USB_VENDOR_ID_PANTHERLORD	0x0810

#define USB_VENDOR_ID_PANTHERLORD	0x0810

drivers/hid/hid-ortek.c

0 → 100644
+56 −0
Original line number Original line Diff line number Diff line 
/*

 *  HID driver for Ortek WKB-2000 (wireless keyboard + mouse trackpad).

 *  Fixes LogicalMaximum error in USB report description, see

 *  http://bugzilla.kernel.org/show_bug.cgi?id=14787

 *

 *  Copyright (c) 2010 Johnathon Harris <jmharris@gmail.com>

 */



/*

 * 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/device.h>

#include <linux/hid.h>

#include <linux/module.h>



#include "hid-ids.h"



static void ortek_report_fixup(struct hid_device *hdev, __u8 *rdesc,

		unsigned int rsize)

{

	if (rsize >= 56 && rdesc[54] == 0x25 && rdesc[55] == 0x01) {

		dev_info(&hdev->dev, "Fixing up Ortek WKB-2000 "

				"report descriptor.\n");

		rdesc[55] = 0x92;

	}

}



static const struct hid_device_id ortek_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },

	{ }

};

MODULE_DEVICE_TABLE(hid, ortek_devices);



static struct hid_driver ortek_driver = {

	.name = "ortek",

	.id_table = ortek_devices,

	.report_fixup = ortek_report_fixup

};



static int __init ortek_init(void)

{

	return hid_register_driver(&ortek_driver);

}



static void __exit ortek_exit(void)

{

	hid_unregister_driver(&ortek_driver);

}



module_init(ortek_init);

module_exit(ortek_exit);

MODULE_LICENSE("GPL");