X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=psp%2Fmain.c;h=d970f8a012e7960838dc468bb524d924027db30e;hb=68504c1c4f3ef4e799f5acf427b3ae063b3b975b;hp=e947b43c13de66566b3e9f7af3efe8e29f805119;hpb=960a8e2716349f9a7df6cca9b6e8e6b0724fe7ba;p=libpicofe.git diff --git a/psp/main.c b/psp/main.c index e947b43..d970f8a 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 @@ -31,10 +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.. @@ -67,8 +69,11 @@ int pico_main(void) break; case PGS_Suspending: - while (engineState == PGS_Suspending) + while (engineState == PGS_Suspending || engineState == PGS_SuspendAck) { + if (engineState == PGS_Suspending) + engineState = PGS_SuspendAck; psp_wait_suspend(); + } break; case PGS_RestartRun: