Clean up includes

uweseimet · Dec 11, 2023 · 25e76ab · 25e76ab
1 parent a409b70
commit 25e76ab
Show file tree

Hide file tree

Showing 88 changed files with 203 additions and 206 deletions.
diff --git a/cpp/base/device.cpp b/cpp/base/device.cpp
@@ -6,11 +6,11 @@
 //
 //---------------------------------------------------------------------------
 
-#include "shared/s2p_version.h"
-#include "device.h"
 #include <spdlog/spdlog.h>
 #include <cassert>
 #include <stdexcept>
+#include "shared/s2p_version.h"
+#include "device.h"
 
 using namespace std;
 

diff --git a/cpp/base/device.h b/cpp/base/device.h
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "generated/s2p_interface.pb.h"
-#include "shared/s2p_util.h"
 #include <unordered_map>
 #include <string>
+#include "generated/s2p_interface.pb.h"
+#include "shared/s2p_util.h"
 
 using namespace std;
 using namespace s2p_interface;

diff --git a/cpp/base/device_logger.h b/cpp/base/device_logger.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "spdlog/spdlog.h"
 #include <string>
+#include "spdlog/spdlog.h"
 
 using namespace std;
 

diff --git a/cpp/base/primary_device.h b/cpp/base/primary_device.h
@@ -10,14 +10,14 @@
 
 #pragma once
 
-#include "interfaces/scsi_primary_commands.h"
-#include "controllers/abstract_controller.h"
-#include "device.h"
-#include "device_logger.h"
 #include <string>
 #include <unordered_map>
 #include <span>
 #include <functional>
+#include "interfaces/scsi_primary_commands.h"
+#include "controllers/abstract_controller.h"
+#include "device.h"
+#include "device_logger.h"
 
 using namespace std;
 using namespace scsi_defs;

diff --git a/cpp/base/scsi_command_util.cpp b/cpp/base/scsi_command_util.cpp
@@ -6,10 +6,10 @@
 //
 //---------------------------------------------------------------------------
 
-#include "shared/shared_exceptions.h"
-#include "scsi_command_util.h"
 #include <spdlog/spdlog.h>
 #include <cstring>
+#include "shared/shared_exceptions.h"
+#include "scsi_command_util.h"
 
 using namespace scsi_defs;
 

diff --git a/cpp/base/scsi_command_util.h b/cpp/base/scsi_command_util.h
@@ -10,12 +10,12 @@
 
 #pragma once
 
-#include "shared/scsi.h"
 #include <cstdint>
 #include <cassert>
 #include <span>
 #include <vector>
 #include <map>
+#include "shared/scsi.h"
 
 using namespace std;
 

diff --git a/cpp/buses/bus.h b/cpp/buses/bus.h
@@ -10,26 +10,14 @@
 
 #pragma once
 
-#include "buses/pin_control.h"
-#include "shared/scsi.h"
 #include <string>
 #include <array>
 #include <cstdint>
 #include <memory>
 #include <unordered_map>
 #include <vector>
-
-#ifdef __linux__
-// Check SEL signal by event
-#define USE_SEL_EVENT_ENABLE
-#endif
-
-// Do not disable IRQs
-#define NO_IRQ_DISABLE
-
-#ifndef __linux__
-#define NO_IRQ_DISABLE
-#endif
+#include "buses/pin_control.h"
+#include "shared/scsi.h"
 
 using namespace std;
 using namespace scsi_defs;

diff --git a/cpp/buses/bus_factory.cpp b/cpp/buses/bus_factory.cpp
@@ -6,11 +6,11 @@
 //
 //---------------------------------------------------------------------------
 
-#include "bus_factory.h"
-#include "buses/rpi_bus.h"
 #include <spdlog/spdlog.h>
 #include <sstream>
 #include <fstream>
+#include "bus_factory.h"
+#include "rpi_bus.h"
 
 using namespace std;
 

diff --git a/cpp/buses/bus_factory.h b/cpp/buses/bus_factory.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "buses/in_process_bus.h"
 #include <string>
+#include "buses/in_process_bus.h"
 
 using namespace std;
 

