-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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}.- Loading branch information
Showing
30 changed files
with
3,592 additions
and
631 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/quirks | ||
| Date: November 2011 | ||
| Contact: Benjamin Tissoires <benjamin.tissoires@gmail.com> | ||
| Description: The integer value of this attribute corresponds to the | ||
| quirks actually in place to handle the device's protocol. | ||
| When read, this attribute returns the current settings (see | ||
| MT_QUIRKS_* in hid-multitouch.c). | ||
| When written this attribute change on the fly the quirks, then | ||
| the protocol to handle the device. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/actual_profile | ||
| Date: June 2011 | ||
| Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
| Description: The integer value of this attribute ranges from 0-4. | ||
| When read, this attribute returns the number of the actual | ||
| profile. This value is persistent, so its equivalent to the | ||
| profile that's active when the device is powered on next time. | ||
| When written, this file sets the number of the startup profile | ||
| and the device activates this profile immediately. | ||
| Users: http://roccat.sourceforge.net | ||
|
|
||
| What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/info | ||
| Date: June 2011 | ||
| Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
| Description: When read, this file returns general data like firmware version. | ||
| The data is 6 bytes long. | ||
| This file is readonly. | ||
| Users: http://roccat.sourceforge.net | ||
|
|
||
| What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/key_mask | ||
| Date: June 2011 | ||
| Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
| Description: When written, this file lets one deactivate certain keys like | ||
| windows and application keys, to prevent accidental presses. | ||
| Profile number for which this settings occur is included in | ||
| written data. The data has to be 6 bytes long. | ||
| Before reading this file, control has to be written to select | ||
| which profile to read. | ||
| Users: http://roccat.sourceforge.net | ||
|
|
||
| What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_capslock | ||
| Date: June 2011 | ||
| Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
| Description: When written, this file lets one set the function of the | ||
| capslock key for a specific profile. Profile number is included | ||
| in written data. The data has to be 6 bytes long. | ||
| Before reading this file, control has to be written to select | ||
| which profile to read. | ||
| Users: http://roccat.sourceforge.net | ||
|
|
||
| What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_easyzone | ||
| Date: June 2011 | ||
| Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
| Description: When written, this file lets one set the function of the | ||
| easyzone keys for a specific profile. Profile number is included | ||
| in written data. The data has to be 65 bytes long. | ||
| Before reading this file, control has to be written to select | ||
| which profile to read. | ||
| Users: http://roccat.sourceforge.net | ||
|
|
||
| What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_function | ||
| Date: June 2011 | ||
| Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
| Description: When written, this file lets one set the function of the | ||
| function keys for a specific profile. Profile number is included | ||
| in written data. The data has to be 41 bytes long. | ||
| Before reading this file, control has to be written to select | ||
| which profile to read. | ||
| Users: http://roccat.sourceforge.net | ||
|
|
||
| What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_macro | ||
| Date: June 2011 | ||
| Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
| Description: When written, this file lets one set the function of the macro | ||
| keys for a specific profile. Profile number is included in | ||
| written data. The data has to be 35 bytes long. | ||
| Before reading this file, control has to be written to select | ||
| which profile to read. | ||
| Users: http://roccat.sourceforge.net | ||
|
|
||
| What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_media | ||
| Date: June 2011 | ||
| Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
| Description: When written, this file lets one set the function of the media | ||
| keys for a specific profile. Profile number is included in | ||
| written data. The data has to be 29 bytes long. | ||
| Before reading this file, control has to be written to select | ||
| which profile to read. | ||
| Users: http://roccat.sourceforge.net | ||
|
|
||
| What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_thumbster | ||
| Date: June 2011 | ||
| Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
| Description: When written, this file lets one set the function of the | ||
| thumbster keys for a specific profile. Profile number is included | ||
| in written data. The data has to be 23 bytes long. | ||
| Before reading this file, control has to be written to select | ||
| which profile to read. | ||
| Users: http://roccat.sourceforge.net | ||
|
|
||
| What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/last_set | ||
| Date: June 2011 | ||
| Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
| Description: When written, this file lets one set the time in secs since | ||
| epoch in which the last configuration took place. | ||
| The data has to be 20 bytes long. | ||
| Users: http://roccat.sourceforge.net | ||
|
|
||
| What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/light | ||
| Date: June 2011 | ||
| Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
| Description: When written, this file lets one set the backlight intensity for | ||
| a specific profile. Profile number is included in written data. | ||
| The data has to be 10 bytes long. | ||
| Before reading this file, control has to be written to select | ||
| which profile to read. | ||
| Users: http://roccat.sourceforge.net | ||
|
|
||
| What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/macro | ||
| Date: June 2011 | ||
| Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
| Description: When written, this file lets one store macros with max 500 | ||
| keystrokes for a specific button for a specific profile. | ||
| Button and profile numbers are included in written data. | ||
| The data has to be 2083 bytes long. | ||
| Before reading this file, control has to be written to select | ||
| which profile and key to read. | ||
| Users: http://roccat.sourceforge.net | ||
|
|
||
| What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/control | ||
| Date: June 2011 | ||
| Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
| Description: When written, this file lets one select which data from which | ||
| profile will be read next. The data has to be 3 bytes long. | ||
| This file is writeonly. | ||
| Users: http://roccat.sourceforge.net | ||
|
|
||
| What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/talk | ||
| Date: June 2011 | ||
| Contact: Stefan Achatz <erazor_de@users.sourceforge.net> | ||
| Description: When written, this file lets one trigger easyshift functionality | ||
| from the host. | ||
| The data has to be 16 bytes long. | ||
| This file is writeonly. | ||
| Users: http://roccat.sourceforge.net |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.