hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree a5ab35b496cc990cc82c53664ad3d129fdd60dee (from bb938b95aa3395f5840c0b7f0d10fd89fbb78995)
Author: Mads Kiilerich <mads at kiilerich.com>
Date:   Tue Jul 17 10:14:44 2007 +0100

    add keymap for dell d610
    
    As requested on
    http://people.freedesktop.org/~hughsient/quirk/quirk-keymap-report.html
    a patch for Dell Latitude D-610, captured on Fedora 7.
    
      system.hardware.product = 'Latitude D610'  (string)
      system.hardware.vendor = 'Dell Inc.'  (string)

diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index cf4110d..da5e2b3 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="D610">
+            <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
+            <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">e00a:suspend</append> <!-- Fn+F1 hibernate -->
+            <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Turn On/Off Wireless -->
+            <append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
+            <append key="info.capabilities" type="strlist">input.keymap</append>
+          </match>
           <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D620">
             <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 -->