hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi |   73 +++++++++------
 1 file changed, 46 insertions(+), 27 deletions(-)

New commits:
commit c048769023d5097d7aeb070e7aacea5bc93e75e3
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Nov 1 18:35:17 2007 +0100

    updated Acer suspend quirks with entries from s2ram whitelist
    
    Updated the suspend quirks for Acer machines with entries from the
    s2ram whitelist.
    
    Added new machines:
    - TravelMate: 800, 2300, 2350, 2410, 2420, 2450, 3010, 3260
    - Aspire: 1350, 1520, 3000, 3690, 5020, 5500Z, 5570

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index 31e7715..3eb86d5 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -6,7 +6,7 @@
         <match key="system.hardware.product" contains="C300">
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains_outof="3220;4650">
+        <match key="system.hardware.product" contains_outof="2350;2410;2420;3220;4650">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>
@@ -14,42 +14,64 @@
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
-      </match>
+        <match key="system.hardware.product" contains_outof="2300;3010;3260">
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+          <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+        </match>
+        <match key="system.hardware.product" contains="8000">
+          <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+        </match>
+        <match key="system.hardware.product" contains="6460">
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        </match>
+        <match key="system.hardware.product" contains="2450">
+          <merge key="power_management.quirk.none" type="bool">true</merge>
+        </match>
 
-      <match key="system.hardware.product" prefix_outof="TravelMate 240;TravelMate 250">
-        <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="TravelMate 380">
-        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
-        <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
-        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
-      </match>
-      <match key="system.hardware.product" prefix="TravelMate 630"> <!-- TravelMate 630Lci -->
-        <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="TravelMate 650">
-        <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="TravelMate 8000">
-        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+	<!-- these need the full name to prevent mixes with other machines -->
+        <match key="system.hardware.product" prefix_outof="TravelMate 240;TravelMate 250;TravelMate 650">
+          <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="TravelMate 380">
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+          <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+          <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+        </match>
+       <match key="system.hardware.product" prefix="TravelMate 630"> <!-- TravelMate 630Lci -->
+          <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" string="TravelMate 800">
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        </match>
       </match>
-      
+
       <match key="system.hardware.product" prefix="Aspire">
         <match key="system.hardware.product" contains="1690">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
           <merge key="power_management.quirk.no_fb" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains_outof="3610;3620">
+        <match key="system.hardware.product" suffix="1350">
+          <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.no_fb" type="bool">true</merge>
+        </match>
+        <match key="system.hardware.product" contains_outof="3610;3620;3690">
           <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" contains="5610">
+        <match key="system.hardware.product" contains_outof="5610;5020">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         </match>
+        <match key="system.hardware.product" contains_outof="1520;3000;5570">
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+          <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+        </match>
+        <match key="system.hardware.product" contains="5500Z ">
+          <merge key="power_management.quirk.none" type="bool">true</merge>
+        </match>
       </match>
 
       <match key="system.hardware.product" string="Extensa 4150">
@@ -62,9 +84,6 @@
         <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         <merge key="power_management.quirk.no_fb" type="bool">true</merge>
       </match>
-      <match key="system.hardware.product" string="TravelMate 6460">
-        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
-      </match>
     </match>
   </device>
 </deviceinfo>