hal: Branch 'master'

[Richard Hughes]

 fdi/information/10freedesktop/10-laptop-panel-hardware.fdi |    7 +++
 fdi/information/10freedesktop/30-keymap-dell.fdi           |   28 +++++++++++++
 fdi/information/10freedesktop/Makefile.am                  |    3 -
 3 files changed, 37 insertions(+), 1 deletion(-)

New commits:
diff-tree a0eef3bf3bb05731c5edd6b9ea51e216e19cf900 (from 8e51fc7898707934079be1c74ce6f5e03ceb3dd5)
Author: Bastien Nocera <hadess at hadess.net>
Date:   Wed Jun 6 09:03:13 2007 +0100

    add Dell D420 keymap support
    
    Add Dell D420 support (untested, because of the matching bugs) - also
    add a quirk for a hardware controlled laptop panel.

diff --git a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
index 9bf76c7..476f279 100644
--- a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
+++ b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
@@ -7,6 +7,13 @@
        This is a hardware "feature" seen on some IBM and Lenovo laptops. -->
   <device>
     <match key="info.category" string="laptop_panel">
+      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Dell">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Latitude">
+	  <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D420">
+	    <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
+	  </match>
+	</match>
+      </match>
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="IBM">
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="ThinkPad">
           <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
new file mode 100644
index 0000000..5e7386c
--- /dev/null
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+
+<deviceinfo version="0.2">
+  <device>
+
+    <!-- These are raw scancodes produced by the atkbd driver -->
+    <match key="@input.originating_device:info.linux.driver" string="atkbd">
+
+      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Dell">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Latitude">
+	  <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D420">
+	    <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">e005: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>
+
+    </match>
+
+  </device>
+</deviceinfo>
+
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index cb604dd..881c40f 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -39,7 +39,8 @@ endif
 
 if BUILD_KEYMAPS
 dist_fdi_DATA +=				\
-		30-keymap-lenovo.fdi
+		30-keymap-lenovo.fdi		\
+		30-keymap-dell.fdi
 endif
 
 check: