X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Flibretro.c;h=103ee8e552aee42394d9c75bd249254fb1ae183a;hp=644db92d879c4cea3ab23db4633adbaee4b0b909;hb=74ebc05b15569d7745b9ab59f9b289f427abeeac;hpb=19a784e63f95b0eb32d252fabb144531f695a983

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 644db92d..103ee8e5 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 
 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/psxcounters.h"
@@ -243,9 +244,8 @@ void retro_set_environment(retro_environment_t cb)
       { "region", "Region; Auto|NTSC|PAL" },
 #ifdef __ARM_NEON__
       { "neon_interlace_enable", "Enable interlacing mode(s); disabled|enabled" },
-#if 0
       { "neon_enhancement_enable", "Enhanced resolution (slow); disabled|enabled" },
-#endif
+      { "neon_enhancement_no_main", "Enhanced resolution speed hack; disabled|enabled" },
 #endif
       { NULL, NULL },
    };
@@ -592,6 +592,33 @@ static void extract_directory(char *buf, const char *path, size_t size)
    }
 }
 
+#ifdef __QNX__
+/* Blackberry QNX doesn't have strcasestr */
+
+/*
+ * Find the first occurrence of find in s, ignore case.
+ */
+char *
+strcasestr(const char *s, const char*find)
+{
+	char c, sc;
+	size_t len;
+
+	if ((c = *find++) != 0) {
+		c = tolower((unsigned char)c);
+		len = strlen(find);
+		do {
+			do {
+				if ((sc = *s++) == 0)
+					return (NULL);
+			} while ((char)tolower((unsigned char)sc) != c);
+		} while (strncasecmp(s, find, len) != 0);
+		s--;
+	}
+	return ((char *)s);
+}
+#endif
+
 bool retro_load_game(const struct retro_game_info *info)
 {
 	size_t i;
@@ -770,7 +797,6 @@ static void update_variables(bool in_flight)
          pl_rearmed_cbs.gpu_neon.allow_interlace = 1;
    }
 
-#if 0
    var.value = NULL;
    var.key = "neon_enhancement_enable";
 
@@ -781,7 +807,17 @@ static void update_variables(bool in_flight)
       else if (strcmp(var.value, "enabled") == 0)
          pl_rearmed_cbs.gpu_neon.enhancement_enable = 1;
    }
-#endif
+
+   var.value = NULL;
+   var.key = "neon_enhancement_no_main";
+
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
+   {
+      if (strcmp(var.value, "disabled") == 0)
+         pl_rearmed_cbs.gpu_neon.enhancement_no_main = 0;
+      else if (strcmp(var.value, "enabled") == 0)
+         pl_rearmed_cbs.gpu_neon.enhancement_no_main = 1;
+   }
 #endif
 
 	if (in_flight) {
@@ -826,13 +862,67 @@ void retro_run(void)
 	vout_fb_dirty = 0;
 }
 
+static bool try_use_bios(const char *path)
+{
+	FILE *f;
+	long size;
+	const char *name;
+
+	f = fopen(path, "rb");
+	if (f == NULL)
+		return false;
+
+	fseek(f, 0, SEEK_END);
+	size = ftell(f);
+	fclose(f);
+
+	if (size != 512 * 1024)
+		return false;
+
+	name = strrchr(path, SLASH);
+	if (name++ == NULL)
+		name = path;
+	snprintf(Config.Bios, sizeof(Config.Bios), "%s", name);
+	return true;
+}
+
+#if 1
+#include <sys/types.h>
+#include <dirent.h>
+
+static bool find_any_bios(const char *dirpath, char *path, size_t path_size)
+{
+	DIR *dir;
+	struct dirent *ent;
+	bool ret = false;
+
+	dir = opendir(dirpath);
+	if (dir == NULL)
+		return false;
+
+	while ((ent = readdir(dir))) {
+		if (strncasecmp(ent->d_name, "scph", 4) != 0)
+			continue;
+
+		snprintf(path, path_size, "%s/%s", dirpath, ent->d_name);
+		ret = try_use_bios(path);
+		if (ret)
+			break;
+	}
+	closedir(dir);
+	return ret;
+}
+#else
+#define find_any_bios(...) false
+#endif
+
 void retro_init(void)
 {
 	const char *bios[] = { "scph1001", "scph5501", "scph7001" };
 	const char *dir;
 	char path[256];
-	FILE *f = NULL;
 	int i, ret, level;
+	bool found_bios = false;
 
 	ret = emu_core_preinit();
 	ret |= emu_core_init();
@@ -849,27 +939,27 @@ void retro_init(void)
 
 		for (i = 0; i < sizeof(bios) / sizeof(bios[0]); i++) {
 			snprintf(path, sizeof(path), "%s/%s.bin", dir, bios[i]);
-			f = fopen(path, "r");
-			if (f != NULL) {
-				snprintf(Config.Bios, sizeof(Config.Bios), "%s.bin", bios[i]);
+			found_bios = try_use_bios(path);
+			if (found_bios)
 				break;
-			}
 		}
+
+		if (!found_bios)
+			found_bios = find_any_bios(dir, path, sizeof(path));
 	}
-	if (f != NULL) {
+	if (found_bios) {
 		SysPrintf("found BIOS file: %s\n", Config.Bios);
-		fclose(f);
 	}
 	else
-   {
+	{
 		SysPrintf("no BIOS files found.\n");
-      struct retro_message msg = 
-      {
-         "no BIOS found, expect bugs!",
-         180
-      };
-      environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE, (void*)&msg);
-   }
+		struct retro_message msg = 
+		{
+			"no BIOS found, expect bugs!",
+			180
+		};
+		environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE, (void*)&msg);
+	}
 
 	level = 1;
 	environ_cb(RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL, &level);