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
e947b43
..
e0698d5
100644
(file)
--- a/
platform/psp/main.c
+++ b/
platform/psp/main.c
@@
-10,8
+10,8
@@
#include "mp3.h"
#include "../common/menu.h"
#include "../common/emu.h"
#include "mp3.h"
#include "../common/menu.h"
#include "../common/emu.h"
+#include "../common/config.h"
#include "../common/lprintf.h"
#include "../common/lprintf.h"
-#include "version.h"
#ifdef GPROF
#include <pspprof.h>
#ifdef GPROF
#include <pspprof.h>
@@
-31,10
+31,12
@@
void dummy(void)
int pico_main(void)
{
int pico_main(void)
{
- lprintf("\nPicoDrive v" VERSION " " __DATE__ " " __TIME__ "\n");
psp_init();
psp_init();
+
emu_prepareDefaultConfig();
emu_ReadConfig(0, 0);
emu_prepareDefaultConfig();
emu_ReadConfig(0, 0);
+ config_readlrom(PicoConfigFile);
+
emu_Init();
menu_init();
// moved to emu_Loop(), after CPU clock change..
emu_Init();
menu_init();
// moved to emu_Loop(), after CPU clock change..
@@
-50,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
@@
-71,13
+73,22
@@
int pico_main(void)
psp_wait_suspend();
break;
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:
if (psp_unhandled_suspend) {
case PGS_RestartRun:
engineState = PGS_Running;
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