From 84a122a008e06901ce2d1d3941864afce8fd5d15 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Mon, 16 Mar 2015 13:43:50 +0100 Subject: [PATCH 1/1] rules: keyboard - remove "platform" from comments --- hwdb/60-keyboard.hwdb | 2 +- rules/60-keyboard.rules | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb index 35bda809d..95c236bfd 100644 --- a/hwdb/60-keyboard.hwdb +++ b/hwdb/60-keyboard.hwdb @@ -85,7 +85,7 @@ keyboard:name:*:dmi:bvn*:bvr*:bd*:svneMachines:pneMachines*E725:pvr* KEYBOARD_KEY_f8=fn KEYBOARD_KEY_f9=prog1 # Launch NTI shadow -# Acer platform kernel driver +# Acer kernel driver keyboard:name:Acer WMI hotkeys:dmi:bvn*:bvr*:bd*:svn*:pnAcer*:pvr* KEYBOARD_KEY_82=f21 # Touchpad toggle diff --git a/rules/60-keyboard.rules b/rules/60-keyboard.rules index 71cef74c5..a7d679ca9 100644 --- a/rules/60-keyboard.rules +++ b/rules/60-keyboard.rules @@ -4,11 +4,11 @@ ACTION=="remove", GOTO="keyboard_end" KERNEL!="event*", GOTO="keyboard_end" ENV{ID_INPUT_KEY}=="", GOTO="keyboard_end" -# import key mapping for input device +# skip later rules when we find something for this input device IMPORT{builtin}="hwdb --lookup-prefix=keyboard:", \ RUN{builtin}+="keyboard", GOTO="keyboard_end" -# import key mapping for platform device +# lookup entries matching the machine's DMI data IMPORT{builtin}="hwdb 'keyboard:name:$attr{name}:$attr{[dmi/id]modalias}'", \ RUN{builtin}+="keyboard", GOTO="keyboard_end" -- 2.30.2