hal: Branch 'master' - 2 commits

[Danny Kukawka]

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

New commits:
commit 3867526003664a62f9a23181ed449d9d7c8e2df1
Author: Ulf Gattner <ugattner at cs.tu-berlin.de>
Date:   Mon Mar 3 14:27:16 2008 +0100

    added keymap for Samsung P55-Pro
    
    Added keymap for a Samsung P55-Pro.

diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index cb35bbf..54f631e 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -93,6 +93,24 @@
 	</match>
       </match>
 
+      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="SAMSUNG">
+        <!-- Samsung P55-Pro -->
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="SP55S">
+          <append key="input.keymap.data" type="strlist">e003:battery</append> <!-- Fn+F2 battery icon -->
+          <!-- Fn+F3  euro (generates a sequence of different keypressed events in syslog) -->
+          <append key="input.keymap.data" type="strlist">e002:displaytoggle</append> <!-- Fn+F4 CRT/LCD -->
+          <append key="input.keymap.data" type="strlist">e004:prog1</append> <!-- Fn+F5 backlight on/off -->
+          <append key="input.keymap.data" type="strlist">e031:prog2</append> <!-- Fn+F7 run Samsung Magic Doctor (keypressed event is generated twice) -->
+          <append key="input.keymap.data" type="strlist">e033:prog3</append> <!-- Fn+F8 switch power mode (battery/dynamic/performance) -->
+          <append key="input.keymap.data" type="strlist">e006:wlan</append> <!-- Fn+F9 Turn On/Off Wireless -->
+          <append key="input.keymap.data" type="strlist">e077:f22</append> <!-- Fn+F10 Touchpad on -->
+          <append key="input.keymap.data" type="strlist">e079:f22</append> <!-- Fn+F10 Touchpad off -->
+          <append key="input.keymap.data" type="strlist">e008:brightnessup</append> <!-- Fn-Up Brightness up -->
+          <append key="input.keymap.data" type="strlist">e009:brightnessdown</append> <!-- Fn-Down Brightness down -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
+      </match>
+
     </match>
 
   </device>
commit a455a551fdee78d7890fabde898623f4442ad757
Author: Thomas Renninger <trenn at suse.de>
Date:   Mon Mar 3 14:22:16 2008 +0100

    added keymap for HP 6715
    
    Added keymap for HP 6715 laptop.

diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index eb6dc21..d2ad959 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -62,7 +62,7 @@
           <append key="input.keymap.data" type="strlist">e059:info</append>	<!-- I key -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="nc6230;nw8440;nx6325;6710b">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="nc6230;nw8440;nx6325;6710b;6715">
           <append key="input.keymap.data" type="strlist">e001:fn_esc</append>	<!-- FnEsc -->
           <append key="input.keymap.data" type="strlist">e008:presentation</append>	<!-- presentation -->
           <append key="input.keymap.data" type="strlist">e009:battery</append>	<!-- FnF8 (battery) -->