From 3e26e6e8541d27c42f8a751fa10c523bf0694814 Mon Sep 17 00:00:00 2001
From: Shaun Inman <shaun@panic.com>
Date: Sat, 18 Mar 2023 21:04:14 -0400
Subject: [PATCH] use new overclock.elf

---
 skeleton/SYSTEM/rg35xx/paks/MinUI.pak/launch.sh | 16 ++++++++--------
 src/common/api.c                                | 14 +++-----------
 src/install/install.sh                          |  5 -----
 src/overclock/overclock.c                       | 11 +++++------
 todo.txt                                        |  3 +++
 5 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/skeleton/SYSTEM/rg35xx/paks/MinUI.pak/launch.sh b/skeleton/SYSTEM/rg35xx/paks/MinUI.pak/launch.sh
index 1b4a580..29c38ef 100755
--- a/skeleton/SYSTEM/rg35xx/paks/MinUI.pak/launch.sh
+++ b/skeleton/SYSTEM/rg35xx/paks/MinUI.pak/launch.sh
@@ -23,7 +23,6 @@ echo on > /sys/devices/b0230000.mmc/mmc_host/mmc1/power/control
 export CPU_SPEED_MENU=504000
 export CPU_SPEED_GAME=1296000
 export CPU_SPEED_PERF=1488000
-export CPU_PATH=/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed
 echo userspace > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
 
 #######################################
@@ -43,19 +42,20 @@ keymon.elf & # &> $LOGS_PATH/keymon.txt &
 #######################################
 
 cd $(dirname "$0")
-export EXEC_PATH=/tmp/minui_exec
+
+EXEC_PATH=/tmp/minui_exec
+NEXT_PATH="/tmp/next"
 touch "$EXEC_PATH" && sync
 while [ -f "$EXEC_PATH" ]; do
-	echo $CPU_SPEED_PERF > "$CPU_PATH"
+	overclock.elf $CPU_SPEED_PERF
 	./minui.elf &> $LOGS_PATH/minui.txt
 	sync
 	
-	NEXT="/tmp/next"
-	if [ -f $NEXT ]; then
-		CMD=`cat $NEXT`
+	if [ -f $NEXT_PATH ]; then
+		CMD=`cat $NEXT_PATH`
 		eval $CMD
-		rm -f $NEXT
-		echo $CPU_SPEED_PERF > "$CPU_PATH"
+		rm -f $NEXT_PATH
+		overclock.elf $CPU_SPEED_PERF
 		sync
 	fi
 done
diff --git a/src/common/api.c b/src/common/api.c
index 0fd6acb..9e370c9 100644
--- a/src/common/api.c
+++ b/src/common/api.c
@@ -1311,7 +1311,6 @@ static void* POW_monitorBattery(void *arg) {
 
 void POW_init(void) {
 	pow.can_poweroff = 1;
-	pow.previous_speed = CPU_SPEED_NORMAL;
 	pow.can_autosleep = 1;
 	pow.should_warn = 0;
 	pow.charge = POW_LOW_CHARGE;
@@ -1430,12 +1429,11 @@ void POW_powerOff(void) {
 }
 
 #define BACKLIGHT_PATH "/sys/class/backlight/backlight.2/bl_power"
-#define CPU_SPEED_SET_PATH "/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed"
-#define CPU_SPEED_GET_PATH "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq"
 
 void POW_setCPUSpeed(int speed) {
-	putInt(CPU_SPEED_SET_PATH, speed);
-	sync();
+	char cmd[32];
+	sprintf(cmd,"overclock.elf %d\n", speed);
+	system(cmd);
 }
 
 static void POW_enterSleep(void) {
@@ -1443,9 +1441,6 @@ static void POW_enterSleep(void) {
 	putInt(BACKLIGHT_PATH, FB_BLANK_POWERDOWN);
 	system("killall -STOP keymon.elf");
 	
-	// TODO: not sure this is necessary
-	// pow.previous_speed = getInt(CPU_SPEED_GET_PATH);
-	// POW_setCPUSpeed(CPU_SPEED_MENU);
 	sync();
 }
 static void POW_exitSleep(void) {
@@ -1454,9 +1449,6 @@ static void POW_exitSleep(void) {
 	putInt(BACKLIGHT_PATH, FB_BLANK_UNBLANK);
 	SetVolume(GetVolume());
 	
-	// TODO: not sure this is necessary
-	// POW_setCPUSpeed(pow.previous_speed);
-	
 	sync();
 }
 static void POW_waitForWake(void) {
diff --git a/src/install/install.sh b/src/install/install.sh
index 7c4d108..ade8580 100755
--- a/src/install/install.sh
+++ b/src/install/install.sh
@@ -9,11 +9,6 @@ FLAG_PATH=/misc/.minstalled
 
 echo "installing/updating"
 
-# old rootfs.img (alpha-only)
-if [ -f $SYSTEM_PATH/rootfs.img ]; then
-	rm $SYSTEM_PATH/rootfs.img
-fi
-
 if [ ! -f $FLAG_PATH ]; then
 	echo "backing up"
 	BAK_PATH=$TF1_PATH/bak
diff --git a/src/overclock/overclock.c b/src/overclock/overclock.c
index e270ccc..2941710 100644
--- a/src/overclock/overclock.c
+++ b/src/overclock/overclock.c
@@ -65,7 +65,6 @@ static struct cpu_opp {
 	int volt;
 	char* desc;
 } cpu_opps[] = {
-	{ CLKMAX, VOLTMAX}, // just a smidge above 1.5GHz
 	{1488000, 1375000}, // 1.5GHz, MinUI Performance + launch
 	{1392000, 1325000}, // 1.4GHz
 	{1296000, 1275000}, // 1.3GHz, MinUI Normal
@@ -74,7 +73,7 @@ static struct cpu_opp {
 	{1008000, 1100000}, // 1.0GHz, Anbernic default max, overvolted to stabilize
 	{ 840000, 1075000}, // 840MHz, overvolted to stabilize
 	{ 720000, 1025000}, // 720MHz, overvolted to stabilize
-	{ 504000, 1000000}, // 500MHz, overvolted to stabilize, MinUI Menus
+	{ 504000, 1000000}, // 500MHz, overvolted to stabilize, MinUI menus
 	{ 240000,  975000}, // 240MHz, overvolted to stabilize
 	{      0,       0},
 };
@@ -101,10 +100,10 @@ int main(int argc, char* argv[]) {
 		if (clk>=cpu->clk) {
 			setcpu( cpu->clk, cpu->volt );
 			// TODO: this doesn't work...
-			// char cmd[128];
-			// sprintf(cmd, "echo %i > /tmp/cpu_freq", cpu->clk);
-			// puts(cmd);
-			// system(cmd);
+			char cmd[128];
+			sprintf(cmd, "echo %i > /tmp/cpu_freq\n", cpu->clk);
+			puts(cmd);
+			system(cmd);
 			break;
 		}
 	}
diff --git a/todo.txt b/todo.txt
index 32e6d9b..136b394 100644
--- a/todo.txt
+++ b/todo.txt
@@ -12,6 +12,9 @@ Please see the README.txt in the zip file for installation and update instructio
 
 -------------------------------
 
+BUG:
+	minui.elf treats bare tag rom folders as empty
+
 hardware rev
 	volumn and menu buttons no longer work
 	headphone jack detection no longer works