notaz.gp2x.de
/
libpicofe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
readpnd: teach to writepng too (todo: rename?)
[libpicofe.git]
/
common
/
main.c
diff --git
a/common/main.c
b/common/main.c
index
00cbac7
..
48f218f
100644
(file)
--- a/
common/main.c
+++ b/
common/main.c
@@
-13,6
+13,7
@@
#include "config.h"
\r
#include "input.h"
\r
#include "plat.h"
\r
#include "config.h"
\r
#include "input.h"
\r
#include "plat.h"
\r
+#include <cpu/debug.h>
\r
#include <version.h>
\r
\r
\r
#include <version.h>
\r
\r
\r
@@
-34,6
+35,12
@@
void parse_cmd_line(int argc, char *argv[])
else if (strcasecmp(argv[x], "-loadstate") == 0) {
\r
if (x+1 < argc) { ++x; load_state_slot = atoi(argv[x]); }
\r
}
\r
else if (strcasecmp(argv[x], "-loadstate") == 0) {
\r
if (x+1 < argc) { ++x; load_state_slot = atoi(argv[x]); }
\r
}
\r
+ else if (strcasecmp(argv[x], "-pdb") == 0) {
\r
+ if (x+1 < argc) { ++x; pdb_command(argv[x]); }
\r
+ }
\r
+ else if (strcasecmp(argv[x], "-pdb_connect") == 0) {
\r
+ if (x+2 < argc) { pdb_net_connect(argv[x+1], argv[x+2]); x += 2; }
\r
+ }
\r
else {
\r
unrecognized = 1;
\r
break;
\r
else {
\r
unrecognized = 1;
\r
break;
\r
@@
-67,17
+74,15
@@
int main(int argc, char *argv[])
\r
plat_early_init();
\r
\r
\r
plat_early_init();
\r
\r
- /* in_init() must go before config, config accesses in_ fwk */
\r
in_init();
\r
in_init();
\r
- emu_prepareDefaultConfig();
\r
- emu_ReadConfig(0, 0);
\r
- config_readlrom(PicoConfigFile);
\r
+ in_probe();
\r
\r
plat_init();
\r
\r
plat_init();
\r
- in_probe();
\r
- in_debug_dump();
\r
\r
\r
- emu_Init();
\r
+ emu_prep_defconfig(); // depends on input
\r
+ emu_read_config(NULL, 0);
\r
+
\r
+ emu_init();
\r
menu_init();
\r
\r
engineState = PGS_Menu;
\r
menu_init();
\r
\r
engineState = PGS_Menu;
\r
@@
-87,11
+92,11
@@
int main(int argc, char *argv[])
\r
if (engineState == PGS_ReloadRom)
\r
{
\r
\r
if (engineState == PGS_ReloadRom)
\r
{
\r
- if (emu_
ReloadR
om(rom_fname_reload)) {
\r
+ if (emu_
reload_r
om(rom_fname_reload)) {
\r
engineState = PGS_Running;
\r
if (load_state_slot >= 0) {
\r
state_slot = load_state_slot;
\r
engineState = PGS_Running;
\r
if (load_state_slot >= 0) {
\r
state_slot = load_state_slot;
\r
- emu_
SaveLoadG
ame(1, 0);
\r
+ emu_
save_load_g
ame(1, 0);
\r
}
\r
}
\r
}
\r
}
\r
}
\r
}
\r
@@
-104,8
+109,12
@@
int main(int argc, char *argv[])
menu_loop();
\r
break;
\r
\r
menu_loop();
\r
break;
\r
\r
+ case PGS_TrayMenu:
\r
+ menu_loop_tray();
\r
+ break;
\r
+
\r
case PGS_ReloadRom:
\r
case PGS_ReloadRom:
\r
- if (emu_
ReloadR
om(rom_fname_reload))
\r
+ if (emu_
reload_r
om(rom_fname_reload))
\r
engineState = PGS_Running;
\r
else {
\r
printf("PGS_ReloadRom == 0\n");
\r
engineState = PGS_Running;
\r
else {
\r
printf("PGS_ReloadRom == 0\n");
\r
@@
-115,9
+124,10
@@
int main(int argc, char *argv[])
\r
case PGS_RestartRun:
\r
engineState = PGS_Running;
\r
\r
case PGS_RestartRun:
\r
engineState = PGS_Running;
\r
+ /* vvv fallthrough */
\r
\r
case PGS_Running:
\r
\r
case PGS_Running:
\r
- emu_
L
oop();
\r
+ emu_
l
oop();
\r
break;
\r
\r
case PGS_Quit:
\r
break;
\r
\r
case PGS_Quit:
\r
@@
-131,7
+141,7
@@
int main(int argc, char *argv[])
\r
endloop:
\r
\r
\r
endloop:
\r
\r
- emu_
Deinit
();
\r
+ emu_
finish
();
\r
plat_finish();
\r
\r
return 0;
\r
plat_finish();
\r
\r
return 0;
\r