Remove NATIVE_INT_TYPE, NATIVE_UINT_TYPE, and POINTER_CAST from Svc #3374

LeStarch · 2025-03-13T17:45:47Z


*Related Issue(s)*
*Has Unit Tests (y/n)*
*Documentation Included (y/n)*

Change Description

This removes old NATIVE_INT_TYPE, NATIVE_UINT_TYPE, and POINTER_CAST types from the Svc directory.

Decisions: @LeStarch

RG context is now a U32 to match other system context variables
TlmPacketizer packet sizes are limited to FwSignedSizeType as -1 is used as a flag value

Decisions: @timcanham

RG context is now a U32 to match other system context variables
TlmPacketizer packet sizes are limited to FwSignedSizeType as -1 is used as a flag value

Decisions: @bocchino

RG context is now a U32 to match other system context variables
TlmPacketizer packet sizes are limited to FwSignedSizeType as -1 is used as a flag value

Decisions: @thomas-bc

RG context is now a U32 to match other system context variables
TlmPacketizer packet sizes are limited to FwSignedSizeType as -1 is used as a flag value

github-advanced-security

CodeQL found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.

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


Svc/Health/HealthComponentImpl.cpp

        HealthComponentBase::init(queueDepth, instance);
        this->queue_depth = queueDepth;

    }

