X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=480319892f669abc5b67e2657939cd9aa7cf0c69;hp=70355dd2e45e93b180f88c06cab82105f28a6021;hb=79f216e32563acc81517729fe56a6f11f110b0a4;hpb=f2de172b46a4948242a53b4b7c24f9fc151c19b5

diff --git a/frontend/main.c b/frontend/main.c
index 70355dd2..48031989 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -20,18 +20,32 @@
 #include "plugin_lib.h"
 #include "pcnt.h"
 #include "menu.h"
+#include "plat.h"
 #include "../libpcsxcore/misc.h"
+#include "../libpcsxcore/cheat.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/cdrcimg/cdrcimg.h"
-#include "common/plat.h"
-#include "common/readpng.h"
-#include "common/input.h"
-#include "linux/in_evdev.h"
+#include "revision.h"
+
+#ifndef NO_FRONTEND
+#include "libpicofe/input.h"
+#include "libpicofe/plat.h"
+#include "libpicofe/readpng.h"
+#endif
+#ifndef BOOT_MSG
+#define BOOT_MSG "Booting up..."
+#endif
 
 // don't include debug.h - it breaks ARM build (R1 redefined)
 void StartDebugger();
 void StopDebugger();
 
+// sound plugin
+extern int iUseReverb;
+extern int iUseInterpolation;
+extern int iXAPitch;
+extern int iVolume;
+
 int ready_to_go;
 unsigned long gpuDisp;
 char cfgfile_basename[MAXPATHLEN];
@@ -40,6 +54,8 @@ enum sched_action emu_action, emu_action_old;
 char hud_msg[64];
 int hud_new_msg;
 
+static void toggle_fast_forward(int force_off);
+
 static void make_path(char *buf, size_t size, const char *dir, const char *fname)
 {
 	if (fname)
@@ -121,14 +137,45 @@ static void set_default_paths(void)
 	strcpy(Config.Pad1, "builtin_pad");
 	strcpy(Config.Pad2, "builtin_pad");
 	strcpy(Config.Net, "Disabled");
-#if defined(__arm__) && !defined(__ARM_ARCH_7A__) /* XXX */
-	strcpy(Config.Gpu, "gpuPCSX4ALL.so");
-#endif
-	Config.PsxAuto = 1;
 
 	snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
 }
 
