hal: Branch 'master'

[Richard Hughes]

 fdi/information/10freedesktop/30-keymap-module-asus-laptop.fdi |   29 ++++++++++
 fdi/information/10freedesktop/Makefile.am                      |    3 -
 2 files changed, 31 insertions(+), 1 deletion(-)

New commits:
diff-tree 2c2051fefd389e7419decdb20802aacb65bdd056 (from 4fbd52dd54129f386f365732d567c93dad5f615b)
Author: Nicolas Trangez <ikke at nicolast.be>
Date:   Sun Sep 30 18:52:40 2007 +0100

    add keymap for ASUS W3J
    
    In attachment you can find an FDI file which maps ACPI event codes
    generated by the ASUS W3J laptop to KEY_* codes. 2 of them are commented
    out as I couldn't find any corresponding keycode.
    As noted in my mail in the ACPI/ASUS/INPUT thread the 0x08a:tv mapping
    gives some funny results.

diff --git a/fdi/information/10freedesktop/30-keymap-module-asus-laptop.fdi b/fdi/information/10freedesktop/30-keymap-module-asus-laptop.fdi
new file mode 100644
index 0000000..bdae8a4
--- /dev/null
+++ b/fdi/information/10freedesktop/30-keymap-module-asus-laptop.fdi
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+  <device>
+    <match key="info.product" string="Asus Extra Buttons">
+      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="ASUS">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="W3J">
+          <append key="input.keymap.data" type="strlist">0x041:nextsong</append>
+          <append key="input.keymap.data" type="strlist">0x045:playpause</append>
+          <append key="input.keymap.data" type="strlist">0x043:stopcd</append>
+          <append key="input.keymap.data" type="strlist">0x040:previoussong</append>
+          <append key="input.keymap.data" type="strlist">0x04c:ejectclosecd</append>
+          <append key="input.keymap.data" type="strlist">0x032:mute</append>
+          <append key="input.keymap.data" type="strlist">0x031:volumedown</append>
+          <append key="input.keymap.data" type="strlist">0x030:volumeup</append>
+          <!-- Disable touchpad -->
+          <!-- <append ket="input.keymap.data" type="strlist">0x06b:</append> -->
+          <append key="input.keymap.data" type="strlist">0x05d:wlan</append>
+          <append key="input.keymap.data" type="strlist">0x07e:bluetooth</append>
+          <!-- Performance -->
+          <!-- <append key="input.keymap.data" type="strlist">0x05c:</append> -->
+          <append key="input.keymap.data" type="strlist">0x08a:tv</append>
+          <!-- TODO: sleep/power buttons -->
+          <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 f8c4811..49aef61 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -61,7 +61,8 @@ dist_fdi_DATA +=					\
 		30-keymap-compaq.fdi			\
 		30-keymap-lenovo.fdi			\
 		30-keymap-dell.fdi			\
-		30-keymap-acer.fdi
+		30-keymap-acer.fdi 			\
+		30-keymap-module-asus-laptop.fdi
 endif
 
 check: