notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UIQ3 update, some makefile unification, rm old configs, stuff
[picodrive.git]
/
platform
/
psp
/
main.c
diff --git
a/platform/psp/main.c
b/platform/psp/main.c
index
d970f8a
..
e0698d5
100644
(file)
--- a/
platform/psp/main.c
+++ b/
platform/psp/main.c
@@
-52,13
+52,13
@@
int pico_main(void)
#ifndef GPROF
menu_loop();
#else
#ifndef GPROF
menu_loop();
#else
- strcpy(romFileName, l
astRomFil
e);
+ strcpy(romFileName, l
oadedRomFNam
e);
engineState = PGS_ReloadRom;
#endif
break;
case PGS_ReloadRom:
engineState = PGS_ReloadRom;
#endif
break;
case PGS_ReloadRom:
- if (emu_ReloadRom()) {
+ if (emu_ReloadRom(
romFileName
)) {
engineState = PGS_Running;
if (mp3_last_error != 0)
engineState = PGS_Menu; // send to menu to display mp3 error
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:
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();
psp_wait_suspend();
- }
+ break;
+
+ case PGS_SuspendWake:
+ psp_unhandled_suspend = 0;
+ psp_resume_suspend();
+ emu_HandleResume();
+ engineState = engineStateSuspend;
break;
case PGS_RestartRun:
break;
case PGS_RestartRun:
@@
-81,8
+85,10
@@
int pico_main(void)
case PGS_Running:
if (psp_unhandled_suspend) {
case PGS_Running:
if (psp_unhandled_suspend) {
+ psp_unhandled_suspend = 0;
psp_resume_suspend();
emu_HandleResume();
psp_resume_suspend();
emu_HandleResume();
+ break;
}
emu_Loop();
#ifdef GPROF
}
emu_Loop();
#ifdef GPROF