continuing input framework integration

[libpicofe.git] / gp2x / main.c

diff --git a/gp2x/main.c b/gp2x/main.c
index 50210f6..d8d82af 100644 (file)
--- a/gp2x/main.c
+++ b/gp2x/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 "emu.h"\r
 #include "940ctl.h"\r
 #include "version.h"\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()) {\r
+               if (emu_ReloadRom(romFileName)) {\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())\r
+                               if (emu_ReloadRom(romFileName))\r
                                        engineState = PGS_Running;\r
                                else {\r
                                        printf("PGS_ReloadRom == 0\n");\r