hal: Branch 'master' - 2 commits

[Richard Hughes]

 fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi |    3 +++
 fdi/information/10freedesktop/30-keymap-dell.fdi         |   14 ++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

New commits:
diff-tree 1c2c2b47596e4be97b603e2fd1b8e57b0d3192b4 (from 9c7a902a252d7484b1264a19b8107dc05006c7ee)
Author: Stuart Fairley <stuart at seegrid.com>
Date:   Sat Jul 7 11:08:18 2007 +0100

    add quirk for Sony Vaio VGN-FS730 resume
    
    As outlined in the HAL Sleep Quirks page:
    
    The attached patch allows me to successfully suspend and resume (without
    it I'd have a live machine - Ctrl-Alt-Del reboots cleanly, but dead
    display).
    
    Tested successfully once from run level 3 and 4 times from X, run level 5.
    
    Thanks for the easy to use instructions

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
index 8e04237..d49f049 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
@@ -9,6 +9,9 @@
       <match key="system.hardware.product" string="VGN-FS115Z">
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
+      <match key="system.hardware.product" string="VGN-FS730">
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+      </match>
     </match>
   </device>
 </deviceinfo>
diff-tree 9c7a902a252d7484b1264a19b8107dc05006c7ee (from 99716c902a1bf0f19c6b4522520f1722a79aac85)
Author: Simon Goodall <sg at ecs.soton.ac.uk>
Date:   Sat Jul 7 11:04:23 2007 +0100

    add keymap for dell inspiron 8500
    
    Please see attached for keybindings for a dell inspiron 8500. I've
    tested this against the version of hal in the utopia repository and
    against the git repo's make check.
    The cdrom eject button does not appear to do anything. I tried both
    ejectcd and ejectclosedcd.

diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index 4f37dce..f29fb57 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -31,10 +31,20 @@
 	  <append key="input.keymap.data" type="strlist">e015:prog1</append> <!-- Shutter button Takes a picture if optional camera available -->
 	  <append key="info.capabilities" type="strlist">input.keymap</append>
 	</match>
-      </match>
 
+	<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Inspiron">
+	   <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="8500">
+	     <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
+	     <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+	     <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+	     <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Toggle WiFi -->
+	     <append key="input.keymap.data" type="strlist">e009:ejectclosedcd</append> <!-- Fn+F10 Eject CD -->
+	     <append key="info.capabilities" type="strlist">input.keymap</append>
+	   </match>
+	</match>
+      </match>
     </match>
-
   </device>
 </deviceinfo>
 
+