X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=754b6d230b3c9ba9548dc48dd2a83f72d7f148e8;hp=e46b50f950f07629ca1aa6445f5e0752e5bee271;hb=c89cd762a63a78e30a59955e705e29ff3d5ae3b8;hpb=6d1a1ac2f1100c69dd3e1084aede6646d6c48f1e

diff --git a/frontend/menu.c b/frontend/menu.c
index e46b50f9..754b6d23 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -1,5 +1,5 @@
 /*
- * (C) Gražvydas "notaz" Ignotas, 2010
+ * (C) Gražvydas "notaz" Ignotas, 2010-2011
  *
  * This work is licensed under the terms of any of these licenses
  * (at your option):
@@ -11,13 +11,16 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <dlfcn.h>
+#include <zlib.h>
 
+#include "main.h"
 #include "menu.h"
 #include "config.h"
+#include "plugin.h"
 #include "plugin_lib.h"
 #include "omap.h"
 #include "common/plat.h"
-#include "../gui/Linux.h"
 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "revision.h"
@@ -33,6 +36,7 @@ typedef enum
 	MA_MAIN_LOAD_STATE,
 	MA_MAIN_RESET_GAME,
 	MA_MAIN_LOAD_ROM,
+	MA_MAIN_RUN_BIOS,
 	MA_MAIN_CONTROLS,
 	MA_MAIN_CREDITS,
 	MA_MAIN_EXIT,
@@ -55,18 +59,19 @@ enum {
 	SCALE_CUSTOM,
 };
 
-extern int ready_to_go;
-static int game_config_loaded;
 static int last_psx_w, last_psx_h, last_psx_bpp;
-static int scaling, filter, state_slot, cpu_clock;
+static int scaling, filter, state_slot, cpu_clock, cpu_clock_st;
 static char rom_fname_reload[MAXPATHLEN];
 static char last_selected_fname[MAXPATHLEN];
+static int region;
 int g_opts;
 
 // from softgpu plugin
 extern int iUseDither;
 extern int UseFrameSkip;
 extern uint32_t dwActFixes;
+extern float fFrameRateHz;
+extern int dwFrameRateTicks;
 
 // sound plugin
 extern int iUseReverb;
@@ -75,6 +80,11 @@ extern int iXAPitch;
 extern int iSPUIRQWait;
 extern int iUseTimer;
 
+static const char *bioses[24];
+static const char *gpu_plugins[16];
+static const char *spu_plugins[16];
+static int bios_sel, gpu_plugsel, spu_plugsel;
+
 
 static int min(int x, int y) { return x < y ? x : y; }
 static int max(int x, int y) { return x > y ? x : y; }
@@ -93,44 +103,63 @@ void emu_make_path(char *buff, const char *end, int size)
 
 static int emu_check_save_file(int slot)
 {
-	char *fname;
+	char fname[MAXPATHLEN];
 	int ret;
 
-	fname = get_state_filename(slot);
-	if (fname == NULL)
+	ret = get_state_filename(fname, sizeof(fname), slot);
+	if (ret != 0)
 		return 0;
 
 	ret = CheckState(fname);
-	free(fname);
 	return ret == 0 ? 1 : 0;
 }
 
 static int emu_save_load_game(int load, int sram)
 {
-	char *fname;
+	char fname[MAXPATHLEN];
 	int ret;
 
-	fname = get_state_filename(state_slot);
-	if (fname == NULL)
+	ret = get_state_filename(fname, sizeof(fname), state_slot);
+	if (ret != 0)
 		return 0;
 
-	if (load)
+	if (load) {
 		ret = LoadState(fname);
+
+		// reflect hle/bios mode from savestate
+		if (Config.HLE)
+			bios_sel = 0;
+		else if (bios_sel == 0 && bioses[1] != NULL)
+			// XXX: maybe find the right bios instead
+			bios_sel = 1;
+	}
 	else
 		ret = SaveState(fname);
-	free(fname);
 
 	return ret;
 }
 
-static void draw_savestate_bg(int slot)
+// propagate menu settings to the emu vars
+static void menu_sync_config(void)
 {
+	Config.PsxAuto = 1;
+	if (region > 0) {
+		Config.PsxAuto = 0;
+		Config.PsxType = region - 1;
+	}
+	pl_frame_interval = Config.PsxType ? 20000 : 16667;
+
+	// used by P.E.Op.S. frameskip code
+	fFrameRateHz = Config.PsxType ? 50.0f : 59.94f;
+	dwFrameRateTicks = (100000*100 / (unsigned long)(fFrameRateHz*100));
 }
 
 static void menu_set_defconfig(void)
 {
+	g_opts = 0;
 	scaling = SCALE_4_3;
 
+	region = 0;
 	Config.Xa = Config.Cdda = Config.Sio =
 	Config.SpuIrq = Config.RCntFix = Config.VSyncWA = 0;
 
@@ -141,6 +170,8 @@ static void menu_set_defconfig(void)
 	iUseInterpolation = 1;
 	iXAPitch = iSPUIRQWait = 0;
 	iUseTimer = 2;
+
+	menu_sync_config();
 }
 
 #define CE_CONFIG_STR(val) \
@@ -163,11 +194,10 @@ static const struct {
 	CE_CONFIG_STR(Bios),
 	CE_CONFIG_STR(Gpu),
 	CE_CONFIG_STR(Spu),
-	CE_CONFIG_STR(Cdr),
+//	CE_CONFIG_STR(Cdr),
 	CE_CONFIG_VAL(Xa),
 	CE_CONFIG_VAL(Sio),
 	CE_CONFIG_VAL(Mdec),
-	CE_CONFIG_VAL(PsxAuto),
 	CE_CONFIG_VAL(Cdda),
 	CE_CONFIG_VAL(Debug),
 	CE_CONFIG_VAL(PsxOut),
@@ -175,8 +205,12 @@ static const struct {
 	CE_CONFIG_VAL(RCntFix),
 	CE_CONFIG_VAL(VSyncWA),
 	CE_CONFIG_VAL(Cpu),
-	CE_CONFIG_VAL(PsxType),
+	CE_INTVAL(region),
 	CE_INTVAL(scaling),
+	CE_INTVAL(g_layer_x),
+	CE_INTVAL(g_layer_y),
+	CE_INTVAL(g_layer_w),
+	CE_INTVAL(g_layer_h),
 	CE_INTVAL(filter),
 	CE_INTVAL(state_slot),
 	CE_INTVAL(cpu_clock),
@@ -191,19 +225,38 @@ static const struct {
 	CE_INTVAL(iUseTimer),
 };
 
+static char *get_cd_label(void)
+{
+	static char trimlabel[33];
+	int j;
+
+	strncpy(trimlabel, CdromLabel, 32);
+	trimlabel[32] = 0;
+	for (j = 31; j >= 0; j--)
+		if (trimlabel[j] == ' ')
+			trimlabel[j] = 0;
+
+	return trimlabel;
+}
+
+static void make_cfg_fname(char *buf, size_t size, int is_game)
+{
+	if (is_game)
+		snprintf(buf, size, "." PCSX_DOT_DIR "cfg/%.32s-%.9s.cfg", get_cd_label(), CdromId);
+	else
+		snprintf(buf, size, "." PCSX_DOT_DIR "%s", cfgfile_basename);
+}
+
 static int menu_write_config(int is_game)
 {
 	char cfgfile[MAXPATHLEN];
 	FILE *f;
 	int i;
 
-	if (is_game)
-		return -1;
-
-	snprintf(cfgfile, sizeof(cfgfile), "." PCSX_DOT_DIR "%s", cfgfile_basename);
+	make_cfg_fname(cfgfile, sizeof(cfgfile), is_game);
 	f = fopen(cfgfile, "w");
 	if (f == NULL) {
-		printf("failed to open: %s\n", cfgfile);
+		printf("menu_write_config: failed to open: %s\n", cfgfile);
 		return -1;
 	}
 
@@ -256,13 +309,10 @@ static int menu_load_config(int is_game)
 	char *cfg;
 	FILE *f;
 
-	if (is_game)
-		return -1;
-
-	snprintf(cfgfile, sizeof(cfgfile), "." PCSX_DOT_DIR "%s", cfgfile_basename);
+	make_cfg_fname(cfgfile, sizeof(cfgfile), is_game);
 	f = fopen(cfgfile, "r");
 	if (f == NULL) {
-		printf("failed to open: %s\n", cfgfile);
+		printf("menu_load_config: failed to open: %s\n", cfgfile);
 		return -1;
 	}
 
@@ -331,6 +381,22 @@ static int menu_load_config(int is_game)
 		}
 	}
 
+	menu_sync_config();
+
+	// sync plugins
+	for (i = bios_sel = 0; bioses[i] != NULL; i++)
+		if (strcmp(Config.Bios, bioses[i]) == 0)
+			{ bios_sel = i; break; }
+
+	for (i = gpu_plugsel = 0; gpu_plugins[i] != NULL; i++)
+		if (strcmp(Config.Gpu, gpu_plugins[i]) == 0)
+			{ gpu_plugsel = i; break; }
+
+	for (i = spu_plugsel = 0; spu_plugins[i] != NULL; i++)
+		if (strcmp(Config.Spu, spu_plugins[i]) == 0)
+			{ spu_plugsel = i; break; }
+
+	ret = 0;
 fail_read:
 	free(cfg);
 fail:
@@ -341,8 +407,8 @@ fail:
 // rrrr rggg gggb bbbb
 static unsigned short fname2color(const char *fname)
 {
-	static const char *cdimg_exts[] = { ".bin", ".img", ".iso", ".z", ".cue" };
-	static const char *other_exts[] = { ".ccd", ".toc", ".mds", ".sub", ".table" };
+	static const char *cdimg_exts[] = { ".bin", ".img", ".iso", ".cue", ".z", ".bz", ".znx", ".pbp" };
+	static const char *other_exts[] = { ".ccd", ".toc", ".mds", ".sub", ".table", ".index" };
 	const char *ext = strrchr(fname, '.');
 	int i;
 
@@ -357,11 +423,80 @@ static unsigned short fname2color(const char *fname)
 	return 0xffff;
 }
 
+static void draw_savestate_bg(int slot);
+
 #define MENU_ALIGN_LEFT
 #define menu_init menu_init_common
 #include "common/menu.c"
 #undef menu_init
 
+// a bit of black magic here
+static void draw_savestate_bg(int slot)
+{
+	extern void bgr555_to_rgb565(void *dst, void *src, int bytes);
+	static const int psx_widths[8]  = { 256, 368, 320, 384, 512, 512, 640, 640 };
+	int x, y, w, h;
+	char fname[MAXPATHLEN];
+	GPUFreeze_t *gpu;
+	u16 *s, *d;
+	gzFile f;
+	int ret;
+	u32 tmp;
+
+	ret = get_state_filename(fname, sizeof(fname), slot);
+	if (ret != 0)
+		return;
+
+	f = gzopen(fname, "rb");
+	if (f == NULL)
+		return;
+
+	if (gzseek(f, 0x29933d, SEEK_SET) != 0x29933d) {
+		fprintf(stderr, "gzseek failed\n");
+		gzclose(f);
+		return;
+	}
+
+	gpu = malloc(sizeof(*gpu));
+	if (gpu == NULL) {
+		gzclose(f);
+		return;
+	}
+
+	ret = gzread(f, gpu, sizeof(*gpu));
+	gzclose(f);
+	if (ret != sizeof(*gpu)) {
+		fprintf(stderr, "gzread failed\n");
+		goto out;
+	}
+
+	memcpy(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2);
+
+	if ((gpu->ulStatus & 0x800000) || (gpu->ulStatus & 0x200000))
+		goto out; // disabled || 24bpp (NYET)
+
+	x = gpu->ulControl[5] & 0x3ff;
+	y = (gpu->ulControl[5] >> 10) & 0x1ff;
+	s = (u16 *)gpu->psxVRam + y * 1024 + (x & ~3);
+	w = psx_widths[(gpu->ulStatus >> 16) & 7];
+	tmp = gpu->ulControl[7];
+	h = ((tmp >> 10) & 0x3ff) - (tmp & 0x3ff);
+	if (gpu->ulStatus & 0x80000) // doubleheight
+		h *= 2;
+
+	x = max(0, g_menuscreen_w - w) & ~3;
+	y = max(0, g_menuscreen_h / 2 - h / 2);
+	w = min(g_menuscreen_w, w);
+	h = min(g_menuscreen_h, h);
+	d = (u16 *)g_menubg_ptr + g_menuscreen_w * y + x;
+
+	for (; h > 0; h--, d += g_menuscreen_w, s += 1024)
+		bgr555_to_rgb565(d, s, w * 2);
+
+out:
+	free(gpu);
+}
+
 // ---------- pandora specific -----------
 
 static const char pnd_script_base[] = "sudo -n /usr/pandora/scripts";
@@ -418,10 +553,10 @@ static void pnd_menu_init(void)
 	struct dirent *ent;
 	int i, count = 0;
 	char **mfilters;
-	char buff[64], *p;
+	char buff[64];
 	DIR *dir;
 
-	cpu_clock = get_cpu_clock();
+	cpu_clock_st = cpu_clock = get_cpu_clock();
 
 	dir = opendir("/etc/pandora/conf/dss_fir");
 	if (dir == NULL) {
@@ -437,9 +572,11 @@ static void pnd_menu_init(void)
 				perror("readdir");
 			break;
 		}
-		p = strstr(ent->d_name, "_up");
-		if (p != NULL && (p[3] == 0 || !strcmp(p + 3, "_h")))
-			count++;
+
+		if (ent->d_type != DT_REG && ent->d_type != DT_LNK)
+			continue;
+
+		count++;
 	}
 
 	if (count == 0)
@@ -453,11 +590,21 @@ static void pnd_menu_init(void)
 	for (i = 0; (ent = readdir(dir)); ) {
 		size_t len;
 
-		p = strstr(ent->d_name, "_up");
-		if (p == NULL || (p[3] != 0 && strcmp(p + 3, "_h")))
+		if (ent->d_type != DT_REG && ent->d_type != DT_LNK)
 			continue;
 
-		len = p - ent->d_name;
+		len = strlen(ent->d_name);
+
+		// skip pre-HF5 extra files
+		if (len >= 3 && strcmp(ent->d_name + len - 3, "_v3") == 0)
+			continue;
+		if (len >= 3 && strcmp(ent->d_name + len - 3, "_v5") == 0)
+			continue;
+
+		// have to cut "_up_h" for pre-HF5
+		if (len > 5 && strcmp(ent->d_name + len - 5, "_up_h") == 0)
+			len -= 5;
+
 		if (len > sizeof(buff) - 1)
 			continue;
 
@@ -474,6 +621,12 @@ static void pnd_menu_init(void)
 	pnd_filter_list = mfilters;
 }
 
+void menu_finish(void)
+{
+	cpu_clock = cpu_clock_st;
+	apply_cpu_clock();
+}
+
 // -------------- key config --------------
 
 me_bind_action me_ctrl_actions[] =
@@ -548,19 +701,12 @@ static const char *mgn_saveloadcfg(int id, int *offs)
 	return "";
 }
 
-static int mh_saveloadcfg(int id, int keys)
+static int mh_savecfg(int id, int keys)
 {
-	switch (id) {
-	case MA_OPT_SAVECFG:
-	case MA_OPT_SAVECFG_GAME:
-		if (menu_write_config(id == MA_OPT_SAVECFG_GAME ? 1 : 0) == 0)
-			me_update_msg("config saved");
-		else
-			me_update_msg("failed to write config");
-		break;
-	default:
-		return 0;
-	}
+	if (menu_write_config(id == MA_OPT_SAVECFG_GAME ? 1 : 0) == 0)
+		me_update_msg("config saved");
+	else
+		me_update_msg("failed to write config");
 
 	return 1;
 }
@@ -570,8 +716,8 @@ static menu_entry e_menu_keyconfig[] =
 	mee_handler_id("Player 1",          MA_CTRL_PLAYER1,    key_config_loop_wrap),
 	mee_handler_id("Player 2",          MA_CTRL_PLAYER2,    key_config_loop_wrap),
 	mee_handler_id("Emulator controls", MA_CTRL_EMU,        key_config_loop_wrap),
-	mee_cust_nosave("Save global config",       MA_OPT_SAVECFG, mh_saveloadcfg, mgn_saveloadcfg),
-//	mee_cust_nosave("Save cfg for loaded game", MA_OPT_SAVECFG_GAME, mh_saveloadcfg, mgn_saveloadcfg),
+//	mee_cust_nosave("Save global config",       MA_OPT_SAVECFG, mh_savecfg, mgn_saveloadcfg),
+//	mee_cust_nosave("Save cfg for loaded game", MA_OPT_SAVECFG_GAME, mh_savecfg, mgn_saveloadcfg),
 	mee_label     (""),
 	mee_label     ("Input devices:"),
 	mee_label_mk  (MA_CTRL_DEV_FIRST, mgn_dev_name),
@@ -588,7 +734,7 @@ static int menu_loop_keyconfig(int id, int keys)
 {
 	static int sel = 0;
 
-//	me_enable(e_menu_keyconfig, MA_OPT_SAVECFG_GAME, ready_to_go);
+//	me_enable(e_menu_keyconfig, MA_OPT_SAVECFG_GAME, ready_to_go && CdromId[0]);
 	me_loop(e_menu_keyconfig, &sel, NULL);
 	return 0;
 }
@@ -607,13 +753,13 @@ static int menu_loop_cscaler(int id, int keys)
 	scaling = SCALE_CUSTOM;
 
 	omap_enable_layer(1);
-	//pnd_restore_layer_data();
 
 	for (;;)
 	{
 		menu_draw_begin(0);
-		memset(g_menuscreen_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2);
-		text_out16(2, 480 - 18, "%dx%d | d-pad to resize, R+d-pad to move", g_layer_w, g_layer_h);
+		memset(g_menuscreen_ptr, 4, g_menuscreen_w * g_menuscreen_h * 2);
+		text_out16(2, 2, "%d,%d", g_layer_x, g_layer_y);
+		text_out16(2, 480 - 18, "%dx%d | d-pad: resize, R+d-pad: move",	g_layer_w, g_layer_h);
 		menu_draw_end();
 
 		inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_R|PBTN_MOK|PBTN_MBACK, 40);
@@ -671,8 +817,6 @@ static int menu_loop_gfx_options(int id, int keys)
 // ------------ bios/plugins ------------
 
 static const char *men_gpu_dithering[] = { "None", "Game dependant", "Always", NULL };
-static const char h_gpu[]              = "Configure built-in P.E.Op.S. SoftGL Driver V1.17\n"
-					 "Coded by Pete Bernert and the P.E.Op.S. team";
 static const char h_gpu_0[]            = "Needed for Chrono Cross";
 static const char h_gpu_1[]            = "Capcom fighting games";
 static const char h_gpu_2[]            = "Black screens in Lunar";
@@ -707,10 +851,8 @@ static int menu_loop_plugin_gpu(int id, int keys)
 
 static const char *men_spu_reverb[] = { "Off", "Fake", "On", NULL };
 static const char *men_spu_interp[] = { "None", "Simple", "Gaussian", "Cubic", NULL };
-static const char h_spu[]           = "Configure built-in P.E.Op.S. Sound Driver V1.7\n"
-				      "Coded by Pete Bernert and the P.E.Op.S. team";
 static const char h_spu_irq_wait[]  = "Wait for CPU; only useful for some games, may cause glitches";
-static const char h_spu_thread[]    = "Run sound emulation in separate thread";
+static const char h_spu_thread[]    = "Run sound emulation in main thread (recommended)";
 
 static menu_entry e_menu_plugin_spu[] =
 {
@@ -718,7 +860,7 @@ static menu_entry e_menu_plugin_spu[] =
 	mee_enum      ("Interpolation",             0, iUseInterpolation, men_spu_interp),
 	mee_onoff     ("Adjust XA pitch",           0, iXAPitch, 1),
 	mee_onoff_h   ("SPU IRQ Wait",              0, iSPUIRQWait, 1, h_spu_irq_wait),
-	mee_onoff_h   ("Use sound thread",          0, iUseTimer, 1, h_spu_thread),
+	mee_onoff_h   ("Sound in main thread",      0, iUseTimer, 2, h_spu_thread),
 	mee_end,
 };
 
@@ -729,22 +871,44 @@ static int menu_loop_plugin_spu(int id, int keys)
 	return 0;
 }
 
+static const char h_bios[]       = "HLE is simulated BIOS. BIOS is saved in savestates.\n"
+				   "Must save config and reload the game\n"
+				   "for change to take effect";
+static const char h_plugin_xpu[] = "Must save config and reload the game\n"
+				   "for plugin change to take effect";
+static const char h_gpu[]        = "Configure built-in P.E.Op.S. SoftGL Driver V1.17";
+static const char h_spu[]        = "Configure built-in P.E.Op.S. Sound Driver V1.7";
+
 static menu_entry e_menu_plugin_options[] =
 {
+	mee_enum_h    ("BIOS",                          0, bios_sel, bioses, h_bios),
+	mee_enum_h    ("GPU plugin",                    0, gpu_plugsel, gpu_plugins, h_plugin_xpu),
+	mee_enum_h    ("SPU plugin",                    0, spu_plugsel, spu_plugins, h_plugin_xpu),
 	mee_handler_h ("Configure built-in GPU plugin", menu_loop_plugin_gpu, h_gpu),
 	mee_handler_h ("Configure built-in SPU plugin", menu_loop_plugin_spu, h_spu),
 	mee_end,
 };
 
+static menu_entry e_menu_main[];
+
 static int menu_loop_plugin_options(int id, int keys)
 {
 	static int sel = 0;
 	me_loop(e_menu_plugin_options, &sel, NULL);
+
+	// sync BIOS/plugins
+	snprintf(Config.Bios, sizeof(Config.Bios), "%s", bioses[bios_sel]);
+	snprintf(Config.Gpu, sizeof(Config.Gpu), "%s", gpu_plugins[gpu_plugsel]);
+	snprintf(Config.Spu, sizeof(Config.Spu), "%s", spu_plugins[spu_plugsel]);
+	me_enable(e_menu_main, MA_MAIN_RUN_BIOS, bios_sel != 0);
+
 	return 0;
 }
 
 // ------------ adv options menu ------------
 
+static const char h_cfg_cpul[]   = "Shows CPU usage in %%";
+static const char h_cfg_fl[]     = "Frame Limiter keeps the game from running too fast";
 static const char h_cfg_xa[]     = "Disables XA sound, which can sometimes improve performance";
 static const char h_cfg_cdda[]   = "Disable CD Audio for a performance boost\n"
 				   "(proper .cue/.bin dump is needed otherwise)";
@@ -752,16 +916,20 @@ static const char h_cfg_sio[]    = "This should be enabled for certain memcards/
 static const char h_cfg_spuirq[] = "Compatibility tweak; should probably be left off";
 static const char h_cfg_rcnt1[]  = "Parasite Eve 2, Vandal Hearts 1/2 Fix";
 static const char h_cfg_rcnt2[]  = "InuYasha Sengoku Battle Fix";
+static const char h_cfg_nodrc[]  = "Disable dynamic recompiler and use interpreter\n"
+				   "Might be useful to overcome some dynarec bugs";
 
 static menu_entry e_menu_adv_options[] =
 {
-	mee_onoff     ("Show CPU load",          0, g_opts, OPT_SHOWCPU),
+	mee_onoff_h   ("Show CPU load",          0, g_opts, OPT_SHOWCPU, h_cfg_cpul),
+	mee_onoff_h   ("Disable Frame Limiter",  0, g_opts, OPT_NO_FRAMELIM, h_cfg_fl),
 	mee_onoff_h   ("Disable XA Decoding",    0, Config.Xa, 1, h_cfg_xa),
 	mee_onoff_h   ("Disable CD Audio",       0, Config.Cdda, 1, h_cfg_cdda),
 	mee_onoff_h   ("SIO IRQ Always Enabled", 0, Config.Sio, 1, h_cfg_sio),
 	mee_onoff_h   ("SPU IRQ Always Enabled", 0, Config.SpuIrq, 1, h_cfg_spuirq),
 	mee_onoff_h   ("Rootcounter hack",       0, Config.RCntFix, 1, h_cfg_rcnt1),
 	mee_onoff_h   ("Rootcounter hack 2",     0, Config.VSyncWA, 1, h_cfg_rcnt2),
+	mee_onoff_h   ("Disable dynarec (slow!)",0, Config.Cpu, 1, h_cfg_nodrc),
 	mee_end,
 };
 
@@ -781,7 +949,7 @@ static int mh_restore_defaults(int id, int keys)
 	return 1;
 }
 
-static const char *men_region[]       = { "NTSC", "PAL", NULL };
+static const char *men_region[]       = { "Auto", "NTSC", "PAL", NULL };
 /*
 static const char *men_confirm_save[] = { "OFF", "writes", "loads", "both", NULL };
 static const char h_confirm_save[]    = "Ask for confirmation when overwriting save,\n"
@@ -796,13 +964,13 @@ static menu_entry e_menu_options[] =
 //	mee_enum_h    ("Confirm savestate",        0, dummy, men_confirm_save, h_confirm_save),
 	mee_onoff     ("Frameskip",                0, UseFrameSkip, 1),
 	mee_onoff     ("Show FPS",                 0, g_opts, OPT_SHOWFPS),
-	mee_enum      ("Region",                   0, Config.PsxType, men_region),
+	mee_enum      ("Region",                   0, region, men_region),
 	mee_range     ("CPU clock",                MA_OPT_CPU_CLOCKS, cpu_clock, 20, 5000),
 	mee_handler   ("[Display]",                menu_loop_gfx_options),
 	mee_handler   ("[BIOS/Plugins]",           menu_loop_plugin_options),
 	mee_handler   ("[Advanced]",               menu_loop_adv_options),
-	mee_cust_nosave("Save global config",      MA_OPT_SAVECFG,      mh_saveloadcfg, mgn_saveloadcfg),
-//	mee_cust_nosave("Save cfg for loaded game",MA_OPT_SAVECFG_GAME, mh_saveloadcfg, mgn_saveloadcfg),
+	mee_cust_nosave("Save global config",      MA_OPT_SAVECFG,      mh_savecfg, mgn_saveloadcfg),
+	mee_cust_nosave("Save cfg for loaded game",MA_OPT_SAVECFG_GAME, mh_savecfg, mgn_saveloadcfg),
 	mee_handler_h ("Restore default config",   mh_restore_defaults, h_restore_def),
 	mee_end,
 };
@@ -814,7 +982,7 @@ static int menu_loop_options(int id, int keys)
 
 	i = me_id2offset(e_menu_options, MA_OPT_CPU_CLOCKS);
 	e_menu_options[i].enabled = cpu_clock != 0 ? 1 : 0;
-//	me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, ready_to_go);
+	me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, ready_to_go && CdromId[0]);
 
 	me_loop(e_menu_options, &sel, NULL);
 
@@ -849,65 +1017,146 @@ static void debug_menu_loop(void)
 
 void OnFile_Exit();
 
+static void draw_frame_main(void)
+{
+	if (CdromId[0] != 0) {
+		char buff[64];
+		snprintf(buff, sizeof(buff), "%.32s/%.9s (running as %s)",
+			 get_cd_label(), CdromId, Config.PsxType ? "PAL" : "NTSC");
+		smalltext_out16(4, 1, buff, 0x105f);
+	}
+}
+
+static void draw_frame_credits(void)
+{
+	smalltext_out16(4, 1, "build: "__DATE__ " " __TIME__ " " REV, 0xe7fc);
+}
+
 const char *plat_get_credits(void)
 {
 	return	"PCSX-ReARMed\n\n"
 		"(C) 1999-2003 PCSX Team\n"
 		"(C) 2005-2009 PCSX-df Team\n"
-		"(C) 2009-2010 PCSX-Reloaded Team\n\n"
+		"(C) 2009-2011 PCSX-Reloaded Team\n\n"
 		"GPU and SPU code by Pete Bernert\n"
 		"  and the P.E.Op.S. team\n"
-		"ARM recompiler (C) 2009-2010 Ari64\n\n"
+		"ARM recompiler (C) 2009-2011 Ari64\n"
+		"PCSX4ALL plugins by PCSX4ALL team\n"
+		"  Chui, Franxis, Unai\n\n"
 		"integration, optimization and\n"
-		"  frontend (C) 2010 notaz\n";
+		"  frontend (C) 2010-2011 notaz\n";
 }
 
-static char *romsel_run(void)
+static int reset_game(void)
 {
-	extern void set_cd_image(const char *fname);
-	char *ret;
+	// sanity check
+	if (bios_sel == 0 && !Config.HLE)
+		return -1;
+
+	ClosePlugins();
+	OpenPlugins();
+	SysReset();
+	if (CheckCdrom() != -1) {
+		LoadCdrom();
+	}
+	return 0;
+}
 
-	ret = menu_loop_romsel(last_selected_fname, sizeof(last_selected_fname));
-	if (ret == NULL)
-		return NULL;
+static int run_bios(void)
+{
+	if (bios_sel == 0)
+		return -1;
 
-	lprintf("selected file: %s\n", ret);
 	ready_to_go = 0;
+	pl_fbdev_buf = NULL;
 
-	set_cd_image(ret);
+	ClosePlugins();
+	set_cd_image(NULL);
 	LoadPlugins();
 	NetOpened = 0;
 	if (OpenPlugins() == -1) {
 		me_update_msg("failed to open plugins");
-		return NULL;
+		return -1;
 	}
+	plugin_call_rearmed_cbs();
+
+	CdromId[0] = '\0';
+	CdromLabel[0] = '\0';
 
 	SysReset();
 
+	ready_to_go = 1;
+	return 0;
+}
+
+static int run_cd_image(const char *fname)
+{
+	ready_to_go = 0;
+	pl_fbdev_buf = NULL;
+
+	ClosePlugins();
+	set_cd_image(fname);
+	LoadPlugins();
+	NetOpened = 0;
+	if (OpenPlugins() == -1) {
+		me_update_msg("failed to open plugins");
+		return -1;
+	}
+	plugin_call_rearmed_cbs();
+
 	if (CheckCdrom() == -1) {
 		// Only check the CD if we are starting the console with a CD
 		ClosePlugins();
 		me_update_msg("unsupported/invalid CD image");
-		return NULL;
+		return -1;
 	}
 
+	SysReset();
+
 	// Read main executable directly from CDRom and start it
 	if (LoadCdrom() == -1) {
 		ClosePlugins();
 		me_update_msg("failed to load CD image");
-		return NULL;
+		return -1;
 	}
 
-	strcpy(last_selected_fname, rom_fname_reload);
-	game_config_loaded = 0;
 	ready_to_go = 1;
-	return ret;
+	return 0;
 }
 
-static int main_menu_handler(int id, int keys)
+static int romsel_run(void)
 {
-	char *ret_name;
+	int prev_gpu, prev_spu;
+	char *fname;
+
+	fname = menu_loop_romsel(last_selected_fname, sizeof(last_selected_fname));
+	if (fname == NULL)
+		return -1;
 
+	printf("selected file: %s\n", fname);
+
+	if (run_cd_image(fname) != 0)
+		return -1;
+
+	prev_gpu = gpu_plugsel;
+	prev_spu = spu_plugsel;
+	if (menu_load_config(1) != 0)
+		menu_load_config(0);
+
+	// check for plugin changes, have to repeat
+	// loading if game config changed plugins to reload them
+	if (prev_gpu != gpu_plugsel || prev_spu != spu_plugsel) {
+		printf("plugin change detected, reloading plugins..\n");
+		if (run_cd_image(fname) != 0)
+			return -1;
+	}
+
+	strcpy(last_selected_fname, rom_fname_reload);
+	return 0;
+}
+
+static int main_menu_handler(int id, int keys)
+{
 	switch (id)
 	{
 	case MA_MAIN_RESUME_GAME:
@@ -923,22 +1172,19 @@ static int main_menu_handler(int id, int keys)
 			return menu_loop_savestate(1);
 		break;
 	case MA_MAIN_RESET_GAME:
-		if (ready_to_go) {
-			OpenPlugins();
-			SysReset();
-			if (CheckCdrom() != -1) {
-				LoadCdrom();
-			}
+		if (ready_to_go && reset_game() == 0)
 			return 1;
-		}
 		break;
 	case MA_MAIN_LOAD_ROM:
-		ret_name = romsel_run();
-		if (ret_name != NULL)
+		if (romsel_run() == 0)
+			return 1;
+		break;
+	case MA_MAIN_RUN_BIOS:
+		if (run_bios() == 0)
 			return 1;
 		break;
 	case MA_MAIN_CREDITS:
-		draw_menu_credits(draw_frame_debug);
+		draw_menu_credits(draw_frame_credits);
 		in_menu_wait(PBTN_MOK|PBTN_MBACK, 70);
 		break;
 	case MA_MAIN_EXIT:
@@ -961,6 +1207,7 @@ static menu_entry e_menu_main[] =
 	mee_handler_id("Load State",         MA_MAIN_LOAD_STATE,  main_menu_handler),
 	mee_handler_id("Reset game",         MA_MAIN_RESET_GAME,  main_menu_handler),
 	mee_handler_id("Load CD image",      MA_MAIN_LOAD_ROM,    main_menu_handler),
+	mee_handler_id("Run BIOS",           MA_MAIN_RUN_BIOS,    main_menu_handler),
 	mee_handler   ("Options",            menu_loop_options),
 	mee_handler   ("Controls",           menu_loop_keyconfig),
 	mee_handler_id("Credits",            MA_MAIN_CREDITS,     main_menu_handler),
@@ -979,15 +1226,15 @@ void menu_loop(void)
 	menu_leave_emu();
 
 	me_enable(e_menu_main, MA_MAIN_RESUME_GAME, ready_to_go);
-	me_enable(e_menu_main, MA_MAIN_SAVE_STATE,  ready_to_go);
-	me_enable(e_menu_main, MA_MAIN_LOAD_STATE,  ready_to_go);
+	me_enable(e_menu_main, MA_MAIN_SAVE_STATE,  ready_to_go && CdromId[0]);
+	me_enable(e_menu_main, MA_MAIN_LOAD_STATE,  ready_to_go && CdromId[0]);
 	me_enable(e_menu_main, MA_MAIN_RESET_GAME,  ready_to_go);
+	me_enable(e_menu_main, MA_MAIN_RUN_BIOS, bios_sel != 0);
 
-//	menu_enter(ready_to_go);
 	in_set_config_int(0, IN_CFG_BLOCKING, 1);
 
 	do {
-		me_loop(e_menu_main, &sel, NULL);
+		me_loop(e_menu_main, &sel, draw_frame_main);
 	} while (!ready_to_go);
 
 	/* wait until menu, ok, back is released */