+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
+	pl_rearmed_cbs.gpu_neon.enhancement_enable =
+	pl_rearmed_cbs.gpu_neon.enhancement_no_main = 0;
+	pl_rearmed_cbs.gpu_peops.iUseDither = 0;
+	pl_rearmed_cbs.gpu_peops.dwActFixes = 1<<7;
+	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;
+	iVolume = 768;
+#ifndef __ARM_ARCH_7A__ /* XXX */
+	iUseReverb = 0;
+	iUseInterpolation = 0;
+#endif
+	new_dynarec_hacks = 0;
+	cycle_multiplier = 200;
+
+	in_type1 = PSE_PAD_TYPE_STANDARD;
+	in_type2 = PSE_PAD_TYPE_STANDARD;
+}
+
 static void check_memcards(void)
 {
 	char buf[MAXPATHLEN];
@@ -150,15 +197,11 @@ static void check_memcards(void)
 
 void do_emu_action(void)
 {
-	char buf[MAXPATHLEN];
 	int ret;
 
 	emu_action_old = emu_action;
 
 	switch (emu_action) {
-	case SACTION_ENTER_MENU:
-		menu_loop();
-		return;
 	case SACTION_LOAD_STATE:
 		ret = emu_load_state(state_slot);
 		snprintf(hud_msg, sizeof(hud_msg), ret == 0 ? "LOADED" : "FAIL!");
@@ -167,6 +210,11 @@ void do_emu_action(void)
 		ret = emu_save_state(state_slot);
 		snprintf(hud_msg, sizeof(hud_msg), ret == 0 ? "SAVED" : "FAIL!");
 		break;
+#ifndef NO_FRONTEND
+	case SACTION_ENTER_MENU:
+		toggle_fast_forward(1);
+		menu_loop();
+		return;
 	case SACTION_NEXT_SSLOT:
 		state_slot++;
 		if (state_slot > 9)
@@ -176,7 +224,12 @@ void do_emu_action(void)
 		state_slot--;
 		if (state_slot < 0)
 			state_slot = 9;
-		goto do_state_slot;
+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);
+		break;
 	case SACTION_TOGGLE_FSKIP:
 		pl_rearmed_cbs.fskip_advice = 0;
 		pl_rearmed_cbs.frameskip++;
@@ -187,8 +240,21 @@ void do_emu_action(void)
 			pl_rearmed_cbs.frameskip == 0 ? "OFF" : "1" );
 		plugin_call_rearmed_cbs();
 		break;
+	case SACTION_SWITCH_DISPMODE:
+		pl_switch_dispmode();
+		plugin_call_rearmed_cbs();
+		if (GPU_open != NULL && GPU_close != NULL) {
+			GPU_close();
+			GPU_open(&gpuDisp, "PCSX", NULL);
+		}
+		break;
+	case SACTION_FAST_FORWARD:
+		toggle_fast_forward(0);
+		plugin_call_rearmed_cbs();
+		break;
 	case SACTION_SCREENSHOT:
 		{
+			char buf[MAXPATHLEN];
 			void *scrbuf;
 			int w, h, bpp;
 			time_t t = time(NULL);
@@ -206,20 +272,147 @@ void do_emu_action(void)
 				snprintf(hud_msg, sizeof(hud_msg), "SCREENSHOT TAKEN");
 			break;
 		}
+	case SACTION_VOLUME_UP:
+	case SACTION_VOLUME_DOWN:
+		plat_target_step_volume(emu_action == SACTION_VOLUME_UP);
+		return;
+	case SACTION_MINIMIZE:
+		if (GPU_close != NULL)
+			GPU_close();
+
+		plat_minimize();
+
+		if (GPU_open != NULL) {
+			ret = GPU_open(&gpuDisp, "PCSX", NULL);
+			if (ret)
+				fprintf(stderr, "GPU_open returned %d\n", ret);
+		}
+		return;
+#endif
 	default:
 		return;
 	}
-	hud_new_msg = 3;
-	return;
 
-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);
 }
 
