hal-info: Branch 'master' - 5 commits

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi |    7 +++++++
 fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi |    5 +++++
 fdi/information/10freedesktop/30-keymap-hp.fdi           |    2 +-
 fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi         |    5 +++++
 4 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit eee016238be6e058d9e5f3ac3c63a4f6ad76a34f
Author: Jorge Pastor <pastorjorge at gmail.com>
Date:   Tue Jun 17 14:08:24 2008 +0200

    blacklist Intuix S300 U3 extra LUN
    
    As in RH #208512, an Intuix USB key exports an extra LUN, too.

diff --git a/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi b/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
index 18db728..5e56980 100644
--- a/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
+++ b/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
@@ -16,6 +16,11 @@
 	      <merge key="info.ignore" type="bool">true</merge>
 	    </match>
 	  </match>
+	  <match key="storage.vendor" string="Intuix">
+            <match key="storage.model" string="U3">
+              <merge key="info.ignore" type="bool">true</merge>
+            </match>
+          </match>
 	</match>
       </match>
      <!-- some usb sticks don't like polling -->
commit 1605b621c75889d77a599011375b1031ec58a54b
Author: David Härdeman <david at hardeman.nu>
Date:   Tue Jun 17 14:03:32 2008 +0200

    keymap for a HP 8510w
    
    Added keymap for a HP 8510w.

diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index c8c41e4..0f9962e 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -77,7 +77,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;6510b;6710b;6715;nx9420">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="nc6230;nw8440;nx6325;6510b;6710b;6715;nx9420;8510w">
           <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) -->
commit 74fbd0f8ac7583ea9d523f9ca61d59d468f1a8ae
Author: Pascal Terjan <pterjan at mandriva.com>
Date:   Tue Jun 17 14:00:14 2008 +0200

    suspend quirk for a Airis machine
    
    Added suspend quirk for a Airis mini laptop (VIA hardware inside):
    
      system.hardware.primary_video.product = 4386  (0x1122)  (int)
      system.hardware.primary_video.vendor = 4358  (0x1106)  (int)
      system.hardware.product = 'KIRA Series'  (string)
      system.hardware.serial = '000009'  (string)
      system.hardware.uuid = ''  (string)
      system.hardware.vendor = 'AIRIS'  (string)
      system.hardware.version = 'VT6413A'  (string)

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 0c6c115..9855a26 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 
 <deviceinfo version="0.2">
   <device>
+    <match key="system.hardware.vendor" string="AIRIS">
+      <match key="system.hardware.version" string="VT6413A">
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+      </match>
+    </match>
+  </device>
+  <device>
     <match key="system.hardware.vendor" prefix="COMPAL">
       <match key="system.hardware.product" contains_outof="HEL80C;HEL80I;HEL81I">
         <merge key="power_management.quirk.none" type="bool">true</merge>
commit 74425a99c4ce5325d3c450c4dd93069c2602c4ad
Author: Minh Tang <mhtang at cs.indiana.edu>
Date:   Tue Jun 17 13:52:15 2008 +0200

    suspend quirk for a Sony Vaio Z1MP
    
    Added suspend quirk for a Sony Vaio Z1MP.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
index 8260f78..d13f5cc 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
@@ -29,6 +29,11 @@
 	<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
 	<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>
+      <match key="system.hardware.product" contains_outof="PCG-Z1MP">
+	<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+	<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+	<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+      </match>
       <match key="system.hardware.product" contains_outof="PCG-Z1RMP;VGN-TX770P">
 	<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
 	<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
commit dfd2dca6d6ec9468970c3c3ac6e7649dabc2ae37
Author: Bozidar Proevski <bobibobi at freemail.com.mk>
Date:   Tue Jun 17 13:47:56 2008 +0200

    keymap for HP Compaq 6510b
    
    Added keymap for HP Compaq 6510b.

diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index 0ecb68c..c8c41e4 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -77,7 +77,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;6715;nx9420">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="nc6230;nw8440;nx6325;6510b;6710b;6715;nx9420">
           <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) -->