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

@@ -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/")

Drv/I2cDriverPorts/CMakeLists.txt

@@ -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()

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()

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 {

Drv/SpiDriverPorts/CMakeLists.txt

@@ -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()

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",