-int main(int argc, char *argv[])
+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)
+			break;
+		id1++;
+		id2++;
+	}
+
+	return *id1 - *id2;
+}
+
+static void parse_cwcheat(void)
+{
+	char line[256], buf[64], name[64], *p;
+	int newcheat = 1;
+	u32 a, v;
+	FILE *f;
+
+	f = fopen("cheatpops.db", "r");
+	if (f == NULL)
+		return;
+
+	/* find the game */
+	while (fgets(line, sizeof(line), f)) {
+		if (sscanf(line, "_S %63s", buf) != 1)
+			continue;
+		if (cdidcmp(buf, CdromId) == 0)
+			break;
+	}
+
+	if (feof(f))
+		goto out;
+
+	printf("cwcheat section found for %s\n", CdromId);
+	while (fgets(line, sizeof(line), f))
+	{
+		p = line + strlen(line);
+		for (p--; p >= line && (*p == '\r' || *p == '\n' || *p == ' '); p--)
+			*p = 0;
+		if (*p == 0 || *p == '#' || *p == ';')
+			continue;
+
+		if (strncmp(line, "_S", 2) == 0)
+			break;
+		if (strncmp(line, "_G", 2) == 0) {
+			printf("  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);
+				free(Cheats[NumCheats - 1].Descr);
+				NumCheats--;
+			}
+			snprintf(name, sizeof(name), "%s", line + 4);
+			newcheat = 1;
+			continue;
+		}
+		if (sscanf(line, "_L %x %x", &a, &v) != 2) {
+			printf("line failed to parse: '%s'\n", line);
+			continue;
+		}
+
+		if (newcheat) {
+			if (NumCheats >= NumCheatsAllocated) {
+				NumCheatsAllocated += 16;
+				Cheats = realloc(Cheats, sizeof(Cheat) *
+						NumCheatsAllocated);
+				if (Cheats == NULL)
+					break;
+			}
+			Cheats[NumCheats].Descr = strdup(name);
+			Cheats[NumCheats].Enabled = 0;
+			Cheats[NumCheats].WasEnabled = 0;
+			Cheats[NumCheats].First = NumCodes;
+			Cheats[NumCheats].n = 0;
+			NumCheats++;
+			newcheat = 0;
+		}
+
+		if (NumCodes >= NumCodesAllocated) {
+			NumCodesAllocated += 16;
+			CheatCodes = realloc(CheatCodes, sizeof(CheatCode) *
+				NumCodesAllocated);
+			if (CheatCodes == NULL)
+				break;
+		}
+		CheatCodes[NumCodes].Addr = a;
+		CheatCodes[NumCodes].Val = v;
+		NumCodes++;
+		Cheats[NumCheats - 1].n++;
+	}
+
+out:
+	fclose(f);
+}
+
+void emu_on_new_cd(int show_hud_msg)
+{
+	ClearAllCheats();
+	parse_cwcheat();
+
+	if (Config.HLE) {
+		printf("note: running with HLE BIOS, expect compatibility problems\n");
+		printf("----------------------------------------------------------\n");
+	}
+
+	if (show_hud_msg) {
+		snprintf(hud_msg, sizeof(hud_msg), BOOT_MSG);
+		hud_new_msg = 3;
+	}
+}
+
+int emu_core_preinit(void)
 {
 	// what is the name of the config file?
 	// it may be redefined by -cfg on the command line
@@ -230,15 +423,35 @@ int main(int argc, char *argv[])
 
 	memset(&Config, 0, sizeof(Config));
 
-	CheckSubDir();
 	set_default_paths();
-	check_memcards();
+	emu_set_default_config();
 	strcpy(Config.Bios, "HLE");
 
-#ifdef MAEMO
-	extern int maemo_main(int argc, char **argv);
-	return maemo_main(argc, argv);
-#else
+	return 0;
+}
+
+int emu_core_init(void)
+{
+	CheckSubDir();
+	check_memcards();
+
+	if (EmuInit() == -1) {
+		printf("PSX emulator couldn't be initialized.\n");
+		return -1;
+	}
+
+	LoadMcds(Config.Mcd1, Config.Mcd2);
+
+	if (Config.Debug) {
+		StartDebugger();
+	}
+
+	return 0;
+}
+
+#ifndef NO_FRONTEND
+int main(int argc, char *argv[])
+{
 	char file[MAXPATHLEN] = "";
 	char path[MAXPATHLEN];
 	const char *cdfile = NULL;
@@ -247,6 +460,8 @@ int main(int argc, char *argv[])
 	int loadst = 0;
 	int i;
 
+	emu_core_preinit();
+
 	// read command line options
 	for (i = 1; i < argc; i++) {
 		     if (!strcmp(argv[i], "-psxout")) psxout = 1;
@@ -280,17 +495,16 @@ int main(int argc, char *argv[])
 		else if (!strcmp(argv[i], "-h") ||
 			 !strcmp(argv[i], "-help") ||
 			 !strcmp(argv[i], "--help")) {
-			 printf(PACKAGE_NAME " " PACKAGE_VERSION "\n");
+			 printf("PCSX-ReARMed " REV "\n");
 			 printf("%s\n", _(
 							" pcsx [options] [file]\n"
 							"\toptions:\n"
 							"\t-cdfile FILE\tRuns a CD image file\n"
-							"\t-nogui\t\tDon't open the GTK GUI\n"
 							"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsx/pcsx.cfg)\n"
 							"\t-psxout\t\tEnable PSX output\n"
 							"\t-load STATENUM\tLoads savestate STATENUM (1-5)\n"
 							"\t-h -help\tDisplay this message\n"
-							"\tfile\t\tLoads file\n"));
+							"\tfile\t\tLoads a PSX EXE file\n"));
 			 return 0;
 		} else {
 			strncpy(file, argv[i], MAXPATHLEN);
@@ -309,16 +523,15 @@ int main(int argc, char *argv[])
 	if (cdfile)
 		set_cd_image(cdfile);
 
-	if (SysInit() == -1)
-		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
-	pl_init();
+
+	emu_core_init();
 
 	if (psxout)
 		Config.PsxOut = 1;
@@ -352,6 +565,7 @@ int main(int argc, char *argv[])
 				printf(_("Could not load CD-ROM!\n"));
 				return -1;
 			}
