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

Push disk data onwards.

Browse Source
This commit is contained in:
Thomas Harte 2021-10-08 17:18:11 -07:00
parent 67546c4d6e
commit b47ca13ed3
2 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Machines/Amiga/Chipset.cpp
View File

@ -37,8 +37,8 @@ Chipset::Chipset(MemoryMap &map, int input_clock_rate) :
blitter_(*this, reinterpret_cast<uint16_t *>(map.chip_ram.data()), map.chip_ram.size() >> 1),
bitplanes_(*this, reinterpret_cast<uint16_t *>(map.chip_ram.data()), map.chip_ram.size() >> 1),
copper_(*this, reinterpret_cast<uint16_t *>(map.chip_ram.data()), map.chip_ram.size() >> 1),
disk_controller_(Cycles(input_clock_rate)),
disk_(*this, reinterpret_cast<uint16_t *>(map.chip_ram.data()), map.chip_ram.size() >> 1),
disk_controller_(Cycles(input_clock_rate), disk_),
crt_(908, 4, Outputs::Display::Type::PAL50, Outputs::Display::InputDataType::Red4Green4Blue4),
cia_a_handler_(map, disk_controller_),
cia_b_handler_(disk_controller_),
@ -904,6 +904,11 @@ void Chipset::Sprite::set_image_data(int slot, uint16_t value) {
// MARK: - Disk.
void Chipset::DiskDMA::enqueue(uint16_t value, bool matches_sync) {
(void)value;
(void)matches_sync;
}
bool Chipset::DiskDMA::advance() {
if(!dma_enable_) return false;
@ -1031,8 +1036,9 @@ void Chipset::set_component_prefers_clocking(ClockingHint::Source *, ClockingHin
// MARK: - Disk Controller.
Chipset::DiskController::DiskController(Cycles clock_rate) :
Storage::Disk::Controller(clock_rate) {
Chipset::DiskController::DiskController(Cycles clock_rate, DiskDMA &disk_dma) :
Storage::Disk::Controller(clock_rate),
disk_dma_(disk_dma) {
// Add four drives.
for(int c = 0; c < 4; c++) {
@ -1044,9 +1050,12 @@ void Chipset::DiskController::process_input_bit(int value) {
data_ = uint16_t((data_ << 1) | value);
++bit_count_;
// if(!(bit_count_&15)) {
// LOG("Word: " << PADHEX(4) << data_);
// }
if(sync_with_word_ && data_ == sync_word_) {
disk_dma_.enqueue(data_, true);
bit_count_ = 0;
} else if(!(bit_count_&15)) {
disk_dma_.enqueue(data_, false);
}
}
void Chipset::DiskController::set_sync_word(uint16_t value) {

50
Machines/Amiga/Chipset.hpp
View File

@ -224,9 +224,33 @@ class Chipset: private ClockingHint::Observer {
// MARK: - Disk drives.
class DiskDMA: public DMADevice<1> {
public:
using DMADevice::DMADevice;
void set_length(uint16_t value) {
dma_enable_ = value & 0x8000;
write_ = value & 0x4000;
length_ = value & 0x3fff;
if(dma_enable_) {
printf("Not yet implemented: disk DMA [%s of %d to %06x]\n", write_ ? "write" : "read", length_, pointer_[0]);
}
}
bool advance();
void enqueue(uint16_t value, bool matches_sync);
private:
uint16_t length_;
bool dma_enable_ = false;
bool write_ = false;
} disk_;
class DiskController: public Storage::Disk::Controller {
public:
DiskController(Cycles clock_rate);
DiskController(Cycles clock_rate, DiskDMA &disk_dma);
void set_mtr_sel_side_dir_step(uint8_t);
uint8_t get_rdy_trk0_wpro_chng();
@ -255,34 +279,14 @@ class Chipset: private ClockingHint::Observer {
uint16_t sync_word_ = 0;
bool sync_with_word_ = false;
DiskDMA &disk_dma_;
} disk_controller_;
void set_component_prefers_clocking(ClockingHint::Source *, ClockingHint::Preference) final;
bool disk_controller_is_sleeping_ = false;
uint16_t paula_disk_control_ = 0;
class DiskDMA: public DMADevice<1> {
public:
using DMADevice::DMADevice;
void set_length(uint16_t value) {
dma_enable_ = value & 0x8000;
write_ = value & 0x4000;
length_ = value & 0x3fff;
if(dma_enable_) {
printf("Not yet implemented: disk DMA [%s of %d to %06x]\n", write_ ? "write" : "read", length_, pointer_[0]);
}
}
bool advance();
private:
uint16_t length_;
bool dma_enable_ = false;
bool write_ = false;
} disk_;
// MARK: - Pixel output.
Outputs::CRT::CRT crt_;