Skip to content

Commit f62f619

Browse files
torvaldstorvalds
committed
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: (68 commits) hid-input/battery: add FEATURE quirk hid-input/battery: remove battery_val hid-input/battery: power-supply type really *is* a battery hid-input/battery: make the battery setup common for INPUTs and FEATUREs hid-input/battery: deal with both FEATURE and INPUT report batteries hid-input/battery: add quirks for battery hid-input/battery: remove apparently redundant kmalloc hid-input: add support for HID devices reporting Battery Strength HID: hid-multitouch: add support 9 new Xiroku devices HID: multitouch: add support for 3M 32" HID: multitouch: add support of Atmel multitouch panels HID: usbhid: defer LED setting to a workqueue HID: usbhid: hid-core: submit queued urbs before suspend HID: usbhid: remove LED_ON HID: emsff: use symbolic name instead of hardcoded PID constant HID: Enable HID_QUIRK_MULTI_INPUT for Trio Linker Plus II HID: Kconfig: fix syntax HID: introduce proper dependency of HID_BATTERY on POWER_SUPPLY HID: multitouch: support PixArt optical touch screen HID: make parser more verbose about parsing errors by default ... Fix up rename/delete conflict in drivers/hid/hid-hyperv.c (removed in staging, moved in this branch) and similarly for the rules for same file in drivers/staging/hv/{Kconfig,Makefile}.
2 parents d04baa1 + 420174a commit f62f619

30 files changed

+3592
-631
lines changed

‎Documentation/ABI/testing/sysfs-driver-hid-multitouch‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/quirks
2+
Date: November 2011
3+
Contact: Benjamin Tissoires <[email protected]>
4+
Description: The integer value of this attribute corresponds to the
5+
quirks actually in place to handle the device's protocol.
6+
When read, this attribute returns the current settings (see
7+
MT_QUIRKS_* in hid-multitouch.c).
8+
When written this attribute change on the fly the quirks, then
9+
the protocol to handle the device.

‎Documentation/ABI/testing/sysfs-driver-hid-roccat-isku‎

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/actual_profile
2+
Date: June 2011
3+
Contact: Stefan Achatz <[email protected]>
4+
Description: The integer value of this attribute ranges from 0-4.
5+
When read, this attribute returns the number of the actual
6+
profile. This value is persistent, so its equivalent to the
7+
profile that's active when the device is powered on next time.
8+
When written, this file sets the number of the startup profile
9+
and the device activates this profile immediately.
10+
Users: http://roccat.sourceforge.net
11+
12+
What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/info
13+
Date: June 2011
14+
Contact: Stefan Achatz <[email protected]>
15+
Description: When read, this file returns general data like firmware version.
16+
The data is 6 bytes long.
17+
This file is readonly.
18+
Users: http://roccat.sourceforge.net
19+
20+
What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/key_mask
21+
Date: June 2011
22+
Contact: Stefan Achatz <[email protected]>
23+
Description: When written, this file lets one deactivate certain keys like
24+
windows and application keys, to prevent accidental presses.
25+
Profile number for which this settings occur is included in
26+
written data. The data has to be 6 bytes long.
27+
Before reading this file, control has to be written to select
28+
which profile to read.
29+
Users: http://roccat.sourceforge.net
30+
31+
What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_capslock
32+
Date: June 2011
33+
Contact: Stefan Achatz <[email protected]>
34+
Description: When written, this file lets one set the function of the
35+
capslock key for a specific profile. Profile number is included
36+
in written data. The data has to be 6 bytes long.
37+
Before reading this file, control has to be written to select
38+
which profile to read.
39+
Users: http://roccat.sourceforge.net
40+
41+
What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_easyzone
42+
Date: June 2011
43+
Contact: Stefan Achatz <[email protected]>
44+
Description: When written, this file lets one set the function of the
45+
easyzone keys for a specific profile. Profile number is included
46+
in written data. The data has to be 65 bytes long.
47+
Before reading this file, control has to be written to select
48+
which profile to read.
49+
Users: http://roccat.sourceforge.net
50+
51+
What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_function
52+
Date: June 2011
53+
Contact: Stefan Achatz <[email protected]>
54+
Description: When written, this file lets one set the function of the
55+
function keys for a specific profile. Profile number is included
56+
in written data. The data has to be 41 bytes long.
57+
Before reading this file, control has to be written to select
58+
which profile to read.
59+
Users: http://roccat.sourceforge.net
60+
61+
What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_macro
62+
Date: June 2011
63+
Contact: Stefan Achatz <[email protected]>
64+
Description: When written, this file lets one set the function of the macro
65+
keys for a specific profile. Profile number is included in
66+
written data. The data has to be 35 bytes long.
67+
Before reading this file, control has to be written to select
68+
which profile to read.
69+
Users: http://roccat.sourceforge.net
70+
71+
What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_media
72+
Date: June 2011
73+
Contact: Stefan Achatz <[email protected]>
74+
Description: When written, this file lets one set the function of the media
75+
keys for a specific profile. Profile number is included in
76+
written data. The data has to be 29 bytes long.
77+
Before reading this file, control has to be written to select
78+
which profile to read.
79+
Users: http://roccat.sourceforge.net
80+
81+
What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_thumbster
82+
Date: June 2011
83+
Contact: Stefan Achatz <[email protected]>
84+
Description: When written, this file lets one set the function of the
85+
thumbster keys for a specific profile. Profile number is included
86+
in written data. The data has to be 23 bytes long.
87+
Before reading this file, control has to be written to select
88+
which profile to read.
89+
Users: http://roccat.sourceforge.net
90+
91+
What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/last_set
92+
Date: June 2011
93+
Contact: Stefan Achatz <[email protected]>
94+
Description: When written, this file lets one set the time in secs since
95+
epoch in which the last configuration took place.
96+
The data has to be 20 bytes long.
97+
Users: http://roccat.sourceforge.net
98+
99+
What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/light
100+
Date: June 2011
101+
Contact: Stefan Achatz <[email protected]>
102+
Description: When written, this file lets one set the backlight intensity for
103+
a specific profile. Profile number is included in written data.
104+
The data has to be 10 bytes long.
105+
Before reading this file, control has to be written to select
106+
which profile to read.
107+
Users: http://roccat.sourceforge.net
108+
109+
What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/macro
110+
Date: June 2011
111+
Contact: Stefan Achatz <[email protected]>
112+
Description: When written, this file lets one store macros with max 500
113+
keystrokes for a specific button for a specific profile.
114+
Button and profile numbers are included in written data.
115+
The data has to be 2083 bytes long.
116+
Before reading this file, control has to be written to select
117+
which profile and key to read.
118+
Users: http://roccat.sourceforge.net
119+
120+
What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/control
121+
Date: June 2011
122+
Contact: Stefan Achatz <[email protected]>
123+
Description: When written, this file lets one select which data from which
124+
profile will be read next. The data has to be 3 bytes long.
125+
This file is writeonly.
126+
Users: http://roccat.sourceforge.net
127+
128+
What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/talk
129+
Date: June 2011
130+
Contact: Stefan Achatz <[email protected]>
131+
Description: When written, this file lets one trigger easyshift functionality
132+
from the host.
133+
The data has to be 16 bytes long.
134+
This file is writeonly.
135+
Users: http://roccat.sourceforge.net

