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

Devolves drive responsibility.

Browse Source
This commit is contained in:
Thomas Harte 2019-07-10 22:39:56 -04:00
parent 2ccb564a7b
commit cac97a9663
5 changed files with 48 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

187
Components/DiskII/IWM.cpp
View File

@ -8,7 +8,6 @@
#include "IWM.hpp" #include "IWM.hpp"
#define NDEBUG
#include "../../Outputs/Log.hpp" #include "../../Outputs/Log.hpp"
using namespace Apple; using namespace Apple;
@ -83,101 +82,16 @@ uint8_t IWM::read(int address) {
(/ENBL1 is low when the first drive's motor is on; /ENBL2 is low when the second drive's motor is on. (/ENBL1 is low when the first drive's motor is on; /ENBL2 is low when the second drive's motor is on.
If the 1-second timer is enabled, motors remain on for one second after being programmatically disabled.) If the 1-second timer is enabled, motors remain on for one second after being programmatically disabled.)
*/ */
LOGNBR("Reading status (including [" << active_drive_ << "][" << ((state_ & CA2) ? '2' : '-') << ((state_ & CA1) ? '1' : '-') << ((state_ & CA0) ? '0' : '-') << ((state_ & SEL) ? 'S' : '-') << "] "); // LOGNBR("Reading status (including [" << active_drive_ << "][" << ((state_ & CA2) ? '2' : '-') << ((state_ & CA1) ? '1' : '-') << ((state_ & CA0) ? '0' : '-') << ((state_ & SEL) ? 'S' : '-') << "] ");
// Determine the SENSE input. // Determine the SENSE input.
uint8_t sense = 0; uint8_t sense = 1;
switch(state_ & (CA2 | CA1 | CA0 | SEL)) { if(drives_[active_drive_])
default: sense = drives_[active_drive_]->read() ? 1 : 0;
LOG("unknown)");
break;
// Possible other meanings:
// B = ready (0 = ready)
//
// {CA1,CA0,SEL,CA2}
case 0: // Head step direction.
// (0 = inward)
LOG("head step direction)");
sense = (step_direction_ > 0) ? 0 : 1;
break;
case SEL: // Disk in place.
// (0 = disk present)
LOG("disk in place)");
sense = drives_[active_drive_] && drives_[active_drive_]->has_disk() ? 0 : 1;
break;
case CA0: // Disk head step completed.
// (0 = still stepping)
LOG("head stepping)");
sense = 1;
break;
case CA0|SEL: // Disk locked.
// (0 = write protected)
LOG("disk locked)");
sense = drives_[active_drive_] && drives_[active_drive_]->get_is_read_only() ? 0 : 1;
break;
case CA1: // Disk motor running.
// (0 = motor on)
LOG("disk motor running)");
sense = drives_[active_drive_] && drives_[active_drive_]->get_motor_on() ? 0 : 1;
break;
case CA1|SEL: // Head at track 0.
// (0 = at track 0)
LOG("head at track 0)");
sense = drives_[active_drive_] && drives_[active_drive_]->get_is_track_zero() ? 0 : 1;
break;
case CA1|CA0|SEL: // Tachometer.
// (arbitrary)
sense = drives_[active_drive_] && drives_[active_drive_]->get_tachometer() ? 0 : 1;
LOG("tachometer " << PADHEX(2) << int(sense) << ")");
break;
case CA2: // Read data, lower head.
LOG("data, lower head)\n");
if(drives_[0]) drives_[0]->set_head(0);
if(drives_[1]) drives_[1]->set_head(0);
break;
case CA2|SEL: // Read data, upper head.
LOG("data, upper head)\n");
if(drives_[0]) drives_[0]->set_head(1);
if(drives_[1]) drives_[1]->set_head(1);
break;
case CA2|CA1: // Single- or double-sided drive.
// (0 = single sided)
LOG("single- or double-sided drive)");
sense = drives_[active_drive_] && (drives_[active_drive_]->get_head_count() == 1) ? 0 : 1;
break;
case CA1|CA0:
LOG("1|0 experimental)");
sense = 0;
break;
case CA2|CA1|CA0: // "Present/HD" (per the Mac Plus ROM)
// (0 = ??HD??)
LOG("present/HD)");
sense = drives_[active_drive_] ? 0 : 1;
break;
case CA2|CA1|CA0|SEL: // Drive installed.
// (0 = present, 1 = missing)
LOG("drive installed)");
sense = drives_[active_drive_] ? 1 : 0;
break;
}
return uint8_t( return uint8_t(
(mode_&0x1f) | (mode_&0x1f) |
(drive_motor_on_ ? 0x20 : 0x00) | ((state_ & ENABLE) ? 0x20 : 0x00) |
(sense << 7) (sense << 7)
); );
} break; } break;
@ -244,70 +158,42 @@ void IWM::access(int address) {
const auto mask = 1 << (address >> 1); const auto mask = 1 << (address >> 1);
const auto old_state = state_; const auto old_state = state_;
// printf("[(%02x) %c%c%c%c ", mask, (state_ & CA2) ? '2' : '-', (state_ & CA1) ? '1' : '-', (state_ & CA0) ? '0' : '-', (state_ & SEL) ? 'S' : '-');
if(address & 1) { if(address & 1) {
state_ |= mask; state_ |= mask;
} else { } else {
state_ &= ~mask; state_ &= ~mask;
} }
// printf("-> %c%c%c%c] ", (state_ & CA2) ? '2' : '-', (state_ & CA1) ? '1' : '-', (state_ & CA0) ? '0' : '-', (state_ & SEL) ? 'S' : '-');
// React appropriately to motor requests and to LSTRB register writes. // React appropriately to motor requests and to LSTRB register writes.
if(old_state != state_) { if(old_state != state_) {
push_drive_state();
switch(mask) { switch(mask) {
default: break; default: break;
case LSTRB:
// Catch low-to-high LSTRB transitions.
if(address & 1) {
switch(state_ & (CA1 | CA0 | SEL)) {
default:
LOG("Unhandled LSTRB");
break;
case 0:
LOG("LSTRB Set stepping direction: " << int(state_ & CA2));
step_direction_ = (state_ & CA2) ? -1 : 1;
break;
case CA0:
LOG("LSTRB Step");
if(drives_[0]) drives_[0]->step(Storage::Disk::HeadPosition(step_direction_));
if(drives_[1]) drives_[1]->step(Storage::Disk::HeadPosition(step_direction_));
break;
case CA1:
LOG("LSTRB Motor on");
break;
case CA1|CA0:
LOG("LSTRB Eject disk");
break;
}
}
break;
case ENABLE: case ENABLE:
if(address & 1) { if(address & 1) {
drive_motor_on_ = true; if(drives_[active_drive_]) drives_[active_drive_]->set_enabled(true);
if(drives_[active_drive_]) drives_[active_drive_]->set_motor_on(true);
} else { } else {
// If the 1-second delay is enabled, set up a timer for that. // If the 1-second delay is enabled, set up a timer for that.
if(!(mode_ & 4)) { // if(!(mode_ & 4)) {
cycles_until_motor_off_ = Cycles(clock_rate_); // cycles_until_motor_off_ = Cycles(clock_rate_);
} else { // } else {
drive_motor_on_ = false; // drive_motor_on_ = false;
if(drives_[active_drive_]) drives_[active_drive_]->set_motor_on(false); if(drives_[active_drive_]) drives_[active_drive_]->set_enabled(false);
} // }
} }
break; break;
case DRIVESEL: { case DRIVESEL: {
const int new_drive = address & 1; const int new_drive = address & 1;
if(new_drive != active_drive_) { if(new_drive != active_drive_) {
if(drives_[active_drive_]) drives_[active_drive_]->set_motor_on(false); if(drives_[active_drive_]) drives_[active_drive_]->set_enabled(false);
active_drive_ = new_drive; active_drive_ = new_drive;
if(drives_[active_drive_]) drives_[active_drive_]->set_motor_on(drive_motor_on_); if(drives_[active_drive_]) {
drives_[active_drive_]->set_enabled(state_ & ENABLE);
push_drive_state();
}
} }
} break; } break;
} }
@ -316,27 +202,38 @@ void IWM::access(int address) {
void IWM::set_select(bool enabled) { void IWM::set_select(bool enabled) {
// Store SEL as an extra state bit. // Store SEL as an extra state bit.
// printf("[%c%c%c%c ", (state_ & CA2) ? '2' : '-', (state_ & CA1) ? '1' : '-', (state_ & CA0) ? '0' : '-', (state_ & SEL) ? 'S' : '-');
if(enabled) state_ |= SEL; if(enabled) state_ |= SEL;
else state_ &= ~SEL; else state_ &= ~SEL;
// printf("-> %c%c%c%c] ", (state_ & CA2) ? '2' : '-', (state_ & CA1) ? '1' : '-', (state_ & CA0) ? '0' : '-', (state_ & SEL) ? 'S' : '-'); push_drive_state();
}
void IWM::push_drive_state() {
if(drives_[active_drive_]) {
const uint8_t drive_control_lines =
((state_ & CA0) ? IWMDrive::CA0 : 0) |
((state_ & CA1) ? IWMDrive::CA1 : 0) |
((state_ & CA2) ? IWMDrive::CA2 : 0) |
((state_ & SEL) ? IWMDrive::SEL : 0) |
((state_ & LSTRB) ? IWMDrive::LSTRB : 0);
drives_[active_drive_]->set_control_lines(drive_control_lines);
}
} }
// MARK: - Active logic // MARK: - Active logic
void IWM::run_for(const Cycles cycles) { void IWM::run_for(const Cycles cycles) {
// Check for a timeout of the motor-off timer. // Check for a timeout of the motor-off timer.
if(cycles_until_motor_off_ > Cycles(0)) { // if(cycles_until_motor_off_ > Cycles(0)) {
cycles_until_motor_off_ -= cycles; // cycles_until_motor_off_ -= cycles;
if(cycles_until_motor_off_ <= Cycles(0)) { // if(cycles_until_motor_off_ <= Cycles(0)) {
drive_motor_on_ = false; // drive_motor_on_ = false;
if(drives_[active_drive_]) // if(drives_[active_drive_])
drives_[active_drive_]->set_motor_on(false); // drives_[active_drive_]->set_motor_on(false);
} // }
} // }
// Activity otherwise depends on mode and motor state. // Activity otherwise depends on mode and motor state.
const bool run_disk = drive_motor_on_ && drives_[active_drive_]; const bool run_disk = drives_[active_drive_]; // drive_motor_on_ &&
int integer_cycles = cycles.as_int(); int integer_cycles = cycles.as_int();
switch(state_ & (Q6 | Q7 | ENABLE)) { switch(state_ & (Q6 | Q7 | ENABLE)) {
case 0: case 0:
@ -369,9 +266,9 @@ void IWM::process_event(const Storage::Disk::Drive::Event &event) {
void IWM::propose_shift(uint8_t bit) { void IWM::propose_shift(uint8_t bit) {
// TODO: synchronous mode. // TODO: synchronous mode.
shift_register_ = uint8_t((shift_register_ << 1) | bit); shift_register_ = uint8_t((shift_register_ << 1) | bit);
if(shift_register_ & 0x80) { if(shift_register_ & 0x80) {
// printf("%02x -> data\n", shift_register_);
data_register_ = shift_register_; data_register_ = shift_register_;
shift_register_ = 0; shift_register_ = 0;
} }

3
Components/DiskII/IWM.hpp
View File

@ -81,7 +81,6 @@ class IWM:
int active_drive_ = 0; int active_drive_ = 0;
IWMDrive *drives_[2] = {nullptr, nullptr}; IWMDrive *drives_[2] = {nullptr, nullptr};
bool drive_motor_on_ = false;
Cycles cycles_until_motor_off_; Cycles cycles_until_motor_off_;
@ -92,7 +91,7 @@ class IWM:
Cycles cycles_since_shift_; Cycles cycles_since_shift_;
Cycles bit_length_; Cycles bit_length_;
int step_direction_ = 0; // TODO: this should live on the drive. void push_drive_state();
}; };

5
Components/DiskII/MacintoshDoubleDensityDrive.cpp
View File

@ -99,6 +99,7 @@ bool DoubleDensityDrive::read() {
// Possible other meanings: // Possible other meanings:
// B = ready (0 = ready) // B = ready (0 = ready)
// C = disk switched?
// //
// {CA1,CA0,SEL,CA2} // {CA1,CA0,SEL,CA2}
@ -115,7 +116,7 @@ bool DoubleDensityDrive::read() {
case CA0: // Disk head step completed. case CA0: // Disk head step completed.
// (0 = still stepping) // (0 = still stepping)
// LOG("head stepping)"); // LOG("head stepping)");
return true; return true; // TODO: stepping delay. But at the main Drive level.
case CA0|SEL: // Disk locked. case CA0|SEL: // Disk locked.
// (0 = write protected) // (0 = write protected)
@ -159,7 +160,7 @@ bool DoubleDensityDrive::read() {
case CA2|CA1|CA0|SEL: // Drive installed. case CA2|CA1|CA0|SEL: // Drive installed.
// (0 = present, 1 = missing) // (0 = present, 1 = missing)
// LOG("drive installed)"); // LOG("drive installed)");
return false; return true;
} }
} }

2
Machines/Apple/Macintosh/Macintosh.cpp
View File

@ -23,7 +23,7 @@
#include "../../../Inputs/QuadratureMouse/QuadratureMouse.hpp" #include "../../../Inputs/QuadratureMouse/QuadratureMouse.hpp"
#define LOG_TRACE //#define LOG_TRACE
#include "../../../Components/6522/6522.hpp" #include "../../../Components/6522/6522.hpp"
#include "../../../Components/8530/z8530.hpp" #include "../../../Components/8530/z8530.hpp"

2
Processors/68000/Implementation/68000Implementation.hpp
View File

@ -309,7 +309,7 @@ template <class T, bool dtack_is_implicit, bool signal_will_perform> void Proces
const uint32_t fetched_pc = (program_counter_.full - 4)&0xffffff; const uint32_t fetched_pc = (program_counter_.full - 4)&0xffffff;
// should_log |= fetched_pc == 0x6d9c; // should_log |= fetched_pc == 0x6d9c;
should_log = (fetched_pc >= 0x4006F4 && fetched_pc <= 0x4007CE); should_log = (fetched_pc >= 0x41806A && fetched_pc <= 0x418618);
// should_log |= fetched_pc == 0x4012A2; // should_log |= fetched_pc == 0x4012A2;
// should_log &= fetched_pc != 0x4012AE; // should_log &= fetched_pc != 0x4012AE;