From 2aa6a3a0cd427c289fd906c5ada5b8e718da6c31 Mon Sep 17 00:00:00 2001
From: notaz
Date: Sat, 29 Oct 2011 22:07:30 +0300
Subject: maemo: call GPU_Open, enable bios

should fix gles breakage
---
 maemo/main.c | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'maemo')

diff --git a/maemo/main.c b/maemo/main.c
index 977f6a3..4531704 100644
--- a/maemo/main.c
+++ b/maemo/main.c
@@ -16,6 +16,7 @@
 #include "plugin_lib.h"
 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
+#include "../plugins/dfinput/main.h"
 #include "maemo_common.h"
 
 // sound plugin
@@ -82,11 +83,9 @@ int maemo_main(int argc, char **argv)
 		else if (!strcmp(argv[i],"-accel"))				g_maemo_opts |= 4;
 		else if (!strcmp(argv[i],"-sputhreaded"))		iUseTimer=1;
 		else if (!strcmp(argv[i],"-nosound"))		strcpy(Config.Spu, "spunull.so");
-		/* unworking with r10
-		else if(!strcmp(argv[i], "-bdir"))			sprintf(Config.BiosDir, "%s", argv[++i]);
-		else if(!strcmp(argv[i], "-bios"))			sprintf(Config.Bios, "%s", argv[++i]);
-		else if (!strcmp(argv[i],"-gles"))			strcpy(Config.Gpu, "gpuGLES.so");
-		*/
+		else if (!strcmp(argv[i], "-bdir"))			sprintf(Config.BiosDir, "%s", argv[++i]);
+		else if (!strcmp(argv[i], "-bios"))			sprintf(Config.Bios, "%s", argv[++i]);
+		else if (!strcmp(argv[i], "-gles"))			strcpy(Config.Gpu, "gpuGLES.so");
 		else if (!strcmp(argv[i], "-cdda"))		Config.Cdda = 1;
 		else if (!strcmp(argv[i], "-xa"))		Config.Xa = 1;
 		else if (!strcmp(argv[i], "-rcnt"))		Config.RCntFix = 1 ;
@@ -134,20 +133,26 @@ int maemo_main(int argc, char **argv)
 		}
 	}
 
+	if (!ready_to_go) {
+		printf ("something goes wrong, maybe you forgot -cdfile ? \n");
+		return 1;
+	}
+
 	// If a state has been specified, then load that
 	if (loadst) {
 		int ret = emu_load_state(loadst - 1);
 		printf("%s state %d\n", ret ? "failed to load" : "loaded", loadst);
 	}
 
-	if (ready_to_go)
-		maemo_init(&argc, &argv);
-	else
-	{
-		printf ("somethings goes wrong, maybe you forgot -cdfile ? \n");
-		return 0;
+	maemo_init(&argc, &argv);
+
+	if (GPU_open != NULL) {
+		int ret = GPU_open(&gpuDisp, "PCSX", NULL);
+		if (ret)
+			fprintf(stderr, "Warning: GPU_open returned %d\n", ret);
 	}
 
+	dfinput_activate();
 	pl_timing_prepare(Config.PsxType);
 
 	while (1)
-- 
cgit v1.2.3