hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree 01c666f841a0c3ba97e186ce6d10436ce2b4c6ea (from af7147f9fe790b54e015bc70ea8db5132c5a9e89)
Author: Angel Marin <anmar at anmar.eu.org>
Date:   Sun Jun 17 19:59:24 2007 +0100

    The patch adds the keymaps for a Dell XPS M1210. It identifies itself as
      system.hardware.product='MXC062' so not sure if it'll match for older
    hardware revisions.

diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index 5e7386c..4f37dce 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -19,6 +19,18 @@
 	    <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 -->
+	  <append key="input.keymap.data" type="strlist">e00b:switchvideomode</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">e00a:suspend</append> <!-- Fn+F1 Hibernate -->
+	  <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Wirelesss switch -->
+	  <append key="input.keymap.data" type="strlist">e008:bluetooth</append> <!-- FIXME Bluetooth switch (same as wireless) -->
+	  <append key="input.keymap.data" type="strlist">e012:media</append> <!-- Dell MediaDirect button Opens Dell Media Experience (a sort of media player) -->
+	  <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>