hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree d41b99195921196b42cb1ac9a6d0d7e93a7d986e (from f97a91e81c37ed39c325f229d52705a58772177d)
Author: Lennart Poettering <mzuny at 0pointer.de>
Date:   Wed Jul 11 21:18:04 2007 +0100

    add keymap quirks for msi-s270
    
    The attached patch contains the keymap data for MSI S270 laptops.
    
    This laptop generates keyboard events when the power cable is plugged
    in/plugged out. These events are completely redundant, because ACPI
    events are sent anyway. Thus I'd like to map this key to some code
    where they are essentially eaten. KEY_RESERVED is not an option,
    because this still fills up dmesg with those well known warnings about
    setkeycode. I am now using KEY_UNKNOWN which fills up dmesg slightly
    less, but still generates a warning when X11 is listening for raw kbd
    events. Better then before but not much better. I guess it would make
    sense to have a proper KEY_NULL or similar in the kernel.

diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index a8fa30c..8c2d0cb 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -31,7 +31,26 @@
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
       </match>
+      
+      <match key="/org/freedesktop/Hal/devices/computer:system.chassis.manufacturer" prefix="MICRO-STAR">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string="0131">
+          <append key="input.keymap.data" type="strlist">e078:brightnessup</append> <!-- Fn-F4   Brightness up -->
+          <append key="input.keymap.data" type="strlist">e077:brightnessdown</append> <!-- Fn-F5   Brightness down -->
+          <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> <!-- www button -->
+          <append key="input.keymap.data" type="strlist">e076:wlan</append> <!-- wlan -->
+          <append key="input.keymap.data" type="strlist">e079:search</append> <!-- search -->
+          <append key="input.keymap.data" type="strlist">e071:unknown</append> <!-- plug -->
+          <append key="input.keymap.data" type="strlist">e072:unknown</append> <!-- unplug -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
+      </match>
 
+	
     </match>
 
   </device>