6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-15 14:27:29 +00:00
Code Issues Projects Releases Wiki Activity

Upped MFM clock cycles, switched back to using the typer for the ADFS and adjusted ADFS ROM slots.

Browse Source
This commit is contained in:
Thomas Harte
2016-09-28 21:28:34 -04:00
parent 91235c7fd7
commit 79412dc84d
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Components/1770/1770.cpp
View File

@@ -12,7 +12,7 @@
using namespace WD; using namespace WD;
WD1770::WD1770() : WD1770::WD1770() :
Storage::Disk::Controller(8000000, 1, 300), Storage::Disk::Controller(8000000, 16, 300),
status_(0), status_(0),
interesting_event_mask_(Event::Command), interesting_event_mask_(Event::Command),
resume_point_(0), resume_point_(0),

4
Machines/Electron/Electron.cpp
View File

@@ -503,8 +503,8 @@ void Machine::configure_as_target(const StaticAnalyser::Target &target)
} }
if(target.acorn.has_adfs) if(target.acorn.has_adfs)
{ {
set_rom(ROMSlot1, _adfs, true); set_rom(ROMSlot4, _adfs, true);
set_rom(ROMSlot2, std::vector<uint8_t>(_adfs.begin() + 16384, _adfs.end()), true); set_rom(ROMSlot5, std::vector<uint8_t>(_adfs.begin() + 16384, _adfs.end()), true);
} }
_plus3->set_disk(target.disks.front(), 0); _plus3->set_disk(target.disks.front(), 0);

15
StaticAnalyser/Acorn/StaticAnalyser.cpp
View File

@@ -126,11 +126,20 @@ void StaticAnalyser::Acorn::AddTargets(
target.acorn.has_dfs = !!dfs_catalogue; target.acorn.has_dfs = !!dfs_catalogue;
target.acorn.has_adfs = !!adfs_catalogue; target.acorn.has_adfs = !!adfs_catalogue;
switch((dfs_catalogue ?: adfs_catalogue)->bootOption) std::string adfs_command;
Catalogue::BootOption bootOption = (dfs_catalogue ?: adfs_catalogue)->bootOption;
switch(bootOption)
{ {
case Catalogue::BootOption::None: target.loadingCommand = "*CAT\n"; break; case Catalogue::BootOption::None: adfs_command = "*CAT\n"; break;
default: target.acorn.should_hold_shift = true; break; case Catalogue::BootOption::LoadBOOT: adfs_command = "*MOUNT\n*LOAD !BOOT\n"; break;
case Catalogue::BootOption::RunBOOT: adfs_command = "*MOUNT\n*RUN !BOOT\n"; break;
case Catalogue::BootOption::ExecBOOT: adfs_command = "*MOUNT\n*EXEC !BOOT\n"; break;
} }
if(target.acorn.has_dfs && bootOption != Catalogue::BootOption::None)
target.acorn.should_hold_shift = true;
else
target.loadingCommand = adfs_command;
} }
} }