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

Merge pull request #923 from TomHarte/STStartup

Browse Source 
Resolves failure of ST to startup
This commit is contained in:
Thomas Harte 2021-04-20 22:43:55 -04:00 committed by GitHub
commit c481f475e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Components/6850/6850.cpp
View File

@ -129,8 +129,8 @@ ClockingHint::Preference ACIA::preferred_clocking() const {
// because it's unclear when the interrupt might come. // because it's unclear when the interrupt might come.
if(bits_incoming_ && receive_interrupt_enabled_) return ClockingHint::Preference::RealTime; if(bits_incoming_ && receive_interrupt_enabled_) return ClockingHint::Preference::RealTime;
// No clocking required then. // Real-time clocking not required then.
return ClockingHint::Preference::None; return ClockingHint::Preference::JustInTime;
} }
bool ACIA::get_interrupt_line() const { bool ACIA::get_interrupt_line() const {

2
Components/68901/MFP68901.cpp
View File

@ -208,7 +208,7 @@ void MFP68901::run_for(HalfCycles time) {
} }
HalfCycles MFP68901::get_next_sequence_point() { HalfCycles MFP68901::get_next_sequence_point() {
return HalfCycles(-1); return HalfCycles::max();
} }
// MARK: - Timers // MARK: - Timers

2
Machines/Atari/ST/DMAController.cpp
View File

@ -252,7 +252,7 @@ void DMAController::set_component_prefers_clocking(ClockingHint::Source *, Clock
} }
ClockingHint::Preference DMAController::preferred_clocking() const { ClockingHint::Preference DMAController::preferred_clocking() const {
return (fdc_.preferred_clocking() == ClockingHint::Preference::None) ? ClockingHint::Preference::None : ClockingHint::Preference::RealTime; return (fdc_.preferred_clocking() == ClockingHint::Preference::None) ? ClockingHint::Preference::JustInTime : ClockingHint::Preference::RealTime;
} }
void DMAController::set_activity_observer(Activity::Observer *observer) { void DMAController::set_activity_observer(Activity::Observer *observer) {