[powersave-commit] r2753 - in branches/powersave/powersave-CODE10: config_files scripts

[Novell Forge SVN]

Author: seife
Date: 2007-01-11 01:35:36 -0700 (Thu, 11 Jan 2007)
New Revision: 2753

Modified:
   branches/powersave/powersave-CODE10/config_files/sleep
   branches/powersave/powersave-CODE10/scripts/do_acpi_sleep
Log:
Add SUSPEND2RAM_VBE_MODE and SUSPEND2RAM_PCI_SAVE for the new options
--vbe_mode and --pci_save of s2ram.


Modified: branches/powersave/powersave-CODE10/config_files/sleep
===================================================================
--- branches/powersave/powersave-CODE10/config_files/sleep	2007-01-11 08:19:09 UTC (rev 2752)
+++ branches/powersave/powersave-CODE10/config_files/sleep	2007-01-11 08:35:36 UTC (rev 2753)
@@ -154,6 +154,17 @@
 ## ServiceRestart: 	powersaved
 #
 # if SUSPEND2RAM_FORCE is set to yes and s2ram is installed, you can enable
+# resetting the VBE graphics mode after suspend to RAM. This, together with
+# VBE_POST is often safer then VBE_SAVE.
+# Read http://en.opensuse.org/S2ram for more info
+SUSPEND2RAM_VBE_MODE=""
+
+## Path:		System/Powermanagement/Powersave/Sleep_Modes
+## Type:		yesno
+## Default:		"no"
+## ServiceRestart: 	powersaved
+#
+# if SUSPEND2RAM_FORCE is set to yes and s2ram is installed, you can enable
 # the equivalent of "vbetool post" after suspend to RAM. This reinitializes
 # the graphics chip on many machines.
 # Be careful, this might crash your machine.
@@ -161,6 +172,17 @@
 
 ## Path:		System/Powermanagement/Powersave/Sleep_Modes
 ## Type:		yesno
+## Default:		"no"
+## ServiceRestart: 	powersaved
+#
+# if SUSPEND2RAM_FORCE is set to yes and s2ram is installed, you can enable
+# to save the PCI config space of the VGA card before suspend to RAM and
+# restore it after resume. This is seldom needed, but should be harmless.
+# Read http://en.opensuse.org/S2ram for more info
+SUSPEND2RAM_PCI_SAVE=""
+
+## Path:		System/Powermanagement/Powersave/Sleep_Modes
+## Type:		yesno
 ## Default:		"yes"
 ## ServiceRestart: 	powersaved
 #

Modified: branches/powersave/powersave-CODE10/scripts/do_acpi_sleep
===================================================================
--- branches/powersave/powersave-CODE10/scripts/do_acpi_sleep	2007-01-11 08:19:09 UTC (rev 2752)
+++ branches/powersave/powersave-CODE10/scripts/do_acpi_sleep	2007-01-11 08:35:36 UTC (rev 2753)
@@ -92,6 +92,8 @@
 		S2RAM_OPTS="--force"
 		[ "$SUSPEND2RAM_VBE_POST" == "yes" ] && S2RAM_OPTS="$S2RAM_OPTS --vbe_post"
 		[ "$SUSPEND2RAM_VBE_SAVE" == "yes" ] && S2RAM_OPTS="$S2RAM_OPTS --vbe_save"
+		[ "$SUSPEND2RAM_VBE_MODE" == "yes" ] && S2RAM_OPTS="$S2RAM_OPTS --vbe_mode"
+		[ "$SUSPEND2RAM_PCI_SAVE" == "yes" ] && S2RAM_OPTS="$S2RAM_OPTS --pci_save"
 		if [ -n "$SUSPEND2RAM_ACPI_SLEEP" ]; then
 			declare -i X
 			X="$SUSPEND2RAM_ACPI_SLEEP"