notaz.gp2x.de
/
libpicofe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ROM loader error handling improved
[libpicofe.git]
/
psp
/
main.c
diff --git
a/psp/main.c
b/psp/main.c
index
4f51516
..
a2e99aa
100644
(file)
--- a/
psp/main.c
+++ b/
psp/main.c
@@
-1,23
+1,46
@@
+// (c) Copyright 2007 notaz, All rights reserved.
+// Free for non-commercial use.
+
+// For commercial use, separate licencing terms must be obtained.
+
+#include <string.h>
#include "psp.h"
#include "emu.h"
#include "menu.h"
#include "mp3.h"
#include "../common/menu.h"
#include "../common/emu.h"
#include "psp.h"
#include "emu.h"
#include "menu.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"
-int main()
+#ifdef GPROF
+#include <pspprof.h>
+#endif
+
+#ifdef GCOV
+#include <stdio.h>
+#include <stdlib.h>
+
+void dummy(void)
{
{
- int mp3_ret;
+ engineState = atoi(romFileName);
+ setbuf(NULL, NULL);
+ getenv(NULL);
+}
+#endif
- lprintf("\nPicoDrive v" VERSION " " __DATE__ " " __TIME__ "\n");
+int pico_main(void)
+{
psp_init();
psp_init();
+ emu_prepareDefaultConfig();
emu_ReadConfig(0, 0);
emu_ReadConfig(0, 0);
+ config_readlrom(PicoConfigFile);
+
emu_Init();
menu_init();
emu_Init();
menu_init();
- mp3_ret = mp3_init();
+ // moved to emu_Loop(), after CPU clock change..
+ //mp3_init();
engineState = PGS_Menu;
engineState = PGS_Menu;
@@
-26,7
+49,12
@@
int main()
switch (engineState)
{
case PGS_Menu:
switch (engineState)
{
case PGS_Menu:
+#ifndef GPROF
menu_loop();
menu_loop();
+#else
+ strcpy(romFileName, lastRomFile);
+ engineState = PGS_ReloadRom;
+#endif
break;
case PGS_ReloadRom:
break;
case PGS_ReloadRom:
@@
-40,11
+68,32
@@
int main()
}
break;
}
break;
+ case PGS_Suspending:
+ while (engineState == PGS_Suspending)
+ 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:
case PGS_RestartRun:
engineState = PGS_Running;
case PGS_Running:
+ if (psp_unhandled_suspend) {
+ psp_unhandled_suspend = 0;
+ psp_resume_suspend();
+ emu_HandleResume();
+ break;
+ }
emu_Loop();
emu_Loop();
+#ifdef GPROF
+ goto endloop;
+#endif
break;
case PGS_Quit:
break;
case PGS_Quit:
@@
-58,9
+107,14
@@
int main()
endloop:
endloop:
-
if (mp3_ret == 0)
mp3_deinit();
+ mp3_deinit();
emu_Deinit();
emu_Deinit();
+#ifdef GPROF
+ gprof_cleanup();
+#endif
+#ifndef GCOV
psp_finish();
psp_finish();
+#endif
return 0;
}
return 0;
}