6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 08:49:37 +00:00
Code Issues Projects Releases Wiki Activity

Much logging later, corrects 7Mhz IWM windows.

Browse Source 
Confirmed by mathematics — the new ones are seven-eighths the length of the established 8Mhz windows — and with reference to suitable Apple documentation.
This commit is contained in:
Thomas Harte 2020-11-13 22:05:45 -05:00
parent bd8af25294
commit 37815a982a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Components/DiskII/IWM.cpp
View File

@ -64,7 +64,7 @@ uint8_t IWM::read(int address) {
if(data_register_ & 0x80) { if(data_register_ & 0x80) {
data_register_ = 0; data_register_ = 0;
LOG("Reading data: " << PADHEX(2) << int(result)); // LOG("Reading data: " << PADHEX(2) << int(result));
} }
// LOG("Reading data register: " << PADHEX(2) << int(result)); // LOG("Reading data register: " << PADHEX(2) << int(result));
@ -136,8 +136,8 @@ void IWM::write(int address, uint8_t input) {
} }
switch(mode_ & 0x18) { switch(mode_ & 0x18) {
case 0x00: bit_length_ = Cycles(24); break; // slow mode, 7Mhz case 0x00: bit_length_ = Cycles(28); break; // slow mode, 7Mhz
case 0x08: bit_length_ = Cycles(12); break; // fast mode, 7Mhz case 0x08: bit_length_ = Cycles(14); break; // fast mode, 7Mhz
case 0x10: bit_length_ = Cycles(32); break; // slow mode, 8Mhz case 0x10: bit_length_ = Cycles(32); break; // slow mode, 8Mhz
case 0x18: bit_length_ = Cycles(16); break; // fast mode, 8Mhz case 0x18: bit_length_ = Cycles(16); break; // fast mode, 8Mhz
} }
@ -256,6 +256,7 @@ void IWM::run_for(const Cycles cycles) {
drives_[active_drive_]->run_for(Cycles(1)); drives_[active_drive_]->run_for(Cycles(1));
++cycles_since_shift_; ++cycles_since_shift_;
if(cycles_since_shift_ == bit_length_ + error_margin) { if(cycles_since_shift_ == bit_length_ + error_margin) {
// LOG("Shifting 0 at " << std::dec << cycles_since_shift_.as_integral());
propose_shift(0); propose_shift(0);
} }
} }
@ -363,7 +364,7 @@ void IWM::process_event(const Storage::Disk::Drive::Event &event) {
switch(event.type) { switch(event.type) {
case Storage::Disk::Track::Event::IndexHole: return; case Storage::Disk::Track::Event::IndexHole: return;
case Storage::Disk::Track::Event::FluxTransition: case Storage::Disk::Track::Event::FluxTransition:
LOG("Shifting 1 at " << std::dec << cycles_since_shift_.as_integral()); // LOG("Shifting 1 at " << std::dec << cycles_since_shift_.as_integral());
propose_shift(1); propose_shift(1);
break; break;
} }