spu: get rid of iSPUIRQWait

[pcsx_rearmed.git] / frontend / main.c

diff --git a/frontend/main.c b/frontend/main.c
index a305312..d6f4cd1 100644 (file)
--- 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,13 +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;
@@ -362,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
@@ -728,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);