X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=blobdiff_plain;f=recipes%2Fpandora-system%2Fpandora-scripts%2Fop_power.sh;h=35e01cff5181c0d96982a76190ac67f50ed3103b;hp=8dc1c21c74fcbc3a115421c373137eb42c4b2f8f;hb=cb697bb996561aaeeb561c1ec54a29e1e7c5fdbd;hpb=afadc0e4570ee55a698f97f832cb3df1c3441407

diff --git a/recipes/pandora-system/pandora-scripts/op_power.sh b/recipes/pandora-system/pandora-scripts/op_power.sh
index 8dc1c21..35e01cf 100644
--- a/recipes/pandora-system/pandora-scripts/op_power.sh
+++ b/recipes/pandora-system/pandora-scripts/op_power.sh
@@ -103,12 +103,13 @@ lowPowerOn(){ #switch from normal to lowpower mode
 	suspend_net
 
 	cat /proc/pandora/cpu_mhz_max > /tmp/oldspeed
-	/usr/pandora/scripts/op_cpuspeed.sh 125
+	/usr/pandora/scripts/op_cpuspeed.sh -n 125
 }
 
 lowPowerOff(){ # switch from lowpower to normal mode
 	oldspeed=$(cat /tmp/oldspeed)
-	/usr/pandora/scripts/op_cpuspeed.sh $oldspeed
+	/usr/pandora/scripts/op_cpuspeed.sh -n $oldspeed
+	rm -f /tmp/oldspeed
 
 	display_on
 	resume_net
@@ -121,10 +122,22 @@ lowPowerOff(){ # switch from lowpower to normal mode
 	echo 255 > /sys/class/leds/pandora\:\:power/brightness #power LED bright
 }
 
+display_on_with_checks() {
+	# after turning on the display, we don't want lowpower state
+	# (which could be active because of some races)
+	if [ "$powerstate" = "buttonlowpower" -o "$powerstate" = "lidlowpower" -o \
+	     -e /tmp/oldspeed ]
+	then
+		lowPowerOff
+	else
+		display_on
+	fi
+}
+
 show_message() {
 	# TODO: check if desktop is visible; maybe use layer3?
 	xfceuser=$(ps u -C xfce4-session | tail -n1 | awk '{print $1}')
-	cmd="DISPLAY=:0.0 zenity --info --text \"$1\""
+	cmd="DISPLAY=:0.0 zenity --info --text \"$1\" --timeout 10"
 	su -c "$cmd" $xfceuser
 }
 
@@ -149,10 +162,6 @@ suspend_real() {
 		return 1
 	fi
 
-	# TODO: we probably want to NOT do real suspend if:
-	# - cards don't unmount (running PNDs will break)
-	# - while charging too, since it stops on suspend?
-
 	if ! grep -q 'mmc_core.removable=0' /proc/cmdline; then
 		# must unmount cards because they will be "ejected" on suspend
 		# (some filesystems may even deadlock if we don't do this due to bugs)
@@ -183,8 +192,9 @@ Please do not remove SD cards while pandora is suspended, doing so will corrupt
 
 	# get rid of modules that prevent suspend due to bugs
 	modules="$(lsmod | awk '{print $1}' | xargs echo)"
-	blacklist="ehci_hcd g_zero g_audio g_ether g_serial g_midi gadgetfs g_file_storage
-		g_mass_storage g_printer g_cdc g_multi g_hid g_dbgp g_nokia g_webcam g_ncm g_acm_ms"
+	blacklist="g_zero g_audio g_ether g_serial g_midi gadgetfs g_file_storage
+		g_mass_storage g_printer g_cdc g_multi g_hid g_dbgp g_nokia g_webcam g_ncm g_acm_ms
+		ehci_hcd bridgedriver"
 	restore_list=""
 	for mod in $modules; do
 		if echo $blacklist | grep -q "\<$mod\>"; then
@@ -280,7 +290,7 @@ elif [[ "$2" == "lid" ]]; then
 					powerstate="on"
 				;;
 				*)
-					(debug && echo "display_on") || display_on
+					(debug && echo "display_on") || display_on_with_checks
 					powerstate="on"
 				;;
 			esac
@@ -302,7 +312,19 @@ elif [[ "$2" == "lid" ]]; then
 			esac
 		fi
 	fi
- fi
+elif [[ "$2" == "screensaver" ]]; then
+	# warning: don't try to interact with X or do real suspend here -
+	# will cause various deadlocks
+	unset DISPLAY
+
+	if [[ "$1" == 0 ]]; then # deactivate screensaver
+		display_on_with_checks
+		powerstate="on"
+	elif [[ "$1" == 1 ]]; then # activate screensaver
+		display_off
+	fi
+fi
+
 debug && echo "powerstate=$powerstate"
 echo "$powerstate" > /tmp/powerstate