1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-21 21:33:54 +00:00

Also seek the extension ROM for the MSX 2.

This commit is contained in:
Thomas Harte 2023-01-11 12:56:09 -05:00
parent 483ee8a74f
commit 76ad465030
3 changed files with 6 additions and 0 deletions

View File

@ -170,7 +170,11 @@ class ConcreteMachine:
// Install the proper TV standard and select an ideal BIOS name.
const std::string machine_name = "MSX";
constexpr ROM::Name bios_name = model == Target::Model::MSX1 ? ROM::Name::MSXGenericBIOS : ROM::Name::MSX2GenericBIOS;
ROM::Request bios_request = ROM::Request(bios_name);
if constexpr (model == Target::Model::MSX2) {
bios_request = bios_request || ROM::Request(ROM::Name::MSX2Extension);
}
bool is_ntsc = true;
uint8_t character_generator = 1; /* 0 = Japan, 1 = USA, etc, 2 = USSR */

View File

@ -573,6 +573,7 @@ Description::Description(Name name) {
case Name::MSXDOS: *this = Description(name, "MSX", "the MSX-DOS ROM", "disk.rom", 16*1024, 0x721f61dfu); break;
case Name::MSX2GenericBIOS: *this = Description(name, "MSX", "a generic MSX2 BIOS", "msx2.rom", 32*1024, 0x6cdaf3a5u); break;
case Name::MSX2Extension: x*this = Description(name, "MSX", "the MSX2 extension ROM", "msx2ext.rom", 16*1024, 0x66237ecfu); break;
case Name::SinclairQLJS:
*this = Description(name, "SinclairQL", "the Sinclair QL 'JS' ROM", "js.rom", 48*1024, 0x0f95aab5u);

View File

@ -118,6 +118,7 @@ enum Name {
MSXDOS,
MSX2GenericBIOS,
MSX2Extension,
// Oric.
OricColourROM,