Removes NATIVE_INT_TYPE, NATIVE_UINT_TYPE, and POINTER_CAST from Fw

Drv/Ports/DataTypes/DataBuffer.cpp

@@ -29,7 +29,7 @@
         return *this;
     }
 
-    NATIVE_UINT_TYPE DataBuffer::getBuffCapacity() const {
+    FwSizeType DataBuffer::getBuffCapacity() const {
         return sizeof(this->m_data);
     }
 

Drv/Ports/DataTypes/DataBuffer.hpp

@@ -21,7 +21,7 @@ namespace Drv {
             virtual ~DataBuffer();
             DataBuffer& operator=(const DataBuffer& other);
 
-            NATIVE_UINT_TYPE getBuffCapacity() const; // !< returns capacity, not current size, of buffer
+            FwSizeType getBuffCapacity() const; // !< returns capacity, not current size, of buffer
             U8* getBuffAddr();
             const U8* getBuffAddr() const;
 

Fw/Buffer/Buffer.cpp

@@ -116,7 +116,7 @@
         return stat;
     }
 #endif
-    stat = buffer.serialize(reinterpret_cast<POINTER_CAST>(this->m_bufferData));
+    stat = buffer.serialize(reinterpret_cast<PlatformPointerCastType>(this->m_bufferData));
     if (stat != Fw::FW_SERIALIZE_OK) {
         return stat;
     }
@@ -146,7 +146,7 @@
         return Fw::FW_DESERIALIZE_TYPE_MISMATCH;
     }
 #endif
