hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/30-keymap-acer.fdi |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+)

New commits:
diff-tree 381d55fe8238efed31459bc21d8623215f81cc97 (from 0011a3c481acd835432fc08244e7889b4dec299a)
Author: Theo van Klaveren <t.vanklaveren at student.utwente.nl>
Date:   Fri Aug 10 17:51:57 2007 +0200

    Keymap for Acer Aspire 3620
    
    > Just saw the committed keymap for the Acer Aspire 3610. I can
    > confirm that that keymap is identical to the keymap for the
    > Aspire 3620.
    > Something like the attached patch should do it, I think.

diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index dc66181..9e48f75 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -112,6 +112,7 @@
             <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
             <append key="info.capabilities" type="strlist">input.keymap</append>
           </match>
+	  <!-- Aspire 3610 and Aspire 3620 are identical -->
           <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3610">
             <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 -->
@@ -129,6 +130,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>
+	  <!-- Aspire 3610 and Aspire 3620 are identical -->
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3620">
+            <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:f14</append> <!-- FIXME Euro symbol -->
+            <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME 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">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 -->
+            <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
+            <append key="info.capabilities" type="strlist">input.keymap</append>
+          </match>
           <!-- Aspire 3020 and Aspire 5020 are identical -->
           <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="5020">
             <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->