hal: Branch 'master' - 2 commits

[Danny Kukawka]

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

New commits:
commit db4ff98bbd8800d52d703a44c65ad815db4bd3e1
Author: Carlos Corbacho <carlos at strangeworlds.co.uk>
Date:   Tue Feb 5 23:23:14 2008 +0100

    fix Acer TravelMate 5620 keymap for brightness up
    
    The Acer TM 5110 / 5610/ 5620 are somewhat "special" on the keymapping
    front - the usual brightness up & down scancodes are reversed.
    
    Fix these "special" laptops so that brightness up works properly

diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index db03e40..4ea0649 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -275,6 +275,7 @@
             <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">e059:brightnessdown</append> <!-- Fn+Left Brightness down -->
+            <append key="input.keymap.data" type="strlist">e06f:brightnessup</append> <!-- Fn+Left Brightness Up -->
             <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:f22</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
             <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
commit 51771153c4da461673838b534882bc0c2953b939
Author: Carlos Corbacho <carlos at strangeworlds.co.uk>
Date:   Tue Feb 5 23:22:34 2008 +0100

    fix Acer TravelMate 4650 keymap
    
    A keymap for this laptop was added in commit 3d6b16, but is
    clearly wrong - from the physical appearance at least, we are
    missing the mapping for the Euro and Dollar keys at a minimum.
    
    This laptop is more likely a "Laptops with extra Euro and Dollar keys, and
    Fn+Right (Brightness Up) needs mapping (type 2)", so change it to that.

diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index 2f12650..db03e40 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -242,11 +242,24 @@
             <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
             <append key="info.capabilities" type="strlist">input.keymap</append>
           </match>
-          <!-- TravelMate 4650 -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="4650">
+          <!-- Laptops with extra Euro and Dollar keys, and Fn+Right (Brightness Up) needs mapping (type 2) -->
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="4650">
+            <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">e059:brightnessup</append> <!-- Fn+Right Brightness Up -->
-            <append key="input.keymap.data" type="strlist">e033:prog2</append> <!-- "P" programmable button -->
-            <append key="input.keymap.data" type="strlist">e034:prog1</append> <!-- "e" Acer eManager button -->
+            <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>
           <!-- Laptops with extra Euro and Dollar keys, and Fn+Left (Brightness Down) needs mapping -->