X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Femu.c;h=d92c598e8c825e5fc990d3b2eb78ca0bca8f4ad3;hb=2446536be520914616403876d7e49621ac6f4b95;hp=1e836941176c40db7842fbee2a94b41722f71971;hpb=07e5dbab71684189f10227108c1e71e2d002a734;p=picodrive.git

diff --git a/platform/common/emu.c b/platform/common/emu.c
index 1e83694..d92c598 100644
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -1,27 +1,32 @@
-// (c) Copyright 2006-2009 notaz, All rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
+/*
+ * PicoDrive
+ * (C) notaz, 2007-2010
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <stdarg.h>
 #ifndef NO_SYNC
 #include <unistd.h>
 #endif
 
+#include "../libpicofe/posix.h"
+#include "../libpicofe/input.h"
+#include "../libpicofe/fonts.h"
+#include "../libpicofe/sndout.h"
+#include "../libpicofe/lprintf.h"
+#include "../libpicofe/plat.h"
 #include "emu.h"
-#include "menu.h"
-#include "fonts.h"
-#include "lprintf.h"
-#include "config.h"
-#include "plat.h"
-#include "input.h"
-#include "posix.h"
+#include "input_pico.h"
+#include "menu_pico.h"
+#include "config_file.h"
 
 #include <pico/pico_int.h>
 #include <pico/patch.h>
-#include <pico/cd/cue.h>
 
 
 #define STATUS_MSG_TIMEOUT 2000
@@ -41,12 +46,12 @@ int pico_pen_x = 320/2, pico_pen_y = 240/2;
 int pico_inp_mode = 0;
 int engineState = PGS_Menu;
 
+static short __attribute__((aligned(4))) sndBuffer[2*44100/50];
+
 /* tmp buff to reduce stack usage for plats with small stack */
 static char static_buff[512];
-/* TODO: len checking */
-char rom_fname_reload[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];
@@ -92,6 +97,36 @@ static void get_ext(const char *file, char *ext)
 	strlwr_(ext);
 }
 
+static void fname_ext(char *dst, int dstlen, const char *prefix, const char *ext, const char *fname)
+{
+	int prefix_len = 0;
+	const char *p;
+
+	*dst = 0;
+	if (prefix) {
+		int len = plat_get_root_dir(dst, dstlen);
+		strcpy(dst + len, prefix);
+		prefix_len = len + strlen(prefix);
+	}
+
+	p = fname + strlen(fname) - 1;
+	for (; p >= fname && *p != PATH_SEP_C; p--)
+		;
+	p++;
+	strncpy(dst + prefix_len, p, dstlen - prefix_len - 1);
+
+	dst[dstlen - 8] = 0;
+	if (dst[strlen(dst) - 4] == '.')
+		dst[strlen(dst) - 4] = 0;
+	if (ext)
+		strcat(dst, ext);
+}
+
+static void romfname_ext(char *dst, int dstlen, const char *prefix, const char *ext)
+{
+	fname_ext(dst, dstlen, prefix, ext, rom_fname_loaded);
+}
+
 void emu_status_msg(const char *format, ...)
 {
 	va_list vl;
@@ -109,23 +144,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, 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;
+
+	// we need to have config loaded at this point
+	ret = emu_read_config(cd_fname, 0);
+	if (!ret) emu_read_config(NULL, 0);
 
-	if (region == 4) { // US
+	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 {
@@ -148,14 +200,12 @@ static int find_bios(int region, 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");
-		me_update_msg(static_buff);
-		return 0;
+			*region != 4 ? (*region == 8 ? "EU" : "JAP") : "USA");
+		menu_update_msg(static_buff);
+		return NULL;
 	}
 }
 
@@ -174,166 +224,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;
@@ -365,7 +255,7 @@ static int extract_text(char *dest, const unsigned char *src, int len, int swab)
 	return p - dest;
 }
 
-static char *emu_make_rom_id(void)
+static char *emu_make_rom_id(const char *fname)
 {
 	static char id_string[3+0xe*3+0x3*3+0x30*3+3];
 	int pos, swab = 1;
@@ -374,15 +264,25 @@ static char *emu_make_rom_id(void)
 		strcpy(id_string, "CD|");
 		swab = 0;
 	}
