major menu unification, minor reorganization

[libpicofe.git] / pandora / main.c

diff --git a/pandora/main.c b/pandora/main.c
index 010bff9..51f7f8e 100644 (file)
--- a/pandora/main.c
+++ b/pandora/main.c
@@ -15,6 +15,7 @@
 #include "../common/menu.h"\r
 #include "../common/emu.h"\r
 #include "../common/config.h"\r
+#include "../common/input.h"\r
 #include "../gp2x/emu.h"\r
 #include "../gp2x/version.h"\r
 \r
@@ -49,9 +50,9 @@ void parse_cmd_line(int argc, char *argv[])
                } else {\r
                        /* External Frontend: ROM Name */\r
                        FILE *f;\r
-                       strncpy(romFileName, argv[x], PATH_MAX);\r
-                       romFileName[PATH_MAX-1] = 0;\r
-                       f = fopen(romFileName, "rb");\r
+                       strncpy(rom_fname_reload, argv[x], PATH_MAX);\r
+                       rom_fname_reload[PATH_MAX-1] = 0;\r
+                       f = fopen(rom_fname_reload, "rb");\r
                        if (f) fclose(f);\r
                        else unrecognized = 1;\r
                        engineState = PGS_ReloadRom;\r
@@ -77,10 +78,13 @@ int main(int argc, char *argv[])
 {\r
        g_argv = argv;\r
 \r
+       in_init();\r
        emu_prepareDefaultConfig();\r
        emu_ReadConfig(0, 0);\r
        config_readlrom(PicoConfigFile);\r
 \r
+       in_probe();\r
+       in_debug_dump();\r
        gp2x_init();\r
        emu_Init();\r
        menu_init();\r
@@ -92,7 +96,7 @@ int main(int argc, char *argv[])
 \r
        if (engineState == PGS_ReloadRom)\r
        {\r
-               if (emu_ReloadRom()) {\r
+               if (emu_ReloadRom(rom_fname_reload)) {\r
                        engineState = PGS_Running;\r
                        if (load_state_slot >= 0) {\r
                                state_slot = load_state_slot;\r
@@ -110,7 +114,7 @@ int main(int argc, char *argv[])
                                break;\r
 \r
                        case PGS_ReloadRom:\r
-                               if (emu_ReloadRom())\r
+                               if (emu_ReloadRom(rom_fname_reload))\r
                                        engineState = PGS_Running;\r
                                else {\r
                                        printf("PGS_ReloadRom == 0\n");\r