From 52ba5c2fa75228f7e219b159df2388c0c4e222c4 Mon Sep 17 00:00:00 2001
From: akuker <akuker@gmail.com>
Date: Sun, 19 Jul 2020 15:10:17 -0500
Subject: [PATCH] Un-do extraneous changes before merging back into source
 branch

---
 src/raspberrypi/disk.cpp   | 33 ++++++++++++++++-----------------
 src/raspberrypi/rascsi.cpp |  1 -
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/raspberrypi/disk.cpp b/src/raspberrypi/disk.cpp
index bc845f9..483487a 100644
--- a/src/raspberrypi/disk.cpp
+++ b/src/raspberrypi/disk.cpp
@@ -6439,14 +6439,14 @@ void FASTCALL SASIDEV::Selection()
 			return;
 		}
 
-        spdlog::trace(
-            "Selection Phase ID=%d (with device)", ctrl.id);
+		spdlog::trace(
+			"Selection Phase ID=%d (with device)", ctrl.id);
 
-        // Phase change
-        ctrl.phase = BUS::selection;
+		// Phase change
+		ctrl.phase = BUS::selection;
 
-        // Raise BSY and respond
-        ctrl.bus->SetBSY(TRUE);
+		// Raise BSY and respond
+	        ctrl.bus->SetBSY(TRUE);
 		return;
 	}
 
@@ -8133,26 +8133,25 @@ void FASTCALL SCSIDEV::Selection()
 		// invalid if IDs do not match
 		id = 1 << ctrl.id;
 		if ((ctrl.bus->GetDAT() & id) == 0) {
-            spdlog::trace("[ID {}] ID doesn't match {}",ctrl.id,id);
+			spdlog::trace("[ID {}] ID doesn't match {}",ctrl.id,id);
 			return;
 		}
 
 		// End if there is no valid unit
 		if (!HasUnit()) {
-            spdlog::trace("[ID {}] No unit attached",ctrl.id);
+			spdlog::trace("[ID {}] No unit attached",ctrl.id);
 			return;
 		}
+		
+		spdlog::trace("Selection Phase ID={} (with device)", ctrl.id);
 
-        spdlog::trace(
-            "Selection Phase ID={} (with device)", ctrl.id);
+		// Phase setting
+		ctrl.phase = BUS::selection;
 
-        // Phase setting
-        ctrl.phase = BUS::selection;
-
-        // Raise BSY and respond
-        ctrl.bus->SetBSY(TRUE);
-        return;
-    }
+		// Raise BSY and respond
+		ctrl.bus->SetBSY(TRUE);
+		return;
+	}
 
 	// Selection completed
 	if (!ctrl.bus->GetSEL() && ctrl.bus->GetBSY()) {
diff --git a/src/raspberrypi/rascsi.cpp b/src/raspberrypi/rascsi.cpp
index 58324c9..16221d2 100644
--- a/src/raspberrypi/rascsi.cpp
+++ b/src/raspberrypi/rascsi.cpp
@@ -998,7 +998,6 @@ int main(int argc, char* argv[])
 
     spdlog::set_level(spdlog::level::trace);
     spdlog::trace("Entering the function with %d arguments", argc);
-
 	// Output the Banner
 	Banner(argc, argv);