6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-13 00:25:26 +00:00
Code Issues Projects Releases Wiki Activity

Make GlaTICK optional.

Browse Source
This commit is contained in:
Thomas Harte
2023-12-27 10:10:42 -05:00
parent 29ed449373
commit 11c7f2ee6e
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Machines/PCCompatible/PCCompatible.cpp
View File

@@ -900,17 +900,21 @@ class ConcreteMachine:
const auto tick = ROM::Name::PCCompatibleGLaTICK; const auto tick = ROM::Name::PCCompatibleGLaTICK;
const auto font = Video::FontROM; const auto font = Video::FontROM;
ROM::Request request = ROM::Request(bios) && ROM::Request(tick) && ROM::Request(font); ROM::Request request = ROM::Request(bios) && ROM::Request(tick, true) && ROM::Request(font);
auto roms = rom_fetcher(request); auto roms = rom_fetcher(request);
if(!request.validate(roms)) { if(!request.validate(roms)) {
throw ROMMachine::Error::MissingROMs; throw ROMMachine::Error::MissingROMs;
} }
// A BIOS is mandatory.
const auto &bios_contents = roms.find(bios)->second; const auto &bios_contents = roms.find(bios)->second;
context.memory.install(0x10'0000 - bios_contents.size(), bios_contents.data(), bios_contents.size()); context.memory.install(0x10'0000 - bios_contents.size(), bios_contents.data(), bios_contents.size());
const auto &tick_contents = roms.find(tick)->second; // If found, install GlaTICK at 0xd'0000.
context.memory.install(0xd'0000, tick_contents.data(), tick_contents.size()); auto tick_contents = roms.find(tick);
if(tick_contents != roms.end()) {
context.memory.install(0xd'0000, tick_contents->second.data(), tick_contents->second.size());
}
// Give the video card something to read from. // Give the video card something to read from.
const auto &font_contents = roms.find(font)->second; const auto &font_contents = roms.find(font)->second;

2
ROMImages/PCCompatible/readme.txt
View File

@@ -3,7 +3,7 @@ Expected files:
For XT-class emulation: For XT-class emulation:
GLABIOS_0.2.5_8T.ROM — the 8088 GLaBIOS ROM. GLABIOS_0.2.5_8T.ROM — the 8088 GLaBIOS ROM.
GLaTICK_0.8.5_AT.ROM — the GLaBIOS AT RTC option ROM. GLaTICK_0.8.5_AT.ROM (optionally) — the GLaBIOS AT RTC option ROM.
For specific video cards: For specific video cards: