X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fmain.c;h=6ac16b8f4d8fac53d2d6bce18dad2a1e5393e260;hb=fa8d133192876a802fbac43c0a0bfe4f5f85b682;hp=2eed35bdb802708b71000cd1f72514fed92edeb3;hpb=d572cbad9886a04f8c51edb825dc6aaec9b02e23;p=libpicofe.git

diff --git a/gp2x/main.c b/gp2x/main.c
index 2eed35b..6ac16b8 100644
--- a/gp2x/main.c
+++ b/gp2x/main.c
@@ -1,4 +1,4 @@
-// (c) Copyright 2006 notaz, All rights reserved.
+// (c) Copyright 2006-2009 notaz, All rights reserved.
 // Free for non-commercial use.
 
 // For commercial use, separate licencing terms must be obtained.
@@ -6,9 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <strings.h>
-#include <linux/limits.h>
 
 #include "../common/menu.h"
 #include "../common/emu.h"
@@ -16,16 +14,11 @@
 #include "../common/input.h"
 #include "../common/plat.h"
 #include "emu.h"
-#include "940ctl.h"
 #include "version.h"
 
-#include "squidgehack.h"
-#include "cpuctrl.h"
-
 
 extern char *PicoConfigFile;
 static int load_state_slot = -1;
-int mmuhack_status = 0;
 char **g_argv;
 
 void parse_cmd_line(int argc, char *argv[])
@@ -73,6 +66,8 @@ int main(int argc, char *argv[])
 {
 	g_argv = argv;
 
+	plat_early_init();
+
 	/* in_init() must go before config, config accesses in_ fwk */
 	in_init();
 	emu_prepareDefaultConfig();
@@ -83,19 +78,6 @@ int main(int argc, char *argv[])
 	in_probe();
 	in_debug_dump();
 
-	if (currentConfig.EmuOpt&0x10) {
-		int ret = mmuhack();
-		printf("squidge hack code finished and returned %i\n", ret); fflush(stdout);
-		mmuhack_status = ret;
-	}
-	cpuctrl_init();
-	if (currentConfig.EmuOpt&0x100) {
-		printf("setting RAM timings.. "); fflush(stdout);
-		// craigix: --trc 6 --tras 4 --twr 1 --tmrd 1 --trfc 1 --trp 2 --trcd 2
-		set_RAM_Timings(6, 4, 1, 1, 1, 2, 2);
-		printf("done.\n"); fflush(stdout);
-	}
-	sharedmem_init();
 	emu_Init();
 	menu_init();
 
@@ -151,11 +133,7 @@ int main(int argc, char *argv[])
 	endloop:
 
 	emu_Deinit();
-	sharedmem_deinit();
-	cpuctrl_deinit();
 	plat_finish();
-	if (mmuhack_status)
-		mmuunhack();
 
 	return 0;
 }