@@ -996,17 +1243,119 @@ void menu_loop(void)
 
 	in_set_config_int(0, IN_CFG_BLOCKING, 0);
 
-	memset(g_menuscreen_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2);
-	menu_draw_end();
 	menu_prepare_emu();
 }
 
+static void scan_bios_plugins(void)
+{
+	char fname[MAXPATHLEN];
+	struct dirent *ent;
+	int bios_i, gpu_i, spu_i;
+	char *p;
+	DIR *dir;
+
+	bioses[0] = "HLE";
+	gpu_plugins[0] = "builtin_gpu";
+	spu_plugins[0] = "builtin_spu";
+	bios_i = gpu_i = spu_i = 1;
+
+	snprintf(fname, sizeof(fname), "%s/", Config.BiosDir);
+	dir = opendir(fname);
+	if (dir == NULL) {
+		perror("scan_bios_plugins bios opendir");
+		goto do_plugins;
+	}
+
+	while (1) {
+		struct stat st;
+
+		errno = 0;
+		ent = readdir(dir);
+		if (ent == NULL) {
+			if (errno != 0)
+				perror("readdir");
+			break;
+		}
+
+		if (ent->d_type != DT_REG && ent->d_type != DT_LNK)
+			continue;
+
+		snprintf(fname, sizeof(fname), "%s/%s", Config.BiosDir, ent->d_name);
+		if (stat(fname, &st) != 0 || st.st_size != 512*1024) {
+			printf("bad BIOS file: %s\n", ent->d_name);
+			continue;
+		}
+
+		if (bios_i < ARRAY_SIZE(bioses) - 1) {
+			bioses[bios_i++] = strdup(ent->d_name);
+			continue;
+		}
+
+		printf("too many BIOSes, dropping \"%s\"\n", ent->d_name);
+	}
+
+	closedir(dir);
+
+do_plugins:
+	snprintf(fname, sizeof(fname), "%s/", Config.PluginsDir);
+	dir = opendir(fname);
+	if (dir == NULL) {
+		perror("scan_bios_plugins opendir");
+		return;
+	}
+
+	while (1) {
+		void *h, *tmp;
+
+		errno = 0;
+		ent = readdir(dir);
+		if (ent == NULL) {
+			if (errno != 0)
+				perror("readdir");
+			break;
+		}
+		p = strstr(ent->d_name, ".so");
+		if (p == NULL)
+			continue;
+
+		snprintf(fname, sizeof(fname), "%s/%s", Config.PluginsDir, ent->d_name);
+		h = dlopen(fname, RTLD_LAZY | RTLD_LOCAL);
+		if (h == NULL) {
+			fprintf(stderr, "%s\n", dlerror());
+			continue;
+		}
+
+		// now what do we have here?
+		tmp = dlsym(h, "GPUinit");
+		if (tmp) {
+			dlclose(h);
+			if (gpu_i < ARRAY_SIZE(gpu_plugins) - 1)
+				gpu_plugins[gpu_i++] = strdup(ent->d_name);
+			continue;
+		}
+
+		tmp = dlsym(h, "SPUinit");
+		if (tmp) {
+			dlclose(h);
+			if (spu_i < ARRAY_SIZE(spu_plugins) - 1)
+				spu_plugins[spu_i++] = strdup(ent->d_name);
+			continue;
+		}
+
+		fprintf(stderr, "ignoring unidentified plugin: %s\n", fname);
+		dlclose(h);
+	}
+
+	closedir(dir);
+}
+
 void menu_init(void)
 {
 	char buff[MAXPATHLEN];
 
 	strcpy(last_selected_fname, "/media");
 
+	scan_bios_plugins();
 	pnd_menu_init();
 	menu_init_common();
 
@@ -1044,7 +1393,7 @@ static void menu_leave_emu(void)
 	}
 
 	memcpy(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2);
