hal-info: Branch 'master' - 4 commits

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi     |    4 +--
 fdi/information/10freedesktop/30-keymap-hp.fdi                 |    6 +++++
 fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi |   12 +++++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

New commits:
commit 6d18fee2d106c736e2855cd93368de22edaa61ae
Author: Pedro Matos Jr <osandy at gmail.com>
Date:   Thu Apr 3 21:34:48 2008 +0200

    added keymap for a Sony Vaio VGN-FZ140E
    
    Added keymap for a Sony Vaio VGN-FZ140E.

diff --git a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
index 8c87bde..1e1be69 100644
--- a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
@@ -28,6 +28,16 @@
           <append key="input.keymap.data" type="strlist">0x10:suspend</append> <!-- Fn+F12 hibernate -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
+
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="VGN-FZ140E">
+          <append key="input.keymap.data" type="strlist">0x06:mute</append> <!-- Fn+F2 mute -->
+          <append key="input.keymap.data" type="strlist">0x09:brightnessdown</append> <!-- Fn+F5 brightness up -->
+          <append key="input.keymap.data" type="strlist">0x0a:brightnessup</append> <!-- Fn+F6 brightness down -->
+          <append key="input.keymap.data" type="strlist">0x0b:switchvideomode</append> <!-- Fn+F7 switch crt/lcd -->
+          <append key="input.keymap.data" type="strlist">0x0e:zoom</append> <!-- Fn+F10 zoom -->
+          <append key="input.keymap.data" type="strlist">0x10:suspend</append> <!-- Fn+F12 hibernate -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
       </match>
     </match>
   </device>
commit 42272f93da3b830a15fac7de1ce7e3822f62b6cf
Author: Valent Turkovic <valent.turkovic at gmail.com>
Date:   Thu Apr 3 21:26:12 2008 +0200

    added keymap for a HP Pavilion 6426us (dv6000)
    
    Added keymap for a HP Pavilion 6426us (dv6000).

diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index bb0c44d..947ee93 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -19,6 +19,12 @@
           <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 (lock) -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
+	<!-- HP Pavilion dv6426us -->
+	<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="dv6000">
+          <append key="input.keymap.data" type="strlist">e008:f20</append>	<!-- FIXME: quick play -->
+          <append key="input.keymap.data" type="strlist">e00e:f21</append>	<!-- FIXME: dvd -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="dv6500">
           <append key="input.keymap.data" type="strlist">e008:f20</append>	<!-- FIXME: quick play -->
           <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 (lock) -->
commit 97a6bc78f2153b7ddd3840fc05a3f01ea52bc31f
Author: Daryl Blanc <darylblanc at gmail.com>
Date:   Thu Apr 3 21:14:37 2008 +0200

    added keymap for a Sony VGN-SZ71WN_C
    
    Added keymap for a Sony VGN-SZ71WN_C.

diff --git a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
index 34cc52b..8c87bde 100644
--- a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
@@ -17,7 +17,7 @@
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
 
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="VGN-FS790B;VGN-TZ11">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="VGN-FS790B;VGN-TZ11;VGN-SZ71WN_C">
           <append key="input.keymap.data" type="strlist">0x06:mute</append> <!-- Fn+F2 mute -->
           <append key="input.keymap.data" type="strlist">0x07:volumedown</append> <!-- Fn+F3 mixer down -->
           <append key="input.keymap.data" type="strlist">0x08:volumeup</append> <!-- Fn+F4 mixer up -->
commit 71c4a54fd1c4b16873ae560f31f6e1bf6a8de74f
Author: Colin Macdonald <cbm at sfu.ca>
Date:   Thu Apr 3 21:11:40 2008 +0200

    added Lenovo Thinkpad X61s suspend quirk
    
    Added Lenovo Thinkpad X61s suspend quirk.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index 064c0d9..0da863d 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -4,8 +4,8 @@
     <match key="system.hardware.vendor" string="LENOVO">
     <!-- ThinkPads -->
 
-      <!-- X60 / X60s / T61 / T61p / R61 / X61 Tablet -->
-      <match key="system.hardware.product" prefix_outof="1702;1704;1706;1709;6363;6364;6365;6458;7658;7661;7666;7733;7738;7767;7768;8919;9452">
+      <!-- X60 / X60s / T61 / T61p / R61 / R61s / X61 Tablet -->
+      <match key="system.hardware.product" prefix_outof="1702;1704;1706;1709;6363;6364;6365;6458;7658;7661;7666;7668;7733;7738;7767;7768;8919;9452">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>