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

diff --git a/psp/main.c b/psp/main.c
index befc427..952d104 100644
--- a/psp/main.c
+++ b/psp/main.c
@@ -10,8 +10,8 @@
 #include "mp3.h"
 #include "../common/menu.h"
 #include "../common/emu.h"
+#include "../common/config.h"
 #include "../common/lprintf.h"
-#include "version.h"
 
 #ifdef GPROF
 #include <pspprof.h>
@@ -23,7 +23,7 @@
 
 void dummy(void)
 {
-	engineState = atoi(romFileName);
+	engineState = atoi(rom_fname_reload);
 	setbuf(NULL, NULL);
 	getenv(NULL);
 }
@@ -31,9 +31,12 @@ void dummy(void)
 
 int pico_main(void)
 {
-	lprintf("\nPicoDrive v" VERSION " " __DATE__ " " __TIME__ "\n");
 	psp_init();
+
+	emu_prepareDefaultConfig();
 	emu_ReadConfig(0, 0);
+	config_readlrom(PicoConfigFile);
+
 	emu_Init();
 	menu_init();
 	// moved to emu_Loop(), after CPU clock change..
@@ -49,13 +52,13 @@ int pico_main(void)
 #ifndef GPROF
 				menu_loop();
 #else
-				strcpy(romFileName, currentConfig.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
@@ -65,11 +68,29 @@ int pico_main(void)
 				}
 				break;
 
+			case PGS_Suspending:
+				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:
 				engineState = PGS_Running;
 
 			case PGS_Running:
-				emu_Loop();
+				if (psp_unhandled_suspend) {
+					psp_unhandled_suspend = 0;
+					psp_resume_suspend();
+					emu_HandleResume();
+					break;
+				}
+				pemu_loop();
 #ifdef GPROF
 				goto endloop;
 #endif