From be251d6b03f9d324880ca10599331fde4d340daf Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Wed, 10 Jul 2019 16:24:48 -0400
Subject: [PATCH] Begins substituting the DoubleDensityDrive for the Sony.

---
 Components/DiskII/IWM.cpp              | 2 +-
 Components/DiskII/IWM.hpp              | 4 ++--
 Machines/Apple/Macintosh/Macintosh.cpp | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Components/DiskII/IWM.cpp b/Components/DiskII/IWM.cpp
index e8a2d044a..2338ba2c5 100644
--- a/Components/DiskII/IWM.cpp
+++ b/Components/DiskII/IWM.cpp
@@ -378,7 +378,7 @@ void IWM::propose_shift(uint8_t bit) {
 	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;
 	drive->set_event_delegate(this);
 }
diff --git a/Components/DiskII/IWM.hpp b/Components/DiskII/IWM.hpp
index cdc52e957..2fe7fbf37 100644
--- a/Components/DiskII/IWM.hpp
+++ b/Components/DiskII/IWM.hpp
@@ -64,7 +64,7 @@ class IWM:
 		void run_for(const Cycles cycles);
 
 		/// Connects a drive to the IWM.
-		void set_drive(int slot, Storage::Disk::Drive *drive);
+		void set_drive(int slot, IWMDrive *drive);
 
 	private:
 		// Storage::Disk::Drive::EventDelegate.
@@ -80,7 +80,7 @@ class IWM:
 		int state_ = 0;
 
 		int active_drive_ = 0;
-		Storage::Disk::Drive *drives_[2] = {nullptr, nullptr};
+		IWMDrive *drives_[2] = {nullptr, nullptr};
 		bool drive_motor_on_ = false;
 
 		Cycles cycles_until_motor_off_;
diff --git a/Machines/Apple/Macintosh/Macintosh.cpp b/Machines/Apple/Macintosh/Macintosh.cpp
index 7b3e08c04..6c587395f 100644
--- a/Machines/Apple/Macintosh/Macintosh.cpp
+++ b/Machines/Apple/Macintosh/Macintosh.cpp
@@ -29,6 +29,7 @@
 #include "../../../Components/6522/6522.hpp"
 #include "../../../Components/8530/z8530.hpp"
 #include "../../../Components/DiskII/IWM.hpp"
+#include "../../../Components/DiskII/MacintoshDoubleDensityDrive.hpp"
 #include "../../../Processors/68000/68000.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;
 		int phase_ = 1;
 
-		SonyDrive drives_[2];
+		DoubleDensityDrive drives_[2];
 		Inputs::QuadratureMouse mouse_;
 
 		Apple::Macintosh::KeyboardMapper keyboard_mapper_;