X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Femu.c;h=88fefd57ca91f34e0a1bb6bbf32e5da80d9a6a9a;hb=868cc0cc8f2fc6cfd278b15e8dbd042188de53ca;hp=140c017d4edf6aca0bf99966875a9cd5551ad7d0;hpb=fa8fb7544593a0ed43f3354cc5f41150464b55bf;p=picodrive.git

diff --git a/platform/common/emu.c b/platform/common/emu.c
index 140c017..88fefd5 100644
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -151,13 +151,13 @@ void emu_status_msg(const char *format, ...)
 }
 
 static const char * const biosfiles_us[] = {
-	"us_scd1_9210", "us_scd2_9306", "SegaCDBIOS9303", "bios_CD_U"
+	"us_scd2_9306", "SegaCDBIOS9303", "us_scd1_9210", "bios_CD_U"
 };
 static const char * const biosfiles_eu[] = {
-	"eu_mcd1_9210", "eu_mcd2_9306", "eu_mcd2_9303", "bios_CD_E"
+	"eu_mcd2_9306", "eu_mcd2_9303", "eu_mcd1_9210", "bios_CD_E"
 };
 static const char * const biosfiles_jp[] = {
-	"jp_mcd1_9112", "jp_mcd1_9111", "bios_CD_J"
+	"jp_mcd2_921222", "jp_mcd1_9112", "jp_mcd1_9111", "bios_CD_J"
 };
 
 static const char *find_bios(int *region, const char *cd_fname)
@@ -530,19 +530,20 @@ out:
 
 int emu_swap_cd(const char *fname)
 {
-	cd_img_type cd_type;
+	enum cd_img_type cd_type;
 	int ret = -1;
 
 	cd_type = PicoCdCheck(fname, NULL);
 	if (cd_type != CIT_NOT_CD)
-		ret = Insert_CD(fname, cd_type);
+		ret = cdd_load(fname, cd_type);
 	if (ret != 0) {
 		menu_update_msg("Load failed, invalid CD image?");
 		return 0;
 	}
 
 	strncpy(rom_fname_loaded, fname, sizeof(rom_fname_loaded)-1);
-	rom_fname_loaded[sizeof(rom_fname_loaded)-1] = 0;
+	rom_fname_loaded[sizeof(rom_fname_loaded) - 1] = 0;
+
 	return 1;
 }
 
@@ -606,7 +607,6 @@ void emu_set_defconfig(void)
 	PsndRate = currentConfig.s_PsndRate;
 	PicoRegionOverride = currentConfig.s_PicoRegion;
 	PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;
-	PicoCDBuffers = currentConfig.s_PicoCDBuffers;
 }
 
 int emu_read_config(const char *rom_fname, int no_defaults)
@@ -1073,9 +1073,9 @@ static void run_events_ui(unsigned int which)
 			char tmp[64];
 			int keys, len;
 
-			strcpy(tmp, (which & PEV_STATE_LOAD) ? "LOAD STATE?" : "OVERWRITE SAVE?");
+			strcpy(tmp, (which & PEV_STATE_LOAD) ? "LOAD STATE? " : "OVERWRITE SAVE? ");
 			len = strlen(tmp);
-			nm = in_get_key_name(-1, -PBTN_MA3);
+			nm = in_get_key_name(-1, -PBTN_MOK);
 			snprintf(tmp + len, sizeof(tmp) - len, "(%s=yes, ", nm);
 			len = strlen(tmp);
 			nm = in_get_key_name(-1, -PBTN_MBACK);
@@ -1084,13 +1084,13 @@ static void run_events_ui(unsigned int which)
 			plat_status_msg_busy_first(tmp);
 
 			in_set_config_int(0, IN_CFG_BLOCKING, 1);
-			while (in_menu_wait_any(NULL, 50) & (PBTN_MA3|PBTN_MBACK))
+			while (in_menu_wait_any(NULL, 50) & (PBTN_MOK | PBTN_MBACK))
 				;
-			while ( !((keys = in_menu_wait_any(NULL, 50)) & (PBTN_MA3|PBTN_MBACK)) )
+			while ( !((keys = in_menu_wait_any(NULL, 50)) & (PBTN_MOK | PBTN_MBACK)))
 				;
 			if (keys & PBTN_MBACK)
 				do_it = 0;
-			while (in_menu_wait_any(NULL, 50) & (PBTN_MA3|PBTN_MBACK))
+			while (in_menu_wait_any(NULL, 50) & (PBTN_MOK | PBTN_MBACK))
 				;
 			in_set_config_int(0, IN_CFG_BLOCKING, 0);
 		}
@@ -1336,10 +1336,6 @@ void emu_loop(void)
 
 	PicoLoopPrepare();
 
-	// prepare CD buffer
-	if (PicoAHW & PAHW_MCD)
-		PicoCDBufferInit();
-
 	plat_video_loop_prepare();
 	emu_loop_prep();
 	pemu_sound_start();
@@ -1383,6 +1379,8 @@ void emu_loop(void)
 			{
 				notice_msg_time = 0;
 				plat_status_msg_clear();
+				plat_video_flip();
+				plat_status_msg_clear(); /* Do it again in case of double buffering */
 				notice_msg = NULL;
 			}
 			else {
@@ -1501,10 +1499,4 @@ 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
-	if (PicoAHW & PAHW_MCD)
-		PicoCDBufferFree();
 }
-