From 0ad6c561aab998313765afd8ba43dee818f40662 Mon Sep 17 00:00:00 2001
From: notaz <notasas@gmail.com>
Date: Sun, 16 Sep 2007 20:45:13 +0000
Subject: [PATCH] gen/cd frame loops merged

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@250 be3aeb3a-fb24-0410-a615-afba39da0efa
---
 gp2x/emu.c | 51 ++++++++++++++++++++++++++++++---------------------
 gp2x/emu.h |  2 +-
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/gp2x/emu.c b/gp2x/emu.c
index 3096edd..9615013 100644
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -151,7 +151,7 @@ int find_bios(int region, char **bios_file)
 
 /* checks if romFileName points to valid MegaCD image
  * if so, checks for suitable BIOS */
-int emu_cd_check(char **bios_file)
+int emu_cd_check(int *pregion)
 {
 	unsigned char buf[32];
 	pm_file *cd_f;
@@ -183,17 +183,9 @@ int emu_cd_check(char **bios_file)
 	printf("detected %s Sega/Mega CD image with %s region\n",
 		type == 2 ? "BIN" : "ISO", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");
 
-	if (PicoRegionOverride) {
-		region = PicoRegionOverride;
-		printf("overrided region to %s\n", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");
-	}
-
-	if (bios_file == NULL) return type;
-
-	if (find_bios(region, bios_file))
-		 return type;	// CD and BIOS detected
+	if (pregion != NULL) *pregion = region;
 
-	return -1;     		// CD detected but load failed
+	return type;
 }
 
 int emu_ReloadRom(void)
@@ -202,7 +194,7 @@ int emu_ReloadRom(void)
 	char *used_rom_name = romFileName;
 	char ext[5];
 	pm_file *rom;
-	int ret, cd_state;
+	int ret, cd_state, cd_region, cfg_loaded = 0;
 
 	printf("emu_ReloadRom(%s)\n", romFileName);
 
@@ -271,14 +263,30 @@ int emu_ReloadRom(void)
 		Stop_CD();
 
 	// check for MegaCD image
-	cd_state = emu_cd_check(&used_rom_name);
-	if (cd_state > 0) {
+	cd_state = emu_cd_check(&cd_region);
+	if (cd_state > 0)
+	{
+		// valid CD image, check for BIOS..
+
+		// we need to have config loaded at this point
+		ret = emu_ReadConfig(1, 1);
+		if (!ret) emu_ReadConfig(0, 1);
+		cfg_loaded = 1;
+
+		if (PicoRegionOverride) {
+			cd_region = PicoRegionOverride;
+			printf("overrided region to %s\n", cd_region != 4 ? (cd_region == 8 ? "EU" : "JAP") : "USA");
+		}
+		if (!find_bios(cd_region, &used_rom_name)) {
+			// bios_help() ?
+			return 0;
+		}
+
 		PicoMCD |= 1;
 		get_ext(used_rom_name, ext);
-	} else if (cd_state == -1) {
-		// bios_help() ?
-		return 0;
-	} else {
+	}
+	else
+	{
 		if (PicoMCD & 1) Stop_CD();
 		PicoMCD &= ~1;
 	}
@@ -317,9 +325,10 @@ int emu_ReloadRom(void)
 	}
 
 	// load config for this ROM (do this before insert to get correct region)
-	ret = emu_ReadConfig(1, 1);
-	if (!ret)
-		emu_ReadConfig(0, 1);
+	if (!cfg_loaded) {
+		ret = emu_ReadConfig(1, 1);
+		if (!ret) emu_ReadConfig(0, 1);
+	}
 
 	printf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);
 	if(PicoCartInsert(rom_data, rom_size)) {
diff --git a/gp2x/emu.h b/gp2x/emu.h
index 55bb53e..6ae089d 100644
--- a/gp2x/emu.h
+++ b/gp2x/emu.h
@@ -53,7 +53,7 @@ char *emu_GetSaveFName(int load, int is_sram, int slot);
 int  emu_check_save_file(int slot);
 void emu_set_save_cbs(int gz);
 void emu_forced_frame(void);
-int  emu_cd_check(char **bios_file);
+int  emu_cd_check(int *pregion);
 int  find_bios(int region, char **bios_file);
 void scaling_update(void);
 
-- 
2.39.2