hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree bb938b95aa3395f5840c0b7f0d10fd89fbb78995 (from eb2ae3c6b0cbe31b37c21a5e494185bf692e3b7f)
Author: Juan Pablo Salazar Bertín <snifer_ at hotmail.com>
Date:   Mon Jul 16 18:19:39 2007 +0100

    add keymap for Dell Inspiron 9400
    
    Keymap for Dell Inspiron 9400 laptop.
    
    Some notes:
    
    * These keys work, even with the unknown key pressed message: wifi/bluetooth, brightness up, brightness down.
    * The media direct key generates 2 events (same scancode), 1 when pressing it and 1 when releasing it.

diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index c316de8..cf4110d 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -53,6 +53,19 @@
           </match>
         </match> <!-- prefix="Latitude" -->
 
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="MP061"> <!-- Dell Inspiron 9400 -->
+          <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 Toggle WiFi -->
+          <append key="input.keymap.data" type="strlist">e008:bluetooth</append> <!-- FIXME Bluetooth switch (same as 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: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 key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="MXC061"> <!-- Dell Inspiron 640m -->
           <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
           <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Toggle WiFi -->