moved Drv ports to a Ports directory (#3008)

* moved driver ports to a Ports directory. This file structure is more inline with how F Prime structures its directories * fixed location for port * further clean up * Adding port subdirectory
nasa · Nov 18, 2024 · c34482d · c34482d
1 parent 442e57a
commit c34482d
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 30 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/I2cDriverPorts/CMakeLists.txt b/Drv/I2cDriverPorts/CMakeLists.txt
diff --git a/Drv/GpioDriverPorts/CMakeLists.txt → Drv/Ports/CMakeLists.txt b/Drv/GpioDriverPorts/CMakeLists.txt → Drv/Ports/CMakeLists.txt
@@ -5,8 +5,12 @@
 # MOD_DEPS: (optional) module dependencies
 #
 ####
+add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/DataTypes/")
+
 set(SOURCE_FILES
   "${CMAKE_CURRENT_LIST_DIR}/GpioDriverPorts.fpp"
+  "${CMAKE_CURRENT_LIST_DIR}/I2cDriverPorts.fpp"
+  "${CMAKE_CURRENT_LIST_DIR}/SpiDriverPorts.fpp"
 )
 
 register_fprime_module()
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/GpioDriverPorts.fpp → Drv/Ports/GpioDriverPorts.fpp b/Drv/GpioDriverPorts/GpioDriverPorts.fpp → Drv/Ports/GpioDriverPorts.fpp
diff --git a/Drv/I2cDriverPorts/I2cDriverPorts.fpp → Drv/Ports/I2cDriverPorts.fpp b/Drv/I2cDriverPorts/I2cDriverPorts.fpp → Drv/Ports/I2cDriverPorts.fpp
diff --git a/Drv/SpiDriverPorts/SpiDriverPorts.fpp → Drv/Ports/SpiDriverPorts.fpp b/Drv/SpiDriverPorts/SpiDriverPorts.fpp → Drv/Ports/SpiDriverPorts.fpp
diff --git a/Drv/SpiDriverPorts/CMakeLists.txt b/Drv/SpiDriverPorts/CMakeLists.txt
diff --git a/cmake/test/src/settings.py b/cmake/test/src/settings.py
@@ -31,7 +31,7 @@
     "Fw_Prm",
     "CFDP_Checksum",
     "Drv_ByteStreamDriverModel",
-    "Drv_DataTypes",
+    "Drv_Ports_DataTypes",
     "Drv_Ip",
     "Drv_TcpClient",
     "Utils_Hash",