moved driver ports to a Ports directory. This file structure is more …

…inline with how F Prime structures its directories
nasa · Nov 4, 2024 · dd1062a · dd1062a
1 parent de8dd0d
commit dd1062a
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 5 deletions.
diff --git a/Drv/CMakeLists.txt b/Drv/CMakeLists.txt
@@ -1,10 +1,7 @@
 # Module subdirectories
 
 # Ports
-add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/DataTypes/")
-add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/GpioDriverPorts/")
-add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/SpiDriverPorts/")
-add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/I2cDriverPorts/")
+add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Ports/")
 
 # Components
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/BlockDriver/")

diff --git a/Drv/Ports/CMakeLists.txt b/Drv/Ports/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Module subdirectories
+
+add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/DataTypes/")
+add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/GpioDriverPorts/")
+add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/SpiDriverPorts/")
+add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/I2cDriverPorts/")
diff --git a/Drv/DataTypes/CMakeLists.txt → Drv/Ports/DataTypes/CMakeLists.txt b/Drv/DataTypes/CMakeLists.txt → Drv/Ports/DataTypes/CMakeLists.txt
diff --git a/Drv/DataTypes/DataBuffer.cpp → Drv/Ports/DataTypes/DataBuffer.cpp b/Drv/DataTypes/DataBuffer.cpp → Drv/Ports/DataTypes/DataBuffer.cpp
@@ -1,4 +1,4 @@
-#include <Drv/DataTypes/DataBuffer.hpp>
+#include <Drv/Ports/DataTypes/DataBuffer.hpp>
 #include <Fw/Types/Assert.hpp>
 
 namespace Drv {

diff --git a/Drv/DataTypes/DataBuffer.hpp → Drv/Ports/DataTypes/DataBuffer.hpp b/Drv/DataTypes/DataBuffer.hpp → Drv/Ports/DataTypes/DataBuffer.hpp
diff --git a/Drv/DataTypes/DataTypes.fpp → Drv/Ports/DataTypes/DataTypes.fpp b/Drv/DataTypes/DataTypes.fpp → Drv/Ports/DataTypes/DataTypes.fpp
diff --git a/Drv/GpioDriverPorts/CMakeLists.txt → Drv/Ports/GpioDriverPorts/CMakeLists.txt b/Drv/GpioDriverPorts/CMakeLists.txt → Drv/Ports/GpioDriverPorts/CMakeLists.txt
diff --git a/Drv/GpioDriverPorts/GpioDriverPorts.fpp → ...Ports/GpioDriverPorts/GpioDriverPorts.fpp b/Drv/GpioDriverPorts/GpioDriverPorts.fpp → ...Ports/GpioDriverPorts/GpioDriverPorts.fpp
diff --git a/Drv/I2cDriverPorts/CMakeLists.txt → Drv/Ports/I2cDriverPorts/CMakeLists.txt b/Drv/I2cDriverPorts/CMakeLists.txt → Drv/Ports/I2cDriverPorts/CMakeLists.txt
diff --git a/Drv/I2cDriverPorts/I2cDriverPorts.fpp → Drv/Ports/I2cDriverPorts/I2cDriverPorts.fpp b/Drv/I2cDriverPorts/I2cDriverPorts.fpp → Drv/Ports/I2cDriverPorts/I2cDriverPorts.fpp
diff --git a/Drv/SpiDriverPorts/CMakeLists.txt → Drv/Ports/SpiDriverPorts/CMakeLists.txt b/Drv/SpiDriverPorts/CMakeLists.txt → Drv/Ports/SpiDriverPorts/CMakeLists.txt
diff --git a/Drv/SpiDriverPorts/SpiDriverPorts.fpp → Drv/Ports/SpiDriverPorts/SpiDriverPorts.fpp b/Drv/SpiDriverPorts/SpiDriverPorts.fpp → Drv/Ports/SpiDriverPorts/SpiDriverPorts.fpp