Moved BlockDrv to Ref

Author: timcanham

Drv/BlockDriver/BlockDriver.hpp

@@ -4,7 +4,6 @@
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Ports/")
 
 # Components
-add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/BlockDriver/")
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/ByteStreamDriverModel/")
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/LinuxGpioDriver/")
 add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/LinuxUartDriver/")

Drv/BlockDriver/BlockDriverImpl.cpp

@@ -0,0 +1,31 @@
+#include <Ref/BlockDriver/BlockDriver.hpp>
+#include <Fw/FPrimeBasicTypes.hpp>
+#include <Fw/Types/Assert.hpp>
+
+namespace Ref {
+
+    BlockDriver::BlockDriver(const char* compName) :
+        BlockDriverComponentBase(compName), m_cycles(0)
+    {}
+
+    BlockDriver::~BlockDriver() {}
+
+    void BlockDriver::BufferIn_handler(FwIndexType portNum, Drv::DataBuffer& buffer) {
+        // just a pass-through
+        this->BufferOut_out(0,buffer);
+    }
+
+    void BlockDriver::Sched_handler(FwIndexType portNum, U32 context) {
+        this->m_cycles++;
+    }
+
+    void BlockDriver::PingIn_handler(
+            const FwIndexType portNum,
+            U32 key
+        )
+      {
+        // call ping output port
+        this->PingOut_out(0,key);
+      }
+
+}

Drv/BlockDriver/CMakeLists.txt

@@ -1,4 +1,4 @@
-module Drv {
+module Ref {
 
   @ An example block driver component with data buffers and interrupts
   active component BlockDriver {
@@ -7,7 +7,7 @@ module Drv {
     # General ports
     # ----------------------------------------------------------------------
 
-    include "../Interfaces/TickInterface.fppi"
+    include "../../Drv/Interfaces/TickInterface.fppi"
 
     @ The rate group scheduler input
     async input port Sched: Svc.Sched
@@ -34,16 +34,6 @@ module Drv {
     @ Telemetry port
     telemetry port Tlm
 
-    # ----------------------------------------------------------------------
-    # Internal ports
-    # ----------------------------------------------------------------------
-
-    @ Internal interrupt reporting interface
-    internal port InterruptReport(
-                                   interrupt: U32 @< The interrupt register value
-                                 ) \
-      priority 1
-
     # ----------------------------------------------------------------------
     # Telemetry
     # ----------------------------------------------------------------------

Drv/BlockDriver/Tlm.xml

@@ -1,25 +1,22 @@
-#ifndef DRV_BLOCK_DRIVER_IMPL_HPP
-#define DRV_BLOCK_DRIVER_IMPL_HPP
+#ifndef REF_BLOCK_DRIVER_IMPL_HPP
+#define REF_BLOCK_DRIVER_IMPL_HPP
 
-#include <Drv/BlockDriver/BlockDriverComponentAc.hpp>
+#include <Ref/BlockDriver/BlockDriverComponentAc.hpp>
 
-namespace Drv {
+namespace Ref {
 
-    class BlockDriverImpl final : public BlockDriverComponentBase  {
+    class BlockDriver final : public BlockDriverComponentBase  {
 
     public:
 
         // Only called by derived class
-        BlockDriverImpl(const char* compName);
+        BlockDriver(const char* compName);
 
-        ~BlockDriverImpl();
-        // a little hack to get the reference running
-        void callIsr();
+        ~BlockDriver();
 
     private:
 
         // downcalls for input ports
-        void InterruptReport_internalInterfaceHandler(U32 ip);
         void BufferIn_handler(FwIndexType portNum, Drv::DataBuffer& buffer);
         void Sched_handler(FwIndexType portNum, U32 context);
         //! Handler implementation for PingIn
@@ -29,9 +26,6 @@ namespace Drv {
             U32 key /*!< Value to return to pinger*/
         );
 
-        // static ISR callback
-        static void s_driverISR(void* arg);
-
         // cycle count
         U32 m_cycles;
 

Drv/CMakeLists.txt

@@ -0,0 +1,29 @@
+####
+# 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}/BlockDriver.fpp"
+  "${CMAKE_CURRENT_LIST_DIR}/BlockDriver.cpp"
+)
+
+register_fprime_module()
+
+### Unit Tests ###
+# set(UT_SOURCE_FILES
+#   "${CMAKE_CURRENT_LIST_DIR}/BlockDriver.fpp"
+#   "${CMAKE_CURRENT_LIST_DIR}/test/ut/BlockDriverTestMain.cpp"
+#   "${CMAKE_CURRENT_LIST_DIR}/test/ut/BlockDriverTester.cpp"
+# )
+# set(UT_MOD_DEPS
+#   STest
+# )
+# set(UT_AUTO_HELPERS ON)
+# register_fprime_ut()
+# set (UT_TARGET_NAME "${FPRIME_CURRENT_MODULE}_ut_exe")
+# if (TARGET "${UT_TARGET_NAME}")
+#     target_compile_options("${UT_TARGET_NAME}" PRIVATE -Wno-conversion)
+# endif()