X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=43a1a03264ae0cb8fa12f1633f9c037f963a5683;hp=59b68d502a2e8060be690a932fad7c05c7f87b98;hb=d8432250e1574fb95bd8aab5b7a0231d0c3c3ded;hpb=87e5b45fe1aa734289cf57531c89988cfafff524

diff --git a/frontend/main.c b/frontend/main.c
index 59b68d50..43a1a032 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -48,7 +48,7 @@ extern int iUseInterpolation;
 extern int iXAPitch;
 extern int iVolume;
 
-int ready_to_go;
+int ready_to_go, g_resetting;
 unsigned long gpuDisp;
 char cfgfile_basename[MAXPATHLEN];
 int state_slot;
@@ -146,7 +146,6 @@ void emu_set_default_config(void)
 	// try to set sane config on which most games work
 	Config.Xa = Config.Cdda = Config.Sio =
 	Config.SpuIrq = Config.RCntFix = Config.VSyncWA = 0;
-	Config.CdrReschedule = 0;
 	Config.PsxAuto = 1;
 
 	pl_rearmed_cbs.gpu_neon.allow_interlace = 2; // auto
@@ -187,7 +186,7 @@ static void check_memcards(void)
 
 		f = fopen(buf, "rb");
 		if (f == NULL) {
-			printf("Creating memcard: %s\n", buf);
+			SysPrintf("Creating memcard: %s\n", buf);
 			CreateMcd(buf);
 		}
 		else
@@ -228,7 +227,7 @@ do_state_slot:
 		snprintf(hud_msg, sizeof(hud_msg), "STATE SLOT %d [%s]", state_slot,
 			emu_check_state(state_slot) == 0 ? "USED" : "FREE");
 		hud_new_msg = 3;
-		printf("* %s\n", hud_msg);
+		SysPrintf("* %s\n", hud_msg);
 		break;
 	case SACTION_TOGGLE_FSKIP:
 		pl_rearmed_cbs.fskip_advice = 0;
@@ -262,7 +261,7 @@ do_state_slot:
 			g_opts |= OPT_SHOWFPS;
 		break;
 	case SACTION_TOGGLE_FULLSCREEN:
-		g_fullscreen = !g_fullscreen;
+		plat_target.vout_fullscreen = !plat_target.vout_fullscreen;
 		if (GPU_open != NULL && GPU_close != NULL) {
 			GPU_close();
 			GPU_open(&gpuDisp, "PCSX", NULL);
@@ -301,7 +300,7 @@ do_state_slot:
 		if (GPU_open != NULL) {
 			ret = GPU_open(&gpuDisp, "PCSX", NULL);
 			if (ret)
-				fprintf(stderr, "GPU_open returned %d\n", ret);
+				SysMessage("GPU_open returned %d", ret);
 		}
 		return;
 #endif
@@ -312,12 +311,19 @@ do_state_slot:
 	hud_new_msg = 3;
 }
 
