Remove NATIVE_INT_TYPE, NATIVE_UINT_TYPE, and POINTER_CAST from Svc

RPI/RpiDemo/RpiDemoComponentImpl.cpp

@@ -114,7 +114,7 @@ namespace RPI {
           char uMsg[serBuffer.getSize() + 1];
           char *bPtr = reinterpret_cast<char *>(serBuffer.getData());
 
-          for (NATIVE_UINT_TYPE byte = 0; byte < serBuffer.getSize(); byte++) {
+          for (FwSizeType byte = 0; byte < serBuffer.getSize(); byte++) {
             uMsg[byte] = isalpha(bPtr[byte]) ? bPtr[byte] : '*';
           }
           uMsg[sizeof(uMsg) - 1] = 0;
@@ -160,7 +160,7 @@ namespace RPI {
         Fw::Logic value
     )
   {
-      NATIVE_INT_TYPE port;
+      FwIndexType port;
       // convert to connected ports
       switch (output.e) {
           case RpiDemo_GpioOutNum::PIN_23:
@@ -191,7 +191,7 @@ namespace RPI {
         RpiDemo_GpioInNum input /*!< Input GPIO*/
     )
   {
-      NATIVE_INT_TYPE port;
+      FwIndexType port;
       // convert to connected ports
       switch (input.e) {
           case RpiDemo_GpioInNum::PIN_25:
@@ -229,7 +229,7 @@ namespace RPI {
       out.setData(reinterpret_cast<U8*>(const_cast<char*>(data.toChar())));
       out.setSize(data.length());
       this->SpiReadWrite_out(0, out, in);
-      for (NATIVE_UINT_TYPE byte = 0; byte < sizeof(inBuf); byte++) {
+      for (FwSizeType byte = 0; byte < static_cast<FwSizeType>(sizeof(inBuf)); byte++) {
           inBuf[byte] = isalpha(inBuf[byte])?inBuf[byte]:'*';
       }
       inBuf[sizeof(inBuf)-1] = 0;

RPI/Top/instances.fpp

@@ -23,7 +23,7 @@ module RPI {
   {
 
     phase Fpp.ToCpp.Phases.configObjects """
-    NATIVE_INT_TYPE context[] = { RpiDemo::RG_CONTEXT_10Hz, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+    U32 context[] = { RpiDemo::RG_CONTEXT_10Hz, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
     """
 
     phase Fpp.ToCpp.Phases.configComponents """
@@ -100,7 +100,7 @@ module RPI {
   {
 
     phase Fpp.ToCpp.Phases.configObjects """
-    NATIVE_INT_TYPE context[] = { 0, 0, RpiDemo::RG_CONTEXT_1Hz, 0, 0, 0, 0, 0, 0, 0 };
+    U32 context[] = { 0, 0, RpiDemo::RG_CONTEXT_1Hz, 0, 0, 0, 0, 0, 0, 0 };
     """
 
     phase Fpp.ToCpp.Phases.configComponents """

Ref/SendBuffApp/SendBuffComponentImpl.cpp

@@ -57,8 +57,8 @@ namespace Ref {
             this->tlmWrite_PacketsSent(this->m_buffsSent);
             // write data
             U8 testData[24];
-            NATIVE_UINT_TYPE dataSize = sizeof(testData);
-            memset(testData,0xFF,dataSize);
+            FwSizeType dataSize = static_cast<FwSizeType>(sizeof(testData));
+            memset(testData,0xFF,static_cast<size_t>(dataSize));
             // compute checksum
             U32 csum = 0;
             for (U32 byte = 0; byte < dataSize; byte++) {

Ref/Top/RefTopology.cpp

@@ -43,9 +43,9 @@ Svc::RateGroupDriver::DividerSet rateGroupDivisorsSet{{{1, 0}, {2, 0}, {4, 0}}};
 
 // Rate groups may supply a context token to each of the attached children whose purpose is set by the project. The
 // reference topology sets each token to zero as these contexts are unused in this project.
-NATIVE_INT_TYPE rateGroup1Context[Svc::ActiveRateGroup::CONNECTION_COUNT_MAX] = {};
-NATIVE_INT_TYPE rateGroup2Context[Svc::ActiveRateGroup::CONNECTION_COUNT_MAX] = {};
-NATIVE_INT_TYPE rateGroup3Context[Svc::ActiveRateGroup::CONNECTION_COUNT_MAX] = {};
+U32 rateGroup1Context[Svc::ActiveRateGroup::CONNECTION_COUNT_MAX] = {};
+U32 rateGroup2Context[Svc::ActiveRateGroup::CONNECTION_COUNT_MAX] = {};
+U32 rateGroup3Context[Svc::ActiveRateGroup::CONNECTION_COUNT_MAX] = {};
 
 // A number of constants are needed for construction of the topology. These are specified here.
 enum TopologyConstants {

Svc/ActiveLogger/ActiveLoggerImpl.cpp

@@ -12,7 +12,7 @@
 #include <Os/File.hpp>
 
 namespace Svc {
-
+    static_assert(std::numeric_limits<FwSizeType>::max() >= TELEM_ID_FILTER_SIZE, "TELEM_ID_FILTER_SIZE must fit within range of FwSizeType");
     typedef ActiveLogger_Enabled Enabled;
     typedef ActiveLogger_FilterSeverity FilterSeverity;
 
@@ -84,7 +84,7 @@
         }
 
         // check ID filters
-        for (NATIVE_INT_TYPE entry = 0; entry < TELEM_ID_FILTER_SIZE; entry++) {
+        for (FwSizeType entry = 0; entry < TELEM_ID_FILTER_SIZE; entry++) {
             if (
               (m_filteredIDs[entry] == id) &&
               (severity != Fw::LogSeverity::FATAL)
@@ -133,15 +133,15 @@
 
         if (Enabled::ENABLED == idEnabled.e) { // add ID
             // search list for existing entry
-            for (NATIVE_INT_TYPE entry = 0; entry < TELEM_ID_FILTER_SIZE; entry++) {
+            for (FwSizeType entry = 0; entry < TELEM_ID_FILTER_SIZE; entry++) {
                 if (this->m_filteredIDs[entry] == ID) {
                     this->cmdResponse_out(opCode,cmdSeq,Fw::CmdResponse::OK);
                     this->log_ACTIVITY_HI_ID_FILTER_ENABLED(ID);
                     return;
                 }
             }
             // if not already a match, search for an open slot
-            for (NATIVE_INT_TYPE entry = 0; entry < TELEM_ID_FILTER_SIZE; entry++) {
+            for (FwSizeType entry = 0; entry < TELEM_ID_FILTER_SIZE; entry++) {
                 if (this->m_filteredIDs[entry] == 0) {
                     this->m_filteredIDs[entry] = ID;
                     this->cmdResponse_out(opCode,cmdSeq,Fw::CmdResponse::OK);
@@ -154,7 +154,7 @@
             this->cmdResponse_out(opCode,cmdSeq,Fw::CmdResponse::EXECUTION_ERROR);
         } else { // remove ID
             // search list for existing entry
-            for (NATIVE_INT_TYPE entry = 0; entry < TELEM_ID_FILTER_SIZE; entry++) {
+            for (FwSizeType entry = 0; entry < TELEM_ID_FILTER_SIZE; entry++) {
                 if (this->m_filteredIDs[entry] == ID) {
                     this->m_filteredIDs[entry] = 0; // zero entry
                     this->cmdResponse_out(opCode,cmdSeq,Fw::CmdResponse::OK);
@@ -175,7 +175,7 @@
         ) {
 
         // first, iterate through severity filters
-        for (NATIVE_UINT_TYPE filter = 0; filter < FilterSeverity::NUM_CONSTANTS; filter++) {
+        for (FwEnumStoreType filter = 0; filter < FilterSeverity::NUM_CONSTANTS; filter++) {
            FilterSeverity filterState(static_cast<FilterSeverity::t>(filter));
            this->log_ACTIVITY_LO_SEVERITY_FILTER_STATE(
                     filterState,
@@ -184,7 +184,7 @@
         }
 
         // iterate through ID filter
-        for (NATIVE_INT_TYPE entry = 0; entry < TELEM_ID_FILTER_SIZE; entry++) {
+        for (FwSizeType entry = 0; entry < TELEM_ID_FILTER_SIZE; entry++) {
             if (this->m_filteredIDs[entry] != 0) {
                 this->log_ACTIVITY_HI_ID_FILTER_ENABLED(this->m_filteredIDs[entry]);
             }

Svc/ActiveLogger/test/ut/ActiveLoggerImplTester.cpp

@@ -19,10 +19,6 @@ namespace Svc {
     typedef ActiveLogger_Enabled Enabled;
     typedef ActiveLogger_FilterSeverity FilterSeverity;
 
-    void ActiveLoggerImplTester::init(NATIVE_INT_TYPE instance) {
-        Svc::ActiveLoggerGTestBase::init();
-    }
-
     ActiveLoggerImplTester::ActiveLoggerImplTester(Svc::ActiveLoggerImpl& inst) :
             Svc::ActiveLoggerGTestBase("testerbase",100),
             m_impl(inst),
@@ -229,7 +225,7 @@ namespace Svc {
 
         REQUIREMENT("AL-003");
 
-        for (NATIVE_INT_TYPE filterID = 1; filterID <= TELEM_ID_FILTER_SIZE; filterID++) {
+        for (FwSizeType filterID = 1; filterID <= TELEM_ID_FILTER_SIZE; filterID++) {
             this->clearHistory();
             this->clearEvents();
             this->sendCmd_SET_ID_FILTER(0,cmdSeq,filterID,Enabled::ENABLED);
@@ -265,7 +261,7 @@ namespace Svc {
         }
 
         // Try to send the IDs that are filtered
-        for (NATIVE_INT_TYPE filterID = 1; filterID <= TELEM_ID_FILTER_SIZE; filterID++) {
+        for (FwSizeType filterID = 1; filterID <= TELEM_ID_FILTER_SIZE; filterID++) {
             this->clearHistory();
             this->clearEvents();
 
@@ -325,7 +321,7 @@ namespace Svc {
 
         // Now clear them
 
-        for (NATIVE_INT_TYPE filterID = 1; filterID <= TELEM_ID_FILTER_SIZE; filterID++) {
+        for (FwSizeType filterID = 1; filterID <= TELEM_ID_FILTER_SIZE; filterID++) {
             this->clearHistory();
             this->clearEvents();
             this->sendCmd_SET_ID_FILTER(0,cmdSeq,filterID,Enabled::DISABLED);

Svc/ActiveLogger/test/ut/ActiveLoggerImplTester.hpp

@@ -19,8 +19,6 @@ namespace Svc {
             ActiveLoggerImplTester(Svc::ActiveLoggerImpl& inst);
             virtual ~ActiveLoggerImplTester();
 
-            void init(NATIVE_INT_TYPE instance = 0) override;
-
             void runEventNominal();
             void runFilterEventNominal();
             void runFilterIdNominal();
@@ -55,24 +53,13 @@ namespace Svc {
             void writeEvent(FwEventIdType id, Fw::LogSeverity severity, U32 value);
             void readEvent(FwEventIdType id, Fw::LogSeverity severity, U32 value, Os::File& file);
 
-            // open call modifiers
-
-            static bool OpenInterceptor(Os::File::Status &stat, const char* fileName, Os::File::Mode mode, void* ptr);
-            Os::File::Status m_testOpenStatus;
-
-            // write call modifiers
-
-            static bool WriteInterceptor(Os::File::Status &status, const void * buffer, NATIVE_INT_TYPE &size, bool waitForDone, void* ptr);
-            Os::File::Status m_testWriteStatus;
-            // How many read calls to let pass before modifying
-            NATIVE_INT_TYPE m_writesToWait;
             // enumeration to tell what kind of error to inject
             typedef enum {
                 FILE_WRITE_WRITE_ERROR, // return a bad read status
                 FILE_WRITE_SIZE_ERROR, // return a bad size
             } FileWriteTestType;
             FileWriteTestType m_writeTestType;
-            NATIVE_INT_TYPE m_writeSize;
+            FwSizeType m_writeSize;
 
             void textLogIn(const FwEventIdType id, //!< The event ID
                       const Fw::Time& timeTag, //!< The time

Svc/ActiveRateGroup/ActiveRateGroup.cpp

@@ -30,7 +30,7 @@
             m_cycleSlips(0) {
     }
 
-    void ActiveRateGroup::configure( NATIVE_INT_TYPE contexts[], NATIVE_INT_TYPE numContexts) {
+    void ActiveRateGroup::configure(U32 contexts[], FwIndexType numContexts) {
         FW_ASSERT(contexts);
         FW_ASSERT(numContexts == this->getNum_RateGroupMemberOut_OutputPorts(),numContexts,this->getNum_RateGroupMemberOut_OutputPorts());
         FW_ASSERT(FW_NUM_ARRAY_ELEMENTS(this->m_contexts) == this->getNum_RateGroupMemberOut_OutputPorts(),
@@ -39,7 +39,7 @@
 
         this->m_numContexts = numContexts;
         // copy context values
-        for (NATIVE_INT_TYPE entry = 0; entry < this->m_numContexts; entry++) {
+        for (FwIndexType entry = 0; entry < this->m_numContexts; entry++) {
             this->m_contexts[entry] = contexts[entry];
         }
     }
@@ -62,7 +62,7 @@
         this->m_cycleStarted = false;
 
         // invoke any members of the rate group
-        for (NATIVE_INT_TYPE port = 0; port < this->m_numContexts; port++) {
+        for (FwIndexType port = 0; port < this->m_numContexts; port++) {
             if (this->isConnected_RateGroupMemberOut_OutputPort(port)) {
                 this->RateGroupMemberOut_out(port, static_cast<U32>(this->m_contexts[port]));
             }

Svc/ActiveRateGroup/ActiveRateGroup.hpp

@@ -50,7 +50,7 @@
             //!         output port number.
             //!  \param numContexts The number of elements in the context array.
 
-            void configure(NATIVE_INT_TYPE contexts[], NATIVE_INT_TYPE numContexts);
+            void configure(U32 contexts[], FwIndexType numContexts);
 
             //!  \brief ActiveRateGroup destructor
             //!
@@ -101,9 +101,9 @@
             U32 m_cycles; //!< cycles executed
             U32 m_maxTime; //!< maximum execution time in microseconds
             volatile bool m_cycleStarted; //!< indicate that cycle has started. Used to detect overruns.
-            NATIVE_INT_TYPE m_contexts[CONNECTION_COUNT_MAX]; //!< Must match number of output ports
-            NATIVE_INT_TYPE m_numContexts; //!< Number of contexts passed in by user
-            NATIVE_INT_TYPE m_overrunThrottle; //!< throttle value for overrun events
+            U32 m_contexts[CONNECTION_COUNT_MAX]; //!< Must match number of output ports
+            FwIndexType m_numContexts; //!< Number of contexts passed in by user
+            FwIndexType m_overrunThrottle; //!< throttle value for overrun events
             U32 m_cycleSlips; //!< tracks number of cycle slips
     };
 

Svc/ActiveRateGroup/docs/sdd.md

@@ -44,7 +44,7 @@ The `Svc::ActiveRateGroup` component has one input port that is called to wake u
 A set of context values are passed in as an array to the configure function:
 
 ```
-void configure(NATIVE_INT_TYPE contexts[], NATIVE_INT_TYPE numContexts);
+void configure(U32 contexts[], FwIndexType numContexts);
 ```
 
 A context value can be used by a component to discriminate between more than one call in the rate group.

Svc/ActiveRateGroup/test/ut/ActiveRateGroupImplTester.cpp

@@ -22,11 +22,6 @@
 #include <cstring>
 
 namespace Svc {
-
-    void ActiveRateGroupImplTester::init(NATIVE_INT_TYPE instance) {
-        ActiveRateGroupGTestBase::init();
-    }
-
     ActiveRateGroupImplTester::ActiveRateGroupImplTester(Svc::ActiveRateGroup& inst) :
             ActiveRateGroupGTestBase("testerbase",100),
             m_impl(inst),m_causeOverrun(false),m_callOrder(0) {
@@ -43,7 +38,7 @@ namespace Svc {
     }
 
     void ActiveRateGroupImplTester::from_RateGroupMemberOut_handler(FwIndexType portNum, U32 context) {
-        ASSERT_TRUE(portNum < static_cast<NATIVE_INT_TYPE>(FW_NUM_ARRAY_ELEMENTS(m_impl.m_RateGroupMemberOut_OutputPort)));
+        ASSERT_TRUE(portNum < static_cast<FwIndexType>(FW_NUM_ARRAY_ELEMENTS(m_impl.m_RateGroupMemberOut_OutputPort)));
         this->m_callLog[portNum].portCalled = true;
         this->m_callLog[portNum].contextVal = context;
         this->m_callLog[portNum].order = this->m_callOrder++;
@@ -65,7 +60,7 @@ namespace Svc {
       this->pushFromPortEntry_PingOut(key);
     }
 
-    void ActiveRateGroupImplTester::runNominal(NATIVE_INT_TYPE contexts[], NATIVE_INT_TYPE numContexts, NATIVE_INT_TYPE instance) {
+    void ActiveRateGroupImplTester::runNominal(U32 contexts[], FwIndexType numContexts, FwEnumStoreType instance) {
 
         TEST_CASE(101.1.1,"Run nominal rate group execution");
 
@@ -96,8 +91,8 @@ namespace Svc {
         ASSERT_FALSE(this->m_impl.m_cycleStarted);
         // check calls
         REQUIREMENT("ARG-002");
-        for (NATIVE_UINT_TYPE portNum = 0; portNum <
-        static_cast<NATIVE_UINT_TYPE>(FW_NUM_ARRAY_ELEMENTS(this->m_impl.m_RateGroupMemberOut_OutputPort)); portNum++) {
+        for (FwIndexType portNum = 0; portNum <
+        static_cast<FwIndexType>(FW_NUM_ARRAY_ELEMENTS(this->m_impl.m_RateGroupMemberOut_OutputPort)); portNum++) {
             ASSERT_TRUE(this->m_callLog[portNum].portCalled);
             ASSERT_EQ(this->m_callLog[portNum].contextVal,contexts[portNum]);
             ASSERT_EQ(this->m_callLog[portNum].order,portNum);
@@ -114,7 +109,7 @@ namespace Svc {
 
     }
 
-    void ActiveRateGroupImplTester::runCycleOverrun(NATIVE_INT_TYPE contexts[], NATIVE_INT_TYPE numContexts, NATIVE_INT_TYPE instance) {
+    void ActiveRateGroupImplTester::runCycleOverrun(U32 contexts[], FwIndexType numContexts, FwEnumStoreType instance) {
 
         TEST_CASE(101.2.1,"Run cycle slip scenario");
         // call the preamble
@@ -127,7 +122,7 @@ namespace Svc {
         Os::RawTime zero_time;
 
         // run some more cycles to verify that event is sent and telemetry is updated
-        for (NATIVE_INT_TYPE cycle = 0; cycle < ACTIVE_RATE_GROUP_OVERRUN_THROTTLE; cycle++) {
+        for (FwIndexType cycle = 0; cycle < ACTIVE_RATE_GROUP_OVERRUN_THROTTLE; cycle++) {
             // clear events
             this->clearEvents();
             // clear port call log
@@ -154,8 +149,8 @@ namespace Svc {
             ASSERT_EQ(this->m_impl.m_cycles,static_cast<U32>(cycle)+1);
 
             // check calls
-            for (NATIVE_UINT_TYPE portNum = 0; portNum <
-            static_cast<NATIVE_UINT_TYPE>(FW_NUM_ARRAY_ELEMENTS(this->m_impl.m_RateGroupMemberOut_OutputPort)); portNum++) {
+            for (FwIndexType portNum = 0; portNum <
+            static_cast<FwIndexType>(FW_NUM_ARRAY_ELEMENTS(this->m_impl.m_RateGroupMemberOut_OutputPort)); portNum++) {
                 ASSERT_TRUE(this->m_callLog[portNum].portCalled == true);
             }
             REQUIREMENT("ARG-004");
@@ -200,8 +195,8 @@ namespace Svc {
         // verify cycle count
         ASSERT_EQ(this->m_impl.m_cycles, static_cast<U32>(ACTIVE_RATE_GROUP_OVERRUN_THROTTLE)+1);
         // check calls
-        for (NATIVE_UINT_TYPE portNum = 0; portNum <
-        static_cast<NATIVE_UINT_TYPE>(FW_NUM_ARRAY_ELEMENTS(this->m_impl.m_RateGroupMemberOut_OutputPort)); portNum++) {
+        for (FwIndexType portNum = 0; portNum <
+        static_cast<FwIndexType>(FW_NUM_ARRAY_ELEMENTS(this->m_impl.m_RateGroupMemberOut_OutputPort)); portNum++) {
             ASSERT_TRUE(this->m_callLog[portNum].portCalled == true);
         }
         // verify overrun event is NOT sent since throttled
@@ -244,8 +239,8 @@ namespace Svc {
         // verify cycle count
         ASSERT_EQ(this->m_impl.m_cycles,static_cast<U32>(ACTIVE_RATE_GROUP_OVERRUN_THROTTLE)+2);
         // check calls
-        for (NATIVE_UINT_TYPE portNum = 0; portNum <
-        static_cast<NATIVE_UINT_TYPE>(FW_NUM_ARRAY_ELEMENTS(this->m_impl.m_RateGroupMemberOut_OutputPort)); portNum++) {
+        for (FwIndexType portNum = 0; portNum <
+        static_cast<FwIndexType>(FW_NUM_ARRAY_ELEMENTS(this->m_impl.m_RateGroupMemberOut_OutputPort)); portNum++) {
             ASSERT_TRUE(this->m_callLog[portNum].portCalled == true);
         }
 
@@ -282,8 +277,8 @@ namespace Svc {
         // verify cycle count
         ASSERT_EQ(this->m_impl.m_cycles,static_cast<U32>(ACTIVE_RATE_GROUP_OVERRUN_THROTTLE)+3);
         // check calls
-        for (NATIVE_UINT_TYPE portNum = 0; portNum <
-        static_cast<NATIVE_UINT_TYPE>(FW_NUM_ARRAY_ELEMENTS(this->m_impl.m_RateGroupMemberOut_OutputPort)); portNum++) {
+        for (FwIndexType portNum = 0; portNum <
+        static_cast<FwIndexType>(FW_NUM_ARRAY_ELEMENTS(this->m_impl.m_RateGroupMemberOut_OutputPort)); portNum++) {
             ASSERT_TRUE(this->m_callLog[portNum].portCalled == true);
         }
         // verify overrun event is sent