X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=common%2Femu.c;h=cc450d8245187d014c0f282491db57206427ca0a;hb=762ab456021d48de4b2601ac8721061e6cca809e;hp=1cecc39f6476f1ee7f7d757a1a23b34cd75cc681;hpb=2f3ca01638b740bc8ca5530dac8f3e2d2e069cb1;p=libpicofe.git

diff --git a/common/emu.c b/common/emu.c
index 1cecc39..cc450d8 100644
--- a/common/emu.c
+++ b/common/emu.c
@@ -245,8 +245,11 @@ static int emu_cd_check(int *pregion, const char *fname_in)
 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 buff[32];
 	char ext[5];
 	int i;
 
@@ -264,34 +267,69 @@ static int detect_media(const char *fname)
 	if (pmf == NULL)
 		return PM_BAD;
 
-	if (pm_read(buff, 32, pmf) != 32) {
+	if (pm_read(buff0, 32, pmf) != 32) {
 		pm_close(pmf);
 		return PM_BAD;
 	}
 
-	if (strncasecmp("SEGADISCSYSTEM", buff + 0x00, 14) == 0 ||
-	    strncasecmp("SEGADISCSYSTEM", buff + 0x10, 14) == 0) {
+	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])
-			goto not_mark3;		/* actually it could be but can't be detected */
+			continue;
 
 		if (pm_read(buff, 16, pmf) != 16)
-			goto not_mark3;
+			continue;
 
-		if (strncasecmp("TMR SEGA", buff, 8) == 0) {
-			pm_close(pmf);
-			return PM_MARK3;
-		}
+		if (strncmp("TMR SEGA", buff, 8) == 0)
+			goto looks_like_sms;
 	}
 
-not_mark3:
+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);
-	/* the main emu function is to emulate MD, so assume MD */
 	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)
@@ -371,6 +409,32 @@ static void shutdown_MCD(void)
 	PicoAHW &= ~PAHW_MCD;
 }
 
+static void system_announce(void)
+{
+	const char *sys_name, *tv_standard;
+	int fps;
+
+	if (PicoAHW & PAHW_SMS) {
+		sys_name = "Master System";
+	} else if (PicoAHW & PAHW_PICO) {
+		sys_name = "Pico";
+	} else if (PicoAHW & PAHW_MCD) {
+		sys_name = "Mega CD";
+		if ((Pico.m.hardware & 0xc0) == 0x80)
+			sys_name = "Sega CD";
+	} else if (PicoAHW & PAHW_32X) {
+		sys_name = "32X";
+	} else {
+		sys_name = "MegaDrive";
+		if ((Pico.m.hardware & 0xc0) == 0x80)
+			sys_name = "Genesis";
+	}
+	tv_standard = Pico.m.pal ? "PAL" : "NTSC";
+	fps = Pico.m.pal ? 50 : 60;
+
+	emu_status_msg("%s %s / %dFPS", tv_standard, sys_name, fps);
+}
+
 // note: this function might mangle rom_fname
 // XXX: portions of this code should move to pico/
 int emu_reload_rom(char *rom_fname)
@@ -450,6 +514,10 @@ int emu_reload_rom(char *rom_fname)
 
 	shutdown_MCD();
 	PicoPatchUnload();
