hal: Branch 'master' - 2 commits

[Danny Kukawka]

 fdi/information/10freedesktop/30-keymap-acer.fdi |   22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

New commits:
commit a17d14b781a227257d564100f5443a3ed462919d
Author: Carlos Corbacho <carlos at strangeworlds.co.uk>
Date:   Wed Dec 26 11:05:48 2007 +0100

    add keymap for Acer Ferrari 5000 series
    
    Added keymap for Acer Ferrari 5000 series.

diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index 5c3d5f8..960dd8b 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -172,6 +172,26 @@
             <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
             <append key="info.capabilities" type="strlist">input.keymap</append>
           </match>
+          <!-- Laptops with extra Euro and Dollar keys, and Fn+Right (Brightness Up) needs mapping (type 1) -->
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="5000">
+            <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
+            <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
+            <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
+            <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
+            <append key="input.keymap.data" type="strlist">e033:euro</append> <!-- Euro symbol -->
+            <append key="input.keymap.data" type="strlist">e034:dollar</append> <!-- Dollar symbol -->
+            <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
+            <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
+            <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
+            <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+            <append key="input.keymap.data" type="strlist">e06e:brightnessup</append> <!-- Fn+Right Brightness Up -->
+            <append key="input.keymap.data" type="strlist">e06f:brightnessdown</append> <!-- Fn+Left Brightness Down -->
+            <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+            <append key="input.keymap.data" type="strlist">e072:f23</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
+            <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
+            <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
+            <append key="info.capabilities" type="strlist">input.keymap</append>
+          </match>
         </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="TravelMate">
           <!-- TravelMate C300 -->
commit 3a633485043a20f2e14273617ff05c3ea83d8de1
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Dec 26 11:04:17 2007 +0100

    Revert "the Ferrari 5000 has the same key mapping stuff as the Ferrari 1000 and 4000"
    
    This reverts commit 5e845a702defd73b634203c625bfbe6d52510c2f.
    Reverted patch, since this is not correct. It does not include all keys of
    the Ferrari 5000. They are not the same as the 1000 and 4000.

diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index 1074147..5c3d5f8 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -155,7 +155,7 @@
         </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Ferrari">
           <!-- Laptops with extra Euro and Dollar keys -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="1000;4000;5000">
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="1000;4000">
             <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
             <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
             <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->