hal: Branch 'master' - 2 commits

[Richard Hughes]

 fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi |   10 ++---
 fdi/information/10freedesktop/30-keymap-acer.fdi        |   32 ++++++++++++++++
 fdi/information/10freedesktop/Makefile.am               |    3 +
 3 files changed, 39 insertions(+), 6 deletions(-)

New commits:
diff-tree eb2ae3c6b0cbe31b37c21a5e494185bf692e3b7f (from 7628f625f4e3d64357885b07643bf20f264246b4)
Author: Jason Merrill <jason at redhat.com>
Date:   Mon Jul 16 18:13:25 2007 +0100

    add suspend quirks for the t43
    
    This patch just adjusts the existing quirks for the ATI and Intel
    variants of the T43 to cover all the relevant model numbers.  With this
    change, my T43 (a 2669) suspends and hibernates cleanly.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index 89eeda5..05fe19a 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -49,14 +49,14 @@
         </match>
       </match>
       <!-- T43 -->
-      <match key="system.hardware.product" prefix="2668">
-        <match key="system.hardware.version" string="ThinkPad T43">
+      <match key="system.hardware.version" string="ThinkPad T43">
+        <!-- Models 2668, 2669, 2678, 2679, 2686, 2687 use ATI graphics -->
+        <match key="system.hardware.product" prefix="26">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
         </match>
-      </match>
-      <match key="system.hardware.product" prefix="1871">
-        <match key="system.hardware.version" string="ThinkPad T43">
+        <!-- Models 1871, 1872, 1873, 1874, 1875, 1876 use Intel graphics -->
+        <match key="system.hardware.product" prefix="18">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>
diff-tree 7628f625f4e3d64357885b07643bf20f264246b4 (from fd31e8c2c7268bfefbe3fd2383ef7757a1b7b52d)
Author: Carlos Corbacho <cathectic at gmail.com>
Date:   Thu Jul 12 21:08:27 2007 +0100

    keymap for Acer Aspire 5020
    
    This patch:
    
    1) Adds a new file for Acer entries
    2) Adds an entry for Aspire 5020

diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
new file mode 100644
index 0000000..1474bc4
--- /dev/null
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+
+<deviceinfo version="0.2">
+  <device>
+
+    <!-- These are raw scancodes produced by the atkbd driver -->
+    <match key="@input.originating_device:info.linux.driver" string="atkbd">
+
+      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Acer">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Aspire">
+          <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 -->
+            <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
+            <append key="input.keymap.data" type="strlist">e027:power2</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> <!-- Euro sign -->
+            <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- Dollar sign -->
+            <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>
+        </match>
+      </match>
+    </match>
+  </device>
+</deviceinfo>
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index 40ef358..f8c4811 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -60,7 +60,8 @@ dist_fdi_DATA +=					\
 		30-keymap-hp.fdi			\
 		30-keymap-compaq.fdi			\
 		30-keymap-lenovo.fdi			\
-		30-keymap-dell.fdi
+		30-keymap-dell.fdi			\
+		30-keymap-acer.fdi
 endif
 
 check: