hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi |   37 +++++++++------
 1 file changed, 23 insertions(+), 14 deletions(-)

New commits:
commit 39c1f01fca31564f9ddfe8de685f1dfbf9dedc32
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Sep 10 15:54:28 2008 +0200

    updated Asus suspend quirks with s2ram whitelist entries from -r1.132
    
    Updated Asus suspend quirks with s2ram whitelist entries from -r1.132.
    
    Added new:
    - A6JC, F3Sg, F9E, G1S, X51RL, ASUS M2A-VM ACPI BIOS Revision *
    Updated:
    - A6J, F3Sc, ASUS M2A-VM ACPI BIOS Revision 1101

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index beb7c5f..b79806e 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -13,18 +13,22 @@
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
-      <match key="system.hardware.product" prefix_outof="A6M;Z84F">
-        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+      <match key="system.hardware.product" string="F3Sc">
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
-      <match key="system.hardware.product" prefix_outof="L3000D;M3N ;U3S ">
+      <match key="system.hardware.product" prefix_outof="A6M;Z84F">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
-        <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
       </match>
       <match key="system.hardware.product" prefix="W7J">
         <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>
+      <match key="system.hardware.product" prefix_outof="L3000D;M3N ;U3S ;X51RL ">
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+      </match>
       <!-- Z91E is identified as A3E -->
-      <match key="system.hardware.product" prefix_outof="A6J;A6U;A3E;F3JP">
+      <match key="system.hardware.product" prefix_outof="A6J ;A6U;A3E;F3JP">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>
@@ -34,7 +38,7 @@
          <merge key="power_management.quirk.dpms_on" type="bool">true</merge>
       </match>
       <!-- these need no quirks, whitelist them -->
-      <match key="system.hardware.product" prefix_outof="A2H/L;A6Km;A6K ;A6T;A6G;A6VA;F3T;K8V-MX">
+      <match key="system.hardware.product" prefix_outof="A2H/L;A6Km;A6JC ;A6K ;A6T;A6G;A6VA;F3Sg;F3T;F9E ;G1S;K8V-MX">
         <merge key="power_management.quirk.none" type="bool">true</merge>
       </match>
     </match>
@@ -61,20 +65,25 @@
       <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
     </match>
     <!-- another ASUS Mainboard -->
-    <match key="system.firmware.version" prefix_outof="ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1201;ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1101;ASUS M2A-VM ACPI BIOS Revision 1101;ASUS M2A-VM HDMI ACPI BIOS Revision 1603">
-      <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+    <match key="system.firmware.version" prefix_outof="ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1201;ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1101;ASUS M2A-VM HDMI ACPI BIOS Revision 1603">
+      <merge key="power_managiement.quirk.vbe_post" type="bool">true</merge>
       <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
     </match>
+    <match key="system.firmware.version" prefix="ASUS M2A-VM ACPI BIOS Revision">
+      <match key="system.firmware.version" contains=" 1101">
+        <merge key="power_management.quirk.s2_bios" type="bool">true</merge>
+        <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+      </match>
+      <match key="system.firmware.version" contains_not=" 1101">
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+      </match>
+    </match>
+    
     <!-- another ASUS Mainboard, this need no quirk -->
     <match key="system.firmware.version" prefix_outof="ASUS M2N-E ACPI BIOS Revision;ASUS Striker ACPI BIOS Revision;ASUS A7V ACPI BIOS Revision">
       <merge key="power_management.quirk.none" type="bool">true</merge>
     </match>
 
-    <match key="system.hardware.product" string="F3Sc">
-      <match key="system.hardware.version" string="1.0">
-        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
-        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
-      </match>
-    </match>
   </device>
 </deviceinfo>