Update dependencies

uweseimet · Jan 24, 2025 · 34d6de3 · 34d6de3
1 parent a3087c5
commit 34d6de3
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 23 deletions.
diff --git a/cpp/base/primary_device.cpp b/cpp/base/primary_device.cpp
@@ -8,6 +8,7 @@
 
 #include "primary_device.h"
 #include <spdlog/sinks/stdout_color_sinks.h>
+#include "controllers/abstract_controller.h"
 #include "shared/command_meta_data.h"
 #include "shared/s2p_exceptions.h"
 
@@ -420,3 +421,27 @@ void PrimaryDevice::ModeSelect(cdb_t, data_out_t, int, int)
     throw ScsiException(SenseKey::ILLEGAL_REQUEST, Asc::INVALID_FIELD_IN_CDB);
 }
 
+int PrimaryDevice::GetCdbByte(int index) const
+{
+    return controller->GetCdb()[index];
+}
+
+int PrimaryDevice::GetCdbInt16(int index) const
+{
+    return memory_util::GetInt16(controller->GetCdb(), index);
+}
+
+int PrimaryDevice::GetCdbInt24(int index) const
+{
+    return memory_util::GetInt24(controller->GetCdb(), index);
+}
+
+uint32_t PrimaryDevice::GetCdbInt32(int index) const
+{
+    return memory_util::GetInt32(controller->GetCdb(), index);
+}
+
+uint64_t PrimaryDevice::GetCdbInt64(int index) const
+{
+    return memory_util::GetInt64(controller->GetCdb(), index);
+}
diff --git a/cpp/base/primary_device.h b/cpp/base/primary_device.h
@@ -11,9 +11,11 @@
 #pragma once
 
 #include <functional>
-#include "controllers/abstract_controller.h"
-#include "shared/memory_util.h"
 #include "device.h"
+#include "shared/memory_util.h"
+#include "shared/s2p_defs.h"
+
+class AbstractController;
 
 class PrimaryDevice : public Device
 {
@@ -39,7 +41,7 @@ class PrimaryDevice : public Device
 
     virtual void Dispatch(ScsiCommand);
 
-    auto* GetController() const
+    AbstractController* GetController() const
     {
         return controller;
     }
@@ -148,26 +150,11 @@ class PrimaryDevice : public Device
     void DataInPhase(int) const;
     void DataOutPhase(int) const;
 
-    auto GetCdbByte(int index) const
-    {
-        return controller->GetCdb()[index];
-    }
-    auto GetCdbInt16(int index) const
-    {
-        return memory_util::GetInt16(controller->GetCdb(), index);
-    }
-    auto GetCdbInt24(int index) const
-    {
-        return memory_util::GetInt24(controller->GetCdb(), index);
-    }
-    auto GetCdbInt32(int index) const
-    {
-        return memory_util::GetInt32(controller->GetCdb(), index);
-    }
-    auto GetCdbInt64(int index) const
-    {
-        return memory_util::GetInt64(controller->GetCdb(), index);
-    }
+    int GetCdbByte(int) const;
+    int GetCdbInt16(int) const;
+    int GetCdbInt24(int) const;
+    uint32_t GetCdbInt32(int) const;
+    uint64_t GetCdbInt64(int) const;
 
 private:
 

diff --git a/cpp/command/command_executor.cpp b/cpp/command/command_executor.cpp
@@ -12,6 +12,7 @@
 #include "base/property_handler.h"
 #include "command_context.h"
 #include "command_image_support.h"
+#include "controllers/abstract_controller.h"
 #include "controllers/controller_factory.h"
 #include "devices/disk.h"
 #include "devices/scsi_generic.h"

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

diff --git a/cpp/devices/daynaport.cpp b/cpp/devices/daynaport.cpp
@@ -22,6 +22,7 @@
 //---------------------------------------------------------------------------
 
 #include "daynaport.h"
+#include "controllers/abstract_controller.h"
 #include "shared/network_util.h"
 #include "shared/s2p_exceptions.h"
 

diff --git a/cpp/devices/disk.cpp b/cpp/devices/disk.cpp
@@ -15,6 +15,7 @@
 #include "disk.h"
 #include "disk_cache.h"
 #include "linux_cache.h"
+#include "controllers/abstract_controller.h"
 #include "shared/s2p_exceptions.h"
 
 using namespace spdlog;

diff --git a/cpp/devices/host_services.cpp b/cpp/devices/host_services.cpp
@@ -86,6 +86,7 @@
 #include <google/protobuf/util/json_util.h>
 #include "command/command_context.h"
 #include "command/command_dispatcher.h"
+#include "controllers/abstract_controller.h"
 #include "protobuf/protobuf_util.h"
 #include "shared/s2p_exceptions.h"
 #include "page_handler.h"

diff --git a/cpp/devices/page_handler.cpp b/cpp/devices/page_handler.cpp
@@ -10,6 +10,7 @@
 #include "page_handler.h"
 #include "base/primary_device.h"
 #include "base/property_handler.h"
+#include "controllers/abstract_controller.h"
 #include "shared/s2p_exceptions.h"
 
 using namespace spdlog;

diff --git a/cpp/devices/printer.cpp b/cpp/devices/printer.cpp
@@ -31,6 +31,7 @@
 
 #include "printer.h"
 #include <filesystem>
+#include "controllers/abstract_controller.h"
 #include "shared/s2p_exceptions.h"
 
 using namespace filesystem;

diff --git a/cpp/devices/sasi_hd.cpp b/cpp/devices/sasi_hd.cpp
@@ -7,6 +7,7 @@
 //---------------------------------------------------------------------------
 
 #include "sasi_hd.h"
+#include "controllers/abstract_controller.h"
 #include "shared/s2p_exceptions.h"
 
 SasiHd::SasiHd(int lun, const set<uint32_t> &sector_sizes) : Disk(SAHD, lun, false, false, sector_sizes)

diff --git a/cpp/devices/scsi_cd.cpp b/cpp/devices/scsi_cd.cpp
@@ -9,6 +9,7 @@
 //---------------------------------------------------------------------------
 
 #include "scsi_cd.h"
+#include "controllers/abstract_controller.h"
 #include "shared/s2p_exceptions.h"
 
 using namespace memory_util;

diff --git a/cpp/devices/scsi_generic.cpp b/cpp/devices/scsi_generic.cpp
@@ -12,6 +12,7 @@
 #include <fcntl.h>
 #include <scsi/sg.h>
 #include <sys/ioctl.h>
+#include "controllers/abstract_controller.h"
 #include "shared/s2p_exceptions.h"
 #include "shared/sg_util.h"
 

diff --git a/cpp/devices/scsi_hd.cpp b/cpp/devices/scsi_hd.cpp
@@ -7,6 +7,7 @@
 //---------------------------------------------------------------------------
 
 #include "scsi_hd.h"
+#include "controllers/abstract_controller.h"
 #include "shared/s2p_exceptions.h"
 
 using namespace memory_util;

diff --git a/cpp/devices/tape.cpp b/cpp/devices/tape.cpp
@@ -18,6 +18,7 @@
 
 #include "tape.h"
 #include "base/property_handler.h"
+#include "controllers/abstract_controller.h"
 #include "shared/s2p_exceptions.h"
 
 using namespace spdlog;