hal: Branch 'master'

[Richard Hughes]

 fdi/information/10freedesktop/30-keymap-dell.fdi |   10 ++++++++++
 1 files changed, 10 insertions(+)

New commits:
diff-tree 841eec601fe08654c5ff3bc1c20c4fb602593106 (from 84080e56eb95b14f0c2fcd7c6eaaa45cf07631fe)
Author: Tyler Owen <tyler.l.owen at gmail.com>
Date:   Tue Jul 10 12:57:30 2007 +0100

    add keymap for DELL D820
    
    I have attached a patch for the D820 scancodes.  I have tested these
    with the latest hal packages from utopia on my F7 laptop.

diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index f29fb57..19fc838 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -18,6 +18,16 @@
 	    <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
 	    <append key="info.capabilities" type="strlist">input.keymap</append>
 	  </match>
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D820">
+            <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
+            <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
+            <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
+            <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">e013:f13</append> <!-- FIXME Fn+Left arrow Auto Brightness -->
+            <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
+            <append key="info.capabilities" type="strlist">input.keymap</append>
+          </match>
 	</match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="MXC062"> <!-- Dell XPS M1210 -->
 	  <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 Battery icon -->