gp2x->common menu migration finished, gp2x now only uses input fwk

[libpicofe.git] / gp2x / main.c

diff --git a/gp2x/main.c b/gp2x/main.c
index bdf90d5..0ea8e82 100644 (file)
--- a/gp2x/main.c
+++ b/gp2x/main.c
@@ -11,10 +11,11 @@
 #include <linux/limits.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 "../common/input.h"\r
+#include "../common/plat.h"\r
 #include "emu.h"\r
 #include "940ctl.h"\r
 #include "version.h"\r
@@ -60,9 +61,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], sizeof(rom_fname_reload));\r
+                       rom_fname_reload[sizeof(rom_fname_reload) - 1] = 0;\r
+                       f = fopen(rom_fname_reload, "rb");\r
                        if (f) fclose(f);\r
                        else unrecognized = 1;\r
                        engineState = PGS_ReloadRom;\r
@@ -88,10 +89,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
        if (currentConfig.EmuOpt&0x10) {\r
                int ret = mmuhack();\r
@@ -118,7 +122,7 @@ int main(int argc, char *argv[])
 \r
        if (engineState == PGS_ReloadRom)\r
        {\r
-               if (emu_ReloadRom(romFileName)) {\r
+               if (emu_ReloadRom(rom_fname_reload)) {\r
                        engineState = PGS_Running;\r
                        if (load_state_slot >= 0) {\r
                                state_slot = load_state_slot;\r
@@ -136,7 +140,7 @@ int main(int argc, char *argv[])
                                break;\r
 \r
                        case PGS_ReloadRom:\r
-                               if (emu_ReloadRom(romFileName))\r
+                               if (emu_ReloadRom(rom_fname_reload))\r
                                        engineState = PGS_Running;\r
                                else {\r
                                        printf("PGS_ReloadRom == 0\n");\r