-	if (ready_to_go && last_psx_bpp == 16) {
+	if (pl_fbdev_buf != NULL && ready_to_go && last_psx_bpp == 16) {
 		int x = max(0, g_menuscreen_w - last_psx_w);
 		int y = max(0, g_menuscreen_h / 2 - last_psx_h / 2);
 		int w = min(g_menuscreen_w, last_psx_w);
@@ -1055,15 +1404,18 @@ static void menu_leave_emu(void)
 		for (; h > 0; h--, d += g_menuscreen_w, s += last_psx_w)
 			menu_darken_bg(d, s, w, 0);
 	}
+
+	if (ready_to_go)
+		cpu_clock = get_cpu_clock();
+
+	plat_video_menu_enter(ready_to_go);
 }
 
 void menu_prepare_emu(void)
 {
-	if (!game_config_loaded) {
-		menu_set_defconfig();
-		menu_load_config(1);
-		game_config_loaded = 1;
-	}
+	R3000Acpu *prev_cpu = psxCpu;
+
+	plat_video_menu_leave();
 
 	switch (scaling) {
 	case SCALE_1_1:
@@ -1084,13 +1436,19 @@ void menu_prepare_emu(void)
 	apply_cpu_clock();
 	stop = 0;
 
+	psxCpu = (Config.Cpu == CPU_INTERPRETER) ? &psxInt : &psxRec;
+	if (psxCpu != prev_cpu)
+		// note that this does not really reset, just clears drc caches
+		psxCpu->Reset();
+
 	// core doesn't care about Config.Cdda changes,
 	// so handle them manually here
 	if (Config.Cdda)
 		CDR_stop();
 
+	menu_sync_config();
+
 	if (GPU_open != NULL) {
-		extern unsigned long gpuDisp;
 		int ret = GPU_open(&gpuDisp, "PCSX", NULL);
 		if (ret)
 			fprintf(stderr, "Warning: GPU_open returned %d\n", ret);