hal-info: Branch 'master' - 2 commits

[Danny Kukawka]

 fdi/information/10freedesktop/30-keymap-dell.fdi               |    9 +++++++++
 fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi |    2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 5af421cabb589c69ee05970faa285022d025e49c
Author: Guillaume Charhon <pub.charhon at wanadoo.fr>
Date:   Wed Apr 23 16:18:53 2008 +0200

    add keymap for a Sony Vaio VGN-S5VP
    
    Added keymap for a Sony Vaio VGN-S5VP.

diff --git a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
index 10b4679..e94ee96 100644
--- a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
@@ -6,7 +6,7 @@
          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">
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string_outof="PCG-Z1RMP;PCG-Z1XMP;VGN-S1XP(GB);VGN-SZ3XWP_C">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string_outof="PCG-Z1RMP;PCG-Z1XMP;VGN-S1XP(GB);VGN-SZ3XWP_C;VGN-S5VP_B">
           <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 -->
commit 12d51b33fce6aec115aa2a57994dd07d8eb0e9d6
Author: Carlos Berroterán <ceb.xan at gmail.com>
Date:   Wed Apr 23 16:17:18 2008 +0200

    add keymap for Dell Inpsiron 1520
    
    Added keymap for Dell Inpsiron 1520.

diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index 57ac946..022d6b3 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -109,6 +109,15 @@
             <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
             <append key="info.capabilities" type="strlist">input.keymap</append>
           </match>
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="1520">
+            <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+            <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+            <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
+            <append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
+            <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 Hibernate -->
+            <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
+            <append key="info.capabilities" type="strlist">input.keymap</append>
+          </match>
         </match>
 
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Precision">