X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Fmain.c;h=5a0287edf516bbcc963001dd26ea42127bfe6ee3;hb=30f0fdd42279a99893034a5d21b64439536c60aa;hp=7167df296c98018285de015a64a856f610586313;hpb=5686d93123821e06ac2d9f6209c37438303dd4c1;p=picodrive.git

diff --git a/platform/common/main.c b/platform/common/main.c
index 7167df2..5a0287e 100644
--- a/platform/common/main.c
+++ b/platform/common/main.c
@@ -1,18 +1,21 @@
-// (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 <cpu/debug.h>
 #include <version.h>
 
@@ -72,17 +75,15 @@ int main(int argc, char *argv[])
 {
 	g_argv = argv;
 
-	plat_early_init();
+	//plat_early_init();
 
-	/* in_init() must go before config, config accesses in_ fwk */
 	in_init();
-	emu_prep_defconfig();
-	emu_read_config(0, 0);
-	config_readlrom(PicoConfigFile);
-
-	plat_init();
 	in_probe();
-	in_debug_dump();
+
+	plat_target_init();
+
+	emu_prep_defconfig(); // depends on input
+	emu_read_config(NULL, 0);
 
 	emu_init();
 	menu_init();
@@ -144,7 +145,7 @@ int main(int argc, char *argv[])
 	endloop:
 
 	emu_finish();
-	plat_finish();
+	plat_target_finish();
 
 	return 0;
 }