Update dependencies

uweseimet · Jan 24, 2025 · ded3cf1 · ded3cf1
1 parent 725ccad
commit ded3cf1
Show file tree

Hide file tree

Showing 15 changed files with 47 additions and 17 deletions.
diff --git a/cpp/buses/in_process_bus.h b/cpp/buses/in_process_bus.h
@@ -9,11 +9,16 @@
 #pragma once
 
 #include <atomic>
+#include <memory>
 #include <mutex>
 #include <unordered_map>
-#include <spdlog/spdlog.h>
 #include "bus.h"
 
+namespace spdlog
+{
+class logger;
+}
+
 class InProcessBus : public Bus
 {
 

diff --git a/cpp/controllers/abstract_controller.cpp b/cpp/controllers/abstract_controller.cpp
@@ -9,6 +9,7 @@
 #include <spdlog/sinks/stdout_color_sinks.h>
 #include "base/primary_device.h"
 #include "buses/bus.h"
+#include "script_generator.h"
 
 using namespace s2p_util;
 

diff --git a/cpp/controllers/abstract_controller.h b/cpp/controllers/abstract_controller.h
@@ -8,17 +8,22 @@
 
 #pragma once
 
+#include <memory>
 #include <span>
 #include <unordered_set>
-#include <spdlog/spdlog.h>
 #include "phase_handler.h"
-#include "script_generator.h"
+#include "shared/s2p_defs.h"
 #include "shared/s2p_formatter.h"
 
-using namespace spdlog;
-
 class Bus;
 class PrimaryDevice;
+class ScriptGenerator;
+namespace spdlog
+{
+class logger;
+}
+
+using namespace spdlog;
 
 class AbstractController : public PhaseHandler
 {

diff --git a/cpp/initiator/initiator_executor.h b/cpp/initiator/initiator_executor.h
@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include <limits>
 #include <memory>
 #include <stdexcept>
 #include "shared/s2p_formatter.h"

diff --git a/cpp/s2p/s2p_core.cpp b/cpp/s2p/s2p_core.cpp
@@ -18,6 +18,7 @@
 #include "base/device_factory.h"
 #include "buses/bus_factory.h"
 #include "command/command_context.h"
+#include "command/command_dispatcher.h"
 #include "command/command_image_support.h"
 #include "command/command_response.h"
 #ifdef BUILD_SCHS

diff --git a/cpp/s2p/s2p_core.h b/cpp/s2p/s2p_core.h
@@ -11,13 +11,14 @@
 #include <filesystem>
 #include "base/property_handler.h"
 #include "buses/bus.h"
-#include "command/command_dispatcher.h"
 #include "command/command_executor.h"
 #include "controllers/controller_factory.h"
 #include "s2p_thread.h"
 
 using namespace filesystem;
 
+class CommandDispatcher;
+
 class S2p
 {
 

diff --git a/cpp/s2p/s2p_thread.h b/cpp/s2p/s2p_thread.h
@@ -2,18 +2,22 @@
 //
 // SCSI2Pi, SCSI device emulator and SCSI tools for the Raspberry Pi
 //
-// Copyright (C) 2022-2024 Uwe Seimet
+// Copyright (C) 2022-2025 Uwe Seimet
 //
 //---------------------------------------------------------------------------
 
 #pragma once
 
 #include <functional>
+#include <memory>
 #include <string>
 #include <thread>
-#include <spdlog/spdlog.h>
 
 class CommandContext;
+namespace spdlog
+{
+class logger;
+}
 
 using namespace std;
 using namespace spdlog;

diff --git a/cpp/s2pdump/s2pdump_core.cpp b/cpp/s2pdump/s2pdump_core.cpp
@@ -20,6 +20,7 @@
 #include "shared/simh_util.h"
 #include "board_executor.h"
 #ifdef __linux__
+#include "shared/sg_adapter.h"
 #include "sg_executor.h"
 #endif
 

diff --git a/cpp/s2pdump/s2pdump_core.h b/cpp/s2pdump/s2pdump_core.h
@@ -8,13 +8,19 @@
 
 #pragma once
 
+#include <chrono>
 #include <fstream>
+#include <memory>
 #include <unordered_map>
 #include <vector>
-#include <spdlog/spdlog.h>
 #include "buses/bus.h"
-#include "shared/sg_adapter.h"
-#include "s2pdump_executor.h"
+
+class S2pDumpExecutor;
+class SgAdapter;
+namespace spdlog
+{
+class logger;
+}
 
 using namespace std;
 using namespace chrono;

diff --git a/cpp/s2pexec/s2pexec_core.cpp b/cpp/s2pexec/s2pexec_core.cpp
@@ -12,6 +12,7 @@
 #include <fstream>
 #include <iostream>
 #include <getopt.h>
+#include "initiator/initiator_util.h"
 #include "shared/command_meta_data.h"
 #include "shared/s2p_exceptions.h"
 

diff --git a/cpp/s2pexec/s2pexec_core.h b/cpp/s2pexec/s2pexec_core.h
@@ -2,17 +2,21 @@
 //
 // SCSI2Pi, SCSI device emulator and SCSI tools for the Raspberry Pi
 //
-// Copyright (C) 2022-2024 Uwe Seimet
+// Copyright (C) 2022-2025 Uwe Seimet
 //
 //---------------------------------------------------------------------------
 
 #pragma once
 
-#include <spdlog/spdlog.h>
 #include "buses/bus_factory.h"
 #include "shared/s2p_formatter.h"
 #include "s2pexec_executor.h"
 
+namespace spdlog
+{
+class logger;
+}
+
 using namespace std;
 
 class S2pExec

diff --git a/cpp/s2pexec/s2pexec_executor.cpp b/cpp/s2pexec/s2pexec_executor.cpp
@@ -8,6 +8,7 @@
 
 #include "s2pexec_executor.h"
 #include "buses/bus_factory.h"
+#include "initiator/initiator_util.h"
 
 string S2pExecExecutor::Init(const string &device)
 {

diff --git a/cpp/s2pexec/s2pexec_executor.h b/cpp/s2pexec/s2pexec_executor.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include "initiator/initiator_executor.h"
-#include "initiator/initiator_util.h"
 #include "shared/sg_adapter.h"
 
 using namespace std;

diff --git a/cpp/shared/s2p_formatter.h b/cpp/shared/s2p_formatter.h
@@ -2,13 +2,14 @@
 //
 // SCSI2Pi, SCSI device emulator and SCSI tools for the Raspberry Pi
 //
-// Copyright (C) 2024 Uwe Seimet
+// Copyright (C) 2024-2025 Uwe Seimet
 //
 //---------------------------------------------------------------------------
 
 #pragma once
 
 #include <cstdint>
+#include <limits>
 #include <span>
 #include <string>
 

diff --git a/cpp/test/abstract_controller_test.cpp b/cpp/test/abstract_controller_test.cpp
@@ -2,11 +2,12 @@
 //
 // SCSI2Pi, SCSI device emulator and SCSI tools for the Raspberry Pi
 //
-// Copyright (C) 2022-2024 Uwe Seimet
+// Copyright (C) 2022-2025 Uwe Seimet
 //
 //---------------------------------------------------------------------------
 
 #include "mocks.h"
+#include "controllers/script_generator.h"
 #include "shared/s2p_defs.h"
 #include "shared/s2p_exceptions.h"