hal-info: Branch 'master'

[Martin Pitt]

 fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi |   29 ++++------
 1 file changed, 12 insertions(+), 17 deletions(-)

New commits:
commit 2e30caa7c3f66e02d232b26addd99a9abca608b3
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Fri May 8 11:29:22 2009 +0200

    reorganize 30-keymap-module-sony-laptop.fdi
    
    This avoids the usage of <match key="input.keymap.data" exists="false"> and
    removes the wrong key bindings on older Sony laptop models instead. This makes
    the file structure consistent with similar cases (e. g. Acer) and is thus
    easier to maintain, and also easier to convert automatically to udev rules.

diff --git a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
index 6ad79dd..1818846 100644
--- a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
@@ -6,30 +6,25 @@
          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="info.capabilities" type="strlist">input.keymap</append>
+
+        <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="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 -->
 
 	<!-- 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;VGN-S360;VGN-SZ2HP_B">
+          <remove key="input.keymap.data" type="strlist">0x06:mute</append>
 	  <append key="input.keymap.data" type="strlist">0x06:battery</append>
+          <remove key="input.keymap.data" type="strlist">0x07:volumedown</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="true">
-          <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>