6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-26 15:32:04 +00:00
Code Issues Projects Releases Wiki Activity

Fire sync-match interrupt upon any match.

Browse Source
This commit is contained in:
Thomas Harte 2021-10-14 16:36:17 -07:00
parent 61e5702520
commit 253a199f27
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Machines/Amiga/Chipset.cpp
View File

@ -43,7 +43,7 @@ Chipset::Chipset(MemoryMap &map, int input_clock_rate) :
cia_a(cia_a_handler_),
cia_b(cia_b_handler_),
disk_(*this, reinterpret_cast<uint16_t *>(map.chip_ram.data()), map.chip_ram.size() >> 1),
disk_controller_(Cycles(input_clock_rate), disk_, cia_b) {
disk_controller_(Cycles(input_clock_rate), *this, disk_, cia_b) {
disk_controller_.set_clocking_hint_observer(this);
}
@ -912,8 +912,6 @@ void Chipset::Sprite::set_image_data(int slot, uint16_t value) {
void Chipset::DiskDMA::enqueue(uint16_t value, bool matches_sync) {
if(matches_sync) {
chipset_.posit_interrupt(InterruptFlag::DiskSyncMatch);
// TODO: start buffering from the next word onwards if
// syncing is enabled.
}
@ -1068,8 +1066,9 @@ void Chipset::set_component_prefers_clocking(ClockingHint::Source *, ClockingHin
// MARK: - Disk Controller.
Chipset::DiskController::DiskController(Cycles clock_rate, DiskDMA &disk_dma, CIAB &cia) :
Chipset::DiskController::DiskController(Cycles clock_rate, Chipset &chipset, DiskDMA &disk_dma, CIAB &cia) :
Storage::Disk::Controller(clock_rate),
chipset_(chipset),
disk_dma_(disk_dma),
cia_(cia) {
@ -1083,6 +1082,10 @@ void Chipset::DiskController::process_input_bit(int value) {
data_ = uint16_t((data_ << 1) | value);
++bit_count_;
if(data_ == sync_word_) {
chipset_.posit_interrupt(InterruptFlag::DiskSyncMatch);
}
if(sync_with_word_ && data_ == sync_word_) {
disk_dma_.enqueue(data_, true);
bit_count_ = 0;

6
Machines/Amiga/Chipset.hpp
View File

@ -274,7 +274,7 @@ class Chipset: private ClockingHint::Observer {
class DiskController: public Storage::Disk::Controller {
public:
DiskController(Cycles clock_rate, DiskDMA &disk_dma, CIAB &cia);
DiskController(Cycles clock_rate, Chipset &chipset, DiskDMA &disk_dma, CIAB &cia);
void set_mtr_sel_side_dir_step(uint8_t);
uint8_t get_rdy_trk0_wpro_chng();
@ -300,13 +300,15 @@ class Chipset: private ClockingHint::Observer {
uint16_t data_ = 0;
int bit_count_ = 0;
uint16_t sync_word_ = 0;
uint16_t sync_word_ = 0x4489; // TODO: confirm or deny guess.
bool sync_with_word_ = false;
Chipset &chipset_;
DiskDMA &disk_dma_;
CIAB &cia_;
} disk_controller_;
friend DiskController;
void set_component_prefers_clocking(ClockingHint::Source *, ClockingHint::Preference) final;
bool disk_controller_is_sleeping_ = false;