X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Fmain.c;h=526766762f0ca8c163f60a6b8bc0863ed7b195f6;hb=b59172e3d428eb6848e6874861804c79bbc9d1ec;hp=00cbac715692900bc66d7d09017b8e4f496642b0;hpb=bcd94522e8afb8d4b266f241adfd2e9aea111904;p=picodrive.git

diff --git a/platform/common/main.c b/platform/common/main.c
index 00cbac7..5267667 100644
--- a/platform/common/main.c
+++ b/platform/common/main.c
@@ -1,22 +1,24 @@
-// (c) Copyright 2006-2009 notaz, All rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
+/*
+ * PicoDrive
+ * (C) notaz, 2006-2010
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
 
-#include "menu.h"
+#include "../libpicofe/input.h"
+#include "../libpicofe/plat.h"
+#include "menu_pico.h"
 #include "emu.h"
-#include "config.h"
-#include "input.h"
-#include "plat.h"
-#include <version.h>
+#include "version.h"
+#include <cpu/debug.h>
 
 
-extern char *PicoConfigFile;
 static int load_state_slot = -1;
 char **g_argv;
 
@@ -31,32 +33,41 @@ void parse_cmd_line(int argc, char *argv[])
 			if (strcasecmp(argv[x], "-config") == 0) {
 				if (x+1 < argc) { ++x; PicoConfigFile = argv[x]; }
 			}
-			else if (strcasecmp(argv[x], "-loadstate") == 0) {
+			else if (strcasecmp(argv[x], "-loadstate") == 0
+				 || strcasecmp(argv[x], "-load") == 0)
+			{
 				if (x+1 < argc) { ++x; load_state_slot = atoi(argv[x]); }
 			}
+			else if (strcasecmp(argv[x], "-pdb") == 0) {
+				if (x+1 < argc) { ++x; pdb_command(argv[x]); }
+			}
+			else if (strcasecmp(argv[x], "-pdb_connect") == 0) {
+				if (x+2 < argc) { pdb_net_connect(argv[x+1], argv[x+2]); x += 2; }
+			}
 			else {
 				unrecognized = 1;
 				break;
 			}
 		} else {
-			/* External Frontend: ROM Name */
-			FILE *f;
-			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;
+			FILE *f = fopen(argv[x], "rb");
+			if (f) {
+				fclose(f);
+				rom_fname_reload = argv[x];
+				engineState = PGS_ReloadRom;
+			}
+			else
+				unrecognized = 1;
 			break;
 		}
 	}
 
 	if (unrecognized) {
-		printf("\n\n\nPicoDrive v" VERSION " (c) notaz, 2006-2009\n");
+		printf("\n\n\nPicoDrive v" VERSION " (c) notaz, 2006-2009,2013\n");
 		printf("usage: %s [options] [romfile]\n", argv[0]);
 		printf("options:\n"
 			" -config <file>    use specified config file instead of default 'config.cfg'\n"
-			" -loadstate <num>  if ROM is specified, try loading slot <num>\n");
+			" -loadstate <num>  if ROM is specified, try loading savestate slot <num>\n");
+		exit(1);
 	}
 }
 
@@ -67,17 +78,16 @@ int main(int argc, char *argv[])
 
 	plat_early_init();
 
-	/* in_init() must go before config, config accesses in_ fwk */
 	in_init();
-	emu_prepareDefaultConfig();
-	emu_ReadConfig(0, 0);
-	config_readlrom(PicoConfigFile);
+	//in_probe();
 
+	plat_target_init();
 	plat_init();
-	in_probe();
-	in_debug_dump();
 
-	emu_Init();
+	emu_prep_defconfig(); // depends on input
+	emu_read_config(NULL, 0);
+
+	emu_init();
 	menu_init();
 
 	engineState = PGS_Menu;
@@ -87,11 +97,11 @@ int main(int argc, char *argv[])
 
 	if (engineState == PGS_ReloadRom)
 	{
-		if (emu_ReloadRom(rom_fname_reload)) {
+		if (emu_reload_rom(rom_fname_reload)) {
 			engineState = PGS_Running;
 			if (load_state_slot >= 0) {
 				state_slot = load_state_slot;
-				emu_SaveLoadGame(1, 0);
+				emu_save_load_game(1, 0);
 			}
 		}
 	}
@@ -104,8 +114,12 @@ int main(int argc, char *argv[])
 				menu_loop();
 				break;
 
+			case PGS_TrayMenu:
+				menu_loop_tray();
+				break;
+
 			case PGS_ReloadRom:
-				if (emu_ReloadRom(rom_fname_reload))
+				if (emu_reload_rom(rom_fname_reload))
 					engineState = PGS_Running;
 				else {
 					printf("PGS_ReloadRom == 0\n");
@@ -115,9 +129,10 @@ int main(int argc, char *argv[])
 
 			case PGS_RestartRun:
 				engineState = PGS_Running;
+				/* vvv fallthrough */
 
 			case PGS_Running:
-				emu_Loop();
+				emu_loop();
 				break;
 
 			case PGS_Quit:
@@ -131,8 +146,9 @@ int main(int argc, char *argv[])
 
 	endloop:
 
-	emu_Deinit();
+	emu_finish();
 	plat_finish();
+	plat_target_finish();
 
 	return 0;
 }