From 792cbb15369e836df54b5c82970dc444d6b346a5 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Sat, 11 Nov 2017 12:35:51 -0500
Subject: [PATCH] Resolvws out-of-order initialisation within the C1540.

---
 Machines/Commodore/1540/Implementation/C1540.cpp     | 3 +--
 Machines/Commodore/1540/Implementation/C1540Base.hpp | 6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Machines/Commodore/1540/Implementation/C1540.cpp b/Machines/Commodore/1540/Implementation/C1540.cpp
index a3f32869f..08c0c7b63 100644
--- a/Machines/Commodore/1540/Implementation/C1540.cpp
+++ b/Machines/Commodore/1540/Implementation/C1540.cpp
@@ -151,8 +151,7 @@ void MachineBase::drive_via_did_set_data_density(void *driveVIA, int density) {
 
 #pragma mark - SerialPortVIA
 
-SerialPortVIA::SerialPortVIA(MOS::MOS6522::MOS6522<SerialPortVIA> &via) :
-	port_b_(0x00), attention_acknowledge_level_(false), attention_level_input_(true), data_level_output_(false), via_(via) {}
+SerialPortVIA::SerialPortVIA(MOS::MOS6522::MOS6522<SerialPortVIA> &via) : via_(via) {}
 
 uint8_t SerialPortVIA::get_port_input(MOS::MOS6522::Port port) {
 	if(port) return port_b_;
diff --git a/Machines/Commodore/1540/Implementation/C1540Base.hpp b/Machines/Commodore/1540/Implementation/C1540Base.hpp
index ed8384a60..3b54788e7 100644
--- a/Machines/Commodore/1540/Implementation/C1540Base.hpp
+++ b/Machines/Commodore/1540/Implementation/C1540Base.hpp
@@ -49,9 +49,11 @@ class SerialPortVIA: public MOS::MOS6522::IRQDelegatePortHandler {
 
 	private:
 		MOS::MOS6522::MOS6522<SerialPortVIA> &via_;
-		uint8_t port_b_;
+		uint8_t port_b_ = 0x0;
 		std::weak_ptr<::Commodore::Serial::Port> serial_port_;
-		bool attention_acknowledge_level_, attention_level_input_, data_level_output_;
+		bool attention_acknowledge_level_ = false;
+		bool attention_level_input_ = true;
+		bool data_level_output_ = false;
 
 		void update_data_line();
 };