Move log.h to legacy folder

PiSCSI · Sep 24, 2023 · a419e5d · a419e5d
1 parent 5c558bd
commit a419e5d
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 15 deletions.
diff --git a/cpp/hal/gpiobus_bananam2p.cpp b/cpp/hal/gpiobus_bananam2p.cpp
@@ -43,7 +43,7 @@
 #include "hal/pi_defs/bpi-gpio.h"
 #include "hal/sunxi_utils.h"
 #include "hal/systimer.h"
-#include "shared/log.h"
+#include "hal/log.h"
 
 #define ARRAY_SIZE(x) (sizeof(x) / (sizeof(x[0])))
 

diff --git a/cpp/hal/gpiobus_bananam2p.h b/cpp/hal/gpiobus_bananam2p.h
@@ -16,7 +16,6 @@
 #include "hal/pi_defs/bpi-gpio.h"
 #include "hal/sbc_version.h"
 #include "hal/sunxi_utils.h"
-#include "shared/log.h"
 #include "shared/scsi.h"
 #include <map>
 

diff --git a/cpp/hal/gpiobus_virtual.cpp b/cpp/hal/gpiobus_virtual.cpp
@@ -13,7 +13,7 @@
 #include "hal/gpiobus_virtual.h"
 #include "hal/gpiobus.h"
 #include "hal/systimer.h"
-#include "shared/log.h"
+#include "hal/log.h"
 #include <cstddef>
 #include <map>
 #include <memory>

diff --git a/cpp/hal/gpiobus_virtual.h b/cpp/hal/gpiobus_virtual.h
@@ -13,7 +13,6 @@
 
 #include "hal/data_sample_raspberry.h"
 #include "hal/gpiobus.h"
-#include "shared/log.h"
 #include "shared/scsi.h"
 
 #include <map>
@@ -171,4 +170,4 @@ class GPIOBUS_Virtual final : public GPIOBUS
     sem_t *mutex_sem, *buffer_count_sem, *spool_signal_sem;
     int fd_shm, fd_log;
 #endif
-};
+};
diff --git a/cpp/shared/log.h → cpp/hal/log.h b/cpp/shared/log.h → cpp/hal/log.h
diff --git a/cpp/hal/sbc_version.cpp b/cpp/hal/sbc_version.cpp
@@ -10,7 +10,7 @@
 //---------------------------------------------------------------------------
 
 #include "sbc_version.h"
-#include "shared/log.h"
+#include "log.h"
 #include <fstream>
 #include <iostream>
 #include <sstream>

diff --git a/cpp/hal/systimer_allwinner.cpp b/cpp/hal/systimer_allwinner.cpp
@@ -14,7 +14,7 @@
 
 #include "hal/gpiobus.h"
 
-#include "shared/log.h"
+#include "hal/log.h"
 
 const std::string SysTimer_AllWinner::dev_mem_filename = "/dev/mem";
 

diff --git a/cpp/monitor/sm_core.cpp b/cpp/monitor/sm_core.cpp
@@ -13,7 +13,7 @@
 #include "hal/gpiobus.h"
 #include "hal/gpiobus_factory.h"
 #include "monitor/sm_reports.h"
-#include "shared/log.h"
+#include "hal/log.h"
 #include "shared/piscsi_version.h"
 #include "shared/piscsi_util.h"
 #include <climits>

diff --git a/cpp/monitor/sm_html_report.cpp b/cpp/monitor/sm_html_report.cpp
@@ -9,7 +9,7 @@
 //
 //---------------------------------------------------------------------------
 
-#include "shared/log.h"
+#include "hal/log.h"
 #include "shared/piscsi_version.h"
 #include "sm_reports.h"
 #include <iostream>

diff --git a/cpp/monitor/sm_json_report.cpp b/cpp/monitor/sm_json_report.cpp
@@ -10,7 +10,7 @@
 //---------------------------------------------------------------------------
 
 #include "hal/data_sample_raspberry.h"
-#include "shared/log.h"
+#include "hal/log.h"
 #include "sm_reports.h"
 #include "string.h"
 #include <fstream>

diff --git a/cpp/monitor/sm_vcd_report.cpp b/cpp/monitor/sm_vcd_report.cpp
@@ -11,7 +11,7 @@
 
 #include "hal/data_sample.h"
 #include "hal/gpiobus.h"
-#include "shared/log.h"
+#include "hal/log.h"
 #include "sm_core.h"
 #include "sm_reports.h"
 #include <fstream>

diff --git a/cpp/scsiloop/scsiloop_core.cpp b/cpp/scsiloop/scsiloop_core.cpp
@@ -12,7 +12,7 @@
 //
 //---------------------------------------------------------------------------
 
-#include "shared/log.h"
+#include "hal/log.h"
 #include "shared/piscsi_version.h"
 #include "shared/piscsi_util.h"
 #include "spdlog/sinks/stdout_color_sinks.h"

diff --git a/cpp/scsiloop/scsiloop_gpio.cpp b/cpp/scsiloop/scsiloop_gpio.cpp
@@ -11,7 +11,7 @@
 #include "hal/gpiobus_factory.h"
 #include "hal/sbc_version.h"
 #include "scsiloop/scsiloop_cout.h"
-#include "shared/log.h"
+#include "hal/log.h"
 
 #if defined CONNECT_TYPE_STANDARD
 #include "hal/connection_type/connection_standard.h"
@@ -589,4 +589,4 @@ int ScsiLoop_GPIO::RunDataOutputTest(vector<string> &error_list)
     ScsiLoop_Cout::FinishTest("DAT Outputs", err_count);
 
     return err_count;
-}
+}
diff --git a/cpp/scsiloop/scsiloop_timer.cpp b/cpp/scsiloop/scsiloop_timer.cpp
@@ -10,7 +10,7 @@
 #include "scsiloop_timer.h"
 #include "hal/systimer.h"
 #include "scsiloop/scsiloop_cout.h"
-#include "shared/log.h"
+#include "hal/log.h"
 
 int ScsiLoop_Timer::RunTimerTest(vector<string> &error_list)
 {