6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2026-04-26 03:29:40 +00:00
Code Issues Projects Releases Wiki Activity

Attempts a full wiring up of 400kb drive speed.

Browse Source
This commit is contained in:
Thomas Harte
2019-07-30 15:08:55 -04:00
parent c41cccd9a6
commit 74c18d7861
5 changed files with 78 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Components/DiskII/MacintoshDoubleDensityDrive.cpp
+15 -6
View File
@@ -23,7 +23,7 @@ DoubleDensityDrive::DoubleDensityDrive(int input_clock_rate, bool is_800k) :
is_800k_(is_800k) {
// Start with a valid rotation speed.
if(is_800k) {
set_rotation_speed(393.3807f);
Drive::set_rotation_speed(393.3807f);
}
}
@@ -51,15 +51,23 @@ void DoubleDensityDrive::did_step(Storage::Disk::HeadPosition to_position) {
*/
const int zone = to_position.as_int() >> 4;
switch(zone) {
case 0: set_rotation_speed(393.3807f); break;
case 1: set_rotation_speed(429.1723f); break;
case 2: set_rotation_speed(472.1435f); break;
case 3: set_rotation_speed(524.5672f); break;
default: set_rotation_speed(590.1098f); break;
case 0: Drive::set_rotation_speed(393.3807f); break;
case 1: Drive::set_rotation_speed(429.1723f); break;
case 2: Drive::set_rotation_speed(472.1435f); break;
case 3: Drive::set_rotation_speed(524.5672f); break;
default: Drive::set_rotation_speed(590.1098f); break;
}
}
}
void DoubleDensityDrive::set_rotation_speed(float revolutions_per_minute) {
if(!is_800k_) {
// Don't allow drive speeds to drop below 10 RPM, as a temporary sop
// to sanity.
Drive::set_rotation_speed(std::max(10.0f, revolutions_per_minute));
}
}
// MARK: - Control input/output.
void DoubleDensityDrive::set_enabled(bool) {
@@ -136,6 +144,7 @@ bool DoubleDensityDrive::read() {
case CA1|CA0|SEL: // Tachometer.
// (arbitrary)
// printf(".");
return get_tachometer();
case CA2: // Read data, lower head.
Components/DiskII/MacintoshDoubleDensityDrive.hpp
+14
View File
@@ -18,6 +18,20 @@ class DoubleDensityDrive: public IWMDrive {
public:
DoubleDensityDrive(int input_clock_rate, bool is_800k);
/*!
@returns @c true if this is an 800kb drive; @c false otherwise.
*/
bool is_800k() {
return is_800k_;
}
/*!
Sets the current rotation speed of this drive only if it is a 400kb drive.
800kb drives select their own rotation speed based on head position,
and ignore this input.
*/
void set_rotation_speed(float revolutions_per_minute);
void set_enabled(bool) override;
void set_control_lines(int) override;
bool read() override;