diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-02-13 15:00:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-13 15:00:10 +0100 |
| commit | fb1ebc442f1ae43fc6950abb9ae033bd467fb61f (patch) | |
| tree | 61b4387eca5eb636e082eb0333da70dd72b72399 | |
| parent | 3b07d037f316196f05cc3d2d2812a3e8401a4c06 (diff) | |
| parent | 374677122057501ce6c7481591e6256fc6c3db99 (diff) | |
Merge pull request #5320 from jwrdegoede/cube-iwork8-air
Extended evdev keyboard match rule + cube iwork8 air keymap fixup hwdb entry
| -rw-r--r-- | hwdb/60-keyboard.hwdb | 17 | ||||
| -rw-r--r-- | rules/60-evdev.rules | 4 |
2 files changed, 21 insertions, 0 deletions
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb index c8452f47d0..4201ad76fc 100644 --- a/hwdb/60-keyboard.hwdb +++ b/hwdb/60-keyboard.hwdb @@ -32,6 +32,15 @@ # driver, <vendor> is the firmware-provided string exported # by the kernel DMI modalias, see /sys/class/dmi/id/modalias # +# - Extended input driver device name, properties and DMI data match: +# evdev:name:<input device name>:phys:<phys>:ev:<ev>:dmi:bvn*:bvr*:bd*:svn<vendor>:pn* +# <input device name> is the name device specified by the +# driver, <phys> is the physical-device-path, "cat +# /sys/class/input/input?/phys", <ev> is the event bitmask, "cat +# /sys/class/input/input?/capabilities/ev" and <vendor> is the +# firmware-provided string exported by the kernel DMI modalias, +# see /sys/class/dmi/id/modalias +# # Scan codes are specified as: # KEYBOARD_KEY_<hex scan code>=<key code identifier> # The scan code should be expressed in hex lowercase. The key codes @@ -206,6 +215,14 @@ evdev:input:b0003v049Fp0051* KEYBOARD_KEY_0c0015=messenger ########################################################### +# Cube +########################################################### + +evdev:name:gpio-keys:phys:gpio-keys/input0:ev:3:dmi:bvn*:bvr*:bd*:svncube:pni1-TF:* + KEYBOARD_KEY_0=home + KEYBOARD_KEY_1=power + +########################################################### # Dell ########################################################### diff --git a/rules/60-evdev.rules b/rules/60-evdev.rules index ade7e7f646..f5d5ba6a5f 100644 --- a/rules/60-evdev.rules +++ b/rules/60-evdev.rules @@ -12,6 +12,10 @@ ENV{ID_INPUT_KEY}=="?*", DRIVERS=="atkbd", \ IMPORT{builtin}="hwdb 'evdev:atkbd:$attr{[dmi/id]modalias}'", \ RUN{builtin}+="keyboard", GOTO="evdev_end" +# device matching the input device name + properties + the machine's DMI data +KERNELS=="input*", IMPORT{builtin}="hwdb 'evdev:name:$attr{name}:phys:$attr{phys}:ev:$attr{capabilities/ev}:$attr{[dmi/id]modalias}'", \ + RUN{builtin}+="keyboard", GOTO="evdev_end" + # device matching the input device name and the machine's DMI data KERNELS=="input*", IMPORT{builtin}="hwdb 'evdev:name:$attr{name}:$attr{[dmi/id]modalias}'", \ RUN{builtin}+="keyboard", GOTO="evdev_end" |