6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-25 16:31:42 +00:00
Code Issues Projects Releases Wiki Activity

Install MSX-MUSIC ROM.

Browse Source
This commit is contained in:
Thomas Harte 2023-05-12 23:50:43 -04:00
parent fed97b8d26
commit 4989701de9
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Machines/MSX/MSX.cpp
View File

@ -174,7 +174,7 @@ class ConcreteMachine:
tape_player_.set_clocking_hint_observer(this); tape_player_.set_clocking_hint_observer(this);
// Set the AY to 50% of available volume, the toggle to 10% and leave 40% for an SCC. // Set the AY to 50% of available volume, the toggle to 10% and leave 40% for an SCC.
mixer_.set_relative_volumes({0.5f, 0.1f, 0.4f, has_opll ? 0.4f : 0.0f}); mixer_.set_relative_volumes({0.5f, 0.1f, 0.4f, has_opll ? 0.5f : 0.0f});
// Install the proper TV standard and select an ideal BIOS name. // Install the proper TV standard and select an ideal BIOS name.
const std::string machine_name = "MSX"; const std::string machine_name = "MSX";
@ -230,11 +230,12 @@ class ConcreteMachine:
// Fetch the necessary ROMs; try the region-specific ROM first, // Fetch the necessary ROMs; try the region-specific ROM first,
// but failing that fall back on patching the main one. // but failing that fall back on patching the main one.
ROM::Request request; ROM::Request request = bios_request;
if(target.has_disk_drive) { if(target.has_disk_drive) {
request = ROM::Request(ROM::Name::MSXDOS) && bios_request; request = request && ROM::Request(ROM::Name::MSXDOS);
} else { }
request = bios_request; if(target.has_msx_music) {
request = request && ROM::Request(ROM::Name::MSXMusic);
} }
auto roms = rom_fetcher(request); auto roms = rom_fetcher(request);
@ -295,6 +296,14 @@ class ConcreteMachine:
disk_slot().map_handler(0x6000, 0x2000); disk_slot().map_handler(0x6000, 0x2000);
} }
// Grab the MSX-MUSIC ROM if applicable.
if(target.has_msx_music) {
std::vector<uint8_t> &msx_music = roms.find(ROM::Name::MSXMusic)->second;
msx_music.resize(65536);
msx_music_slot().set_source(msx_music);
msx_music_slot().map(0, 0, 0x10000);
}
// Insert the media. // Insert the media.
insert_media(target.media); insert_media(target.media);
@ -950,7 +959,7 @@ class ConcreteMachine:
// //
// Slot 3-1 holds the BIOS extension ROM. // Slot 3-1 holds the BIOS extension ROM.
// //
// [Slot 3-2 will likely hold MSX-MUSIC, but that's TODO] // Slot 3-2 holds the MSX-MUSIC.
// //
MemorySlot &bios_slot() { MemorySlot &bios_slot() {
return memory_slots_[0].subslot(0); return memory_slots_[0].subslot(0);
@ -961,6 +970,9 @@ class ConcreteMachine:
MemorySlot &extension_rom_slot() { MemorySlot &extension_rom_slot() {
return memory_slots_[3].subslot(1); return memory_slots_[3].subslot(1);
} }
MemorySlot &msx_music_slot() {
return memory_slots_[3].subslot(2);
}
MemorySlot &cartridge_slot() { MemorySlot &cartridge_slot() {
return cartridge_primary().subslot(0); return cartridge_primary().subslot(0);
@ -981,7 +993,8 @@ class ConcreteMachine:
} }
DiskROM *disk_handler() { DiskROM *disk_handler() {
return dynamic_cast<DiskROM *>(disk_primary().handler.get()); return dynamic_cast<DiskROM *>(disk_primary().handler.get());
}}; }
};
} }