extend mmap wrapper functionality

[libpicofe.git] / common / main.c

diff --git a/common/main.c b/common/main.c
index 67f15da..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 <cpu/debug.h>\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], "-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
@@ -67,15 +74,13 @@ int main(int argc, char *argv[])
 \r
        plat_early_init();\r
 \r
-       /* in_init() must go before config, config accesses in_ fwk */\r
        in_init();\r
-       pemu_prep_defconfig();\r
-       emu_ReadConfig(0, 0);\r
-       config_readlrom(PicoConfigFile);\r
+       in_probe();\r
 \r
        plat_init();\r
-       in_probe();\r
-       in_debug_dump();\r
+\r
+       emu_prep_defconfig(); // depends on input\r
+       emu_read_config(NULL, 0);\r
 \r
        emu_init();\r
        menu_init();\r
@@ -87,11 +92,11 @@ int main(int argc, char *argv[])
 \r
        if (engineState == PGS_ReloadRom)\r
        {\r
-               if (emu_ReloadRom(rom_fname_reload)) {\r
+               if (emu_reload_rom(rom_fname_reload)) {\r
                        engineState = PGS_Running;\r
                        if (load_state_slot >= 0) {\r
                                state_slot = load_state_slot;\r
-                               emu_SaveLoadGame(1, 0);\r
+                               emu_save_load_game(1, 0);\r
                        }\r
                }\r
        }\r
@@ -104,8 +109,12 @@ int main(int argc, char *argv[])
                                menu_loop();\r
                                break;\r
 \r
+                       case PGS_TrayMenu:\r
+                               menu_loop_tray();\r
+                               break;\r
+\r
                        case PGS_ReloadRom:\r
-                               if (emu_ReloadRom(rom_fname_reload))\r
+                               if (emu_reload_rom(rom_fname_reload))\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
+                               /* vvv fallthrough */\r
 \r
                        case PGS_Running:\r
-                               pemu_loop();\r
+                               emu_loop();\r
                                break;\r
 \r
                        case PGS_Quit:\r