+	PicoCartUnload();
+	rom_loaded = 0;
+
+	PicoAHW = 0;
 
 	if (media_type == PM_CD)
 	{
@@ -493,9 +561,6 @@ int emu_reload_rom(char *rom_fname)
 
 	menu_romload_prepare(used_rom_name); // also CD load
 
-	PicoCartUnload();
-	rom_loaded = 0;
-
 	ret = PicoCartLoad(rom, &rom_data, &rom_size, (PicoAHW & PAHW_SMS) ? 1 : 0);
 	pm_close(rom);
 	if (ret != 0) {
@@ -573,21 +638,7 @@ int emu_reload_rom(char *rom_fname)
 	}
 	else
 	{
-		const char *sys_name, *tv_standard;
-		int fps;
-
-		if (PicoAHW & PAHW_SMS) {
-			sys_name = "Master System";
-		} else {
-			sys_name = "MegaDrive";
-			if ((Pico.m.hardware&0xc0) == 0x80)
-				sys_name = "Genesis";
-		}
-		tv_standard = Pico.m.pal ? "PAL" : "NTSC";
-		fps = Pico.m.pal ? 50 : 60;
-
- 		emu_status_msg("%s %s / %dFPS", tv_standard, sys_name, fps);
-
+		system_announce();
 		PicoOpt &= ~POPT_DIS_VDP_FIFO;
 	}
 
@@ -938,7 +989,7 @@ int emu_save_load_game(int load, int sram)
 		int truncate = 1;
 		if (PicoAHW & PAHW_MCD)
 		{
-			if (PicoOpt&POPT_EN_MCD_RAMCART) {
+			if (PicoOpt & POPT_EN_MCD_RAMCART) {
 				sram_size = 0x12000;
 				sram_data = SRam.data;
 				if (sram_data)
@@ -949,8 +1000,7 @@ int emu_save_load_game(int load, int sram)
 				truncate  = 0; // the .brm may contain RAM cart data after normal brm
 			}
 		} else {
-			sram_size = SRam.end-SRam.start+1;
-			if(Pico.m.sram_reg & 4) sram_size=0x2000;
+			sram_size = SRam.size;
 			sram_data = SRam.data;
 		}
 		if (!sram_data) return 0; // SRam forcefully disabled for this game
@@ -1035,6 +1085,12 @@ static void emu_tray_close(void)
 	emu_status_msg("CD tray closed.");
 }
 
+void emu_32x_startup(void)
+{
+	plat_video_toggle_renderer(0, 1, 0);
+	system_announce();
+}
+
 void emu_reset_game(void)
 {
 	PicoReset();
@@ -1162,9 +1218,9 @@ static void run_events_ui(unsigned int which)
 			PicoStateProgressCB = NULL;
 		}
 	}
-	if (which & PEV_SWITCH_RND)
+	if ((which & PEV_SWITCH_RND) && !(PicoAHW & PAHW_32X))
 	{
-		plat_video_toggle_renderer(1, 0);
+		plat_video_toggle_renderer(1, 0, 0);
 	}
 	if (which & (PEV_SSLOT_PREV|PEV_SSLOT_NEXT))
 	{
@@ -1293,7 +1349,7 @@ void emu_loop(void)
 {
 	int pframes_done;		/* "period" frames, used for sync */
 	int frames_done, frames_shown;	/* actual frames for fps counter */
-	int oldmodes, target_fps, target_frametime;
+	int target_fps, target_frametime;
 	unsigned int timestamp_base = 0, timestamp_fps;
 	char *notice_msg = NULL;
 	char fpsbuff[24];
@@ -1302,8 +1358,8 @@ void emu_loop(void)
 	fpsbuff[0] = 0;
 
 	/* make sure we are in correct mode */
-	oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
 	Pico.m.dirtyPal = 1;
+	rendstatus_old = -1;
 
 	/* number of ticks per frame */
 	if (Pico.m.pal) {
@@ -1332,7 +1388,6 @@ void emu_loop(void)
 	{
 		unsigned int timestamp;
 		int diff, diff_lim;
-		int modes;
 
 		timestamp = get_ticks();
 		if (reset_timing) {
@@ -1359,13 +1414,6 @@ void emu_loop(void)
 			}
 		}
 
-		// check for mode changes
-		modes = ((Pico.video.reg[12]&1)<<2) | (Pico.video.reg[1]&8);
-		if (modes != oldmodes) {
-			oldmodes = modes;
-			pemu_video_mode_change(!(modes & 4), (modes & 8));
-		}
-
 		// second changed?
 		if (timestamp - timestamp_fps >= ms_to_ticks(1000))
 		{