hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi |   37 +++++-----
 1 file changed, 21 insertions(+), 16 deletions(-)

New commits:
commit 6c0308a2d604d9e4d833031527c6a91dccc69397
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Aug 11 16:27:30 2008 +0200

    fixed/improved keymapping for sony-laptop
    
    Fixed Sony keymapping to prevent adding and immediately removing some
    of these keys again.

diff --git a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
index 3661d37..4c02044 100644
--- a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
@@ -6,25 +6,30 @@
          You can find the scancodes in the kernel source of the module (drivers/misc/sony-laptop.c) -->
     <match key="input.product" string="Sony Vaio Keys">
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Sony">
-        <append key="input.keymap.data" type="strlist">0x06:mute</append> <!-- Fn+F2 mute -->
-        <append key="input.keymap.data" type="strlist">0x07:volumedown</append> <!-- Fn+F3 mixer down -->
-        <append key="input.keymap.data" type="strlist">0x08:volumeup</append> <!-- Fn+F4 mixer up -->
-        <append key="input.keymap.data" type="strlist">0x09:brightnessdown</append> <!-- Fn+F5 brightness up -->
-        <append key="input.keymap.data" type="strlist">0x0a:brightnessup</append> <!-- Fn+F6 brightness down -->
-        <append key="input.keymap.data" type="strlist">0x0b:switchvideomode</append> <!-- Fn+F7 switch crt/lcd -->
-        <append key="input.keymap.data" type="strlist">0x0e:zoom</append> <!-- Fn+F10 zoom -->
-        <append key="input.keymap.data" type="strlist">0x10:suspend</append> <!-- Fn+F12 hibernate -->
-        <append key="info.capabilities" type="strlist">input.keymap</append>
+
+	<!-- Older Vaios have a different keymap -->
 	<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="PCG-C1;PCG-K25;PCG-F1;PCG-F2;PCG-F3;PCG-F4;PCG-F5;PCG-F6;PCG-FX;PCG-FRV;PCG-GR;PCG-TR;PCG-NV;PCG-Z">
-	  <!-- Older Vaios have a different keymap -->
-	  <remove key="input.keymap.data" type="strlist">0x06:mute</remove>
-	  <remove key="input.keymap.data" type="strlist">0x07:volumedown</remove>
-	  <remove key="input.keymap.data" type="strlist">0x08:volumeup</remove>
-	  <remove key="input.keymap.data" type="strlist">0x09:brightnessdown</remove>
-	  <remove key="input.keymap.data" type="strlist">0x0a:brightnessup</remove>
-          <append key="input.keymap.data" type="strlist">0x06:battery</append>
+	  <append key="input.keymap.data" type="strlist">0x06:battery</append>
           <append key="input.keymap.data" type="strlist">0x07:mute</append> 
 	</match>
+	
+	<!-- now the generic mapping -->
+	<match key="input.keymap.data" exists="false">
+          <append key="input.keymap.data" type="strlist">0x06:mute</append> <!-- Fn+F2 mute -->
+          <append key="input.keymap.data" type="strlist">0x07:volumedown</append> <!-- Fn+F3 mixer down -->
+          <append key="input.keymap.data" type="strlist">0x08:volumeup</append> <!-- Fn+F4 mixer up -->
+          <append key="input.keymap.data" type="strlist">0x09:brightnessdown</append> <!-- Fn+F5 brightness up -->
+          <append key="input.keymap.data" type="strlist">0x0a:brightnessup</append> <!-- Fn+F6 brightness down -->
+	</match>
+
+	<!-- now the common part -->
+	<match key="input.keymap.data" exists="yes">
+          <append key="input.keymap.data" type="strlist">0x0b:switchvideomode</append> <!-- Fn+F7 switch crt/lcd -->
+          <append key="input.keymap.data" type="strlist">0x0e:zoom</append> <!-- Fn+F10 zoom -->
+          <append key="input.keymap.data" type="strlist">0x10:suspend</append> <!-- Fn+F12 hibernate -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
+
      </match>
     </match>
   </device>