hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree 447851d8b7064eeaa3a70c3cf16cc629e558cd52 (from dae9101265536e248a07ea28507b4dd093efdcc7)
Author: Andreas Thienemann <andreas at bawue.net>
Date:   Tue Jul 10 14:03:05 2007 +0100

    add keymap for hp nx5000
    
    attached is a little patch adding support to the nx5000 keymaps.
    
    regards,
     andreas

diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index 51d826f..f06976f 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -7,6 +7,14 @@
     <match key="@input.originating_device:info.linux.driver" string="atkbd">
 
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Hewlett-Packard">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nx5000">
+          <append key="input.keymap.data" type="strlist">e001:lock</append>	<!-- FnEsc -->
+          <append key="input.keymap.data" type="strlist">e008:tv</append>	<!-- SVideo/Presentation -->
+          <append key="input.keymap.data" type="strlist">e009:battery</append>	<!-- FnF8 (battery) -->
+          <append key="input.keymap.data" type="strlist">e00a:lock</append>	<!-- Lock -->
+          <append key="input.keymap.data" type="strlist">e057:wlan</append>	<!-- Wlan -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nc6120">
           <append key="input.keymap.data" type="strlist">e059:www</append>	<!-- I key -->
           <append key="input.keymap.data" type="strlist">e009:battery</append>	<!-- FnF8 (battery) -->