notaz.gp2x.de
/
libpicofe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make OSS detect blocking, adjust audio API
[libpicofe.git]
/
psp
/
main.c
diff --git
a/psp/main.c
b/psp/main.c
index
4c7eef6
..
952d104
100644
(file)
--- a/
psp/main.c
+++ b/
psp/main.c
@@
-12,7
+12,6
@@
#include "../common/emu.h"
#include "../common/config.h"
#include "../common/lprintf.h"
#include "../common/emu.h"
#include "../common/config.h"
#include "../common/lprintf.h"
-#include "version.h"
#ifdef GPROF
#include <pspprof.h>
#ifdef GPROF
#include <pspprof.h>
@@
-24,7
+23,7
@@
void dummy(void)
{
void dummy(void)
{
- engineState = atoi(rom
FileName
);
+ engineState = atoi(rom
_fname_reload
);
setbuf(NULL, NULL);
getenv(NULL);
}
setbuf(NULL, NULL);
getenv(NULL);
}
@@
-32,7
+31,6
@@
void dummy(void)
int pico_main(void)
{
int pico_main(void)
{
- lprintf("\nPicoDrive v" VERSION " " __DATE__ " " __TIME__ "\n");
psp_init();
emu_prepareDefaultConfig();
psp_init();
emu_prepareDefaultConfig();
@@
-54,13
+52,13
@@
int pico_main(void)
#ifndef GPROF
menu_loop();
#else
#ifndef GPROF
menu_loop();
#else
- strcpy(rom
FileName, lastRomFile
);
+ strcpy(rom
_fname_reload, rom_fname_loaded
);
engineState = PGS_ReloadRom;
#endif
break;
case PGS_ReloadRom:
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
engineState = PGS_Running;
if (mp3_last_error != 0)
engineState = PGS_Menu; // send to menu to display mp3 error
@@
-75,15
+73,24
@@
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_L
oop();
+
pemu_l
oop();
#ifdef GPROF
goto endloop;
#endif
#ifdef GPROF
goto endloop;
#endif