-	else strcpy(id_string, "MD|");
+	else if (PicoAHW & PAHW_SMS)
+		strcpy(id_string, "MS|");
+	else	strcpy(id_string, "MD|");
 	pos = 3;
 
-	pos += extract_text(id_string + pos, id_header + 0x80, 0x0e, swab); // serial
-	id_string[pos] = '|'; pos++;
-	pos += extract_text(id_string + pos, id_header + 0xf0, 0x03, swab); // region
-	id_string[pos] = '|'; pos++;
-	pos += extract_text(id_string + pos, id_header + 0x50, 0x30, swab); // overseas name
-	id_string[pos] = 0;
+	if (!(PicoAHW & PAHW_SMS)) {
+		pos += extract_text(id_string + pos, media_id_header + 0x80, 0x0e, swab); // serial
+		id_string[pos] = '|'; pos++;
+		pos += extract_text(id_string + pos, media_id_header + 0xf0, 0x03, swab); // region
+		id_string[pos] = '|'; pos++;
+		pos += extract_text(id_string + pos, media_id_header + 0x50, 0x30, swab); // overseas name
+		id_string[pos] = 0;
+		if (pos > 5)
+			return id_string;
+		pos = 3;
+	}
+
+	// can't find name in ROM, use filename
+	fname_ext(id_string + 3, sizeof(id_string) - 3, NULL, NULL, fname);
 
 	return id_string;
 }
@@ -393,7 +293,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++)
 	{
@@ -404,20 +304,16 @@ 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;
+	const char *sys_name, *tv_standard, *extra = "";
 	int fps;
 
 	if (PicoAHW & PAHW_SMS) {
 		sys_name = "Master System";
+#ifdef NO_SMS
+		extra = " [no support]";
+#endif
 	} else if (PicoAHW & PAHW_PICO) {
 		sys_name = "Pico";
 	} else if (PicoAHW & PAHW_MCD) {
@@ -434,64 +330,73 @@ static void system_announce(void)
 	tv_standard = Pico.m.pal ? "PAL" : "NTSC";
 	fps = Pico.m.pal ? 50 : 60;
 
-	emu_status_msg("%s %s / %dFPS", tv_standard, sys_name, fps);
+	emu_status_msg("%s %s / %dFPS%s", tv_standard, sys_name, fps, extra);
+}
+
+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);
 }
 
-// note: this function might mangle rom_fname
-// XXX: portions of this code should move to pico/
-int emu_reload_rom(char *rom_fname)
+int emu_reload_rom(const char *rom_fname_in)
 {
-	unsigned int rom_size = 0;
-	char *used_rom_name = rom_fname;
-	unsigned char *rom_data = NULL;
+	char *rom_fname = 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);
 
-	lprintf("emu_ReloadRom(%s)\n", rom_fname);
+	rom_fname = strdup(rom_fname_in);
+	if (rom_fname == NULL)
+		return 0;
 
 	get_ext(rom_fname, ext);
 
-	// check for movie file
+	// early cleanup
+	PicoPatchUnload();
 	if (movie_data) {
 		free(movie_data);
 		movie_data = 0;
 	}