diff --git a/cpp/buses/gpio_bus.cpp b/cpp/buses/gpio_bus.cpp
@@ -8,11 +8,11 @@
 //
 //---------------------------------------------------------------------------
 
-#include "buses/gpio_bus.h"
 #ifdef __linux__
 #include <sys/epoll.h>
 #endif
 #include <chrono>
+#include "gpio_bus.h"
 
 using namespace std;
 

diff --git a/cpp/buses/gpio_bus.h b/cpp/buses/gpio_bus.h
@@ -10,10 +10,10 @@
 
 #pragma once
 
-#include "buses/bus.h"
 #include <spdlog/spdlog.h>
 #include <memory>
 #include <vector>
+#include "buses/bus.h"
 
 //---------------------------------------------------------------------------
 //

diff --git a/cpp/buses/in_process_bus.cpp b/cpp/buses/in_process_bus.cpp
@@ -6,8 +6,8 @@
 //
 //---------------------------------------------------------------------------
 
-#include "buses/in_process_bus.h"
 #include <spdlog/spdlog.h>
+#include "in_process_bus.h"
 
 void InProcessBus::Reset()
 {

diff --git a/cpp/buses/rpi_bus.cpp b/cpp/buses/rpi_bus.cpp
@@ -8,16 +8,13 @@
 //
 //---------------------------------------------------------------------------
 
-#include "buses/rpi_bus.h"
-#include <spdlog/spdlog.h>
 #include <map>
 #include <cstring>
-#ifdef USE_SEL_EVENT_ENABLE
-#include <sys/epoll.h>
-#endif
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/time.h>
+#include <spdlog/spdlog.h>
+#include "rpi_bus.h"
 
 //---------------------------------------------------------------------------
 //

diff --git a/cpp/buses/rpi_bus.h b/cpp/buses/rpi_bus.h
@@ -10,10 +10,25 @@
 
 #pragma once
 
+// Configurable settings
+#ifdef __linux__
+// Check SEL signal by event instead of polling
+#define USE_SEL_EVENT_ENABLE
+#endif
+// Do not disable IRQs
+#define NO_IRQ_DISABLE
+
+#ifndef __linux__
+#define NO_IRQ_DISABLE
+#endif
+
 #ifdef __linux__
 #include <linux/gpio.h>
 #endif
-#include "buses/gpio_bus.h"
+#ifdef USE_SEL_EVENT_ENABLE
+#include <sys/epoll.h>
+#endif
+#include "gpio_bus.h"
 
 // Constant declarations (GIC)
 const static uint32_t ARM_GICD_BASE = 0xFF841000;

diff --git a/cpp/controllers/abstract_controller.cpp b/cpp/controllers/abstract_controller.cpp
@@ -6,11 +6,11 @@
 //
 //---------------------------------------------------------------------------
 
+#include <cstring>
+#include <ranges>
 #include "shared/shared_exceptions.h"
 #include "base/primary_device.h"
 #include "abstract_controller.h"
-#include <cstring>
-#include <ranges>
 
 using namespace scsi_defs;
 

diff --git a/cpp/controllers/abstract_controller.h b/cpp/controllers/abstract_controller.h
@@ -10,13 +10,13 @@
 
 #pragma once
 
-#include "buses/bus.h"
-#include "phase_handler.h"
-#include "base/device_logger.h"
 #include <unordered_set>
 #include <unordered_map>
 #include <span>
 #include <vector>
+#include "buses/bus.h"
+#include "phase_handler.h"
+#include "base/device_logger.h"
 
 using namespace std;
 

diff --git a/cpp/controllers/controller_factory.h b/cpp/controllers/controller_factory.h
@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "buses/bus.h"
-#include "base/primary_device.h"
-#include "abstract_controller.h"
 #include <unordered_map>
 #include <unordered_set>
 #include <memory>
+#include "buses/bus.h"
+#include "base/primary_device.h"
+#include "abstract_controller.h"
 
 using namespace std;
 

diff --git a/cpp/controllers/phase_handler.h b/cpp/controllers/phase_handler.h
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "shared/scsi.h"
-#include "shared/shared_exceptions.h"
 #include <unordered_map>
 #include <functional>
+#include "shared/scsi.h"
+#include "shared/shared_exceptions.h"
 
 class PhaseHandler
 {

diff --git a/cpp/controllers/scsi_controller.h b/cpp/controllers/scsi_controller.h
@@ -11,8 +11,8 @@
 
 #pragma once
 
-#include "generic_controller.h"
 #include <array>
+#include "generic_controller.h"
 
 using namespace std;
 

diff --git a/cpp/devices/cd_track.cpp b/cpp/devices/cd_track.cpp
@@ -9,8 +9,8 @@
 //
 //---------------------------------------------------------------------------
 
-#include "cd_track.h"
 #include <cassert>
+#include "cd_track.h"
 
 void CDTrack::Init(int track, uint32_t first, uint32_t last)
 {

diff --git a/cpp/devices/ctapdriver.cpp b/cpp/devices/ctapdriver.cpp
@@ -9,9 +9,6 @@
 //
 //---------------------------------------------------------------------------
 
-#include "shared/s2p_util.h"
-#include "shared/network_util.h"
-#include "ctapdriver.h"
 #include <unistd.h>
 #include <poll.h>
 #include <arpa/inet.h>
@@ -23,6 +20,9 @@
 #include <linux/if_tun.h>
 #include <linux/sockios.h>
 #endif
+#include "shared/s2p_util.h"
+#include "shared/network_util.h"
+#include "ctapdriver.h"
 
 using namespace std;
 using namespace s2p_util;

diff --git a/cpp/devices/ctapdriver.h b/cpp/devices/ctapdriver.h
@@ -12,10 +12,10 @@
 
 #pragma once
 
-#include "base/device.h"
 #include <vector>
 #include <string>
 #include <span>
+#include "base/device.h"
 
 #ifndef ETH_FRAME_LEN
 static const int ETH_FRAME_LEN = 1514;

diff --git a/cpp/devices/daynaport.h b/cpp/devices/daynaport.h
@@ -25,15 +25,15 @@
 
 #pragma once
 
-#include "base/primary_device.h"
-#include "ctapdriver.h"
 #ifndef __NetBSD__
 #include <net/ethernet.h>
 #endif
 #include <string>
 #include <span>
 #include <unordered_map>
 #include <array>
+#include "base/primary_device.h"
+#include "ctapdriver.h"
 
 class SCSIDaynaPort : public PrimaryDevice
 {

diff --git a/cpp/devices/disk.h b/cpp/devices/disk.h
@@ -13,16 +13,16 @@
 
 #pragma once
 
-#include "shared/s2p_util.h"
-#include "disk_track.h"
-#include "disk_cache.h"
-#include "base/interfaces/scsi_block_commands.h"
-#include "storage_device.h"
 #include <string>
 #include <span>
 #include <unordered_set>
 #include <unordered_map>
 #include <tuple>
+#include "base/interfaces/scsi_block_commands.h"
+#include "shared/s2p_util.h"
+#include "disk_track.h"
+#include "disk_cache.h"
+#include "storage_device.h"
 
 using namespace std;
 

diff --git a/cpp/devices/disk_cache.cpp b/cpp/devices/disk_cache.cpp
@@ -11,11 +11,11 @@
 //
 //---------------------------------------------------------------------------
 
-#include "disk_track.h"
-#include "disk_cache.h"
 #include <cstdlib>
 #include <cassert>
 #include <algorithm>
+#include "disk_track.h"
+#include "disk_cache.h"
 
 DiskCache::DiskCache(const string &path, int size, uint32_t blocks, off_t imgoff)
 : sec_path(path), sec_size(size), sec_blocks(blocks), imgoffset(imgoff)

diff --git a/cpp/devices/disk_cache.h b/cpp/devices/disk_cache.h
@@ -13,11 +13,11 @@
 
 #pragma once
 
-#include "generated/s2p_interface.pb.h"
 #include <span>
 #include <array>
 #include <memory>
 #include <string>
+#include "generated/s2p_interface.pb.h"
 
 using namespace std;
 using namespace s2p_interface;