-    void HealthImpl::setPingEntries(PingEntry* pingEntries, NATIVE_INT_TYPE numPingEntries, U32 watchDogCode) {
+    void HealthImpl::setPingEntries(PingEntry* pingEntries, FwIndexType numPingEntries, U32 watchDogCode) {


Svc/Health/HealthComponentImpl.cpp

@@ -203,12 +204,12 @@
        this->cmdResponse_out(opCode,cmdSeq,Fw::CmdResponse::OK);
    }

-    NATIVE_INT_TYPE HealthImpl::findEntry(const Fw::CmdStringArg& entry) {
-
+    FwIndexType HealthImpl::findEntry(const Fw::CmdStringArg& entry) {


Svc/LinuxTimer/LinuxTimerComponentImplTimerFd.cpp

@@ -20,17 +20,17 @@

 namespace Svc {

-  void LinuxTimerComponentImpl::startTimer(NATIVE_INT_TYPE interval) {
+  void LinuxTimerComponentImpl::startTimer(FwSizeType interval) {


Svc/PassiveRateGroup/PassiveRateGroup.cpp

@@ -23,7 +23,7 @@

 PassiveRateGroup::~PassiveRateGroup() {}

-void PassiveRateGroup::configure(NATIVE_INT_TYPE contexts[], NATIVE_INT_TYPE numContexts) {
+void PassiveRateGroup::configure(U32 contexts[], FwIndexType numContexts) {


Ref/SendBuffApp/SendBuffComponentImpl.cpp

RPI/RpiDemo/RpiDemoComponentImpl.cpp

Svc/ComLogger/ComLogger.cpp

Svc/ComQueue/ComQueue.cpp

Svc/LinuxTimer/LinuxTimerComponentImplTimerFd.cpp

Svc/TlmPacketizer/TlmPacketizer.hpp

Svc/Health/HealthComponentImpl.cpp

@@ -161,7 +162,7 @@

    void HealthImpl::HLTH_PING_ENABLE_cmdHandler(const FwOpcodeType opCode, U32 cmdSeq, const Fw::CmdStringArg& entry, Fw::Enabled enable) {
        // check to see if entry is in range
-        NATIVE_INT_TYPE entryIndex = this->findEntry(entry);
+        FwIndexType entryIndex = this->findEntry(entry);


Svc/Health/HealthComponentImpl.cpp

@@ -181,7 +182,7 @@

    void HealthImpl::HLTH_CHNG_PING_cmdHandler(const FwOpcodeType opCode, U32 cmdSeq, const Fw::CmdStringArg& entry, U32 warningValue, U32 fatalValue) {
        // check to see if entry is in range
-        NATIVE_INT_TYPE entryIndex = this->findEntry(entry);
+        FwIndexType entryIndex = this->findEntry(entry);


Svc/LinuxTimer/LinuxTimerComponentImplTimerFd.cpp

-      itval.it_interval.tv_nsec = (interval*1000000)%1000000000;
-      itval.it_value.tv_sec = interval/1000;
-      itval.it_value.tv_nsec = (interval*1000000)%1000000000;
+      const FwSizeType interval_secs = interval/1000;


Svc/TlmChan/TlmChan.cpp

@@ -54,11 +59,11 @@
 void TlmChan::TlmGet_handler(FwIndexType portNum, FwChanIdType id, Fw::Time& timeTag, Fw::TlmBuffer& val) {
    // Compute index for entry

-    NATIVE_UINT_TYPE index = this->doHash(id);
+    FwChanIdType index = this->doHash(id);


Svc/TlmChan/TlmChan.cpp

@@ -81,14 +86,14 @@
 void TlmChan::TlmRecv_handler(FwIndexType portNum, FwChanIdType id, Fw::Time& timeTag, Fw::TlmBuffer& val) {
    // Compute index for entry

-    NATIVE_UINT_TYPE index = this->doHash(id);
+    FwChanIdType index = this->doHash(id);


Svc/TlmPacketizer/TlmPacketizer.cpp


            packetLen += packetList.list[pktEntry]->list[tlmEntry].size;

        }  // end channel in packet
        FW_ASSERT(packetLen <= FW_COM_BUFFER_MAX_SIZE, static_cast<FwAssertArgType>(packetLen), static_cast<FwAssertArgType>(pktEntry));
        // clear contents
-        memset(this->m_fillBuffers[pktEntry].buffer.getBuffAddr(), 0, packetLen);
+        memset(this->m_fillBuffers[pktEntry].buffer.getBuffAddr(), 0, static_cast<size_t>(packetLen));


Svc/TlmPacketizer/TlmPacketizer.cpp

@@ -127,15 +130,15 @@
 }

 TlmPacketizer::TlmEntry* TlmPacketizer::findBucket(FwChanIdType id) {
-    NATIVE_UINT_TYPE index = this->doHash(id);
+    FwChanIdType index = this->doHash(id);


Svc/TlmPacketizer/TlmPacketizer.cpp

@@ -186,7 +189,7 @@
                                     Fw::TlmBuffer& val) {
    FW_ASSERT(this->m_configured);
    // get hash value for id
-    NATIVE_UINT_TYPE index = this->doHash(id);
+    FwChanIdType index = this->doHash(id);


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


Svc/PassiveRateGroup/PassiveRateGroup.cpp

@@ -23,7 +23,7 @@

 PassiveRateGroup::~PassiveRateGroup() {}

-void PassiveRateGroup::configure(NATIVE_INT_TYPE contexts[], NATIVE_INT_TYPE numContexts) {
+void PassiveRateGroup::configure(U32 contexts[], FwIndexType numContexts) {


thomas-bc

It all looks good to me, just checking on one TODO

Svc/TlmPacketizer/TlmPacketizer.cpp

LeStarch added 25 commits March 12, 2025 16:43

Remove NATIVE_* types from FileUplink

5227dec

Remove NATIVE_* types from RateGroupDriver

0f44b4c

Remove NATIVE_* types from ComLogger

c86b6a2

Addressing init function usage of NATIVE_ types

76241c5

NATIVE_ types from command dispatcher

65e7721

NATIVE_ types from ComQueue

1ef205c

NATIVE_ types from CmdSplitter

987cac8

U32 -> FwOpcodeType in CmdDispatcher

a654039

NATIVE_ types in BufferManager

0f91883

NATIVE_ types in LinuxTimer

6986c6b

NATIVE_ types from BufferAccumulator and renabling UT

61481eb

NATIVE_ types from TlmChan

985a2c3

NATIVE_ types from BufferRepeater

febf47e

NATIVE_ types from Active/Passive Rate Group

f5f3743

NATIVE_ types from ComSplitter and ComStub

4c0576c

NATIVE_ types from ActiveLogger and fixed ActiveRateGroup sdd

da4c884

NATIVE_ types from Dp*

255d568

NATIVE_ types from FileManager and ActiveLogger (missed)

bb7d065

NATIVE_ types from BufferLogger, FileDownlink, StaticMemory

29ddfaf

Deleting UdpSender/UdpReceiver that lack models and build config

b7f9786

NATIVE_ types from Health

f259108

NATIVE_ types from CmdSequencer

3b1c9bd

NATIVE_ types from TlmPacketizer

7015ec6

Fixing unit test issues

69fd08d

POINTER_CAST from Svc

063bfc4

LeStarch requested review from bocchino and thomas-bc March 13, 2025 17:46

CI fixes

b5f171e

github-advanced-security bot found potential problems Mar 13, 2025

View reviewed changes

CI fixes (Linux)

6d742c4

LeStarch added 2 commits March 13, 2025 12:26

Fixing Ref/RPI for RG context

71ee45b

CI (sp)

3c2e08f

github-advanced-security bot found potential problems Mar 13, 2025

View reviewed changes

Fixing RPI build for time conversions

eead0a5

LeStarch commented Mar 13, 2025

View reviewed changes

Ref/SendBuffApp/SendBuffComponentImpl.cpp Show resolved Hide resolved

CI fixes (RPI)

8adc219

LeStarch commented Mar 13, 2025

View reviewed changes

LeStarch added 2 commits March 13, 2025 13:42

Self review comments

33a3774

Removing UDP sender/receiver config

5a55178

github-advanced-security bot found potential problems Mar 13, 2025

View reviewed changes

thomas-bc approved these changes Mar 14, 2025

View reviewed changes

Svc/TlmPacketizer/TlmPacketizer.cpp Outdated Show resolved Hide resolved

Review recommendations - pt 1

0befbc9

thomas-bc approved these changes Mar 15, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove NATIVE_INT_TYPE, NATIVE_UINT_TYPE, and POINTER_CAST from Svc #3374

Remove NATIVE_INT_TYPE, NATIVE_UINT_TYPE, and POINTER_CAST from Svc #3374

LeStarch commented Mar 13, 2025 •

edited

Loading

github-advanced-security bot left a comment

thomas-bc left a comment

Remove NATIVE_INT_TYPE, NATIVE_UINT_TYPE, and POINTER_CAST from Svc #3374

Are you sure you want to change the base?

Remove NATIVE_INT_TYPE, NATIVE_UINT_TYPE, and POINTER_CAST from Svc #3374

Conversation

LeStarch commented Mar 13, 2025 • edited Loading

Change Description

github-advanced-security bot left a comment

Choose a reason for hiding this comment

thomas-bc left a comment

Choose a reason for hiding this comment

LeStarch commented Mar 13, 2025 •

edited

Loading