X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fpsp%2Fmain.c;h=989ce5c738c1bfb300256b7e53f21ba59de0db14;hb=ee3c39efd2cf51cd654b6240f6fb595673f10f45;hp=d970f8a012e7960838dc468bb524d924027db30e;hpb=052c0f86cbb61685b705024f24057840d2f79b5e;p=picodrive.git

diff --git a/platform/psp/main.c b/platform/psp/main.c
index d970f8a..989ce5c 100644
--- a/platform/psp/main.c
+++ b/platform/psp/main.c
@@ -1,7 +1,10 @@
-// (c) Copyright 2007 notaz, All rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
+/*
+ * PicoDrive
+ * (C) notaz, 2007,2008
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
 
 #include <string.h>
 #include "psp.h"
@@ -23,7 +26,7 @@
 
 void dummy(void)
 {
-	engineState = atoi(romFileName);
+	engineState = atoi(rom_fname_reload);
 	setbuf(NULL, NULL);
 	getenv(NULL);
 }
@@ -52,13 +55,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 +72,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 +88,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