From c34482d52b22fc953b1c2b14eb9569c4b17fb745 Mon Sep 17 00:00:00 2001 From: kevin-f-ortega Date: Mon, 18 Nov 2024 09:49:42 -0800 Subject: [PATCH] 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 --- Drv/CMakeLists.txt | 5 +---- Drv/I2cDriverPorts/CMakeLists.txt | 12 ------------ Drv/{GpioDriverPorts => Ports}/CMakeLists.txt | 4 ++++ Drv/{ => Ports}/DataTypes/CMakeLists.txt | 0 Drv/{ => Ports}/DataTypes/DataBuffer.cpp | 2 +- Drv/{ => Ports}/DataTypes/DataBuffer.hpp | 0 Drv/{ => Ports}/DataTypes/DataTypes.fpp | 0 Drv/{GpioDriverPorts => Ports}/GpioDriverPorts.fpp | 0 Drv/{I2cDriverPorts => Ports}/I2cDriverPorts.fpp | 0 Drv/{SpiDriverPorts => Ports}/SpiDriverPorts.fpp | 0 Drv/SpiDriverPorts/CMakeLists.txt | 12 ------------ cmake/test/src/settings.py | 2 +- 12 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 Drv/I2cDriverPorts/CMakeLists.txt rename Drv/{GpioDriverPorts => Ports}/CMakeLists.txt (59%) rename Drv/{ => Ports}/DataTypes/CMakeLists.txt (100%) rename Drv/{ => Ports}/DataTypes/DataBuffer.cpp (96%) rename Drv/{ => Ports}/DataTypes/DataBuffer.hpp (100%) rename Drv/{ => Ports}/DataTypes/DataTypes.fpp (100%) rename Drv/{GpioDriverPorts => Ports}/GpioDriverPorts.fpp (100%) rename Drv/{I2cDriverPorts => Ports}/I2cDriverPorts.fpp (100%) rename Drv/{SpiDriverPorts => Ports}/SpiDriverPorts.fpp (100%) delete mode 100644 Drv/SpiDriverPorts/CMakeLists.txt diff --git a/Drv/CMakeLists.txt b/Drv/CMakeLists.txt index 0419ea2d70..61d8d67725 100644 --- 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 deleted file mode 100644 index c164cb9f43..0000000000 --- a/Drv/I2cDriverPorts/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -#### -# F prime CMakeLists.txt: -# -# SOURCE_FILES: combined list of source and autocoding files -# MOD_DEPS: (optional) module dependencies -# -#### -set(SOURCE_FILES - "${CMAKE_CURRENT_LIST_DIR}/I2cDriverPorts.fpp" -) - -register_fprime_module() diff --git a/Drv/GpioDriverPorts/CMakeLists.txt b/Drv/Ports/CMakeLists.txt similarity index 59% rename from Drv/GpioDriverPorts/CMakeLists.txt rename to Drv/Ports/CMakeLists.txt index 8ed47ecc86..d5830136a3 100644 --- a/Drv/GpioDriverPorts/CMakeLists.txt +++ b/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 b/Drv/Ports/DataTypes/CMakeLists.txt similarity index 100% rename from Drv/DataTypes/CMakeLists.txt rename to Drv/Ports/DataTypes/CMakeLists.txt diff --git a/Drv/DataTypes/DataBuffer.cpp b/Drv/Ports/DataTypes/DataBuffer.cpp similarity index 96% rename from Drv/DataTypes/DataBuffer.cpp rename to Drv/Ports/DataTypes/DataBuffer.cpp index c29c1719f2..a6229fc2c4 100644 --- a/Drv/DataTypes/DataBuffer.cpp +++ b/Drv/Ports/DataTypes/DataBuffer.cpp @@ -1,4 +1,4 @@ -#include +#include #include namespace Drv { diff --git a/Drv/DataTypes/DataBuffer.hpp b/Drv/Ports/DataTypes/DataBuffer.hpp similarity index 100% rename from Drv/DataTypes/DataBuffer.hpp rename to Drv/Ports/DataTypes/DataBuffer.hpp diff --git a/Drv/DataTypes/DataTypes.fpp b/Drv/Ports/DataTypes/DataTypes.fpp similarity index 100% rename from Drv/DataTypes/DataTypes.fpp rename to Drv/Ports/DataTypes/DataTypes.fpp diff --git a/Drv/GpioDriverPorts/GpioDriverPorts.fpp b/Drv/Ports/GpioDriverPorts.fpp similarity index 100% rename from Drv/GpioDriverPorts/GpioDriverPorts.fpp rename to Drv/Ports/GpioDriverPorts.fpp diff --git a/Drv/I2cDriverPorts/I2cDriverPorts.fpp b/Drv/Ports/I2cDriverPorts.fpp similarity index 100% rename from Drv/I2cDriverPorts/I2cDriverPorts.fpp rename to Drv/Ports/I2cDriverPorts.fpp diff --git a/Drv/SpiDriverPorts/SpiDriverPorts.fpp b/Drv/Ports/SpiDriverPorts.fpp similarity index 100% rename from Drv/SpiDriverPorts/SpiDriverPorts.fpp rename to Drv/Ports/SpiDriverPorts.fpp diff --git a/Drv/SpiDriverPorts/CMakeLists.txt b/Drv/SpiDriverPorts/CMakeLists.txt deleted file mode 100644 index 1d6bd704f4..0000000000 --- a/Drv/SpiDriverPorts/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -#### -# F prime CMakeLists.txt: -# -# SOURCE_FILES: combined list of source and autocoding files -# MOD_DEPS: (optional) module dependencies -# -#### -set(SOURCE_FILES - "${CMAKE_CURRENT_LIST_DIR}/SpiDriverPorts.fpp" -) - -register_fprime_module() diff --git a/cmake/test/src/settings.py b/cmake/test/src/settings.py index 91eefd2648..2a901ec323 100644 --- a/cmake/test/src/settings.py +++ b/cmake/test/src/settings.py @@ -31,7 +31,7 @@ STANDARD_MODULES = [ "Fw_Prm", "CFDP_Checksum", "Drv_ByteStreamDriverModel", - "Drv_DataTypes", + "Drv_Ports_DataTypes", "Drv_Ip", "Drv_TcpClient", "Utils_Hash",