X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Femu.c;h=1573d12818c032b5577728eb785b2f3251d766df;hb=be7867d8756f15956447d3275382a77a71922feb;hp=36539c65b07faf3a24b27eb753fa1526975b1a72;hpb=39e6f9733a2680d97db891bec163bb91e96c20d9;p=picodrive.git

diff --git a/platform/common/emu.c b/platform/common/emu.c
index 36539c6..1573d12 100644
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -8,8 +8,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <stdarg.h>
-#ifndef NO_SYNC
+#ifdef __GP2X__
 #include <unistd.h>
 #endif
 
@@ -26,24 +27,29 @@
 
 #include <pico/pico_int.h>
 #include <pico/patch.h>
-#include <pico/cd/cue.h>
 
+#ifndef _WIN32
+#define PATH_SEP      "/"
+#define PATH_SEP_C    '/'
+#else
+#define PATH_SEP      "\\"
+#define PATH_SEP_C    '\\'
+#endif
 
 #define STATUS_MSG_TIMEOUT 2000
 
 void *g_screen_ptr;
 
-#if !SCREEN_SIZE_FIXED
-int g_screen_width  = SCREEN_WIDTH;
-int g_screen_height = SCREEN_HEIGHT;
-#endif
+int g_screen_width  = 320;
+int g_screen_height = 240;
 
 char *PicoConfigFile = "config.cfg";
 currentConfig_t currentConfig, defaultConfig;
 int state_slot = 0;
 int config_slot = 0, config_slot_current = 0;
 int pico_pen_x = 320/2, pico_pen_y = 240/2;
-int pico_inp_mode = 0;
+int pico_inp_mode;
+int flip_after_sync;
 int engineState = PGS_Menu;
 
 static short __attribute__((aligned(4))) sndBuffer[2*44100/50];
@@ -52,7 +58,6 @@ static short __attribute__((aligned(4))) sndBuffer[2*44100/50];
 static char static_buff[512];
 const char *rom_fname_reload;
 char rom_fname_loaded[512];
-int rom_loaded = 0;
 int reset_timing = 0;
 static unsigned int notice_msg_time;	/* when started showing */
 static char noticeMsg[40];
@@ -145,23 +150,40 @@ void emu_status_msg(const char *format, ...)
 	notice_msg_time = plat_get_ticks_ms();
 }
 
