notaz.gp2x.de
/
libpicofe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some ts support, currently for Pico only
[libpicofe.git]
/
gp2x
/
main.c
diff --git
a/gp2x/main.c
b/gp2x/main.c
index
23d6241
..
ed2191c
100644
(file)
--- a/
gp2x/main.c
+++ b/
gp2x/main.c
@@
-11,6
+11,9
@@
\r
#include "gp2x.h"
\r
#include "menu.h"
\r
\r
#include "gp2x.h"
\r
#include "menu.h"
\r
+#include "../common/menu.h"
\r
+#include "../common/emu.h"
\r
+#include "../common/config.h"
\r
#include "emu.h"
\r
#include "940ctl.h"
\r
#include "version.h"
\r
#include "emu.h"
\r
#include "940ctl.h"
\r
#include "version.h"
\r
@@
-63,7
+66,7
@@
void parse_cmd_line(int argc, char *argv[])
}
\r
\r
if (unrecognized) {
\r
}
\r
\r
if (unrecognized) {
\r
- printf("\n\n\nPicoDrive v" VERSION " (c) notaz, 2006\n");
\r
+ printf("\n\n\nPicoDrive v" VERSION " (c) notaz, 2006
-2008
\n");
\r
printf("usage: %s [options] [romfile]\n", argv[0]);
\r
printf( "options:\n"
\r
"-menu <menu_path> launch a custom program on exit instead of default gp2xmenu\n"
\r
printf("usage: %s [options] [romfile]\n", argv[0]);
\r
printf( "options:\n"
\r
"-menu <menu_path> launch a custom program on exit instead of default gp2xmenu\n"
\r
@@
-79,7
+82,10
@@
int main(int argc, char *argv[])
{
\r
g_argv = argv;
\r
\r
{
\r
g_argv = argv;
\r
\r
- emu_ReadConfig(0);
\r
+ emu_prepareDefaultConfig();
\r
+ emu_ReadConfig(0, 0);
\r
+ config_readlrom(PicoConfigFile);
\r
+
\r
gp2x_init();
\r
if (currentConfig.EmuOpt&0x10) {
\r
int ret = mmuhack();
\r
gp2x_init();
\r
if (currentConfig.EmuOpt&0x10) {
\r
int ret = mmuhack();
\r
@@
-97,6
+103,7
@@
int main(int argc, char *argv[])
}
\r
sharedmem_init();
\r
emu_Init();
\r
}
\r
sharedmem_init();
\r
emu_Init();
\r
+ menu_init();
\r
\r
engineState = PGS_Menu;
\r
\r
\r
engineState = PGS_Menu;
\r
\r
@@
-120,6
+127,9
@@
int main(int argc, char *argv[])
}
\r
break;
\r
\r
}
\r
break;
\r
\r
+ case PGS_RestartRun:
\r
+ engineState = PGS_Running;
\r
+
\r
case PGS_Running:
\r
emu_Loop();
\r
break;
\r
case PGS_Running:
\r
emu_Loop();
\r
break;
\r