+
 	if (!strcmp(ext, ".gmv"))
 	{
 		// check for both gmv and rom
 		int dummy;
 		FILE *movie_file = fopen(rom_fname, "rb");
 		if (!movie_file) {
-			me_update_msg("Failed to open movie.");
-			return 0;
+			menu_update_msg("Failed to open movie.");
+			goto out;
 		}
 		fseek(movie_file, 0, SEEK_END);
 		movie_size = ftell(movie_file);
 		fseek(movie_file, 0, SEEK_SET);
 		if (movie_size < 64+3) {
-			me_update_msg("Invalid GMV file.");
+			menu_update_msg("Invalid GMV file.");
 			fclose(movie_file);
-			return 0;
+			goto out;
 		}
 		movie_data = malloc(movie_size);
 		if (movie_data == NULL) {
-			me_update_msg("low memory.");
+			menu_update_msg("low memory.");
 			fclose(movie_file);
-			return 0;
+			goto out;
 		}
 		dummy = fread(movie_data, 1, movie_size, movie_file);
 		fclose(movie_file);
 		if (strncmp((char *)movie_data, "Gens Movie TEST", 15) != 0) {
-			me_update_msg("Invalid GMV file.");
-			return 0;
+			menu_update_msg("Invalid GMV file.");
+			goto out;
 		}
 		dummy = try_rfn_cut(rom_fname) || try_rfn_cut(rom_fname);
 		if (!dummy) {
-			me_update_msg("Could't find a ROM for movie.");
-			return 0;
+			menu_update_msg("Could't find a ROM for movie.");
+			goto out;
 		}
 		get_ext(rom_fname, ext);
 		lprintf("gmv loaded for %s\n", rom_fname);
@@ -502,119 +407,39 @@ int emu_reload_rom(char *rom_fname)
 		PicoPatchLoad(rom_fname);
 		dummy = try_rfn_cut(rom_fname) || try_rfn_cut(rom_fname);
 		if (!dummy) {
-			me_update_msg("Could't find a ROM to patch.");
-			return 0;
+			menu_update_msg("Could't find a ROM to patch.");
+			goto out;
 		}
 		get_ext(rom_fname, ext);
 	}
 
-	media_type = detect_media(rom_fname);
-	if (media_type == PM_BAD) {
-		me_update_msg("Not a ROM/CD img selected.");
-		return 0;
-	}
-
-	shutdown_MCD();
-	PicoPatchUnload();
-	PicoCartUnload();
-	rom_loaded = 0;
-
-	PicoAHW = 0;
+	menu_romload_prepare(rom_fname); // also CD load
+	menu_romload_started = 1;
 
-	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..
+	emu_make_path(carthw_path, "carthw.cfg", sizeof(carthw_path));
 
-			// we need to have config loaded at this point
-			ret = emu_read_config(1, 0);
-			if (!ret) emu_read_config(0, 0);
-			cfg_loaded = 1;
+	media_type = PicoLoadMedia(rom_fname, carthw_path,
+			find_bios, do_region_override);
 
-			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))
-				return 0;
-
-			get_ext(used_rom_name, ext);
-			PicoAHW |= PAHW_MCD;
-		}
-		else {
-			me_update_msg("Invalid CD image");
-			return 0;
-		}
-	}
-	else if (media_type == PM_MARK3) {
-		lprintf("detected SMS ROM\n");
-		PicoAHW = PAHW_SMS;
-	}
-
-	rom = pm_open(used_rom_name);
-	if (rom == NULL) {
-		me_update_msg("Failed to open ROM");
-		return 0;
-	}
-
-	menu_romload_prepare(used_rom_name); // also CD load
-	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) me_update_msg("Out of memory");
-		else if (ret == 3) me_update_msg("Read failed");
-		else               me_update_msg("PicoCartLoad() failed.");
-		goto fail;
-	}
-
-	// 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) {
-		me_update_msg("Bad ROM detected.");
-		goto fail;
-	}
-
-	// 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(1, 0);
-		if (!ret) emu_read_config(0, 0);
-	}
-
-	emu_make_path(static_buff, "carthw.cfg", sizeof(static_buff));
-	if (PicoCartInsert(rom_data, rom_size, static_buff)) {
-		me_update_msg("Failed to load ROM.");
-		goto fail;
-	}
-
-	// 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
-			me_update_msg("Insert_CD() failed, invalid CD image?");
-			goto fail;
-		}
+	switch (media_type) {
+	case PM_BAD_DETECT:
+		menu_update_msg("Not a ROM/CD img selected.");
+		goto out;
+	case PM_BAD_CD:
+		menu_update_msg("Invalid CD image");
+		goto out;
+	case PM_BAD_CD_NO_BIOS:
+		// find_bios() prints a message
+		goto out;
+	case PM_ERROR:
+		menu_update_msg("Load error");
+		goto out;
+	default:
+		break;
 	}
 
 	menu_romload_end();
+	menu_romload_started = 0;
 
 	if (PicoPatches) {
 		PicoPatchPrepare();
@@ -648,19 +473,17 @@ int emu_reload_rom(char *rom_fname)
 
 	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)
 		emu_save_load_game(1, 1);
 
