}\r
\r
static const char * const biosfiles_us[] = {\r
- "us_scd1_9210", "us_scd2_9306", "SegaCDBIOS9303", "bios_CD_U"\r
+ "us_scd2_9306", "SegaCDBIOS9303", "us_scd1_9210", "bios_CD_U"\r
};\r
static const char * const biosfiles_eu[] = {\r
- "eu_mcd1_9210", "eu_mcd2_9306", "eu_mcd2_9303", "bios_CD_E"\r
+ "eu_mcd2_9306", "eu_mcd2_9303", "eu_mcd1_9210", "bios_CD_E"\r
};\r
static const char * const biosfiles_jp[] = {\r
- "jp_mcd1_9112", "jp_mcd1_9111", "bios_CD_J"\r
+ "jp_mcd2_921222", "jp_mcd1_9112", "jp_mcd1_9111", "bios_CD_J"\r
};\r
\r
static const char *find_bios(int *region, const char *cd_fname)\r
#endif\r
} else if (PicoAHW & PAHW_PICO) {\r
sys_name = "Pico";\r
+ } else if ((PicoAHW & (PAHW_32X|PAHW_MCD)) == (PAHW_32X|PAHW_MCD)) {\r
+ sys_name = "32X + Mega CD";\r
+ if ((Pico.m.hardware & 0xc0) == 0x80)\r
+ sys_name = "32X + Sega CD";\r
} else if (PicoAHW & PAHW_MCD) {\r
sys_name = "Mega CD";\r
if ((Pico.m.hardware & 0xc0) == 0x80)\r
\r
int emu_swap_cd(const char *fname)\r
{\r
- cd_img_type cd_type;\r
+ enum cd_img_type cd_type;\r
int ret = -1;\r
\r
cd_type = PicoCdCheck(fname, NULL);\r
if (cd_type != CIT_NOT_CD)\r
- ret = Insert_CD(fname, cd_type);\r
+ ret = cdd_load(fname, cd_type);\r
if (ret != 0) {\r
menu_update_msg("Load failed, invalid CD image?");\r
return 0;\r
}\r
\r
strncpy(rom_fname_loaded, fname, sizeof(rom_fname_loaded)-1);\r
- rom_fname_loaded[sizeof(rom_fname_loaded)-1] = 0;\r
+ rom_fname_loaded[sizeof(rom_fname_loaded) - 1] = 0;\r
+\r
return 1;\r
}\r
\r
PsndRate = currentConfig.s_PsndRate;\r
PicoRegionOverride = currentConfig.s_PicoRegion;\r
PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;\r
- PicoCDBuffers = currentConfig.s_PicoCDBuffers;\r
}\r
\r
int emu_read_config(const char *rom_fname, int no_defaults)\r
\r
PicoLoopPrepare();\r
\r
- // prepare CD buffer\r
- if (PicoAHW & PAHW_MCD)\r
- PicoCDBufferInit();\r
-\r
plat_video_loop_prepare();\r
emu_loop_prep();\r
pemu_sound_start();\r
\r
pemu_loop_end();\r
emu_sound_stop();\r
-\r
- // pemu_loop_end() might want to do 1 frame for bg image,\r
- // so free CD buffer here\r
- if (PicoAHW & PAHW_MCD)\r
- PicoCDBufferFree();\r
}\r
-\r