hal: Branch 'master' - 2 commits

[Danny Kukawka]

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

New commits:
commit 5427f8c904832bd4466acb07703c740b98a87502
Author: Carlos Corbacho <carlos at strangeworlds.co.uk>
Date:   Tue Nov 20 14:01:49 2007 +0100

    add more Acer Aspire keymaps
    
    Add keymaps for the following Aspire series laptops:
    
    3690, 5610, 5630, 5680

diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index 489bb1e..fb0bf28 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -72,7 +72,7 @@
             <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 2) -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3100;5100;5650;9110">
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3100;3690;5100;5610;5630;5650;5680;9110">
             <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 -->
@@ -124,6 +124,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">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 -->
commit a46d8e28ce25f88f059f07eecdcc2ca96eade8a3
Author: Carlos Corbacho <carlos at strangeworlds.co.uk>
Date:   Tue Nov 20 14:00:52 2007 +0100

    extend brightness down fix to more Acer laptops
    
    The scancode used for brightness down on the TravelMate 'type 1
    brightness up' laptops can also be applied to the Aspire and Extensa
    'type 1 brightness up' laptops.
    
    It has also been confirmed that the 'type 2 brightness up' laptops also
    use the same scancode for brightness down, so remap their brightness
    down key too.

diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index 948f668..489bb1e 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -64,6 +64,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">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 -->
@@ -83,6 +84,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: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 -->
@@ -170,6 +172,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">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 -->