6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-06 01:28:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #617 from TomHarte/MSXDisk

Browse Source 
Removes hard-coded assumption about disk ROM list placement.
This commit is contained in:
Thomas Harte 2019-04-16 11:22:52 -04:00 committed by GitHub
commit 5e65ee79b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Machines/MSX/MSX.cpp
View File

@ -209,7 +209,9 @@ class ConcreteMachine:
// Fetch the necessary ROMs; try the region-specific ROM first,
// but failing that fall back on patching the main one.
size_t disk_index = 0;
if(target.has_disk_drive) {
disk_index = rom_names.size();
rom_names.push_back("disk.rom");
}
const auto roms = rom_fetcher("MSX", rom_names);
@ -227,7 +229,6 @@ class ConcreteMachine:
memory_slots_[0].source = std::move(*roms[0]);
memory_slots_[0].source.resize(32768);
memory_slots_[0].source[0x2b] = uint8_t(
(is_ntsc ? 0x00 : 0x80) |
(date_format << 4) |
@ -252,7 +253,7 @@ class ConcreteMachine:
// Add a disk cartridge if any disks were supplied.
if(target.has_disk_drive) {
memory_slots_[2].set_handler(new DiskROM(memory_slots_[2].source));
memory_slots_[2].source = std::move(*roms[1]);
memory_slots_[2].source = std::move(*roms[disk_index]);
memory_slots_[2].source.resize(16384);
map(2, 0, 0x4000, 0x2000);