diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 12:37:55 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 12:37:55 -0400 |
commit | 19b344efa35dbc253e2d10403dafe6aafda73c56 (patch) | |
tree | 47c4ad25398642bcf1a93e186d77548ced3f7a2a /Documentation | |
parent | 5d434fcb255dec99189f1c58a06e4f56e12bf77d (diff) | |
parent | ad1b890e06af049fb48d7ccb799d0e96c071c893 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID updates from Jiri Kosina:
- hid driver transport cleanup, finalizing the long-desired decoupling
of core from transport layers, by Benjamin Tissoires and Henrik
Rydberg
- support for hybrid finger/pen multitouch HID devices, by Benjamin
Tissoires
- fix for long-standing issue in Logitech unifying driver sometimes not
inializing properly due to device specifics, by Andrew de los Reyes
- Wii remote driver updates to support 2nd generation of devices, by
David Herrmann
- support for Apple IR remote
- roccat driver now supports new devices (Roccat Kone Pure, IskuFX), by
Stefan Achatz
- debugfs locking fixes in hid debug interface, by Jiri Kosina
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (43 commits)
HID: protect hid_debug_list
HID: debug: break out hid_dump_report() into hid-debug
HID: Add PID for Japanese version of NE4K keyboard
HID: hid-lg4ff add support for new version of DFGT wheel
HID: icade: u16 which never < 0
HID: clarify Magic Mouse Kconfig description
HID: appleir: add support for Apple ir devices
HID: roccat: added media key support for Kone
HID: hid-lenovo-tpkbd: remove doubled hid_get_drvdata
HID: i2c-hid: fix length for set/get report in i2c hid
HID: wiimote: parse reduced status reports
HID: wiimote: add 2nd generation Wii Remote IDs
HID: wiimote: use unique battery names
HID: hidraw: warn if userspace headers are outdated
HID: multitouch: force BTN_STYLUS for pen devices
HID: multitouch: append " Pen" to the name of the stylus input
HID: multitouch: add handling for pen in dual-sensors device
HID: multitouch: change touch sensor detection in mt_input_configured()
HID: multitouch: do not map usage from non used reports
HID: multitouch: breaks out touch handling in specific functions
...
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/ABI/testing/sysfs-driver-hid-roccat-isku | 12 | ||||
-rw-r--r-- | Documentation/ABI/testing/sysfs-driver-hid-roccat-konepure | 105 |
2 files changed, 116 insertions, 1 deletions
diff --git a/Documentation/ABI/testing/sysfs-driver-hid-roccat-isku b/Documentation/ABI/testing/sysfs-driver-hid-roccat-isku index 9eca5a182e64..c601d0f2ac46 100644 --- a/Documentation/ABI/testing/sysfs-driver-hid-roccat-isku +++ b/Documentation/ABI/testing/sysfs-driver-hid-roccat-isku | |||
@@ -101,7 +101,8 @@ Date: June 2011 | |||
101 | Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | 101 | Contact: Stefan Achatz <erazor_de@users.sourceforge.net> |
102 | Description: When written, this file lets one set the backlight intensity for | 102 | Description: When written, this file lets one set the backlight intensity for |
103 | a specific profile. Profile number is included in written data. | 103 | a specific profile. Profile number is included in written data. |
104 | The data has to be 10 bytes long. | 104 | The data has to be 10 bytes long for Isku, IskuFX needs 16 bytes |
105 | of data. | ||
105 | Before reading this file, control has to be written to select | 106 | Before reading this file, control has to be written to select |
106 | which profile to read. | 107 | which profile to read. |
107 | Users: http://roccat.sourceforge.net | 108 | Users: http://roccat.sourceforge.net |
@@ -141,3 +142,12 @@ Description: When written, this file lets one trigger easyshift functionality | |||
141 | The data has to be 16 bytes long. | 142 | The data has to be 16 bytes long. |
142 | This file is writeonly. | 143 | This file is writeonly. |
143 | Users: http://roccat.sourceforge.net | 144 | Users: http://roccat.sourceforge.net |
145 | |||
146 | What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/talkfx | ||
147 | Date: February 2013 | ||
148 | Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
149 | Description: When written, this file lets one trigger temporary color schemes | ||
150 | from the host. | ||
151 | The data has to be 16 bytes long. | ||
152 | This file is writeonly. | ||
153 | Users: http://roccat.sourceforge.net | ||
diff --git a/Documentation/ABI/testing/sysfs-driver-hid-roccat-konepure b/Documentation/ABI/testing/sysfs-driver-hid-roccat-konepure new file mode 100644 index 000000000000..41a9b7fbfc79 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-driver-hid-roccat-konepure | |||
@@ -0,0 +1,105 @@ | |||
1 | What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/konepure/roccatkonepure<minor>/actual_profile | ||
2 | Date: December 2012 | ||
3 | Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
4 | Description: The mouse can store 5 profiles which can be switched by the | ||
5 | press of a button. actual_profile holds number of actual profile. | ||
6 | This value is persistent, so its value determines the profile | ||
7 | that's active when the mouse is powered on next time. | ||
8 | When written, the mouse activates the set profile immediately. | ||
9 | The data has to be 3 bytes long. | ||
10 | The mouse will reject invalid data. | ||
11 | Users: http://roccat.sourceforge.net | ||
12 | |||
13 | What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/konepure/roccatkonepure<minor>/control | ||
14 | Date: December 2012 | ||
15 | Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
16 | Description: When written, this file lets one select which data from which | ||
17 | profile will be read next. The data has to be 3 bytes long. | ||
18 | This file is writeonly. | ||
19 | Users: http://roccat.sourceforge.net | ||
20 | |||
21 | What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/konepure/roccatkonepure<minor>/info | ||
22 | Date: December 2012 | ||
23 | Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
24 | Description: When read, this file returns general data like firmware version. | ||
25 | When written, the device can be reset. | ||
26 | The data is 6 bytes long. | ||
27 | Users: http://roccat.sourceforge.net | ||
28 | |||
29 | What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/konepure/roccatkonepure<minor>/macro | ||
30 | Date: December 2012 | ||
31 | Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
32 | Description: The mouse can store a macro with max 500 key/button strokes | ||
33 | internally. | ||
34 | When written, this file lets one set the sequence for a specific | ||
35 | button for a specific profile. Button and profile numbers are | ||
36 | included in written data. The data has to be 2082 bytes long. | ||
37 | This file is writeonly. | ||
38 | Users: http://roccat.sourceforge.net | ||
39 | |||
40 | What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/konepure/roccatkonepure<minor>/profile_buttons | ||
41 | Date: December 2012 | ||
42 | Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
43 | Description: The mouse can store 5 profiles which can be switched by the | ||
44 | press of a button. A profile is split in settings and buttons. | ||
45 | profile_buttons holds information about button layout. | ||
46 | When written, this file lets one write the respective profile | ||
47 | buttons back to the mouse. The data has to be 59 bytes long. | ||
48 | The mouse will reject invalid data. | ||
49 | Which profile to write is determined by the profile number | ||
50 | contained in the data. | ||
51 | Before reading this file, control has to be written to select | ||
52 | which profile to read. | ||
53 | Users: http://roccat.sourceforge.net | ||
54 | |||
55 | What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/konepure/roccatkonepure<minor>/profile_settings | ||
56 | Date: December 2012 | ||
57 | Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
58 | Description: The mouse can store 5 profiles which can be switched by the | ||
59 | press of a button. A profile is split in settings and buttons. | ||
60 | profile_settings holds information like resolution, sensitivity | ||
61 | and light effects. | ||
62 | When written, this file lets one write the respective profile | ||
63 | settings back to the mouse. The data has to be 31 bytes long. | ||
64 | The mouse will reject invalid data. | ||
65 | Which profile to write is determined by the profile number | ||
66 | contained in the data. | ||
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>/konepure/roccatkonepure<minor>/sensor | ||
72 | Date: December 2012 | ||
73 | Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
74 | Description: The mouse has a tracking- and a distance-control-unit. These | ||
75 | can be activated/deactivated and the lift-off distance can be | ||
76 | set. The data has to be 6 bytes long. | ||
77 | This file is writeonly. | ||
78 | Users: http://roccat.sourceforge.net | ||
79 | |||
80 | What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/konepure/roccatkonepure<minor>/talk | ||
81 | Date: December 2012 | ||
82 | Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
83 | Description: Used to active some easy* functions of the mouse from outside. | ||
84 | The data has to be 16 bytes long. | ||
85 | This file is writeonly. | ||
86 | Users: http://roccat.sourceforge.net | ||
87 | |||
88 | What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/konepure/roccatkonepure<minor>/tcu | ||
89 | Date: December 2012 | ||
90 | Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
91 | Description: When written a calibration process for the tracking control unit | ||
92 | can be initiated/cancelled. Also lets one read/write sensor | ||
93 | registers. | ||
94 | The data has to be 4 bytes long. | ||
95 | Users: http://roccat.sourceforge.net | ||
96 | |||
97 | What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/konepure/roccatkonepure<minor>/tcu_image | ||
98 | Date: December 2012 | ||
99 | Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
100 | Description: When read the mouse returns a 30x30 pixel image of the | ||
101 | sampled underground. This works only in the course of a | ||
102 | calibration process initiated with tcu. | ||
103 | The returned data is 1028 bytes in size. | ||
104 | This file is readonly. | ||
105 | Users: http://roccat.sourceforge.net | ||