‎Documentation/ABI/testing/sysfs-driver-hid-wiimote‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,15 @@ Contact: David Herrmann <[email protected]>
88
Description: Make it possible to set/get current led state. Reading from it
99
returns 0 if led is off and 1 if it is on. Writing 0 to it
1010
disables the led, writing 1 enables it.
11+
12+
What: /sys/bus/hid/drivers/wiimote/<dev>/extension
13+
Date: August 2011
14+
KernelVersion: 3.2
15+
Contact: David Herrmann <[email protected]>
16+
Description: This file contains the currently connected and initialized
17+
extensions. It can be one of: none, motionp, nunchuck, classic,
18+
motionp+nunchuck, motionp+classic
19+
motionp is the official Nintendo Motion+ extension, nunchuck is
20+
the official Nintendo Nunchuck extension and classic is the
21+
Nintendo Classic Controller extension. The motionp extension can
22+
be combined with the other two.

‎drivers/hid/Kconfig‎

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ config HID
3131

3232
If unsure, say Y.
3333

34+
config HID_BATTERY_STRENGTH
35+
bool
36+
depends on HID && POWER_SUPPLY && HID = POWER_SUPPLY
37+
default y
38+
3439
config HIDRAW
3540
bool "/dev/hidraw raw HID device support"
3641
depends on HID
@@ -335,6 +340,7 @@ config HID_MULTITOUCH
335340
Say Y here if you have one of the following devices:
336341
- 3M PCT touch screens
337342
- ActionStar dual touch panels
343+
- Atmel panels
338344
- Cando dual touch panels
339345
- Chunghwa panels
340346
- CVTouch panels
@@ -349,12 +355,15 @@ config HID_MULTITOUCH
349355
- Lumio CrystalTouch panels
350356
- MosArt dual-touch panels
351357
- PenMount dual touch panels
358+
- PixArt optical touch screen
352359
- Pixcir dual touch panels
360+
- Quanta panels
353361
- eGalax dual-touch panels, including the Joojoo and Wetab tablets
354362
- Stantum multitouch panels
355363
- Touch International Panels
356364
- Unitec Panels
357365
- XAT optical touch panels
366+
- Xiroku optical touch panels
358367

359368
If unsure, say N.
360369

@@ -466,12 +475,6 @@ config HID_PRIMAX
466475
Support for Primax devices that are not fully compliant with the
467476
HID standard.
468477

469-
config HID_QUANTA
470-
tristate "Quanta Optical Touch panels"
471-
depends on USB_HID
472-
---help---
473-
Support for Quanta Optical Touch dual-touch panels.
474-
475478
config HID_ROCCAT
476479
tristate "Roccat special event support"
477480
depends on USB_HID
@@ -492,6 +495,13 @@ config HID_ROCCAT_ARVO
492495
---help---
493496
Support for Roccat Arvo keyboard.
494497

498+
config HID_ROCCAT_ISKU
499+
tristate "Roccat Isku keyboard support"
500+
depends on USB_HID
501+
depends on HID_ROCCAT
502+
---help---
503+
Support for Roccat Isku keyboard.
504+
495505
config HID_ROCCAT_KONE
496506
tristate "Roccat Kone Mouse support"
497507
depends on USB_HID
@@ -560,6 +570,12 @@ config GREENASIA_FF
560570
(like MANTA Warrior MM816 and SpeedLink Strike2 SL-6635) or adapter
561571
and want to enable force feedback support for it.
562572

573+
config HID_HYPERV_MOUSE
574+
tristate "Microsoft Hyper-V mouse driver"
575+
depends on HYPERV
576+
---help---
577+
Select this option to enable the Hyper-V mouse driver.
578+
563579
config HID_SMARTJOYPLUS
564580
tristate "SmartJoy PLUS PS2/USB adapter support"
565581
depends on USB_HID
@@ -620,9 +636,19 @@ config HID_WIIMOTE
620636
depends on BT_HIDP
621637
depends on LEDS_CLASS
622638
select POWER_SUPPLY
639+
select INPUT_FF_MEMLESS
623640
---help---
624641
Support for the Nintendo Wii Remote bluetooth device.
625642

643+
config HID_WIIMOTE_EXT
644+
bool "Nintendo Wii Remote Extension support"
645+
depends on HID_WIIMOTE
646+
default HID_WIIMOTE
647+
---help---
648+
Support for extension controllers of the Nintendo Wii Remote. Say yes
649+
here if you want to use the Nintendo Motion+, Nunchuck or Classic
650+
extension controllers with your Wii Remote.
651+
626652
config HID_ZEROPLUS
627653
tristate "Zeroplus based game controller support"
628654
depends on USB_HID

‎drivers/hid/Makefile‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@ ifdef CONFIG_LOGIWHEELS_FF
2525
hid-logitech-y += hid-lg4ff.o
2626
endif
2727

28+
hid-wiimote-y := hid-wiimote-core.o
29+
ifdef CONFIG_HID_WIIMOTE_EXT
30+
hid-wiimote-y += hid-wiimote-ext.o
31+
endif
32+
ifdef CONFIG_DEBUG_FS
33+
hid-wiimote-y += hid-wiimote-debug.o
34+
endif
35+
2836
obj-$(CONFIG_HID_A4TECH) += hid-a4tech.o
2937
obj-$(CONFIG_HID_ACRUX) += hid-axff.o
3038
obj-$(CONFIG_HID_APPLE) += hid-apple.o
@@ -38,6 +46,7 @@ obj-$(CONFIG_HID_ELECOM) += hid-elecom.o
3846
obj-$(CONFIG_HID_EZKEY) += hid-ezkey.o
3947
obj-$(CONFIG_HID_GYRATION) += hid-gyration.o
4048
obj-$(CONFIG_HID_HOLTEK) += hid-holtekff.o
49+
obj-$(CONFIG_HID_HYPERV_MOUSE) += hid-hyperv.o
4150
obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o
4251
obj-$(CONFIG_HID_KEYTOUCH) += hid-keytouch.o
4352
obj-$(CONFIG_HID_KYE) += hid-kye.o
@@ -51,14 +60,14 @@ obj-$(CONFIG_HID_MULTITOUCH) += hid-multitouch.o
5160
obj-$(CONFIG_HID_NTRIG) += hid-ntrig.o
5261
obj-$(CONFIG_HID_ORTEK) += hid-ortek.o
5362
obj-$(CONFIG_HID_PRODIKEYS) += hid-prodikeys.o
54-
obj-$(CONFIG_HID_QUANTA) += hid-quanta.o
5563
obj-$(CONFIG_HID_PANTHERLORD) += hid-pl.o
5664
obj-$(CONFIG_HID_PETALYNX) += hid-petalynx.o
5765
obj-$(CONFIG_HID_PICOLCD) += hid-picolcd.o
5866
obj-$(CONFIG_HID_PRIMAX) += hid-primax.o
5967
obj-$(CONFIG_HID_ROCCAT) += hid-roccat.o
6068
obj-$(CONFIG_HID_ROCCAT_COMMON) += hid-roccat-common.o
6169
obj-$(CONFIG_HID_ROCCAT_ARVO) += hid-roccat-arvo.o
70+
obj-$(CONFIG_HID_ROCCAT_ISKU) += hid-roccat-isku.o
6271
obj-$(CONFIG_HID_ROCCAT_KONE) += hid-roccat-kone.o
6372
obj-$(CONFIG_HID_ROCCAT_KONEPLUS) += hid-roccat-koneplus.o
6473
obj-$(CONFIG_HID_ROCCAT_KOVAPLUS) += hid-roccat-kovaplus.o

0 commit comments

Comments
 (0)