op_power: reload modules correctly

[openpandora.oe.git] / recipes / pandora-system / pandora-scripts / op_power.sh

diff --git a/recipes/pandora-system/pandora-scripts/op_power.sh b/recipes/pandora-system/pandora-scripts/op_power.sh
index 8dc1c21..49c8c1d 100644 (file)
--- 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
@@ -200,7 +210,9 @@ Please do not remove SD cards while pandora is suspended, doing so will corrupt
 
        # if we are here, either we already resumed or the suspend failed
        if [ -n "$restore_list" ]; then
-               modprobe $restore_list
+               for module in $restore_list; do
+                       modprobe $module
+               done
        fi
 
        display_on
@@ -280,7 +292,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 +314,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