hal: Branch 'master'

[Richard Hughes]

 fdi/information/10freedesktop/30-keymap-lenovo.fdi |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

New commits:
diff-tree 51ac28987a6492e08acc446f7725c16e72b68560 (from d68caa95593ce25e402d86b6f79b0d226e415989)
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Jun 6 14:24:52 2007 +0100

    don't use depreciated keys, and add complete keymap for the x60
    
    Don't use depreciated keys for matching, and add a complete keymap for the x60.
    All the blue buttons now work using thinkpad_acpi. Woot!

diff --git a/fdi/information/10freedesktop/30-keymap-lenovo.fdi b/fdi/information/10freedesktop/30-keymap-lenovo.fdi
index 1262a8e..83b13a5 100644
--- a/fdi/information/10freedesktop/30-keymap-lenovo.fdi
+++ b/fdi/information/10freedesktop/30-keymap-lenovo.fdi
@@ -7,7 +7,7 @@
     <match key="@input.originating_device:info.linux.driver" string="atkbd">
 
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="LENOVO">
-        <match key="/org/freedesktop/Hal/devices/computer:smbios.system.version" contains="3000">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="3000">
           <append key="input.keymap.data" type="strlist">e016:wlan</append> <!-- Fn+F5 wireless -->
           <append key="input.keymap.data" type="strlist">e017:sleep</append> <!-- Fn+F4 suspend -->
           <append key="input.keymap.data" type="strlist">e018:suspend</append> <!-- Fn+F12 hibernate -->
@@ -16,12 +16,24 @@
       </match>
 
     </match>
+  </device>
+
+  <device>
 
     <!-- These are buttons synthesized in other kernel drivers -->
     <match key="input.product" string="ThinkPad Extra Buttons">
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="LENOVO">
-        <append key="input.keymap.data" type="strlist">007f:coffee</append> <!-- thinkvantage -->
-        <append key="info.capabilities" type="strlist">input.keymap</append>
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="X60">
+          <append key="input.keymap.data" type="strlist">0x01:coffee</append> <!-- Fn+F2 lock -->
+          <append key="input.keymap.data" type="strlist">0x02:battery</append> <!-- Fn+F3 battery -->
+          <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
+          <append key="input.keymap.data" type="strlist">0x04:wifi</append> <!-- Fn+F5 wifi -->
+          <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
+          <append key="input.keymap.data" type="strlist">0x07:f22</append> <!-- Fn+F8 touchpadtoggle -->
+          <append key="input.keymap.data" type="strlist">0x08:f24</append> <!-- Fn+F9 undock -->
+          <append key="input.keymap.data" type="strlist">0x0b:suspend</append> <!-- Fn+F12 hibernate -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
       </match>
     </match>