6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-03 11:30:02 +00:00
Code Issues Projects Releases Wiki Activity

Begins substituting the DoubleDensityDrive for the Sony.

Browse Source
This commit is contained in:
Thomas Harte 2019-07-10 16:24:48 -04:00
parent 6cfaf920ee
commit be251d6b03
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Components/DiskII/IWM.cpp
View File

@ -378,7 +378,7 @@ void IWM::propose_shift(uint8_t bit) {
cycles_since_shift_ = Cycles(0); cycles_since_shift_ = Cycles(0);
} }
void IWM::set_drive(int slot, Storage::Disk::Drive *drive) { void IWM::set_drive(int slot, IWMDrive *drive) {
drives_[slot] = drive; drives_[slot] = drive;
drive->set_event_delegate(this); drive->set_event_delegate(this);
} }

4
Components/DiskII/IWM.hpp
View File

@ -64,7 +64,7 @@ class IWM:
void run_for(const Cycles cycles); void run_for(const Cycles cycles);
/// Connects a drive to the IWM. /// Connects a drive to the IWM.
void set_drive(int slot, Storage::Disk::Drive *drive); void set_drive(int slot, IWMDrive *drive);
private: private:
// Storage::Disk::Drive::EventDelegate. // Storage::Disk::Drive::EventDelegate.
@ -80,7 +80,7 @@ class IWM:
int state_ = 0; int state_ = 0;
int active_drive_ = 0; int active_drive_ = 0;
Storage::Disk::Drive *drives_[2] = {nullptr, nullptr}; IWMDrive *drives_[2] = {nullptr, nullptr};
bool drive_motor_on_ = false; bool drive_motor_on_ = false;
Cycles cycles_until_motor_off_; Cycles cycles_until_motor_off_;

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

@ -29,6 +29,7 @@
#include "../../../Components/6522/6522.hpp" #include "../../../Components/6522/6522.hpp"
#include "../../../Components/8530/z8530.hpp" #include "../../../Components/8530/z8530.hpp"
#include "../../../Components/DiskII/IWM.hpp" #include "../../../Components/DiskII/IWM.hpp"
#include "../../../Components/DiskII/MacintoshDoubleDensityDrive.hpp"
#include "../../../Processors/68000/68000.hpp" #include "../../../Processors/68000/68000.hpp"
#include "../../../Analyser/Static/Macintosh/Target.hpp" #include "../../../Analyser/Static/Macintosh/Target.hpp"
@ -584,7 +585,7 @@ template <Analyser::Static::Macintosh::Target::Model model> class ConcreteMachin
bool ROM_is_overlay_ = true; bool ROM_is_overlay_ = true;
int phase_ = 1; int phase_ = 1;
SonyDrive drives_[2]; DoubleDensityDrive drives_[2];
Inputs::QuadratureMouse mouse_; Inputs::QuadratureMouse mouse_;
Apple::Macintosh::KeyboardMapper keyboard_mapper_; Apple::Macintosh::KeyboardMapper keyboard_mapper_;