+			emu_on_new_cd(!loadst);
 			ready_to_go = 1;
 		}
 	}
@@ -385,32 +599,47 @@ int main(int argc, char *argv[])
 	}
 
 	return 0;
-#endif
 }
 
-int SysInit() {
-	if (EmuInit() == -1) {
-		printf("PSX emulator couldn't be initialized.\n");
-		return -1;
-	}
+static void toggle_fast_forward(int force_off)
+{
+	static int fast_forward;
+	static int normal_g_opts;
+	static int normal_frameskip;
+	static int normal_enhancement_enable;
 
-	LoadMcds(Config.Mcd1, Config.Mcd2);
+	if (force_off && !fast_forward)
+		return;
 
-	if (Config.Debug) {
-		StartDebugger();
+	fast_forward = !fast_forward;
+	if (fast_forward) {
+		normal_g_opts = g_opts;
+		normal_frameskip = pl_rearmed_cbs.frameskip;
+		normal_enhancement_enable =
+			pl_rearmed_cbs.gpu_neon.enhancement_enable;
+
+		g_opts |= OPT_NO_FRAMELIM;
+		pl_rearmed_cbs.frameskip = 3;
+		pl_rearmed_cbs.gpu_neon.enhancement_enable = 0;
+	} else {
+		g_opts = normal_g_opts;
+		pl_rearmed_cbs.frameskip = normal_frameskip;
+		pl_rearmed_cbs.gpu_neon.enhancement_enable =
+			normal_enhancement_enable;
+
+		pl_timing_prepare(Config.PsxType);
 	}
 
-	return 0;
+	if (!force_off)
+		snprintf(hud_msg, sizeof(hud_msg), "FAST FORWARD %s",
+			fast_forward ? "ON" : "OFF");
 }
+#endif
 
 void SysRunGui() {
         printf("SysRunGui\n");
 }
 
-void StartGui() {
-        printf("StartGui\n");
-}
-
 static void dummy_lace()
 {
 }
@@ -422,6 +651,9 @@ void SysReset() {
 	void *real_lace = GPU_updateLace;
 	GPU_updateLace = dummy_lace;
 
+	// reset can run code, timing must be set
+	pl_timing_prepare(Config.PsxType);
+
 	EmuReset();
 
 	// hmh core forgets this
@@ -444,12 +676,12 @@ void SysUpdate() {
 
 void OnFile_Exit() {
 	printf("OnFile_Exit\n");
-#ifndef MAEMO
-	menu_finish();
-#endif
 	SysClose();
+#ifndef NO_FRONTEND
+	menu_finish();
 	plat_finish();
 	exit(0);
+#endif
 }
 
 int get_state_filename(char *buf, int size, int i) {
@@ -479,6 +711,9 @@ int emu_save_state(int slot)
 		return ret;
 
 	ret = SaveState(fname);
+#ifndef __ARM_ARCH_7A__ /* XXX */
+	sync();
+#endif
 	printf("* %s \"%s\" [%d]\n", ret == 0 ? "saved" : "failed to save", fname, slot);
 	return ret;
 }
@@ -560,7 +795,7 @@ static int _OpenPlugins(void) {
 
 		MAKE_PATH(dotdir, "/.pcsx/plugins/", NULL);
 
-		strcpy(info.EmuName, "PCSX " PACKAGE_VERSION);
+		strcpy(info.EmuName, "PCSX");
 		strncpy(info.CdromID, CdromId, 9);
 		strncpy(info.CdromLabel, CdromLabel, 9);
 		info.psxMem = psxM;
@@ -671,13 +906,6 @@ void *SysLoadLibrary(const char *lib) {
 				return (void *)(long)(PLUGIN_DL_BASE + builtin_plugin_ids[i]);
 	}
 
-#if defined(__x86_64__) || defined(__i386__)
-	// convenience hack
-	char name[MAXPATHLEN];
-	snprintf(name, sizeof(name), "%s.x86", lib);
-	lib = name;
-#endif
-
 	ret = dlopen(lib, RTLD_NOW);
 	if (ret == NULL)
 		fprintf(stderr, "dlopen: %s\n", dlerror());