claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into cdrom_changes

Browse Source
This commit is contained in:
OBattler
2025-02-19 12:56:42 +01:00
parent 8074c2b7b2 c262760155
commit bec3bf6d95
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/machine/m_ps1.c
View File

@@ -320,30 +320,28 @@ ps1_setup(int model)
mem_remap_top(384); mem_remap_top(384);
device_add(&ps_nvr_device);
device_add(&fdc_ps2_device); device_add(&fdc_ps2_device);
if (model == 2011) { if (model == 2011) {
if (!strcmp("english_us", device_get_config_bios("bios_language"))) { const device_t *d = device_context_get_device();
/* US English */ const char * bios = device_get_config_bios("bios_language");
rom_init(&ps->high_rom, const char * first = device_get_bios_file(d, bios, 0);
device_get_bios_file(device_context_get_device(), device_get_config_bios("bios_language"), 0), const char * second = device_get_bios_file(d, bios, 1);
0xfc0000, 0x40000, 0x3ffff, 0, MEM_MAPPING_EXTERNAL);
} else if ((device_get_bios_file(device_context_get_device(), device_get_config_bios("bios_language"), 1)) == NULL) { if (!strcmp(bios, "english_us")) {
/* US English */
rom_init(&ps->high_rom, first,
0xfc0000, 0x40000, 0x3ffff, 0, MEM_MAPPING_EXTERNAL);
} else if (second == NULL) {
/* Combined ROM. */ /* Combined ROM. */
rom_init(&ps->high_rom, rom_init(&ps->high_rom, first,
device_get_bios_file(device_context_get_device(), device_get_config_bios("bios_language"), 0),
0xf80000, 0x80000, 0x7ffff, 0, MEM_MAPPING_EXTERNAL); 0xf80000, 0x80000, 0x7ffff, 0, MEM_MAPPING_EXTERNAL);
} else { } else {
/* Split ROM. */ /* Split ROM. */
rom_init(&ps->mid_rom, rom_init(&ps->mid_rom, first,
device_get_bios_file(device_context_get_device(), device_get_config_bios("bios_language"), 0),
0xf80000, 0x40000, 0x3ffff, 0, MEM_MAPPING_EXTERNAL); 0xf80000, 0x40000, 0x3ffff, 0, MEM_MAPPING_EXTERNAL);
rom_init(&ps->high_rom, rom_init(&ps->high_rom, second,
device_get_bios_file(device_context_get_device(), device_get_config_bios("bios_language"), 1),
0xfc0000, 0x40000, 0x3ffff, 0, MEM_MAPPING_EXTERNAL); 0xfc0000, 0x40000, 0x3ffff, 0, MEM_MAPPING_EXTERNAL);
} }
@@ -381,6 +379,8 @@ ps1_setup(int model)
device_add(&ps1snd_device); device_add(&ps1snd_device);
} }
device_add(&ps_nvr_device);
} }
static void static void