Brought in cf_utils for list traversals

Author: Brian-Campuzano

Svc/Ccsds/CfdpManager/CMakeLists.txt

@@ -23,6 +23,7 @@ register_fprime_library(
         "${CMAKE_CURRENT_LIST_DIR}/cf_cfdp_s.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/cf_chunk.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/cf_clist.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/cf_utils.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/CfeStubs.hpp"
         "${CMAKE_CURRENT_LIST_DIR}/CfdpTimer.cpp"
         # TODO This should be moved to the F' config directory

Svc/Ccsds/CfdpManager/CfdpManager.cpp

@@ -70,7 +70,7 @@ void CfdpManager ::TODO_cmdHandler(FwOpcodeType opCode, U32 cmdSeq) {
 // differences between F' and cFE
 // ----------------------------------------------------------------------
 
-CfdpStatus::T CfdpManager ::cfdpGetPduBuffer(CF_Logical_PduBuffer_t* pduPtr, U8* msgPtr, U8 channelNum, FwSizeType size)
+CfdpStatus::T CfdpManager ::getPduBuffer(CF_Logical_PduBuffer_t* pduPtr, U8* msgPtr, U8 channelNum, FwSizeType size)
 {
     // FwIndexType portNum;
 
@@ -86,6 +86,9 @@ CfdpStatus::T CfdpManager ::cfdpGetPduBuffer(CF_Logical_PduBuffer_t* pduPtr, U8*
     FW_ASSERT(pduPtr == NULL);
     FW_ASSERT(msgPtr == NULL);
 
+    // TODO Add output throtteling and guards here
+    // CF implemented this in CF_CFDP_MsgOutGet()
+
     for(U32 i = 0; i < CFDP_MANAGER_NUM_BUFFERS; i++)
     {
         if(this->pduBuffers[i].inUse == false)
@@ -109,7 +112,7 @@ CfdpStatus::T CfdpManager ::cfdpGetPduBuffer(CF_Logical_PduBuffer_t* pduPtr, U8*
 
 // TODO call this from reset
 // Check for other escape routes
-void CfdpManager ::cfdpReturnPduBuffer(U8 channelNum, CF_Logical_PduBuffer_t * pdu)
+void CfdpManager ::returnPduBuffer(U8 channelNum, CF_Logical_PduBuffer_t * pdu)
 {
     // FwIndexType portNum;
 
@@ -125,7 +128,7 @@ void CfdpManager ::cfdpReturnPduBuffer(U8 channelNum, CF_Logical_PduBuffer_t * p
     this->returnBufferHelper(pdu);
 }
 
-void CfdpManager ::cfdpSendPduBuffer(U8 channelNum, CF_Logical_PduBuffer_t * pdu, const U8* msgPtr)
+void CfdpManager ::sendPduBuffer(U8 channelNum, CF_Logical_PduBuffer_t * pdu, const U8* msgPtr)
 {
     FwIndexType portNum;
     FwSizeType msgSize;

Svc/Ccsds/CfdpManager/CfdpManager.hpp

@@ -51,11 +51,11 @@ class CfdpManager final : public CfdpManagerComponentBase {
   // ----------------------------------------------------------------------
 
   // Equivelent of CF_CFDP_MsgOutGet
-  CfdpStatus::T cfdpGetPduBuffer(CF_Logical_PduBuffer_t* pduPtr, U8* msgPtr, U8 channelNum, FwSizeType size);
+  CfdpStatus::T getPduBuffer(CF_Logical_PduBuffer_t* pduPtr, U8* msgPtr, U8 channelNum, FwSizeType size);
   // Not sure there is an equivelent
-  void cfdpReturnPduBuffer(U8 channelNum, CF_Logical_PduBuffer_t *);
+  void returnPduBuffer(U8 channelNum, CF_Logical_PduBuffer_t *);
   // Equivelent of CF_CFDP_Send
-  void cfdpSendPduBuffer(U8 channelNum, CF_Logical_PduBuffer_t * pdu, const U8* msgPtr);
+  void sendPduBuffer(U8 channelNum, CF_Logical_PduBuffer_t * pdu, const U8* msgPtr);
 
   private:
     // ----------------------------------------------------------------------