X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fmain.c;h=d8d82afecd6d34c0859c62bad9a6e5634fcc4f13;hb=fce20e73e7094060b29f1668b8f0032f75eb152e;hp=61579cfd3f5f22a1487b48b2c014bfe5c31fb44f;hpb=5e2e14f284d1abbee9f212f75d6766a5825c7ada;p=libpicofe.git

diff --git a/gp2x/main.c b/gp2x/main.c
index 61579cf..d8d82af 100644
--- a/gp2x/main.c
+++ b/gp2x/main.c
@@ -4,6 +4,7 @@
 // For commercial use, separate licencing terms must be obtained.
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <strings.h>
@@ -11,6 +12,10 @@
 
 #include "gp2x.h"
 #include "menu.h"
+#include "../common/menu.h"
+#include "../common/emu.h"
+#include "../common/config.h"
+#include "../common/input.h"
 #include "emu.h"
 #include "940ctl.h"
 #include "version.h"
@@ -22,6 +27,7 @@
 extern char *ext_menu, *ext_state;
 extern int select_exits;
 extern char *PicoConfigFile;
+static int load_state_slot = -1;
 int mmuhack_status = 0;
 char **g_argv;
 
@@ -45,6 +51,9 @@ void parse_cmd_line(int argc, char *argv[])
 			else if(strcasecmp(argv[x], "-selectexit") == 0) {
 				select_exits = 1;
 			}
+			else if(strcasecmp(argv[x], "-loadstate") == 0) {
+				if(x+1 < argc) { ++x; load_state_slot = atoi(argv[x]); }
+			}
 			else {
 				unrecognized = 1;
 				break;
@@ -63,14 +72,15 @@ void parse_cmd_line(int argc, char *argv[])
 	}
 
 	if (unrecognized) {
-		printf("\n\n\nPicoDrive v" VERSION " (c) notaz, 2006\n");
+		printf("\n\n\nPicoDrive v" VERSION " (c) notaz, 2006-2008\n");
 		printf("usage: %s [options] [romfile]\n", argv[0]);
 		printf( "options:\n"
 				"-menu <menu_path> launch a custom program on exit instead of default gp2xmenu\n"
 				"-state <param>    pass '-state param' to the menu program\n"
 				"-config <file>    use specified config file instead of default 'picoconfig.bin'\n"
 				"                  see currentConfig_t structure in emu.h for the file format\n"
-				"-selectexit       pressing SELECT will exit the emu and start 'menu_path'\n");
+				"-selectexit       pressing SELECT will exit the emu and start 'menu_path'\n"
+				"-loadstate <num>  if ROM is specified, try loading slot <num>\n");
 	}
 }
 
@@ -79,7 +89,13 @@ int main(int argc, char *argv[])
 {
 	g_argv = argv;
 
-	emu_ReadConfig(0);
+	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();
@@ -97,12 +113,24 @@ int main(int argc, char *argv[])
 	}
 	sharedmem_init();
 	emu_Init();
+	menu_init();
 
 	engineState = PGS_Menu;
 
 	if (argc > 1)
 		parse_cmd_line(argc, argv);
 
+	if (engineState == PGS_ReloadRom)
+	{
+		if (emu_ReloadRom(romFileName)) {
+			engineState = PGS_Running;
+			if (load_state_slot >= 0) {
+				state_slot = load_state_slot;
+				emu_SaveLoadGame(1, 0);
+			}
+		}
+	}
+
 	for (;;)
 	{
 		switch (engineState)
@@ -112,7 +140,7 @@ int main(int argc, char *argv[])
 				break;
 
 			case PGS_ReloadRom:
-				if (emu_ReloadRom())
+				if (emu_ReloadRom(romFileName))
 					engineState = PGS_Running;
 				else {
 					printf("PGS_ReloadRom == 0\n");