notaz.gp2x.de
/
libpicofe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wait for button release after save load
[libpicofe.git]
/
psp
/
main.c
diff --git
a/psp/main.c
b/psp/main.c
index
bad56a9
..
952f80e
100644
(file)
--- a/
psp/main.c
+++ b/
psp/main.c
@@
-13,14
+13,11
@@
#include "../common/lprintf.h"
#include "version.h"
#include "../common/lprintf.h"
#include "version.h"
-#define GPROF 0
-#define GCOV 0
-
-#if GPROF
+#ifdef GPROF
#include <pspprof.h>
#endif
#include <pspprof.h>
#endif
-#if GCOV
+#if
def
GCOV
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
@@
-32,11
+29,15
@@
void dummy(void)
}
#endif
}
#endif
-int
main(
)
+int
pico_main(void
)
{
lprintf("\nPicoDrive v" VERSION " " __DATE__ " " __TIME__ "\n");
psp_init();
{
lprintf("\nPicoDrive v" VERSION " " __DATE__ " " __TIME__ "\n");
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,10
+50,10
@@
int main()
switch (engineState)
{
case PGS_Menu:
switch (engineState)
{
case PGS_Menu:
-#if
!
GPROF
+#if
ndef
GPROF
menu_loop();
#else
menu_loop();
#else
- strcpy(romFileName,
currentConfig.
lastRomFile);
+ strcpy(romFileName, lastRomFile);
engineState = PGS_ReloadRom;
#endif
break;
engineState = PGS_ReloadRom;
#endif
break;
@@
-68,12
+69,21
@@
int main()
}
break;
}
break;
+ case PGS_Suspending:
+ while (engineState == PGS_Suspending)
+ psp_wait_suspend();
+ break;
+
case PGS_RestartRun:
engineState = PGS_Running;
case PGS_Running:
case PGS_RestartRun:
engineState = PGS_Running;
case PGS_Running:
+ if (psp_unhandled_suspend) {
+ psp_resume_suspend();
+ emu_HandleResume();
+ }
emu_Loop();
emu_Loop();
-#if GPROF
+#if
def
GPROF
goto endloop;
#endif
break;
goto endloop;
#endif
break;
@@
-91,10
+101,10
@@
int main()
mp3_deinit();
emu_Deinit();
mp3_deinit();
emu_Deinit();
-#if GPROF
+#if
def
GPROF
gprof_cleanup();
#endif
gprof_cleanup();
#endif
-#if
!
GCOV
+#if
ndef
GCOV
psp_finish();
#endif
psp_finish();
#endif