hal-info: Branch 'master' - 2 commits

[Danny Kukawka]

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

New commits:
commit 40969744b3eec6f6018fb9d9729b1cfb1762bc2a
Author: Dawid Wróbel <dawid at klej.net>
Date:   Thu Apr 3 22:01:10 2008 +0200

    added suspend quirks for a Dell Precision M20
    
    Added suspend quirks for a Dell Precision M20.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index c37f55e..9682957 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -80,6 +80,10 @@
 
       <!-- Dell Precision -->
       <match key="system.hardware.product" prefix="Precision">
+        <match key="system.hardware.product" contains="M20">
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+          <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+        </match>
         <match key="system.hardware.product" contains=" M60">
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
commit fe3bf78ef14f783819837f5d60a5428cfaef96b7
Author: Dawid Wróbel <dawid at klej.net>
Date:   Thu Apr 3 21:59:21 2008 +0200

    added keymap for a Dell Precision M20
    
    Added keymap for a Dell Precision M20.

diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index 0e8f6d0..57ac946 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -112,6 +112,16 @@
         </match>
 
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Precision">
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="M20">
+            <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 Turn On/Off Wireless -->
+            <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:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
+            <append key="info.capabilities" type="strlist">input.keymap</append>
+          </match>
           <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 -->