-	return 1;
-
-fail:
-	if (rom_data)
-		free(rom_data);
-	menu_romload_end();
-	return 0;
+	retval = 1;
+out:
+	if (menu_romload_started)
+		menu_romload_end();
+	free(rom_fname);
+	return retval;
 }
 
 int emu_swap_cd(const char *fname)
@@ -668,11 +491,11 @@ 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) {
-		me_update_msg("Load failed, invalid CD image?");
+		menu_update_msg("Load failed, invalid CD image?");
 		return 0;
 	}
 
@@ -681,29 +504,6 @@ int emu_swap_cd(const char *fname)
 	return 1;
 }
 
-static void romfname_ext(char *dst, const char *prefix, const char *ext)
-{
-	char *p;
-	int prefix_len = 0;
-
-	// make save filename
-	p = rom_fname_loaded + strlen(rom_fname_loaded) - 1;
-	for (; p >= rom_fname_loaded && *p != PATH_SEP_C; p--); p++;
-	*dst = 0;
-	if (prefix) {
-		int len = plat_get_root_dir(dst, 512);
-		strcpy(dst + len, prefix);
-		prefix_len = len + strlen(prefix);
-	}
-#ifdef UIQ3
-	else p = rom_fname_loaded; // backward compatibility
-#endif
-	strncpy(dst + prefix_len, p, 511-prefix_len);
-	dst[511-8] = 0;
-	if (dst[strlen(dst)-4] == '.') dst[strlen(dst)-4] = 0;
-	if (ext) strcat(dst, ext);
-}
-
 // <base dir><end>
 void emu_make_path(char *buff, const char *end, int size)
 {
@@ -733,7 +533,7 @@ static void make_config_cfg(char *cfg_buff_512)
 void emu_prep_defconfig(void)
 {
 	memset(&defaultConfig, 0, sizeof(defaultConfig));
-	defaultConfig.EmuOpt    = 0x9d | EOPT_RAM_TIMINGS|EOPT_CONFIRM_SAVE|EOPT_EN_CD_LEDS;
+	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_32X|POPT_EN_PWM;
@@ -741,6 +541,7 @@ void emu_prep_defconfig(void)
 	defaultConfig.s_PicoRegion = 0; // auto
 	defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP
 	defaultConfig.s_PicoCDBuffers = 0;
+	defaultConfig.confirm_save = EOPT_CONFIRM_SAVE;
 	defaultConfig.Frameskip = -1; // auto
 	defaultConfig.volume = 50;
 	defaultConfig.gamma = 100;
@@ -759,9 +560,11 @@ 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(int game, int no_defaults)
+int emu_read_config(const char *rom_fname, int no_defaults)
 {
 	char cfg[512];
 	int ret;
@@ -769,16 +572,16 @@ int emu_read_config(int game, int no_defaults)
 	if (!no_defaults)
 		emu_set_defconfig();
 
-	if (!game)
+	if (rom_fname == NULL)
 	{
+		// global config
 		make_config_cfg(cfg);
 		ret = config_readsect(cfg, NULL);
 	}
 	else
 	{
-		char *sect = emu_make_rom_id();
+		char *sect = emu_make_rom_id(rom_fname);
 
-		// try new .cfg way
 		if (config_slot != 0)
 		     sprintf(cfg, "game.%i.cfg", config_slot);
 		else strcpy(cfg,  "game.cfg");
@@ -839,7 +642,7 @@ int emu_write_config(int is_game)
 		if (config_slot != 0)
 		     sprintf(cfg, "game.%i.cfg", config_slot);
 		else strcpy(cfg,  "game.cfg");
-		game_sect = emu_make_rom_id();
+		game_sect = emu_make_rom_id(rom_fname_loaded);
 		lprintf("emu_write_config: sect \"%s\"\n", game_sect);
 	}
 
@@ -939,14 +742,15 @@ char *emu_get_save_fname(int load, int is_sram, int slot)
 	if (is_sram)
 	{
 		strcpy(ext, (PicoAHW & PAHW_MCD) ? ".brm" : ".srm");
-		romfname_ext(saveFname, (PicoAHW & PAHW_MCD) ? "brm"PATH_SEP : "srm"PATH_SEP, ext);
+		romfname_ext(saveFname, sizeof(static_buff),
+			(PicoAHW & PAHW_MCD) ? "brm"PATH_SEP : "srm"PATH_SEP, ext);
 		if (!load)
 			return saveFname;
 
 		if (try_ropen_file(saveFname))
 			return saveFname;
 
-		romfname_ext(saveFname, NULL, ext);
+		romfname_ext(saveFname, sizeof(static_buff), NULL, ext);
 		if (try_ropen_file(saveFname))
 			return saveFname;
 	}
@@ -960,15 +764,15 @@ char *emu_get_save_fname(int load, int is_sram, int slot)
 		strcat(ext, ext_main);
 
 		if (!load) {
-			romfname_ext(saveFname, "mds" PATH_SEP, ext);
+			romfname_ext(saveFname, sizeof(static_buff), "mds" PATH_SEP, ext);
 			return saveFname;
 		}
 		else {
-			romfname_ext(saveFname, "mds" PATH_SEP, ext);
+			romfname_ext(saveFname, sizeof(static_buff), "mds" PATH_SEP, ext);
 			if (try_ropen_file(saveFname))
 				return saveFname;
 
-			romfname_ext(saveFname, NULL, ext);
+			romfname_ext(saveFname, sizeof(static_buff), NULL, ext);
 			if (try_ropen_file(saveFname))
 				return saveFname;
 
@@ -978,7 +782,7 @@ char *emu_get_save_fname(int load, int is_sram, int slot)
 				sprintf(ext, ".%i", slot);
 			strcat(ext, ext_othr);
 
-			romfname_ext(saveFname, "mds"PATH_SEP, ext);
+			romfname_ext(saveFname, sizeof(static_buff), "mds"PATH_SEP, ext);
 			if (try_ropen_file(saveFname))
 				return saveFname;
 		}
@@ -987,7 +791,7 @@ char *emu_get_save_fname(int load, int is_sram, int slot)
 	return NULL;
 }
 
-int emu_check_save_file(int slot)
+int emu_check_save_file(int slot, int *time)
 {
 	return emu_get_save_fname(1, 0, slot) ? 1 : 0;
 }
@@ -1116,7 +920,7 @@ static void emu_tray_close(void)
 
 void emu_32x_startup(void)
 {
-	plat_video_toggle_renderer(0, 0);
+	plat_video_toggle_renderer(0, 0); // HACK
 	system_announce();
 }
 
@@ -1211,9 +1015,9 @@ static void run_events_ui(unsigned int which)
 	if (which & (PEV_STATE_LOAD|PEV_STATE_SAVE))
 	{
 		int do_it = 1;
-		if ( emu_check_save_file(state_slot) &&
-				(((which & PEV_STATE_LOAD) && (currentConfig.EmuOpt & EOPT_CONFIRM_LOAD)) ||
-				 ((which & PEV_STATE_SAVE) && (currentConfig.EmuOpt & EOPT_CONFIRM_SAVE))) )
+		if ( emu_check_save_file(state_slot, NULL) &&
+			(((which & PEV_STATE_LOAD) && (currentConfig.confirm_save & EOPT_CONFIRM_LOAD)) ||
+			 ((which & PEV_STATE_SAVE) && (currentConfig.confirm_save & EOPT_CONFIRM_SAVE))) )
 		{
 			const char *nm;
 			char tmp[64];
@@ -1229,16 +1033,16 @@ static void run_events_ui(unsigned int which)
 
 			plat_status_msg_busy_first(tmp);
 
-			in_set_blocking(1);
-			while (in_menu_wait_any(50) & (PBTN_MA3|PBTN_MBACK))
+			in_set_config_int(0, IN_CFG_BLOCKING, 1);
+			while (in_menu_wait_any(NULL, 50) & (PBTN_MA3|PBTN_MBACK))
 				;
-			while ( !((keys = in_menu_wait_any(50)) & (PBTN_MA3|PBTN_MBACK)) )
+			while ( !((keys = in_menu_wait_any(NULL, 50)) & (PBTN_MA3|PBTN_MBACK)) )
 				;
 			if (keys & PBTN_MBACK)
 				do_it = 0;
-			while (in_menu_wait_any(50) & (PBTN_MA3|PBTN_MBACK))
+			while (in_menu_wait_any(NULL, 50) & (PBTN_MA3|PBTN_MBACK))
 				;
-			in_set_blocking(0);
+			in_set_config_int(0, IN_CFG_BLOCKING, 0);
 		}
 		if (do_it) {
 			plat_status_msg_busy_first((which & PEV_STATE_LOAD) ? "LOADING STATE" : "SAVING STATE");
@@ -1264,7 +1068,7 @@ static void run_events_ui(unsigned int which)
 		}
 
 		emu_status_msg("SAVE SLOT %i [%s]", state_slot,
-			emu_check_save_file(state_slot) ? "USED" : "FREE");
+			emu_check_save_file(state_slot, NULL) ? "USED" : "FREE");
 	}
 	if (which & PEV_MENU)
 		engineState = PGS_Menu;
@@ -1323,6 +1127,27 @@ static void mkdir_path(char *path_with_reserve, int pos, const char *name)
 		lprintf("failed to create: %s\n", path_with_reserve);
 }
 
