cd: prefer model2 bios

[picodrive.git] / platform / common / emu.c

diff --git a/platform/common/emu.c b/platform/common/emu.c
index 1024b84..c66c637 100644 (file)
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -151,13 +151,13 @@ void emu_status_msg(const char *format, ...)
 }\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
@@ -322,6 +322,10 @@ static void system_announce(void)
 #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