X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fmain.c;h=d6f4cd19f72b05eba31e3bcce157606645a9559b;hb=f3a78e7ea779e6187d571056e0c97823b09a7bb0;hp=c512175a39a9f48ef866df9b6f911dd8a9a0288f;hpb=cbb260483b3b51839805cc5b8cd95720784118c0;p=pcsx_rearmed.git

diff --git a/frontend/main.c b/frontend/main.c
index c512175a..d6f4cd19 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -37,8 +37,6 @@ void StopDebugger();
 extern int iUseReverb;
 extern int iUseInterpolation;
 extern int iXAPitch;
-extern int iSPUIRQWait;
-extern int iUseTimer;
 extern int iVolume;
 
 int ready_to_go;
@@ -131,7 +129,7 @@ static void set_default_paths(void)
 	strcpy(Config.Pad2, "builtin_pad");
 	strcpy(Config.Net, "Disabled");
 #if defined(__arm__) && !defined(__ARM_ARCH_7A__) /* XXX */
-	strcpy(Config.Gpu, "gpuPCSX4ALL.so");
+	strcpy(Config.Gpu, "gpu_unai.so");
 #endif
 
 	snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
@@ -151,14 +149,13 @@ void emu_set_default_config(void)
 	pl_rearmed_cbs.gpu_unai.abe_hack =
 	pl_rearmed_cbs.gpu_unai.no_light =
 	pl_rearmed_cbs.gpu_unai.no_blend = 0;
+	memset(&pl_rearmed_cbs.gpu_peopsgl, 0, sizeof(pl_rearmed_cbs.gpu_peopsgl));
 	pl_rearmed_cbs.gpu_peopsgl.iVRamSize = 64;
 	pl_rearmed_cbs.gpu_peopsgl.iTexGarbageCollection = 1;
 
 	iUseReverb = 2;
 	iUseInterpolation = 1;
 	iXAPitch = 0;
-	iSPUIRQWait = 1;
-	iUseTimer = 2;
 	iVolume = 768;
 #ifndef __ARM_ARCH_7A__ /* XXX */
 	iUseReverb = 0;
@@ -363,9 +360,9 @@ int main(int argc, char *argv[])
 		return 1;
 
 	// frontend stuff
+	// init input but leave probing to platform code,
+	// they add input drivers and may need to modify them after probe
 	in_init();
-	in_evdev_init();
-	//in_probe();
 	pl_init();
 	plat_init();
 	menu_init(); // loads config
@@ -729,9 +726,11 @@ void *SysLoadLibrary(const char *lib) {
 
 #if defined(__x86_64__) || defined(__i386__)
 	// convenience hack
-	char name[MAXPATHLEN];
-	snprintf(name, sizeof(name), "%s.x86", lib);
-	lib = name;
+	if (strstr(lib, ".x86") == NULL) {
+		char name[MAXPATHLEN];
+		snprintf(name, sizeof(name), "%s.x86_64", lib);
+		lib = name;
+	}
 #endif
 
 	ret = dlopen(lib, RTLD_NOW);