Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: Add support for CH Pro Throttle
HID: hid-magicmouse: Increase evdev buffer size
HID: add FF support for Logitech G25/G27
HID: roccat: Add support for wireless variant of Pyra
HID: Fix typo Keyoutch -> Keytouch
HID: add support for Skycable 0x3f07 wireless presenter
+36
-7
+10
-3
drivers/hid/Kconfig
+10
-3
drivers/hid/Kconfig
···
185
185
Support for Ezkey BTC 8193 keyboard.
186
186
187
187
config HID_KEYTOUCH
188
-
tristate "Keyoutch HID devices"
188
+
tristate "Keytouch HID devices"
189
189
depends on USB_HID
190
190
---help---
191
191
Support for Keytouch HID devices not fully compliant with
···
340
340
Support for N-Trig touch screen.
341
341
342
342
config HID_ORTEK
343
-
tristate "Ortek PKB-1700/WKB-2000 wireless keyboard and mouse trackpad"
343
+
tristate "Ortek PKB-1700/WKB-2000/Skycable wireless keyboard and mouse trackpad"
344
344
depends on USB_HID
345
345
---help---
346
-
Support for Ortek PKB-1700/WKB-2000 wireless keyboard + mouse trackpad.
346
+
There are certain devices which have LogicalMaximum wrong in the keyboard
347
+
usage page of their report descriptor. The most prevailing ones so far
348
+
are manufactured by Ortek, thus the name of the driver. Currently
349
+
supported devices by this driver are
350
+
351
+
- Ortek PKB-1700
352
+
- Ortek WKB-2000
353
+
- Skycable wireless presenter
347
354
348
355
config HID_PANTHERLORD
349
356
tristate "Pantherlord/GreenAsia game controller"
+2
drivers/hid/hid-core.c
+2
drivers/hid/hid-core.c
···
1449
1449
{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPLUS) },
1450
1450
{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KOVAPLUS) },
1451
1451
{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_PYRA_WIRED) },
1452
+
{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_PYRA_WIRELESS) },
1452
1453
{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
1453
1454
{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) },
1455
+
{ HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) },
1454
1456
{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
1455
1457
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
1456
1458
{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
+4
drivers/hid/hid-ids.h
+4
drivers/hid/hid-ids.h
···
150
150
#define USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6 0x0f01
151
151
152
152
#define USB_VENDOR_ID_CH 0x068e
153
+
#define USB_DEVICE_ID_CH_PRO_THROTTLE 0x00f1
153
154
#define USB_DEVICE_ID_CH_PRO_PEDALS 0x00f2
154
155
#define USB_DEVICE_ID_CH_COMBATSTICK 0x00f4
155
156
#define USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE 0x0051
···
524
523
#define USB_VENDOR_ID_SAMSUNG 0x0419
525
524
#define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001
526
525
#define USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE 0x0600
526
+
527
+
#define USB_VENDOR_ID_SKYCABLE 0x1223
528
+
#define USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER 0x3F07
527
529
528
530
#define USB_VENDOR_ID_SONY 0x054c
529
531
#define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE 0x024b
+2
drivers/hid/hid-lgff.c
+2
drivers/hid/hid-lgff.c
+2
drivers/hid/hid-magicmouse.c
+2
drivers/hid/hid-magicmouse.c
+13
-3
drivers/hid/hid-ortek.c
+13
-3
drivers/hid/hid-ortek.c
···
1
1
/*
2
-
* HID driver for Ortek PKB-1700/WKB-2000 (wireless keyboard + mouse trackpad).
3
-
* Fixes LogicalMaximum error in HID report description.
2
+
* HID driver for various devices which are apparently based on the same chipset
3
+
* from certain vendor which produces chips that contain wrong LogicalMaximum
4
+
* value in their HID report descriptor. Currently supported devices are:
5
+
*
6
+
* Ortek PKB-1700
7
+
* Ortek WKB-2000
8
+
* Skycable wireless presenter
4
9
*
5
10
* Copyright (c) 2010 Johnathon Harris <jmharris@gmail.com>
11
+
* Copyright (c) 2011 Jiri Kosina
6
12
*/
7
13
8
14
/*
···
28
22
unsigned int *rsize)
29
23
{
30
24
if (*rsize >= 56 && rdesc[54] == 0x25 && rdesc[55] == 0x01) {
31
-
hid_info(hdev, "Fixing up Ortek WKB-2000 report descriptor\n");
25
+
hid_info(hdev, "Fixing up logical minimum in report descriptor (Ortek)\n");
32
26
rdesc[55] = 0x92;
27
+
} else if (*rsize >= 54 && rdesc[52] == 0x25 && rdesc[53] == 0x01) {
28
+
hid_info(hdev, "Fixing up logical minimum in report descriptor (Skycable)\n");
29
+
rdesc[53] = 0x65;
33
30
}
34
31
return rdesc;
35
32
}
···
40
31
static const struct hid_device_id ortek_devices[] = {
41
32
{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) },
42
33
{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
34
+
{ HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) },
43
35
{ }
44
36
};
45
37
MODULE_DEVICE_TABLE(hid, ortek_devices);
+2
-1
drivers/hid/hid-roccat-pyra.c
+2
-1
drivers/hid/hid-roccat-pyra.c
···
652
652
static const struct hid_device_id pyra_devices[] = {
653
653
{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT,
654
654
USB_DEVICE_ID_ROCCAT_PYRA_WIRED) },
655
-
/* TODO add USB_DEVICE_ID_ROCCAT_PYRA_WIRELESS after testing */
655
+
{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT,
656
+
USB_DEVICE_ID_ROCCAT_PYRA_WIRELESS) },
656
657
{ }
657
658
};
658
659
+1
drivers/hid/usbhid/hid-quirks.c
+1
drivers/hid/usbhid/hid-quirks.c
···
59
59
{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_COMBATSTICK, HID_QUIRK_NOGET },
60
60
{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE, HID_QUIRK_NOGET },
61
61
{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE, HID_QUIRK_NOGET },
62
+
{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_PRO_THROTTLE, HID_QUIRK_NOGET },
62
63
{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_PRO_PEDALS, HID_QUIRK_NOGET },
63
64
{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_3AXIS_5BUTTON_STICK, HID_QUIRK_NOGET },
64
65
{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET },