6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-09-29 16:55:59 +00:00
Code Issues Projects Releases Wiki Activity

Adds sometime real-time clocking for DMA.

Browse Source
This commit is contained in:
Thomas Harte 2019-10-30 22:59:32 -04:00
parent 635e18a50d
commit 731dc350b4
5 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Components/1770/1770.cpp
View File

@ -769,16 +769,18 @@ void WD1770::posit_event(int new_event_type) {
}
void WD1770::update_status(std::function<void(Status &)> updater) {
const Status old_status = status_;
if(delegate_) {
Status old_status = status_;
updater(status_);
const bool did_change =
(status_.busy != old_status.busy) ||
(status_.data_request != old_status.data_request) ||
(status_.interrupt_request != old_status.interrupt_request);
if(did_change) delegate_->wd1770_did_change_output(this);
}
else updater(status_);
} else updater(status_);
if(status_.busy != old_status.busy) update_clocking_observer();
}
void WD1770::set_head_load_request(bool head_load) {}
@ -788,3 +790,8 @@ void WD1770::set_head_loaded(bool head_loaded) {
head_is_loaded_ = head_loaded;
if(head_loaded) posit_event(static_cast<int>(Event1770::HeadLoad));
}
ClockingHint::Preference WD1770::preferred_clocking() {
if(status_.busy) return ClockingHint::Preference::RealTime;
return Storage::Disk::MFMController::preferred_clocking();
}

2
Components/1770/1770.hpp
View File

@ -73,6 +73,8 @@ class WD1770: public Storage::Disk::MFMController {
};
inline void set_delegate(Delegate *delegate) { delegate_ = delegate; }
ClockingHint::Preference preferred_clocking() final;
protected:
virtual void set_head_load_request(bool head_load);
virtual void set_motor_on(bool motor_on);

2
Machines/AtariST/AtariST.cpp
View File

@ -279,6 +279,7 @@ class ConcreteMachine:
keyboard_acia_->set_clocking_hint_observer(this);
ikbd_.set_clocking_hint_observer(this);
mfp_->set_clocking_hint_observer(this);
dma_->set_clocking_hint_observer(this);
mfp_->set_interrupt_delegate(this);
dma_->set_interrupt_delegate(this);
@ -658,6 +659,7 @@ class ConcreteMachine:
(midi_acia_.last_valid()->preferred_clocking() != ClockingHint::Preference::RealTime);
keyboard_needs_clock_ = ikbd_.preferred_clocking() != ClockingHint::Preference::None;
mfp_is_realtime_ = mfp_.last_valid()->preferred_clocking() == ClockingHint::Preference::RealTime;
dma_is_realtime_ = dma_.last_valid()->preferred_clocking() == ClockingHint::Preference::RealTime;
}
// MARK: - GPIP input.

9
Machines/AtariST/DMAController.cpp
View File

@ -14,6 +14,7 @@ using namespace Atari::ST;
DMAController::DMAController() {
fdc_.set_delegate(this);
fdc_.set_clocking_hint_observer(this);
}
uint16_t DMAController::read(int address) {
@ -100,3 +101,11 @@ void DMAController::set_interrupt_delegate(InterruptDelegate *delegate) {
bool DMAController::get_interrupt_line() {
return interrupt_line_;
}
void DMAController::set_component_prefers_clocking(ClockingHint::Source *, ClockingHint::Preference) {
update_clocking_observer();
}
ClockingHint::Preference DMAController::preferred_clocking() {
return (fdc_.preferred_clocking() == ClockingHint::Preference::None) ? ClockingHint::Preference::None : ClockingHint::Preference::RealTime;
}

8
Machines/AtariST/DMAController.hpp
View File

@ -13,12 +13,13 @@
#include <vector>
#include "../../ClockReceiver/ClockReceiver.hpp"
#include "../../ClockReceiver/ClockingHintSource.hpp"
#include "../../Components/1770/1770.hpp"
namespace Atari {
namespace ST {
class DMAController: public WD::WD1770::Delegate {
class DMAController: public WD::WD1770::Delegate, public ClockingHint::Source, public ClockingHint::Observer {
public:
DMAController();
@ -33,6 +34,9 @@ class DMAController: public WD::WD1770::Delegate {
};
void set_interrupt_delegate(InterruptDelegate *delegate);
// ClockingHint::Source.
ClockingHint::Preference preferred_clocking() final;
private:
HalfCycles running_time_;
struct WD1772: public WD::WD1770 {
@ -59,6 +63,8 @@ class DMAController: public WD::WD1770::Delegate {
InterruptDelegate *interrupt_delegate_ = nullptr;
bool interrupt_line_ = false;
void set_component_prefers_clocking(ClockingHint::Source *, ClockingHint::Preference) final;
};
}