-static const char * const biosfiles_us[] = { "us_scd1_9210", "us_scd2_9306", "SegaCDBIOS9303" };
-static const char * const biosfiles_eu[] = { "eu_mcd1_9210", "eu_mcd2_9306", "eu_mcd2_9303"   };
-static const char * const biosfiles_jp[] = { "jp_mcd1_9112", "jp_mcd1_9111" };
-
-static int find_bios(int region, const char **bios_file)
+static const char * const biosfiles_us[] = {
+	"us_scd1_9210", "us_scd2_9306", "SegaCDBIOS9303", "bios_CD_U"
+};
+static const char * const biosfiles_eu[] = {
+	"eu_mcd1_9210", "eu_mcd2_9306", "eu_mcd2_9303", "bios_CD_E"
+};
+static const char * const biosfiles_jp[] = {
+	"jp_mcd1_9112", "jp_mcd1_9111", "bios_CD_J"
+};
+
+static const char *find_bios(int *region, const char *cd_fname)
 {
 	int i, count;
 	const char * const *files;
 	FILE *f = NULL;
+	int ret;
 
-	if (region == 4) { // US
+	// we need to have config loaded at this point
+	ret = emu_read_config(cd_fname, 0);
+	if (!ret) emu_read_config(NULL, 0);
+
+	if (PicoRegionOverride) {
+		*region = PicoRegionOverride;
+		lprintf("override region to %s\n", *region != 4 ?
+			(*region == 8 ? "EU" : "JAP") : "USA");
+	}
+
+	if (*region == 4) { // US
 		files = biosfiles_us;
 		count = sizeof(biosfiles_us) / sizeof(char *);
-	} else if (region == 8) { // EU
+	} else if (*region == 8) { // EU
 		files = biosfiles_eu;
 		count = sizeof(biosfiles_eu) / sizeof(char *);
-	} else if (region == 1 || region == 2) {
+	} else if (*region == 1 || *region == 2) {
 		files = biosfiles_jp;
 		count = sizeof(biosfiles_jp) / sizeof(char *);
 	} else {
@@ -184,14 +206,12 @@ static int find_bios(int region, const char **bios_file)
 	if (f) {
 		lprintf("using bios: %s\n", static_buff);
 		fclose(f);
-		if (bios_file)
-			*bios_file = static_buff;
-		return 1;
+		return static_buff;
 	} else {
 		sprintf(static_buff, "no %s BIOS files found, read docs",
-			region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");
+			*region != 4 ? (*region == 8 ? "EU" : "JAP") : "USA");
 		menu_update_msg(static_buff);
-		return 0;
+		return NULL;
 	}
 }
 
@@ -210,166 +230,6 @@ static int emu_isBios(const char *name)
 }
 */
 
-static unsigned char id_header[0x100];
-
-/* checks if fname points to valid MegaCD image */
-static int emu_cd_check(int *pregion, const char *fname_in)
-{
-	const char *fname = fname_in;
-	unsigned char buf[32];
-	pm_file *cd_f;
-	int region = 4; // 1: Japan, 4: US, 8: Europe
-	char ext[5];
-	cue_track_type type = CT_UNKNOWN;
-	cue_data_t *cue_data = NULL;
-
-	get_ext(fname_in, ext);
-	if (strcasecmp(ext, ".cue") == 0) {
-		cue_data = cue_parse(fname_in);
-		if (cue_data != NULL) {
-			fname = cue_data->tracks[1].fname;
-			type  = cue_data->tracks[1].type;
-		}
-		else
-			return -1;
-	}
-
-	cd_f = pm_open(fname);
-	if (cue_data != NULL)
-		cue_destroy(cue_data);
-
-	if (cd_f == NULL) return 0; // let the upper level handle this
-
-	if (pm_read(buf, 32, cd_f) != 32) {
-		pm_close(cd_f);
-		return -1;
-	}
-
-	if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x00, 14)) {
-		if (type && type != CT_ISO)
-			elprintf(EL_STATUS, ".cue has wrong type: %i", type);
-		type = CT_ISO;       // Sega CD (ISO)
-	}
-	if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x10, 14)) {
-		if (type && type != CT_BIN)
-			elprintf(EL_STATUS, ".cue has wrong type: %i", type);
-		type = CT_BIN;       // Sega CD (BIN)
-	}
-
-	if (type == CT_UNKNOWN) {
-		pm_close(cd_f);
-		return 0;
-	}
-
-	pm_seek(cd_f, (type == CT_ISO) ? 0x100 : 0x110, SEEK_SET);
-	pm_read(id_header, sizeof(id_header), cd_f);
-
-	/* it seems we have a CD image here. Try to detect region now.. */
-	pm_seek(cd_f, (type == CT_ISO) ? 0x100+0x10B : 0x110+0x10B, SEEK_SET);
-	pm_read(buf, 1, cd_f);
-	pm_close(cd_f);
-
-	if (buf[0] == 0x64) region = 8; // EU
-	if (buf[0] == 0xa1) region = 1; // JAP
-
-	lprintf("detected %s Sega/Mega CD image with %s region\n",
-		type == CT_BIN ? "BIN" : "ISO", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");
-
-	if (pregion != NULL) *pregion = region;
-
-	return type;
-}
-
-static int detect_media(const char *fname)
-{
-	static const short sms_offsets[] = { 0x7ff0, 0x3ff0, 0x1ff0 };
-	static const char *sms_exts[] = { "sms", "gg", "sg" };
-	static const char *md_exts[] = { "gen", "bin", "smd" };
-	char buff0[32], buff[32];
-	unsigned short *d16;
-	pm_file *pmf;
-	char ext[5];
-	int i;
-
-	get_ext(fname, ext);
-
-	// detect wrong extensions
-	if (!strcmp(ext, ".srm") || !strcmp(ext, "s.gz") || !strcmp(ext, ".mds")) // s.gz ~ .mds.gz
-		return PM_BAD;
-
-	/* don't believe in extensions, except .cue */
-	if (strcasecmp(ext, ".cue") == 0)
-		return PM_CD;
-
-	pmf = pm_open(fname);
-	if (pmf == NULL)
-		return PM_BAD;
-
-	if (pm_read(buff0, 32, pmf) != 32) {
-		pm_close(pmf);
-		return PM_BAD;
-	}
-
-	if (strncasecmp("SEGADISCSYSTEM", buff0 + 0x00, 14) == 0 ||
-	    strncasecmp("SEGADISCSYSTEM", buff0 + 0x10, 14) == 0) {
-		pm_close(pmf);
-		return PM_CD;
-	}
-
-	/* check for SMD evil */
-	if (pmf->size >= 0x4200 && (pmf->size & 0x3fff) == 0x200) {
-		if (pm_seek(pmf, sms_offsets[0] + 0x200, SEEK_SET) == sms_offsets[0] + 0x200 &&
-		    pm_read(buff, 16, pmf) == 16 &&
-		    strncmp("TMR SEGA", buff, 8) == 0)
-			goto looks_like_sms;
-
-		/* could parse further but don't bother */
-		goto extension_check;
-	}
-
-	/* MD header? Act as TMSS BIOS here */
-	if (pm_seek(pmf, 0x100, SEEK_SET) == 0x100 && pm_read(buff, 16, pmf) == 16) {
-		if (strncmp(buff, "SEGA", 4) == 0 || strncmp(buff, " SEG", 4) == 0)
-			goto looks_like_md;
-	}
-
-	for (i = 0; i < array_size(sms_offsets); i++) {
-		if (pm_seek(pmf, sms_offsets[i], SEEK_SET) != sms_offsets[i])
-			continue;
-
-		if (pm_read(buff, 16, pmf) != 16)
-			continue;
-
-		if (strncmp("TMR SEGA", buff, 8) == 0)
-			goto looks_like_sms;
-	}
-
-extension_check:
-	/* probably some headerless thing. Maybe check the extension after all. */
-	for (i = 0; i < array_size(md_exts); i++)
-		if (strcasecmp(pmf->ext, md_exts[i]) == 0)
-			goto looks_like_md;
-
-	for (i = 0; i < array_size(sms_exts); i++)
-		if (strcasecmp(pmf->ext, sms_exts[i]) == 0)
-			goto looks_like_sms;
-
-	/* If everything else fails, make a guess on the reset vector */
-	d16 = (unsigned short *)(buff0 + 4);
-	if ((((d16[0] << 16) | d16[1]) & 0xffffff) >= pmf->size) {
-		lprintf("bad MD reset vector, assuming SMS\n");
-		goto looks_like_sms;
-	}
-
-looks_like_md:
-	pm_close(pmf);
-	return PM_MD_CART;
-
-looks_like_sms:
-	pm_close(pmf);
-	return PM_MARK3;
-}
-
 static int extract_text(char *dest, const unsigned char *src, int len, int swab)
 {
 	char *p = dest;
@@ -416,11 +276,11 @@ static char *emu_make_rom_id(const char *fname)
 	pos = 3;
 
 	if (!(PicoAHW & PAHW_SMS)) {
-		pos += extract_text(id_string + pos, id_header + 0x80, 0x0e, swab); // serial
+		pos += extract_text(id_string + pos, media_id_header + 0x80, 0x0e, swab); // serial
 		id_string[pos] = '|'; pos++;
-		pos += extract_text(id_string + pos, id_header + 0xf0, 0x03, swab); // region
+		pos += extract_text(id_string + pos, media_id_header + 0xf0, 0x03, swab); // region
 		id_string[pos] = '|'; pos++;
-		pos += extract_text(id_string + pos, id_header + 0x50, 0x30, swab); // overseas name
+		pos += extract_text(id_string + pos, media_id_header + 0x50, 0x30, swab); // overseas name
 		id_string[pos] = 0;
 		if (pos > 5)
 			return id_string;
@@ -439,7 +299,7 @@ void emu_get_game_name(char *str150)
 	int ret, swab = (PicoAHW & PAHW_MCD) ? 0 : 1;
 	char *s, *d;
 
-	ret = extract_text(str150, id_header + 0x50, 0x30, swab); // overseas name
+	ret = extract_text(str150, media_id_header + 0x50, 0x30, swab); // overseas name
 
 	for (s = d = str150 + 1; s < str150+ret; s++)
 	{
@@ -450,13 +310,6 @@ void emu_get_game_name(char *str150)
 	*d = 0;
 }
 
-static void shutdown_MCD(void)
-{
-	if ((PicoAHW & PAHW_MCD) && Pico_mcd != NULL)
-		Stop_CD();
-	PicoAHW &= ~PAHW_MCD;
-}
-
 static void system_announce(void)
 {
 	const char *sys_name, *tv_standard, *extra = "";
@@ -486,19 +339,20 @@ static void system_announce(void)
 	emu_status_msg("%s %s / %dFPS%s", tv_standard, sys_name, fps, extra);
 }
 
-// XXX: portions of this code should move to pico/
+static void do_region_override(const char *media_fname)
+{
+	// we only need to override region if config tells us so
+	int ret = emu_read_config(media_fname, 0);
+	if (!ret) emu_read_config(NULL, 0);
+}
+
 int emu_reload_rom(const char *rom_fname_in)
 {
-	unsigned int rom_size = 0;
-	const char *used_rom_name = NULL;
 	char *rom_fname = NULL;
-	unsigned char *rom_data = NULL;
 	char ext[5];
-	pm_file *rom = NULL;
-	int cd_state = CIT_NOT_CD;
-	int ret, media_type, cd_region;
-	int cfg_loaded = 0, bad_rom = 0;
+	enum media_type_e media_type;
 	int menu_romload_started = 0;
+	char carthw_path[512];
 	int retval = 0;
 
 	lprintf("emu_ReloadRom(%s)\n", rom_fname_in);
@@ -507,7 +361,6 @@ int emu_reload_rom(const char *rom_fname_in)
 	if (rom_fname == NULL)
 		return 0;
 
-	used_rom_name = rom_fname;
 	get_ext(rom_fname, ext);
 
 	// early cleanup
@@ -566,110 +419,29 @@ int emu_reload_rom(const char *rom_fname_in)
 		get_ext(rom_fname, ext);
 	}
 
-	media_type = detect_media(rom_fname);
-	if (media_type == PM_BAD) {
-		menu_update_msg("Not a ROM/CD img selected.");
-		goto out;
-	}
-
-	shutdown_MCD();
-	PicoCartUnload();
-	rom_loaded = 0;
-
-	PicoAHW = 0;
-
-	if (media_type == PM_CD)
-	{
-		// check for MegaCD image
-		cd_state = emu_cd_check(&cd_region, rom_fname);
-		if (cd_state >= 0 && cd_state != CIT_NOT_CD)
-		{
-			// valid CD image, check for BIOS..
-
-			// we need to have config loaded at this point
-			ret = emu_read_config(rom_fname, 0);
-			if (!ret) emu_read_config(NULL, 0);
-			cfg_loaded = 1;
+	menu_romload_prepare(rom_fname); // also CD load
+	menu_romload_started = 1;
 
-			if (PicoRegionOverride) {
-				cd_region = PicoRegionOverride;
-				lprintf("override region to %s\n", cd_region != 4 ?
-					(cd_region == 8 ? "EU" : "JAP") : "USA");
-			}
-			if (!find_bios(cd_region, &used_rom_name))
-				goto out;
+	emu_make_path(carthw_path, "carthw.cfg", sizeof(carthw_path));
 
-			get_ext(used_rom_name, ext);
-			PicoAHW |= PAHW_MCD;
-		}
-		else {
-			menu_update_msg("Invalid CD image");
-			goto out;
-		}
-	}
-	else if (media_type == PM_MARK3) {
-		lprintf("detected SMS ROM\n");
-		PicoAHW = PAHW_SMS;
-	}
+	media_type = PicoLoadMedia(rom_fname, carthw_path,
+			find_bios, do_region_override);
 
-	rom = pm_open(used_rom_name);
-	if (rom == NULL) {
-		menu_update_msg("Failed to open ROM");
+	switch (media_type) {
+	case PM_BAD_DETECT:
+		menu_update_msg("Not a ROM/CD img selected.");
 		goto out;
-	}
-
-	menu_romload_prepare(used_rom_name); // also CD load
-	menu_romload_started = 1;
-	used_rom_name = NULL; // uses static_buff
-
-	ret = PicoCartLoad(rom, &rom_data, &rom_size, (PicoAHW & PAHW_SMS) ? 1 : 0);
-	pm_close(rom);
-	if (ret != 0) {
-		if      (ret == 2) menu_update_msg("Out of memory");
-		else if (ret == 3) menu_update_msg("Read failed");
-		else               menu_update_msg("PicoCartLoad() failed.");
+	case PM_BAD_CD:
+		menu_update_msg("Invalid CD image");
 		goto out;
-	}
-
-	// detect wrong files
-	if (strncmp((char *)rom_data, "Pico", 4) == 0)
-		bad_rom = 1;
-	else if (!(PicoAHW & PAHW_SMS)) {
-		unsigned short *d = (unsigned short *)(rom_data + 4);
-		if ((((d[0] << 16) | d[1]) & 0xffffff) >= (int)rom_size) {
-			lprintf("bad reset vector\n");
-			bad_rom = 1;
-		}
-	}
-
-	if (bad_rom) {
-		menu_update_msg("Bad ROM detected.");
+	case PM_BAD_CD_NO_BIOS:
+		// find_bios() prints a message
 		goto out;
-	}
-
-	// load config for this ROM (do this before insert to get correct region)
-	if (!(PicoAHW & PAHW_MCD))
-		memcpy(id_header, rom_data + 0x100, sizeof(id_header));
-	if (!cfg_loaded) {
-		ret = emu_read_config(rom_fname, 0);
-		if (!ret) emu_read_config(NULL, 0);
-	}
-
-	emu_make_path(static_buff, "carthw.cfg", sizeof(static_buff));
-	if (PicoCartInsert(rom_data, rom_size, static_buff)) {
-		menu_update_msg("Failed to load ROM.");
+	case PM_ERROR:
+		menu_update_msg("Load error");
 		goto out;
-	}
-
-	// insert CD if it was detected
-	if (cd_state != CIT_NOT_CD) {
-		ret = Insert_CD(rom_fname, cd_state);
-		if (ret != 0) {
-			PicoCartUnload();
-			rom_data = NULL; // freed by unload
-			menu_update_msg("Insert_CD() failed, invalid CD image?");
-			goto out;
-		}
+	default:
+		break;
 	}
 
 	menu_romload_end();
@@ -707,7 +479,6 @@ int emu_reload_rom(const char *rom_fname_in)
 
 	strncpy(rom_fname_loaded, rom_fname, sizeof(rom_fname_loaded)-1);
 	rom_fname_loaded[sizeof(rom_fname_loaded)-1] = 0;
-	rom_loaded = 1;
 
 	// load SRAM for this ROM
 	if (currentConfig.EmuOpt & EOPT_EN_SRAM)
@@ -715,8 +486,6 @@ int emu_reload_rom(const char *rom_fname_in)
 
 	retval = 1;
 out:
-	if (retval == 0 && rom_data)
-		free(rom_data);
 	if (menu_romload_started)
 		menu_romload_end();
 	free(rom_fname);
@@ -728,7 +497,7 @@ int emu_swap_cd(const char *fname)
 	cd_img_type cd_type;
 	int ret = -1;
 
-	cd_type = emu_cd_check(NULL, fname);
+	cd_type = PicoCdCheck(fname, NULL);
 	if (cd_type != CIT_NOT_CD)
 		ret = Insert_CD(fname, cd_type);
 	if (ret != 0) {
@@ -772,7 +541,8 @@ void emu_prep_defconfig(void)
 	memset(&defaultConfig, 0, sizeof(defaultConfig));
 	defaultConfig.EmuOpt    = 0x9d | EOPT_RAM_TIMINGS|EOPT_EN_CD_LEDS;
 	defaultConfig.s_PicoOpt = POPT_EN_STEREO|POPT_EN_FM|POPT_EN_PSG|POPT_EN_Z80 |
-				  POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC|POPT_ACC_SPRITES |
+				  POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_MCD_GFX |
+				  POPT_EN_SVP_DRC|POPT_ACC_SPRITES |
 				  POPT_EN_32X|POPT_EN_PWM;
 	defaultConfig.s_PsndRate = 44100;
 	defaultConfig.s_PicoRegion = 0; // auto
@@ -784,6 +554,8 @@ void emu_prep_defconfig(void)
 	defaultConfig.gamma = 100;
 	defaultConfig.scaling = 0;
 	defaultConfig.turbo_rate = 15;
+	defaultConfig.msh2_khz = PICO_MSH2_HZ / 1000;
+	defaultConfig.ssh2_khz = PICO_SSH2_HZ / 1000;
 
 	// platform specific overrides
 	pemu_prep_defconfig();
@@ -797,8 +569,6 @@ void emu_set_defconfig(void)
 	PicoRegionOverride = currentConfig.s_PicoRegion;
 	PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;
 	PicoCDBuffers = currentConfig.s_PicoCDBuffers;
-	p32x_msh2_multiplier = MSH2_MULTI_DEFAULT;
-	p32x_ssh2_multiplier = SSH2_MULTI_DEFAULT;
 }
 
 int emu_read_config(const char *rom_fname, int no_defaults)
@@ -817,33 +587,29 @@ int emu_read_config(const char *rom_fname, int no_defaults)
 	}
 	else
 	{
-		char *sect = emu_make_rom_id(rom_fname);
+		char ext[16];
+		int vol;
 
 		if (config_slot != 0)
-		     sprintf(cfg, "game.%i.cfg", config_slot);
-		else strcpy(cfg,  "game.cfg");
-
-		ret = -1;
-		if (config_havesect(cfg, sect))
-		{
-			// read user's config
-			int vol = currentConfig.volume;
-			emu_set_defconfig();
-			ret = config_readsect(cfg, sect);
-			currentConfig.volume = vol; // make vol global (bah)
-		}
+			snprintf(ext, sizeof(ext), ".%i.cfg", config_slot);
 		else
+			strcpy(ext, ".cfg");
+
+		fname_ext(cfg, sizeof(cfg), "cfg"PATH_SEP, ext, rom_fname);
+
+		// read user's config
+		vol = currentConfig.volume;
+		ret = config_readsect(cfg, NULL);
+		currentConfig.volume = vol; // make vol global (bah)
+
+		if (ret != 0)
 		{
 			// read global config, and apply game_def.cfg on top
 			make_config_cfg(cfg);
 			config_readsect(cfg, NULL);
-			emu_make_path(cfg, "game_def.cfg", sizeof(cfg));
-			ret = config_readsect(cfg, sect);
-		}
 
-		if (ret == 0)
-		{
-			lprintf("loaded cfg from sect \"%s\"\n", sect);
+			emu_make_path(cfg, "game_def.cfg", sizeof(cfg));
+			ret = config_readsect(cfg, emu_make_rom_id(rom_fname));
 		}
 	}
 
@@ -868,7 +634,7 @@ int emu_read_config(const char *rom_fname, int no_defaults)
 
 int emu_write_config(int is_game)
 {
-	char cfg[512], *game_sect = NULL;
+	char cfg[512];
 	int ret, write_lrom = 0;
 
 	if (!is_game)
@@ -876,17 +642,20 @@ int emu_write_config(int is_game)
 		make_config_cfg(cfg);
 		write_lrom = 1;
 	} else {
+		char ext[16];
+
 		if (config_slot != 0)
-		     sprintf(cfg, "game.%i.cfg", config_slot);
-		else strcpy(cfg,  "game.cfg");
-		game_sect = emu_make_rom_id(rom_fname_loaded);
-		lprintf("emu_write_config: sect \"%s\"\n", game_sect);
+			snprintf(ext, sizeof(ext), ".%i.cfg", config_slot);
+		else
+			strcpy(ext, ".cfg");
+
+		romfname_ext(cfg, sizeof(cfg), "cfg"PATH_SEP, ext);
 	}
 
 	lprintf("emu_write_config: %s ", cfg);
-	ret = config_writesect(cfg, game_sect);
+	ret = config_write(cfg);
 	if (write_lrom) config_writelrom(cfg);
-#ifndef NO_SYNC
+#ifdef __GP2X__
 	sync();
 #endif
 	lprintf((ret == 0) ? "(ok)\n" : "(failed)\n");
@@ -1096,7 +865,7 @@ int emu_save_load_game(int load, int sram)
 				ret = fwrite(sram_data, 1, sram_size, sramFile);
 				ret = (ret != sram_size) ? -1 : 0;
 				fclose(sramFile);
-#ifndef NO_SYNC
+#ifdef __GP2X__
 				sync();
 #endif
 			}
@@ -1107,7 +876,7 @@ int emu_save_load_game(int load, int sram)
 	{
 		ret = PicoState(saveFname, !load);
 		if (!ret) {
-#ifndef NO_SYNC
+#ifdef __GP2X__
 			if (!load) sync();
 #endif
 			emu_status_msg(load ? "STATE LOADED" : "STATE SAVED");
@@ -1159,9 +928,6 @@ void emu_32x_startup(void)
 {
 	plat_video_toggle_renderer(0, 0); // HACK
 	system_announce();
-
-	// force mode change event
-	rendstatus_old = -1;
 }
 
 void emu_reset_game(void)
@@ -1411,6 +1177,7 @@ void emu_init(void)
 	mkdir_path(path, pos, "mds");
 	mkdir_path(path, pos, "srm");
 	mkdir_path(path, pos, "brm");
+	mkdir_path(path, pos, "cfg");
 
 	pprof_init();
 
@@ -1437,7 +1204,7 @@ void emu_finish(void)
 		char cfg[512];
 		make_config_cfg(cfg);
 		config_writelrom(cfg);
-#ifndef NO_SYNC
+#ifdef __GP2X__
 		sync();
 #endif
 	}
@@ -1483,6 +1250,29 @@ void emu_sound_wait(void)
 	sndout_wait();
 }
 
+static void emu_loop_prep(void)
+{
+	static int pal_old = -1;
+	static int filter_old = -1;
+
+	if (currentConfig.CPUclock != plat_target_cpu_clock_get())
+		plat_target_cpu_clock_set(currentConfig.CPUclock);
+
+	if (Pico.m.pal != pal_old) {
+		plat_target_lcdrate_set(Pico.m.pal);
+		pal_old = Pico.m.pal;
+	}
+
+	if (currentConfig.filter != filter_old) {
+		plat_target_hwfilter_set(currentConfig.filter);
+		filter_old = currentConfig.filter;
+	}
+
+	plat_target_gamma_set(currentConfig.gamma, 0);
+
+	pemu_loop_prep();
+}
+
 static void skip_frame(int do_audio)
 {
 	PicoSkipFrame = do_audio ? 1 : 2;
@@ -1506,10 +1296,6 @@ void emu_loop(void)
 
 	fpsbuff[0] = 0;
 
-	/* make sure we are in correct mode */
-	Pico.m.dirtyPal = 1;
-	rendstatus_old = -1;
-
 	PicoLoopPrepare();
 
 	// prepare CD buffer
@@ -1517,7 +1303,7 @@ void emu_loop(void)
 		PicoCDBufferInit();
 
 	plat_video_loop_prepare();
-	pemu_loop_prep();
+	emu_loop_prep();
 	pemu_sound_start();
 
 	/* number of ticks per frame */
@@ -1584,10 +1370,8 @@ void emu_loop(void)
 			sprintf(fpsbuff, "%02i/%02i/%02i", frames_shown, bench_fps_s, (bf[0]+bf[1]+bf[2]+bf[3])>>2);
 			printf("%s\n", fpsbuff);
 #else
-			if (currentConfig.EmuOpt & EOPT_SHOW_FPS) {
-				sprintf(fpsbuff, "%02i/%02i", frames_shown, frames_done);
-				if (fpsbuff[5] == 0) { fpsbuff[5] = fpsbuff[6] = ' '; fpsbuff[7] = 0; }
-			}
+			if (currentConfig.EmuOpt & EOPT_SHOW_FPS)
+				sprintf(fpsbuff, "%02i/%02i  ", frames_shown, frames_done);
 #endif
 			frames_shown = frames_done = 0;
 			timestamp_fps += ms_to_ticks(1000);
@@ -1646,7 +1430,8 @@ void emu_loop(void)
 		PicoFrame();
 		pemu_finalize_frame(fpsbuff, notice_msg);
 
-		// plat_video_flip();
+		if (!flip_after_sync)
+			plat_video_flip();
 
 		/* frame limiter */
 		if (!reset_timing && !(currentConfig.EmuOpt & (EOPT_NO_FRMLIMIT|EOPT_EXT_FRMLIMIT)))
@@ -1664,9 +1449,8 @@ void emu_loop(void)
 			}
 		}
 
-		// XXX: for some plats it might be better to flip before vsync
-		// (due to shadow registers in display hw)
-		plat_video_flip();
+		if (flip_after_sync)
+			plat_video_flip();
 
 		pframes_done++; frames_done++; frames_shown++;