+void emu_cmn_forced_frame(int no_scale, int do_emu)
+{
+	int po_old = PicoOpt;
+
+	memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);
+
+	PicoOpt &= ~POPT_ALT_RENDERER;
+	PicoOpt |= POPT_ACC_SPRITES;
+	if (!no_scale)
+		PicoOpt |= POPT_EN_SOFTSCALE;
+
+	PicoDrawSetOutFormat(PDF_RGB555, 1);
+	Pico.m.dirtyPal = 1;
+	if (do_emu)
+		PicoFrame();
+	else
+		PicoFrameDrawOnly();
+
+	PicoOpt = po_old;
+}
+
 void emu_init(void)
 {
 	char path[512];
@@ -1356,6 +1181,8 @@ void emu_init(void)
 	PicoMessage = plat_status_msg_busy_next;
 	PicoMCDopenTray = emu_tray_open;
 	PicoMCDcloseTray = emu_tray_close;
+
+	sndout_init();
 }
 
 void emu_finish(void)
@@ -1378,6 +1205,65 @@ void emu_finish(void)
 	pprof_finish();
 
 	PicoExit();
+	sndout_exit();
+}
+
+static void snd_write_nonblocking(int len)
+{
+	sndout_write_nb(PsndOut, len);
+}
+
+void emu_sound_start(void)
+{
+	PsndOut = NULL;
+
+	if (currentConfig.EmuOpt & EOPT_EN_SOUND)
+	{
+		int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;
+
+		PsndRerate(Pico.m.frame_count ? 1 : 0);
+
+		printf("starting audio: %i len: %i stereo: %i, pal: %i\n",
+			PsndRate, PsndLen, is_stereo, Pico.m.pal);
+		sndout_start(PsndRate, is_stereo);
+		PicoWriteSound = snd_write_nonblocking;
+		plat_update_volume(0, 0);
+		memset(sndBuffer, 0, sizeof(sndBuffer));
+		PsndOut = sndBuffer;
+	}
+}
+
+void emu_sound_stop(void)
+{
+	sndout_stop();
+}
+
+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)
@@ -1403,9 +1289,15 @@ 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
+	if (PicoAHW & PAHW_MCD)
+		PicoCDBufferInit();
+
+	plat_video_loop_prepare();
+	emu_loop_prep();
+	pemu_sound_start();
 
 	/* number of ticks per frame */
 	if (Pico.m.pal) {
@@ -1416,13 +1308,6 @@ void emu_loop(void)
 		target_frametime = ms_to_ticks(1000) / 60 + 1;
 	}
 
-	// prepare CD buffer
-	if (PicoAHW & PAHW_MCD)
-		PicoCDBufferInit();
-	PicoLoopPrepare();
-
-	pemu_loop_prep();
-
 	timestamp_fps = get_ticks();
 	reset_timing = 1;
 
@@ -1577,6 +1462,7 @@ void emu_loop(void)
 	}
 
 	pemu_loop_end();
+	emu_sound_stop();
 
 	// pemu_loop_end() might want to do 1 frame for bg image,
 	// so free CD buffer here