From 906d28117c998dffa1c902429160d0f692b7b51f Mon Sep 17 00:00:00 2001
From: tomcw <tomcw@users.noreply.github.com>
Date: Sun, 13 Oct 2019 16:01:00 +0100
Subject: [PATCH] Disk: minor refactor

---
 source/Disk.h       | 13 +++++--------
 source/Harddisk.cpp |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/source/Disk.h b/source/Disk.h
index aac355c3..2122a1c1 100644
--- a/source/Disk.h
+++ b/source/Disk.h
@@ -241,17 +241,14 @@ private:
 	bool m_resetSequencer;
 
 	enum SEQFUNC {readSequencing=0, checkWriteProtAndInitWrite, dataShiftWrite, dataLoadWrite};	// UTAIIe 9-14
-	struct SEQUENCER_FUNCTION
+	union SEQUENCER_FUNCTION
 	{
-		union
+		struct
 		{
-			struct
-			{
-				UINT writeMode : 1;	// $C08E/F,X
-				UINT loadMode : 1;	// $C08C/D,X
-			};
-			SEQFUNC function;
+			UINT writeMode : 1;	// $C08E/F,X
+			UINT loadMode : 1;	// $C08C/D,X
 		};
+		SEQFUNC function;
 	};
 
 	SEQUENCER_FUNCTION m_seqFunc;
diff --git a/source/Harddisk.cpp b/source/Harddisk.cpp
index 6f861ea1..adadcbd6 100644
--- a/source/Harddisk.cpp
+++ b/source/Harddisk.cpp
@@ -845,7 +845,7 @@ bool HD_LoadSnapshot(YamlLoadHelper& yamlLoadHelper, UINT slot, UINT version, co
 		throw std::string("Card: wrong version");
 
 	if (version == 1 && (regs.pc >> 8) == (0xC0|slot))
-			throw std::string("HDD card: 6502 is running old HDD firmware");
+		throw std::string("HDD card: 6502 is running old HDD firmware");
 
 	g_nHD_UnitNum = yamlLoadHelper.LoadUint(SS_YAML_KEY_CURRENT_UNIT);	// b7=unit
 	g_nHD_Command = yamlLoadHelper.LoadUint(SS_YAML_KEY_COMMAND);