From 70a753d8a8958c97d22d9564859a067a050b1125 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Fri, 19 Jan 2024 10:41:59 -0500
Subject: [PATCH] Update to latest logging.

---
 Components/1770/1770.cpp                          | 2 +-
 Storage/MassStorage/SCSI/Target.hpp               | 1 +
 Storage/MassStorage/SCSI/TargetImplementation.hpp | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Components/1770/1770.cpp b/Components/1770/1770.cpp
index ed9f81853..3fb7eb33b 100644
--- a/Components/1770/1770.cpp
+++ b/Components/1770/1770.cpp
@@ -13,7 +13,7 @@
 
 namespace {
 
-auto logger = Log::Logger(Log::Source::WDFDC);
+auto logger = Log::Logger<Log::Source::WDFDC>();
 
 }
 
diff --git a/Storage/MassStorage/SCSI/Target.hpp b/Storage/MassStorage/SCSI/Target.hpp
index 75ff3d9b3..1daee626d 100644
--- a/Storage/MassStorage/SCSI/Target.hpp
+++ b/Storage/MassStorage/SCSI/Target.hpp
@@ -347,6 +347,7 @@ template <typename Executor> class Target: public Bus::Observer, public Responde
 
 	private:
 		Executor executor_;
+		Log::Logger<Log::Source::SCSI> log_;
 
 		// Bus::Observer.
 		void scsi_bus_did_change(Bus *, BusState new_state, double time_since_change) final;
diff --git a/Storage/MassStorage/SCSI/TargetImplementation.hpp b/Storage/MassStorage/SCSI/TargetImplementation.hpp
index 06672e9fe..4ef8e230d 100644
--- a/Storage/MassStorage/SCSI/TargetImplementation.hpp
+++ b/Storage/MassStorage/SCSI/TargetImplementation.hpp
@@ -178,7 +178,7 @@ template <typename Executor> bool Target<Executor>::dispatch_command() {
 #define G1(x)	(0x20|x)
 #define G5(x)	(0xa0|x)
 
-	LOG("---Command " << PADHEX(2) << int(command_[0]) << "---");
+	log_.info().append("---Command %02x---", command_[0]);
 
 	switch(command_[0]) {
 		default:		return false;
@@ -278,5 +278,5 @@ template <typename Executor> void Target<Executor>::end_command() {
 	bus_state_ = DefaultBusState;
 	set_device_output(bus_state_);
 
-	LOG("---Done---");
+	log_.info().append("---Done---");
 }