hal: Branch 'master'

[Richard Hughes]

 fdi/information/10freedesktop/30-keymap-hp.fdi |   20 ++++++++++++++++++++
 fdi/information/10freedesktop/Makefile.am      |    1 +
 2 files changed, 21 insertions(+)

New commits:
diff-tree b9c7a2e5a9c05c4a2b7d73a260f0cd42b9f74efb (from 89e45b45cb2433541cdd017c54a740eb1ff03aa2)
Author: William Ritchie <billr at domsys.com>
Date:   Mon Jul 9 15:23:32 2007 +0100

    add keybinding for hp nc6120
    
    here is a new file for hp laptops that I started. The only one listed is
    the nc6120.  The only missing keys were the I button, the Svideo button
    and the battery button.

diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
new file mode 100644
index 0000000..07ed507
--- /dev/null
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+
+<deviceinfo version="0.2">
+  <device>
+
+    <!-- These are raw scancodes produced by the atkbd driver -->
+    <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="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) -->
+          <append key="input.keymap.data" type="strlist">e008:tv</append>	<!-- SVideo -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
+      </match>
+    </match>
+  </device>
+</deviceinfo>
+
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index eefc158..dae40e8 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -40,6 +40,7 @@ endif
 if BUILD_KEYMAPS
 dist_fdi_DATA +=				\
 		30-keymap-misc.fdi		\
+		30-keymap-hp.fdi		\
 		30-keymap-compaq.fdi		\
 		30-keymap-lenovo.fdi		\
 		30-keymap-dell.fdi