hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree 6c7fcb6e3e1679fd6eef98c0f9b6dada17c1776d (from 9a4c2b716568b9db1255208f92fa83edd5805675)
Author: Eric Harney <eharney at gmail.com>
Date:   Wed Jul 11 09:56:07 2007 +0100

    add keymap for dell inspiron e1505
    
    I've written a patch to enable extra keys on the Insprion E1505.  This
    is a rebranded Inspiron 6400, which is what HAL sees the laptop as.

diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index 81164f8..4330aa6 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -76,6 +76,17 @@
             <append key="info.capabilities" type="strlist">input.keymap</append>
           </match>
         </match>
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="MM061">  <!-- Inspiron E1505/6400 -->
+            <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:bluetooth</append> <!-- Fn+F2 bluetooth -->
+            <append key="input.keymap.data" type="strlist">e009:ejectclosedcd</append> <!-- Fn+F10 Eject CD -->
+            <append key="input.keymap.data" type="strlist">e00a:hibernate</append> <!-- Fn+F1 Hibernate -->
+            <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
+            <append key="input.keymap.data" type="strlist">e012:media</append> <!-- MediaDirect button (house icon) -->
+            <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
       </match>
     </match>
   </device>