+static char basic_lcase(char c)
+{
+	if ('A' <= c && c <= 'Z')
+		return c - 'A' + 'a';
+	return c;
+}
+
 static int cdidcmp(const char *id1, const char *id2)
 {
 	while (*id1 != 0 && *id2 != 0) {
 		if (*id1 == '_') { id1++; continue; }
 		if (*id2 == '_') { id2++; continue; }
-		if (*id1 != *id2)
+		if (basic_lcase(*id1) != basic_lcase(*id2))
 			break;
 		id1++;
 		id2++;
@@ -348,7 +354,7 @@ static void parse_cwcheat(void)
 	if (feof(f))
 		goto out;
 
-	printf("cwcheat section found for %s\n", CdromId);
+	SysPrintf("cwcheat section found for %s\n", CdromId);
 	while (fgets(line, sizeof(line), f))
 	{
 		p = line + strlen(line);
@@ -360,12 +366,12 @@ static void parse_cwcheat(void)
 		if (strncmp(line, "_S", 2) == 0)
 			break;
 		if (strncmp(line, "_G", 2) == 0) {
-			printf("  cwcheat game name: '%s'\n", line + 3);
+			SysPrintf("  cwcheat game name: '%s'\n", line + 3);
 			continue;
 		}
 		if (strncmp(line, "_C0", 3) == 0) {
 			if (!newcheat && Cheats[NumCheats - 1].n == 0) {
-				printf("cheat '%s' failed to parse\n", name);
+				SysPrintf("cheat '%s' failed to parse\n", name);
 				free(Cheats[NumCheats - 1].Descr);
 				NumCheats--;
 			}
@@ -374,7 +380,7 @@ static void parse_cwcheat(void)
 			continue;
 		}
 		if (sscanf(line, "_L %x %x", &a, &v) != 2) {
-			printf("line failed to parse: '%s'\n", line);
+			SysPrintf("line failed to parse: '%s'\n", line);
 			continue;
 		}
 
@@ -418,8 +424,8 @@ void emu_on_new_cd(int show_hud_msg)
 	parse_cwcheat();
 
 	if (Config.HLE) {
-		printf("note: running with HLE BIOS, expect compatibility problems\n");
-		printf("----------------------------------------------------------\n");
+		SysPrintf("note: running with HLE BIOS, expect compatibility problems\n");
+		SysPrintf("----------------------------------------------------------\n");
 	}
 
 	if (show_hud_msg) {
@@ -452,7 +458,7 @@ int emu_core_init(void)
 	check_memcards();
 
 	if (EmuInit() == -1) {
-		printf("PSX emulator couldn't be initialized.\n");
+		SysPrintf("PSX emulator couldn't be initialized.\n");
 		return -1;
 	}
 
@@ -485,7 +491,7 @@ int main(int argc, char *argv[])
 		else if (!strcmp(argv[i], "-cfg")) {
 			if (i+1 >= argc) break;
 			strncpy(cfgfile_basename, argv[++i], MAXPATHLEN-100);	/* TODO buffer overruns */
-			printf("Using config file %s.\n", cfgfile_basename);
+			SysPrintf("Using config file %s.\n", cfgfile_basename);
 		}
 		else if (!strcmp(argv[i], "-cdfile")) {
 			char isofilename[MAXPATHLEN];
@@ -578,7 +584,7 @@ int main(int argc, char *argv[])
 		if (cdfile) {
 			if (LoadCdrom() == -1) {
 				ClosePlugins();
-				printf(_("Could not load CD-ROM!\n"));
+				SysPrintf(_("Could not load CD-ROM!\n"));
 				return -1;
 			}
 			emu_on_new_cd(!loadst);
@@ -588,7 +594,8 @@ int main(int argc, char *argv[])
 
 	if (loadst_f) {
 		int ret = LoadState(loadst_f);
-		printf("%s state file: %s\n", ret ? "failed to load" : "loaded", loadst_f);
+		SysPrintf("%s state file: %s\n",
+			ret ? "failed to load" : "loaded", loadst_f);
 		ready_to_go |= ret == 0;
 	}
 
@@ -598,7 +605,8 @@ int main(int argc, char *argv[])
 		// 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);
+			SysPrintf("%s state %d\n",
+				ret ? "failed to load" : "loaded", loadst);
 		}
 	}
 	else
@@ -668,6 +676,7 @@ void SysReset() {
 	// so we need to prevent updateLace() call..
 	void *real_lace = GPU_updateLace;
 	GPU_updateLace = dummy_lace;
+	g_resetting = 1;
 
 	// reset can run code, timing must be set
 	pl_timing_prepare(Config.PsxType);
@@ -678,6 +687,7 @@ void SysReset() {
 	CDR_stop();
 
 	GPU_updateLace = real_lace;
+	g_resetting = 0;
 }
 
 void SysClose() {
@@ -732,7 +742,8 @@ int emu_save_state(int slot)
 #ifndef __ARM_ARCH_7A__ /* XXX */
 	sync();
 #endif
-	printf("* %s \"%s\" [%d]\n", ret == 0 ? "saved" : "failed to save", fname, slot);
+	SysPrintf("* %s \"%s\" [%d]\n",
+		ret == 0 ? "saved" : "failed to save", fname, slot);
 	return ret;
 }
 
@@ -752,13 +763,10 @@ int emu_load_state(int slot)
 
 void SysPrintf(const char *fmt, ...) {
 	va_list list;
-	char msg[512];
 
 	va_start(list, fmt);
-	vsprintf(msg, fmt, list);
+	vfprintf(emuLog, fmt, list);
 	va_end(list);
-
-	fprintf(emuLog, "%s", msg);
 }
 
 void SysMessage(const char *fmt, ...) {
@@ -766,13 +774,13 @@ void SysMessage(const char *fmt, ...) {
         char msg[512];
 
         va_start(list, fmt);
-        vsprintf(msg, fmt, list);
+        vsnprintf(msg, sizeof(msg), fmt, list);
         va_end(list);
 
         if (msg[strlen(msg) - 1] == '\n')
                 msg[strlen(msg) - 1] = 0;
 
-	fprintf(stderr, "%s\n", msg);
+	SysPrintf("%s\n", msg);
 }
 
 static void SignalExit(int sig) {
@@ -917,7 +925,7 @@ void *SysLoadLibrary(const char *lib) {
 	void *ret;
 	int i;
 
-	printf("plugin: %s\n", lib);
+	SysPrintf("plugin: %s\n", lib);
 
 	if (tmp != NULL) {
 		tmp++;
@@ -928,7 +936,7 @@ void *SysLoadLibrary(const char *lib) {
 
 	ret = dlopen(lib, RTLD_NOW);
 	if (ret == NULL)
-		fprintf(stderr, "dlopen: %s\n", dlerror());
+		SysMessage("dlopen: %s", dlerror());
 	return ret;
 }