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

Attempts to rely on JustInTimeActor's built-in ClockingHint::Observer.

Browse Source
This commit is contained in:
Thomas Harte 2021-03-26 23:54:08 -04:00
parent 7937cc2d0f
commit faaa4961ed
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp
View File

@ -85,7 +85,6 @@ template<Model model> class ConcreteMachine:
memcpy(rom_.data(), roms[0]->data(), std::min(rom_.size(), roms[0]->size())); memcpy(rom_.data(), roms[0]->data(), std::min(rom_.size(), roms[0]->size()));
// Register for sleeping notifications. // Register for sleeping notifications.
fdc_->set_clocking_hint_observer(this);
tape_player_.set_clocking_hint_observer(this); tape_player_.set_clocking_hint_observer(this);
// Set up initial memory map. // Set up initial memory map.
@ -384,7 +383,7 @@ template<Model model> class ConcreteMachine:
} }
if constexpr (model == Model::Plus3) { if constexpr (model == Model::Plus3) {
if(!fdc_is_sleeping_) fdc_ += Cycles(duration.as_integral()); fdc_ += Cycles(duration.as_integral());
} }
if(typer_) typer_->run_for(duration); if(typer_) typer_->run_for(duration);
@ -448,7 +447,6 @@ template<Model model> class ConcreteMachine:
// MARK: - ClockingHint::Observer. // MARK: - ClockingHint::Observer.
void set_component_prefers_clocking(ClockingHint::Source *, ClockingHint::Preference) override { void set_component_prefers_clocking(ClockingHint::Source *, ClockingHint::Preference) override {
fdc_is_sleeping_ = fdc_.last_valid()->preferred_clocking() == ClockingHint::Preference::None;
tape_player_is_sleeping_ = tape_player_.preferred_clocking() == ClockingHint::Preference::None; tape_player_is_sleeping_ = tape_player_.preferred_clocking() == ClockingHint::Preference::None;
} }
@ -666,7 +664,6 @@ template<Model model> class ConcreteMachine:
// MARK: - Disc. // MARK: - Disc.
JustInTimeActor<Amstrad::FDC, 1, 1, Cycles> fdc_; JustInTimeActor<Amstrad::FDC, 1, 1, Cycles> fdc_;
bool fdc_is_sleeping_ = false;
// MARK: - Automatic startup. // MARK: - Automatic startup.
Cycles duration_to_press_enter_; Cycles duration_to_press_enter_;