hal: Branch 'master' - 3 commits

[Richard Hughes]

 fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi |    2 -
 fdi/information/10freedesktop/30-keymap-dell.fdi           |   22 +++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit 98cf343e0daa5a21fdb9c6161baf8ba813c2ac04
Author: Dave Jones <davej at redhat.com>
Date:   Wed Oct 17 22:35:33 2007 +0100

    Dell Precision M65 keys
    
    These seem to mostly do the right thing.  I say mostly, because the
    brightness keys pop up the brightness dialog onscreen, but it seems to
    fail to read the current brightness, so there's no visible feedback in
    the dialog. The brightness does change though.

diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index a9d4921..2147a9a 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -110,6 +110,18 @@
             <append key="info.capabilities" type="strlist">input.keymap</append>
           </match>
         </match>
+
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Precision">
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="M65">
+            <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+            <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+            <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
+            <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
+            <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
+            <append key="input.keymap.data" type="strlist">e013:f23</append> <!-- Fn+Left arrow Auto Brightness -->
+            <append key="info.capabilities" type="strlist">input.keymap</append>
+          </match>
+        </match>
       </match>
     </match>
   </device>
commit a43d16869f46926d652fb4dc5f514117f5b8cfb6
Author: Sahak Petrosyan <sahak at MIT.EDU>
Date:   Wed Oct 17 22:33:34 2007 +0100

    quirk patch for Thinkpad X61 model
    
    Here is a sleep quirk patch for Thinkpad X61 model 7675CTO

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index daccdf9..b0a4c1c 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -8,7 +8,7 @@
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
       <!-- X61 Tablet -->
-      <match key="system.hardware.product" prefix="7764">
+      <match key="system.hardware.product" prefix_outof="7764;7675">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
       </match>
       <match key="system.hardware.product" prefix="63664DU">
commit 9b820b289d33d52fc16a442949d021e8674b69ce
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Oct 17 22:32:13 2007 +0100

    add Keymap support for Dell XP2 Gen2 Laptop
    
    Here is a patch to add Keymap support for Dell XP2 Gen2 Laptop.
    
    At first I tried to use, as stated in
    http://people.freedesktop.org/~hughsient/quirk/quirk-keymap-try.html ,
    the value radio for the Fn + F2 hotkey, however this wasn't working
    (the message Unknown

diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index a6d7aa9..a9d4921 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -99,6 +99,16 @@
             <append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
             <append key="info.capabilities" type="strlist">input.keymap</append>
           </match>
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="XPS Gen2">
+            <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+            <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+            <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
+            <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Toggle WiFi -->
+            <append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
+            <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 Hibernate -->
+            <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
+            <append key="info.capabilities" type="strlist">input.keymap</append>
+          </match>
         </match>
       </match>
     </match>