From b701ce9721676008d649c41f52331ec25b9f1e94 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Tue, 15 Oct 2024 21:51:23 -0400
Subject: [PATCH] Shuffle construction order.

---
 Machines/Apple/Macintosh/Macintosh.cpp | 4 ++--
 Machines/MSX/MSX.cpp                   | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Machines/Apple/Macintosh/Macintosh.cpp b/Machines/Apple/Macintosh/Macintosh.cpp
index 35424a2f3..cf1f65981 100644
--- a/Machines/Apple/Macintosh/Macintosh.cpp
+++ b/Machines/Apple/Macintosh/Macintosh.cpp
@@ -91,8 +91,8 @@ template <Analyser::Static::Macintosh::Target::Model model> class ConcreteMachin
 			mc68000_(*this),
 			iwm_(CLOCK_RATE),
 			video_(audio_, drive_speed_accumulator_),
-			via_(via_port_handler_),
 			via_port_handler_(*this, clock_, keyboard_, audio_, iwm_, mouse_),
+			via_(via_port_handler_),
 			scsi_bus_(CLOCK_RATE * 2),
 			scsi_(scsi_bus_, CLOCK_RATE * 2),
 			hard_drive_(scsi_bus_, 6 /* SCSI ID */),
@@ -760,8 +760,8 @@ template <Analyser::Static::Macintosh::Target::Model model> class ConcreteMachin
 		Apple::Clock::SerialClock clock_;
 		Keyboard keyboard_;
 
-		MOS::MOS6522::MOS6522<VIAPortHandler> via_;
 		VIAPortHandler via_port_handler_;
+		MOS::MOS6522::MOS6522<VIAPortHandler> via_;
 
 		Zilog::SCC::z8530 scc_;
 		SCSI::Bus scsi_bus_;
diff --git a/Machines/MSX/MSX.cpp b/Machines/MSX/MSX.cpp
index acf3fffa9..66dae2aa4 100644
--- a/Machines/MSX/MSX.cpp
+++ b/Machines/MSX/MSX.cpp
@@ -198,10 +198,10 @@ class ConcreteMachine:
 	public:
 		ConcreteMachine(const Target &target, const ROMMachine::ROMFetcher &rom_fetcher):
 			z80_(*this),
-			i8255_(i8255_port_handler_),
 			tape_player_(3579545 * 2),
 			i8255_port_handler_(*this, speaker_.audio_toggle, tape_player_),
 			ay_port_handler_(tape_player_),
+			i8255_(i8255_port_handler_),
 			memory_slots_{{*this}, {*this}, {*this}, {*this}},
 			clock_(ClockRate) {
 			set_clock_rate(ClockRate);
@@ -913,7 +913,6 @@ class ConcreteMachine:
 
 		CPU::Z80::Processor<ConcreteMachine, false, false> z80_;
 		JustInTimeActor<TI::TMS::TMS9918<vdp_model()>> vdp_;
-		Intel::i8255::i8255<i8255PortHandler> i8255_;
 
 		Storage::Tape::BinaryTapePlayer tape_player_;
 		bool tape_player_is_sleeping_ = false;
@@ -932,6 +931,8 @@ class ConcreteMachine:
 		Speaker<has_opll> speaker_;
 		AYPortHandler ay_port_handler_;
 
+		Intel::i8255::i8255<i8255PortHandler> i8255_;
+
 		/// The current primary and secondary slot selections; the former retains whatever was written
 		/// last to the 8255 PPI via port A8 and the latter — if enabled — captures 0xffff on a per-slot basis.
 		uint8_t primary_slots_ = 0;