hal: Branch 'master'

[Richard Hughes]

 fdi/information/10freedesktop/30-keymap-misc.fdi |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

New commits:
commit d41f5423d3c0557310d151b17f8132ec1ca98d61
Author: Daniele C <legolas558 at email.it>
Date:   Tue Feb 19 15:38:38 2008 +0000

    hal-info patch for Maxdata Pro 7000DX
    
    I have created a patch for the multimedia keys of Maxdata Pro
    7000X/7000DX notebooks (http://gentoo-wiki.com/HARDWARE_Maxdata_Pro_7000DX).
    
    Please note that  system.hardware.product is 'Pro 7000X', although I
    have always thought to own a 7000DX! I am sure that 7000X/7000DX have
    the same multimedia keys.

diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index ee12775..948a10a 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -77,6 +77,21 @@
 	  <append key="info.capabilities" type="strlist">input.keymap</append>
 	</match>
       </match>
+      
+      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="MAXDATA">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Pro 7000">
+	  <append key="input.keymap.data" type="strlist">97:prog2</append> <!-- "P2" programmable button -->
+	  <append key="input.keymap.data" type="strlist">9f:prog1</append> <!-- "P1" programmable button -->
+	  <append key="input.keymap.data" type="strlist">a0:mute</append> <!-- Fn-F5   Sound On/Off -->
+	  <append key="input.keymap.data" type="strlist">82:www</append> <!-- www button -->
+	  <append key="input.keymap.data" type="strlist">ec:email</append> <!-- envelope button -->
+            <append key="input.keymap.data" type="strlist">ae:volumedown</append> <!-- Fn-Down   Volume down -->
+            <append key="input.keymap.data" type="strlist">b0:volumeup</append> <!-- Fn-Up   Volume up -->
+	  <append key="input.keymap.data" type="strlist">df:suspend</append> <!-- Fn+F2 hibernate -->
+            <append key="input.keymap.data" type="strlist">f5:help</append> <!-- Help button -->
+	  <append key="info.capabilities" type="strlist">input.keymap</append>
+	</match>
+      </match>
 
     </match>