hal: Branch 'master' - 3 commits

[Richard Hughes]

 fdi/information/10freedesktop/30-keymap-compaq.fdi |   23 ++++++++++++
 fdi/information/10freedesktop/30-keymap-misc.fdi   |   39 +++++++++++++++++++++
 fdi/information/10freedesktop/Makefile.am          |    2 +
 3 files changed, 64 insertions(+)

New commits:
diff-tree d68caa95593ce25e402d86b6f79b0d226e415989 (from 76e3392e3288276e64a9e93db3884026d11283b7)
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Jun 6 09:24:25 2007 +0100

    add Microstar Infinity Keyboard keymap

diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index 1587d39..a8fa30c 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -14,6 +14,24 @@
         </match>
       </match>
 
+      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="MICRO-STAR">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="INFINITY">
+          <append key="input.keymap.data" type="strlist">e064:prog1</append> <!-- Fn-F3   Touchpad disable -->
+          <append key="input.keymap.data" type="strlist">e077:brightnessdown</append> <!-- Fn-F4   Brightness down -->
+          <append key="input.keymap.data" type="strlist">e078:brightnessup</append> <!-- Fn-F5   Brightness up -->
+          <append key="input.keymap.data" type="strlist">e02e:volumedown</append> <!-- Fn-F7   Volume down -->
+          <append key="input.keymap.data" type="strlist">e030:volumeup</append> <!-- Fn-F8   Volume up -->
+          <append key="input.keymap.data" type="strlist">e020:mute</append> <!-- Fn-F9   Sound On/Off -->
+          <append key="input.keymap.data" type="strlist">e05f:sleep</append> <!-- Fn-F12  Sleep -->
+          <append key="input.keymap.data" type="strlist">e06c:email</append> <!-- envelope button -->
+          <append key="input.keymap.data" type="strlist">e032:www</append> <!-- e button -->
+          <append key="input.keymap.data" type="strlist">e076:wlan</append> <!-- satellite dish1 -->
+          <append key="input.keymap.data" type="strlist">e062:bluetooth</append> <!-- satellite dish2 -->
+          <append key="input.keymap.data" type="strlist">e079:search</append> <!-- Search -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
+      </match>
+
     </match>
 
   </device>
diff-tree 76e3392e3288276e64a9e93db3884026d11283b7 (from 16c125c02a8257896c7ee21d73fa0aa9077069b4)
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Jun 6 09:18:49 2007 +0100

    add Medion FID2060 keymap

diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
new file mode 100644
index 0000000..1587d39
--- /dev/null
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -0,0 +1,21 @@
+<?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="MEDION">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="FID2060">
+          <append key="input.keymap.data" type="strlist">6b:channeldown</append> <!-- Thottle Down -->
+          <append key="input.keymap.data" type="strlist">6d:channelup</append> <!-- Thottle Up -->
+          <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 d02d996..eefc158 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -39,6 +39,7 @@ endif
 
 if BUILD_KEYMAPS
 dist_fdi_DATA +=				\
+		30-keymap-misc.fdi		\
 		30-keymap-compaq.fdi		\
 		30-keymap-lenovo.fdi		\
 		30-keymap-dell.fdi
diff-tree 16c125c02a8257896c7ee21d73fa0aa9077069b4 (from a0eef3bf3bb05731c5edd6b9ea51e216e19cf900)
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Jun 6 09:12:41 2007 +0100

    add keymap for Compaq E500 laptop

diff --git a/fdi/information/10freedesktop/30-keymap-compaq.fdi b/fdi/information/10freedesktop/30-keymap-compaq.fdi
new file mode 100644
index 0000000..60b86c7
--- /dev/null
+++ b/fdi/information/10freedesktop/30-keymap-compaq.fdi
@@ -0,0 +1,23 @@
+<?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="Compaq">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="E500">
+          <append key="input.keymap.data" type="strlist">e023:www</append>	<!-- I key -->
+          <append key="input.keymap.data" type="strlist">e01f:home</append>	<!-- Home key -->
+          <append key="input.keymap.data" type="strlist">e01a:search</append>	<!-- Search key -->
+          <append key="input.keymap.data" type="strlist">e01e:email</append>	<!-- Email -->
+          <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 881c40f..d02d996 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -39,6 +39,7 @@ endif
 
 if BUILD_KEYMAPS
 dist_fdi_DATA +=				\
+		30-keymap-compaq.fdi		\
 		30-keymap-lenovo.fdi		\
 		30-keymap-dell.fdi
 endif