op_cpu*: check for overclocking /proc entry, not kernel version

diff --git a/recipes/pandora-system/pandora-scripts.bb b/recipes/pandora-system/pandora-scripts.bb
index 7ec7f71..cb565cc 100644 (file)
--- a/recipes/pandora-system/pandora-scripts.bb
+++ b/recipes/pandora-system/pandora-scripts.bb
@@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "omap3-pandora"
 DEPENDS = "zenity dbus"
 RDEPENDS = "zenity dbus"
 
-PR = "r83"
+PR = "r84"
 
 SRC_URI = " \
           file://op_paths.sh \

diff --git a/recipes/pandora-system/pandora-scripts/op_cpusettings.sh b/recipes/pandora-system/pandora-scripts/op_cpusettings.sh
index b8fc541..aa627a8 100755 (executable)
--- a/recipes/pandora-system/pandora-scripts/op_cpusettings.sh
+++ b/recipes/pandora-system/pandora-scripts/op_cpusettings.sh
@@ -3,11 +3,10 @@
 # CPU-Settings, v1.1, written by Michael Mrozek aka EvilDragon 2011.
 # This scripts allows you to change Pandora CPU-Settings.
 
-kernel_major=`uname -r | cut -c 1`
-if [ "$kernel_major" = "3" ]; then
+if [ ! -e /proc/pandora/cpu_mhz_max ]; then
     zenity --info --title="CPU-Settings not supported" --text "Sorry, the experimental kernel does not support overclocking (yet).\n\nTherefore, you cannot configure the CPU-Settings."
     exit 1
-else
+fi
 
 while mainsel=$(zenity --title="CPU-Settings" --width="400" --height="350" --list --column "id" --column "Please select" --hide-column=1 --text="Welcome to the CPU-Settings.\nHere, you can configure the behaviour of your CPU \nThis can make your Pandora run faster but also more unstable.\n\nDon't worry though, you cannot permanently damage your unit.\n\nWhat do you want to do?\n" "opp" "Set the max allowed OPP level" "mhz" "Set the minimum / maximum allowed MHz" "warning" "Change warning settings" "defaultmhz" "Set the default MHz" --ok-label="Change Setting" --cancel-label="Exit"); do
 
@@ -80,4 +79,3 @@ case $mainsel in
 
 esac
 done
-fi
\ No newline at end of file

diff --git a/recipes/pandora-system/pandora-scripts/op_cpuspeed.sh b/recipes/pandora-system/pandora-scripts/op_cpuspeed.sh
index 2aae2d2..965cb0a 100755 (executable)
--- a/recipes/pandora-system/pandora-scripts/op_cpuspeed.sh
+++ b/recipes/pandora-system/pandora-scripts/op_cpuspeed.sh
@@ -4,15 +4,18 @@ minmhz="$(cat /etc/pandora/conf/cpu.conf | grep 'min:' | awk -F\: '{print $2}')"
 safemhz="$(cat /etc/pandora/conf/cpu.conf | grep 'safe:' | awk -F\: '{print $2}')"
 maxmhz="$(cat /etc/pandora/conf/cpu.conf | grep 'max:' | awk -F\: '{print $2}')"
 warn="$(cat /etc/pandora/conf/cpu.conf | grep 'warn:' | awk -F\: '{print $2}')"
-curmhz="$(cat /proc/pandora/cpu_mhz_max)"
-newmhz="$(cat /proc/pandora/cpu_mhz_max)"
 device=/proc/pandora/cpu_mhz_max
+curmhz="$(cat $device)"
+newmhz="$(cat $device)"
 kernel_major=`uname -r | cut -c 1`
 
-if [ "$kernel_major" = "3" ]; then
-    zenity --info --title="CPU-Settings not supported" --text "Sorry, the experimental kernel does not support setting the clockspeed (yet)."
+if [ ! -e $device ]; then
+    if [ -z "$1" -a -n "$DISPLAY" ]; then
+        zenity --info --title="CPU-Settings not supported" --text \
+            "Sorry, the experimental kernel does not support setting the clockspeed (yet)."
+    fi
     exit 1
-else
+fi
 
 if [ ! $1 ]; then
        if [ $DISPLAY ]; then
@@ -21,8 +24,9 @@ if [ ! $1 ]; then
                newmhz=$(read -p "Please enter the desired clockspeed")
        fi
 else
-newmhz=$1
+       newmhz=$1
 fi
+
 if [ $newmhz ]; then
         if [ $newmhz -gt $safemhz ]; then
                if [ $warn != no ]; then 
@@ -41,6 +45,5 @@ if [ $newmhz ]; then
         if [ $newmhz -le $minmhz ]; then newmhz=$minmhz; fi
         if [ $newmhz -ge $maxmhz ]; then newmhz=$maxmhz; fi
        echo $newmhz > $device
-       echo cpu_mhz_max set to $(cat /proc/pandora/cpu_mhz_max)
+       echo cpu_mhz_max set to $(cat $device)
 fi
-fi
\ No newline at end of file