X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=psp%2Fmain.c;h=952d1047e2da889242b827a473b1e4e979e9ac91;hb=f342bededbe5d51afd1632e689f5105e50d4f63e;hp=d970f8a012e7960838dc468bb524d924027db30e;hpb=4b811a8abecf3ca8ee0b8a02214982a87d013e2f;p=libpicofe.git

diff --git a/psp/main.c b/psp/main.c
index d970f8a..952d104 100644
--- a/psp/main.c
+++ b/psp/main.c
@@ -23,7 +23,7 @@
 
 void dummy(void)
 {
-	engineState = atoi(romFileName);
+	engineState = atoi(rom_fname_reload);
 	setbuf(NULL, NULL);
 	getenv(NULL);
 }
@@ -52,13 +52,13 @@ int pico_main(void)
 #ifndef GPROF
 				menu_loop();
 #else
-				strcpy(romFileName, lastRomFile);
+				strcpy(rom_fname_reload, rom_fname_loaded);
 				engineState = PGS_ReloadRom;
 #endif
 				break;
 
 			case PGS_ReloadRom:
-				if (emu_ReloadRom()) {
+				if (emu_reload_rom(rom_fname_reload)) {
 					engineState = PGS_Running;
 					if (mp3_last_error != 0)
 						engineState = PGS_Menu; // send to menu to display mp3 error
@@ -69,11 +69,15 @@ int pico_main(void)
 				break;
 
 			case PGS_Suspending:
-				while (engineState == PGS_Suspending || engineState == PGS_SuspendAck) {
-					if (engineState == PGS_Suspending)
-						engineState = PGS_SuspendAck;
+				while (engineState == PGS_Suspending)
 					psp_wait_suspend();
-				}
+				break;
+
+			case PGS_SuspendWake:
+				psp_unhandled_suspend = 0;
+				psp_resume_suspend();
+				emu_HandleResume();
+				engineState = engineStateSuspend;
 				break;
 
 			case PGS_RestartRun:
@@ -81,10 +85,12 @@ int pico_main(void)
 
 			case PGS_Running:
 				if (psp_unhandled_suspend) {
+					psp_unhandled_suspend = 0;
 					psp_resume_suspend();
 					emu_HandleResume();
+					break;
 				}
-				emu_Loop();
+				pemu_loop();
 #ifdef GPROF
 				goto endloop;
 #endif