X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=0f0e641bce0e88c82f5404c0c2aed694600b051d;hp=762d7533cf916056af559d834e988d34478b019d;hb=e6495add01b91c6ebb9fdb15920fc7fa431d647e;hpb=f29fbd5358e28135d389e2218da7c90f8b94b983

diff --git a/frontend/main.c b/frontend/main.c
index 762d7533..0f0e641b 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -33,6 +33,8 @@
 #include "libpicofe/readpng.h"
 
 static void toggle_fast_forward(int force_off);
+static void check_profile(void);
+static void check_memcards(void);
 #endif
 #ifndef BOOT_MSG
 #define BOOT_MSG "Booting up..."
@@ -48,7 +50,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;
@@ -66,28 +68,6 @@ static void make_path(char *buf, size_t size, const char *dir, const char *fname
 #define MAKE_PATH(buf, dir, fname) \
 	make_path(buf, sizeof(buf), dir, fname)
 
-static void create_profile_dir(const char *directory) {
-	char path[MAXPATHLEN];
-
-	MAKE_PATH(path, directory, NULL);
-	mkdir(path, S_IRWXU | S_IRWXG);
-}
-
-static void CheckSubDir() {
-	// make sure that ~/.pcsx exists
-	create_profile_dir(PCSX_DOT_DIR);
-
-	create_profile_dir(BIOS_DIR);
-	create_profile_dir(MEMCARD_DIR);
-	create_profile_dir(STATES_DIR);
-	create_profile_dir(PLUGINS_DIR);
-	create_profile_dir(PLUGINS_CFG_DIR);
-	create_profile_dir(CHEATS_DIR);
-	create_profile_dir(PATCHES_DIR);
-	create_profile_dir(PCSX_DOT_DIR "cfg");
-	create_profile_dir("/screenshots/");
-}
-
 static int get_gameid_filename(char *buf, int size, const char *fmt, int i) {
 	char trimlabel[33];
 	int j;
@@ -126,9 +106,12 @@ void set_cd_image(const char *fname)
 
 static void set_default_paths(void)
 {
+#ifndef NO_FRONTEND
+	snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
 	MAKE_PATH(Config.Mcd1, MEMCARD_DIR, "card1.mcd");
 	MAKE_PATH(Config.Mcd2, MEMCARD_DIR, "card2.mcd");
 	strcpy(Config.BiosDir, "bios");
+#endif
 
 	strcpy(Config.PluginsDir, "plugins");
 	strcpy(Config.Gpu, "builtin_gpu");
@@ -137,8 +120,6 @@ static void set_default_paths(void)
 	strcpy(Config.Pad1, "builtin_pad");
 	strcpy(Config.Pad2, "builtin_pad");
 	strcpy(Config.Net, "Disabled");
-
-	snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
 }
 
 void emu_set_default_config(void)
@@ -146,7 +127,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
@@ -176,25 +156,6 @@ void emu_set_default_config(void)
 	in_type2 = PSE_PAD_TYPE_STANDARD;
 }
 
-static void check_memcards(void)
-{
-	char buf[MAXPATHLEN];
-	FILE *f;
-	int i;
-
-	for (i = 1; i <= 9; i++) {
-		snprintf(buf, sizeof(buf), ".%scard%d.mcd", MEMCARD_DIR, i);
-
-		f = fopen(buf, "rb");
-		if (f == NULL) {
-			SysPrintf("Creating memcard: %s\n", buf);
-			CreateMcd(buf);
-		}
-		else
-			fclose(f);
-	}
-}
-
 void do_emu_action(void)
 {
 	int ret;
@@ -262,7 +223,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);
@@ -312,12 +273,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++;
@@ -448,8 +416,12 @@ int emu_core_preinit(void)
 
 int emu_core_init(void)
 {
-	CheckSubDir();
+	SysPrintf("Starting PCSX-ReARMed " REV "\n");
+
+#ifndef NO_FRONTEND
+	check_profile();
 	check_memcards();
+#endif
 
 	if (EmuInit() == -1) {
 		SysPrintf("PSX emulator couldn't be initialized.\n");
@@ -466,6 +438,47 @@ int emu_core_init(void)
 }
 
 #ifndef NO_FRONTEND
+static void create_profile_dir(const char *directory) {
+	char path[MAXPATHLEN];
+
+	MAKE_PATH(path, directory, NULL);
+	mkdir(path, S_IRWXU | S_IRWXG);
+}
+
+static void check_profile(void) {
+	// make sure that ~/.pcsx exists
+	create_profile_dir(PCSX_DOT_DIR);
+
+	create_profile_dir(BIOS_DIR);
+	create_profile_dir(MEMCARD_DIR);
+	create_profile_dir(STATES_DIR);
+	create_profile_dir(PLUGINS_DIR);
+	create_profile_dir(PLUGINS_CFG_DIR);
+	create_profile_dir(CHEATS_DIR);
+	create_profile_dir(PATCHES_DIR);
+	create_profile_dir(PCSX_DOT_DIR "cfg");
+	create_profile_dir("/screenshots/");
+}
+
+static void check_memcards(void)
+{
+	char buf[MAXPATHLEN];
+	FILE *f;
+	int i;
+
+	for (i = 1; i <= 9; i++) {
+		snprintf(buf, sizeof(buf), ".%scard%d.mcd", MEMCARD_DIR, i);
+
+		f = fopen(buf, "rb");
+		if (f == NULL) {
+			SysPrintf("Creating memcard: %s\n", buf);
+			CreateMcd(buf);
+		}
+		else
+			fclose(f);
+	}
+}
+
 int main(int argc, char *argv[])
 {
 	char file[MAXPATHLEN] = "";
@@ -547,7 +560,8 @@ int main(int argc, char *argv[])
 	plat_init();
 	menu_init(); // loads config
 
-	emu_core_init();
+	if (emu_core_init() != 0)
+		return 1;
 
 	if (psxout)
 		Config.PsxOut = 1;
@@ -670,6 +684,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);
@@ -680,6 +695,7 @@ void SysReset() {
 	CDR_stop();
 
 	GPU_updateLace = real_lace;
+	g_resetting = 0;
 }
 
 void SysClose() {
@@ -753,6 +769,8 @@ int emu_load_state(int slot)
 	return LoadState(fname);
 }
 
+#ifndef ANDROID
+
 void SysPrintf(const char *fmt, ...) {
 	va_list list;
 
@@ -761,16 +779,31 @@ void SysPrintf(const char *fmt, ...) {
 	va_end(list);
 }
 
+#else
+
+#include <android/log.h>
+
+void SysPrintf(const char *fmt, ...) {
+	va_list list;
+
+	va_start(list, fmt);
+	__android_log_vprint(ANDROID_LOG_INFO, "PCSX", fmt, list);
+	va_end(list);
+}
+
+#endif
+
 void SysMessage(const char *fmt, ...) {
-        va_list list;
-        char msg[512];
+	va_list list;
+	char msg[512];
+	int ret;
 
-        va_start(list, fmt);
-        vsnprintf(msg, sizeof(msg), fmt, list);
-        va_end(list);
+	va_start(list, fmt);
+	ret = vsnprintf(msg, sizeof(msg), fmt, list);
+	va_end(list);
 
-        if (msg[strlen(msg) - 1] == '\n')
-                msg[strlen(msg) - 1] = 0;
+	if (ret < sizeof(msg) && msg[ret - 1] == '\n')
+		msg[ret - 1] = 0;
 
 	SysPrintf("%s\n", msg);
 }