notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uncommited code for 151 release (PSP suspend, file browser, etc)
[picodrive.git]
/
platform
/
psp
/
main.c
diff --git
a/platform/psp/main.c
b/platform/psp/main.c
index
bf3069c
..
a2e99aa
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,9
+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_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..
@@
-49,7
+52,7
@@
int pico_main(void)
#ifndef GPROF
menu_loop();
#else
#ifndef GPROF
menu_loop();
#else
- strcpy(romFileName,
currentConfig.
lastRomFile);
+ strcpy(romFileName, lastRomFile);
engineState = PGS_ReloadRom;
#endif
break;
engineState = PGS_ReloadRom;
#endif
break;
@@
-70,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