X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fmain.c;h=0ea8e824c771f1df655311ca6e69a426d88d3a27;hb=82abf46f3db8ade517881c03327bdbc0de848eb2;hp=50210f66d641cf1f688f38f7e427196e5db371ce;hpb=f7c40368a7700e5f18993c71a7d77bfe768c4900;p=libpicofe.git

diff --git a/gp2x/main.c b/gp2x/main.c
index 50210f6..0ea8e82 100644
--- a/gp2x/main.c
+++ b/gp2x/main.c
@@ -11,10 +11,11 @@
 #include <linux/limits.h>
 
 #include "gp2x.h"
-#include "menu.h"
 #include "../common/menu.h"
 #include "../common/emu.h"
 #include "../common/config.h"
+#include "../common/input.h"
+#include "../common/plat.h"
 #include "emu.h"
 #include "940ctl.h"
 #include "version.h"
@@ -60,9 +61,9 @@ void parse_cmd_line(int argc, char *argv[])
 		} else {
 			/* External Frontend: ROM Name */
 			FILE *f;
-			strncpy(romFileName, argv[x], PATH_MAX);
-			romFileName[PATH_MAX-1] = 0;
-			f = fopen(romFileName, "rb");
+			strncpy(rom_fname_reload, argv[x], sizeof(rom_fname_reload));
+			rom_fname_reload[sizeof(rom_fname_reload) - 1] = 0;
+			f = fopen(rom_fname_reload, "rb");
 			if (f) fclose(f);
 			else unrecognized = 1;
 			engineState = PGS_ReloadRom;
@@ -88,10 +89,13 @@ int main(int argc, char *argv[])
 {
 	g_argv = argv;
 
+	in_init();
 	emu_prepareDefaultConfig();
 	emu_ReadConfig(0, 0);
 	config_readlrom(PicoConfigFile);
 
+	in_probe();
+	in_debug_dump();
 	gp2x_init();
 	if (currentConfig.EmuOpt&0x10) {
 		int ret = mmuhack();
@@ -118,7 +122,7 @@ int main(int argc, char *argv[])
 
 	if (engineState == PGS_ReloadRom)
 	{
-		if (emu_ReloadRom()) {
+		if (emu_ReloadRom(rom_fname_reload)) {
 			engineState = PGS_Running;
 			if (load_state_slot >= 0) {
 				state_slot = load_state_slot;
@@ -136,7 +140,7 @@ int main(int argc, char *argv[])
 				break;
 
 			case PGS_ReloadRom:
-				if (emu_ReloadRom())
+				if (emu_ReloadRom(rom_fname_reload))
 					engineState = PGS_Running;
 				else {
 					printf("PGS_ReloadRom == 0\n");