-    POINTER_CAST pointer;
+    PlatformPointerCastType pointer;
     stat = buffer.deserialize(pointer);
     if (stat != Fw::FW_SERIALIZE_OK) {
         return stat;

Fw/Cmd/CmdArgBuffer.cpp

@@ -3,7 +3,7 @@
 
 namespace Fw {
 
-    CmdArgBuffer::CmdArgBuffer(const U8 *args, NATIVE_UINT_TYPE size) {
+    CmdArgBuffer::CmdArgBuffer(const U8 *args, FwSizeType size) {
         SerializeStatus stat = this->setBuff(args,size);
         FW_ASSERT(FW_SERIALIZE_OK == stat,static_cast<FwAssertArgType>(stat));
     }
@@ -29,7 +29,7 @@
         return *this;
     }
 
-    NATIVE_UINT_TYPE CmdArgBuffer::getBuffCapacity() const {
+    FwSizeType CmdArgBuffer::getBuffCapacity() const {
         return sizeof(this->m_bufferData);
     }
 

Fw/Cmd/CmdArgBuffer.hpp

@@ -26,13 +26,13 @@ namespace Fw {
                 SERIALIZED_SIZE = FW_CMD_ARG_BUFFER_MAX_SIZE + sizeof(I32)  //!< size when serialized. Buffer + size of buffer
             };
 
-            CmdArgBuffer(const U8 *args, NATIVE_UINT_TYPE size);  //!< buffer source constructor
+            CmdArgBuffer(const U8 *args, FwSizeType size);  //!< buffer source constructor
             CmdArgBuffer();  //!< default constructor
             CmdArgBuffer(const CmdArgBuffer& other);  //!< other arg buffer constructor
             virtual ~CmdArgBuffer();  //!< destructor
             CmdArgBuffer& operator=(const CmdArgBuffer& other);  //!< Equal operator
 
-            NATIVE_UINT_TYPE getBuffCapacity() const;  //!< return capacity of buffer (how much it can hold)
+            FwSizeType getBuffCapacity() const;  //!< return capacity of buffer (how much it can hold)
             U8* getBuffAddr();  //!< return address of buffer (non const version)
             const U8* getBuffAddr() const;  //!< return address of buffer (const version)
 

Fw/Com/ComBuffer.cpp

@@ -3,7 +3,7 @@
 
 namespace Fw {
 
-    ComBuffer::ComBuffer(const U8 *args, NATIVE_UINT_TYPE size) {
+    ComBuffer::ComBuffer(const U8 *args, FwSizeType size) {
         SerializeStatus stat = SerializeBufferBase::setBuff(args,size);
         FW_ASSERT(FW_SERIALIZE_OK == stat,static_cast<FwAssertArgType>(stat));
     }
@@ -29,7 +29,7 @@
         return *this;
     }
 
-    NATIVE_UINT_TYPE ComBuffer::getBuffCapacity() const {
+    FwSizeType ComBuffer::getBuffCapacity() const {
         return sizeof(this->m_bufferData);
     }
 

Fw/Com/ComBuffer.hpp

@@ -25,13 +25,13 @@ namespace Fw {
                 SERIALIZED_SIZE = FW_COM_BUFFER_MAX_SIZE + sizeof(FwBuffSizeType)  // size of buffer + storage of size word
             };
 
-            ComBuffer(const U8 *args, NATIVE_UINT_TYPE size);
+            ComBuffer(const U8 *args, FwSizeType size);
             ComBuffer();
             ComBuffer(const ComBuffer& other);
             virtual ~ComBuffer();
             ComBuffer& operator=(const ComBuffer& other);
 
-            NATIVE_UINT_TYPE getBuffCapacity() const; // !< returns capacity, not current size, of buffer
+            FwSizeType getBuffCapacity() const; // !< returns capacity, not current size, of buffer
             U8* getBuffAddr();
             const U8* getBuffAddr() const;
 

Fw/Comp/ActiveComponentBase.cpp

@@ -8,7 +8,7 @@
     class ActiveComponentExitSerializableBuffer : public Fw::SerializeBufferBase {
 
         public:
-            NATIVE_UINT_TYPE getBuffCapacity() const {
+            FwSizeType getBuffCapacity() const {
                 return sizeof(m_buff);
             }
 
@@ -33,7 +33,7 @@
     ActiveComponentBase::~ActiveComponentBase() {
     }
 
-    void ActiveComponentBase::init(NATIVE_INT_TYPE instance) {
+    void ActiveComponentBase::init(FwEnumStoreType instance) {
         QueuedComponentBase::init(instance);
     }
 

Fw/Comp/ActiveComponentBase.hpp

@@ -43,7 +43,7 @@ class ActiveComponentBase : public QueuedComponentBase {
 
     explicit ActiveComponentBase(const char* name);  //!< Constructor
     virtual ~ActiveComponentBase();                  //!< Destructor
-    void init(NATIVE_INT_TYPE instance);             //!< initialization code
+    void init(FwEnumStoreType instance);             //!< initialization code
     virtual void preamble();   //!< A function that will be called before the event loop is entered
     MsgDispatchStatus dispatch(); //!< The function that will dispatching messages
     virtual void finalizer();  //!< A function that will be called after exiting the loop

Fw/Comp/PassiveComponentBase.cpp

@@ -14,7 +14,7 @@
         return "Comp: %s";
     }
 
-    void PassiveComponentBase::toString(char* buffer, NATIVE_INT_TYPE size) {
+    void PassiveComponentBase::toString(char* buffer, FwSizeType size) {
         FW_ASSERT(size > 0);
         FW_ASSERT(buffer != nullptr);
         Fw::FormatStatus status = Fw::ExternalString(buffer, static_cast<Fw::ExternalString::SizeType>(size)).format(
@@ -34,12 +34,12 @@
     PassiveComponentBase::~PassiveComponentBase() {
     }
 
-    void PassiveComponentBase::init(NATIVE_INT_TYPE instance) {
+    void PassiveComponentBase::init(FwEnumStoreType instance) {
         ObjBase::init();
         this->m_instance = instance;
     }
 
-    NATIVE_INT_TYPE PassiveComponentBase::getInstance() const {
+    FwEnumStoreType PassiveComponentBase::getInstance() const {
         return this->m_instance;
     }
 

Fw/Comp/PassiveComponentBase.hpp

@@ -20,17 +20,17 @@ namespace Fw {
         PROTECTED:
             PassiveComponentBase(const char* name); //!< Named constructor
             virtual ~PassiveComponentBase(); //!< Destructor
-            void init(NATIVE_INT_TYPE instance); //!< Initialization function
-            NATIVE_INT_TYPE getInstance() const;
+            void init(FwEnumStoreType instance); //!< Initialization function
+            FwEnumStoreType getInstance() const;
 
 
 #if FW_OBJECT_TO_STRING == 1
             virtual const char* getToStringFormatString(); //!< Return the format  for a generic component toString
-            void toString(char* str, NATIVE_INT_TYPE size) override; //!< returns string description of component
+            void toString(char* str, FwSizeType size) override; //!< returns string description of component
 #endif
         PRIVATE:
             U32 m_idBase; //!< ID base for opcodes etc.
-            NATIVE_INT_TYPE m_instance; //!< instance of component object
+            FwEnumStoreType m_instance; //!< instance of component object
 
 
     };

Fw/Comp/QueuedComponentBase.cpp

@@ -15,7 +15,7 @@
 
     }
 
-    void QueuedComponentBase::init(NATIVE_INT_TYPE instance) {
+    void QueuedComponentBase::init(FwEnumStoreType instance) {
         PassiveComponentBase::init(instance);
     }
 
@@ -36,7 +36,7 @@
     	return this->m_queue.create(queueName, depth, msgSize);
     }
 
-    NATIVE_INT_TYPE QueuedComponentBase::getNumMsgsDropped() {
+    FwSizeType QueuedComponentBase::getNumMsgsDropped() {
         return this->m_msgsDropped;
     }
 

Fw/Comp/QueuedComponentBase.hpp

@@ -32,17 +32,17 @@
         PROTECTED:
             QueuedComponentBase(const char* name); //!< Constructor
             virtual ~QueuedComponentBase(); //!< Destructor
-            void init(NATIVE_INT_TYPE instance); //!< initialization function
+            void init(FwEnumStoreType instance); //!< initialization function
             Os::Queue m_queue; //!< queue object for active component
             Os::Queue::Status createQueue(FwSizeType depth, FwSizeType msgSize);
             virtual MsgDispatchStatus doDispatch()=0; //!< method to dispatch a single message in the queue.
 #if FW_OBJECT_TO_STRING == 1
             virtual const char* getToStringFormatString(); //!< Format string for toString function
 #endif
-            NATIVE_INT_TYPE getNumMsgsDropped(); //!< return number of messages dropped
+            FwSizeType getNumMsgsDropped(); //!< return number of messages dropped
             void incNumMsgDropped(); //!< increment the number of messages dropped
         PRIVATE:
-            NATIVE_INT_TYPE m_msgsDropped; //!< number of messages dropped from full queue
+            FwSizeType m_msgsDropped; //!< number of messages dropped from full queue
     };
 
 }

Fw/Dp/DpContainer.cpp

@@ -203,7 +203,7 @@ Utils::HashBuffer DpContainer::computeDataHash() const {
     FW_ASSERT(DATA_OFFSET + dataSize <= bufferSize, static_cast<FwAssertArgType>(DATA_OFFSET + dataSize),
               static_cast<FwAssertArgType>(bufferSize));
     Utils::HashBuffer computedHash;
-    Utils::Hash::hash(dataAddr, static_cast<NATIVE_INT_TYPE>(dataSize), computedHash);
+    Utils::Hash::hash(dataAddr, dataSize, computedHash);
     return computedHash;
 }
 

Fw/Dp/test/util/DpContainerHeader.hpp

@@ -76,7 +76,7 @@ struct DpContainerHeader {
         DP_CONTAINER_HEADER_ASSERT_EQ(status, FW_SERIALIZE_OK);
         // Deserialize the user data
         DpContainerHeader::moveDeserToOffset(file, line, buffer, DpContainer::Header::USER_DATA_OFFSET);
-        NATIVE_UINT_TYPE size = sizeof this->m_userData;
+        FwSizeType size = sizeof this->m_userData;
         const bool omitLength = true;
         status = serializeRepr.deserialize(this->m_userData, size, omitLength);
         DP_CONTAINER_HEADER_ASSERT_EQ(status, FW_SERIALIZE_OK);

Fw/Log/AmpcsEvrLogPacket.cpp

@@ -50,7 +50,7 @@ namespace Fw {
     }
 
     SerializeStatus AmpcsEvrLogPacket::deserialize(SerializeBufferBase& buffer) {
-        NATIVE_UINT_TYPE len;
+        FwSizeType len;
 
         SerializeStatus stat;
 
@@ -75,7 +75,7 @@ namespace Fw {
             return stat;
         }
 
-        NATIVE_UINT_TYPE size = buffer.getBuffLeft();
+        FwSizeType size = buffer.getBuffLeft();
         stat = buffer.deserialize(this->m_logBuffer.getBuffAddr(),size,true);
         if (stat == FW_SERIALIZE_OK) {
             // Shouldn't fail

Fw/Log/LogBuffer.cpp

@@ -3,7 +3,7 @@
 
 namespace Fw {
 
-    LogBuffer::LogBuffer(const U8 *args, NATIVE_UINT_TYPE size) {
+    LogBuffer::LogBuffer(const U8 *args, FwSizeType size) {
         SerializeStatus stat = SerializeBufferBase::setBuff(args,size);
         FW_ASSERT(FW_SERIALIZE_OK == stat, static_cast<FwAssertArgType>(stat));
     }
@@ -29,7 +29,7 @@
         return *this;
     }
 
-    NATIVE_UINT_TYPE LogBuffer::getBuffCapacity() const {
+    FwSizeType LogBuffer::getBuffCapacity() const {
         return sizeof(this->m_bufferData);
     }
 

Fw/Log/LogBuffer.hpp

@@ -26,13 +26,13 @@ namespace Fw {
                 SERIALIZED_SIZE = FW_LOG_BUFFER_MAX_SIZE + sizeof(FwBuffSizeType)
             };
 
-            LogBuffer(const U8 *args, NATIVE_UINT_TYPE size);
+            LogBuffer(const U8 *args, FwSizeType size);
             LogBuffer();
             LogBuffer(const LogBuffer& other);
             virtual ~LogBuffer();
             LogBuffer& operator=(const LogBuffer& other);
 
-            NATIVE_UINT_TYPE getBuffCapacity() const; // !< returns capacity, not current size, of buffer
+            FwSizeType getBuffCapacity() const; // !< returns capacity, not current size, of buffer
             U8* getBuffAddr();
             const U8* getBuffAddr() const;
 

Fw/Log/LogPacket.cpp

@@ -56,7 +56,7 @@
         }
 
         // remainder of buffer must be telemetry value
-        NATIVE_UINT_TYPE size = buffer.getBuffLeft();
+        FwSizeType size = buffer.getBuffLeft();
         stat = buffer.deserialize(this->m_logBuffer.getBuffAddr(),size,true);
         if (stat == FW_SERIALIZE_OK) {
             // Shouldn't fail

Fw/Logger/test/ut/LoggerRules.cpp

@@ -27,7 +27,7 @@ bool Register::precondition(const MockLogging::FakeLogger& truth) {
 // Register NULL or truth as the system logger
 void Register::action(MockLogging::FakeLogger& truth) {
     // Select a registration value: 1 -> logger, 0 -> NULL
-    NATIVE_INT_TYPE random = STest::Pick::lowerUpper(0, 1);
+    U32 random = STest::Pick::lowerUpper(0, 1);
     if (random == 1) {
         Fw::Logger::registerLogger(&truth);
         truth.s_current = &truth;
@@ -48,8 +48,8 @@ bool LogGood::precondition(const MockLogging::FakeLogger& truth) {
 
 // Log valid messages
 void LogGood::action(MockLogging::FakeLogger& truth) {
-    NATIVE_INT_TYPE random = STest::Pick::lowerUpper(0, 10);
-    NATIVE_INT_TYPE ra[10];
+    U32 random = STest::Pick::lowerUpper(0, 10);
+    U32 ra[10];
     for (int i = 0; i < 10; ++i) {
         ra[i] = STest::Pick::lowerUpper(0, 0xffffffff);
     }
@@ -127,8 +127,8 @@ bool LogGoodStringObject::precondition(const MockLogging::FakeLogger& truth) {
 // Log valid messages
 void LogGoodStringObject::action(MockLogging::FakeLogger& truth) {
     Fw::String my_string;
-    NATIVE_INT_TYPE random = STest::Pick::lowerUpper(0, my_string.getCapacity() - 1);
-    for (int i = 0; i < random; ++i) {
+    U32 random = STest::Pick::lowerUpper(0, my_string.getCapacity() - 1);
+    for (U32 i = 0; i < random; ++i) {
         const_cast<char*>(my_string.toChar())[i] =
             static_cast<char>(STest::Pick::lowerUpper(0, std::numeric_limits<unsigned char>::max()));
     }
@@ -149,8 +149,8 @@ bool LogBad::precondition(const MockLogging::FakeLogger& truth) {
 
 // Log valid messages
 void LogBad::action(MockLogging::FakeLogger& truth) {
-    NATIVE_INT_TYPE random = STest::Pick::lowerUpper(0, 10);
-    NATIVE_INT_TYPE ra[10];
+    U32 random = STest::Pick::lowerUpper(0, 10);
+    U32 ra[10];
     for (int i = 0; i < 10; ++i) {
         ra[i] = STest::Pick::lowerUpper(0, 0xffffffff);
     }

Fw/Obj/ObjBase.cpp

@@ -44,7 +44,7 @@
         this->m_objName = name;
     }
 #if FW_OBJECT_TO_STRING == 1
-    void ObjBase::toString(char* str, NATIVE_INT_TYPE size) {
+    void ObjBase::toString(char* str, FwSizeType size) {
         FW_ASSERT(size > 0);
         FW_ASSERT(str != nullptr);
         Fw::FormatStatus formatStatus = Fw::ExternalString(str, static_cast<Fw::ExternalString::SizeType>(size)).format("Obj: %s", this->m_objName.toChar());

Fw/Obj/ObjBase.hpp

@@ -61,7 +61,7 @@ namespace Fw {
             //!
             //!  \param str destination buffer where string description is placed
             //!  \param size destination buffer size (including terminator). String should be terminated
-            virtual void toString(char* str, NATIVE_INT_TYPE size); //!< virtual method to get description of object
+            virtual void toString(char* str, FwSizeType size); //!< virtual method to get description of object
 #endif // FW_OBJECT_TO_STRING
 #endif // FW_OBJECT_NAMES
 

Fw/Obj/SimpleObjRegistry.cpp

@@ -13,7 +13,7 @@
         ObjBase::setObjRegistry(this);
         this->m_numEntries = 0;
         // Initialize pointer array
-        for (NATIVE_INT_TYPE entry = 0; entry < FW_OBJ_SIMPLE_REG_ENTRIES; entry++) {
+        for (FwSizeType entry = 0; entry < FW_OBJ_SIMPLE_REG_ENTRIES; entry++) {
             this->m_objPtrArray[entry] = nullptr;
         }
     }
@@ -23,7 +23,7 @@
     }
 
     void SimpleObjRegistry::dump() {
-        for (NATIVE_INT_TYPE obj = 0; obj < this->m_numEntries; obj++) {
+        for (FwSizeType obj = 0; obj < this->m_numEntries; obj++) {
 #if FW_OBJECT_NAMES == 1
 #if FW_OBJECT_TO_STRING == 1
             char objDump[FW_OBJ_SIMPLE_REG_BUFF_SIZE];
@@ -43,7 +43,7 @@
 
 #if FW_OBJECT_NAMES == 1
     void SimpleObjRegistry::dump(const char* objName) {
-        for (NATIVE_INT_TYPE obj = 0; obj < this->m_numEntries; obj++) {
+        for (FwSizeType obj = 0; obj < this->m_numEntries; obj++) {
             char objDump[FW_OBJ_SIMPLE_REG_BUFF_SIZE];
             if (strncmp(objName,this->m_objPtrArray[obj]->getObjName(),sizeof(objDump)) == 0) {
 #if FW_OBJECT_TO_STRING == 1

Fw/Obj/SimpleObjRegistry.hpp

@@ -38,7 +38,7 @@
         private:
             void regObject(ObjBase* obj); //!< register an object with the registry
             ObjBase* m_objPtrArray[FW_OBJ_SIMPLE_REG_ENTRIES]; //!< array of objects
-            NATIVE_INT_TYPE m_numEntries; //!< number of entries in the registry
+            FwSizeType m_numEntries; //!< number of entries in the registry
     };
 
 }

Fw/Port/PortBase.cpp

@@ -81,7 +81,7 @@
         return "Port: %s %s->(%s)";
     }
 
-    void PortBase::toString(char* buffer, NATIVE_INT_TYPE size) {
+    void PortBase::toString(char* buffer, FwSizeType size) {
         FW_ASSERT(size > 0);
         // Get the port-custom format string
         const char* formatString = this->getToStringFormatString();