hal-info: Branch 'master' - 2 commits

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi |    2 -
 fdi/information/10freedesktop/30-keymap-misc.fdi            |   14 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 138f017456ef46abdcb48d935626166254838f7d
Author: Sam Morris <sam at robots.org.uk>
Date:   Tue Apr 15 12:45:16 2008 +0200

    added keymap info for Samsung Q45
    
    Added keymap info for Samsung Q45.

diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index d33f601..171b13d 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -117,6 +117,20 @@
           <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 key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="SQ45S70S">
+          <append key="input.keymap.data" type="strlist">e003:battery</append> <!-- Fn+F2 battery icon -->
+	  <!-- Fn+F3 euro; generates these scancodes according to showkeys(1): 0x38 0x52 0xd2 0x4f 0xcf 0x50 0xd0 0x48 0xc8 0xb8 -->
+          <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 (keypress 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 key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="TOSHIBA">
commit 1ce3bfedf97e8b7a901394181b8903d3ab147501
Author: Sam Morris <sam at robots.org.uk>
Date:   Tue Apr 15 12:38:32 2008 +0200

    added suspend quirk for a Samsung Q45
    
    Added suspend quirk for a Samsung Q45.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
index 037c5d5..785015f 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
@@ -2,7 +2,7 @@
 <deviceinfo version="0.2">
   <device>
     <match key="system.hardware.vendor" prefix_ncase="Samsung">
-      <match key="system.hardware.product" string_outof="Q35/Q36;SM40S">
+      <match key="system.hardware.product" string_outof="Q35/Q36;SM40S;SQ45S70">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>