Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NUM_PORTS -> FwIndexType #3239

Merged
merged 1 commit into from
Feb 14, 2025
Merged

NUM_PORTS -> FwIndexType #3239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Fw/Port/InputPortBase.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
void init() override;

PassiveComponentBase* m_comp; // !< pointer to containing component
NATIVE_INT_TYPE m_portNum; // !< port number in containing object
FwIndexType m_portNum; // !< port number in containing object

Check notice

Code scanning / CodeQL

Use of basic integral type Note

m_portNum uses the basic integral type int rather than a typedef with size and signedness.
#if FW_OBJECT_TO_STRING == 1
const char* getToStringFormatString() override; //!< Get format string for toString call
#endif
Expand Down
2 changes: 1 addition & 1 deletion Svc/ActiveRateGroup/ActiveRateGroup.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

class ActiveRateGroup : public ActiveRateGroupComponentBase {
public:
static constexpr NATIVE_INT_TYPE CONNECTION_COUNT_MAX = NUM_RATEGROUPMEMBEROUT_OUTPUT_PORTS;
static constexpr FwIndexType CONNECTION_COUNT_MAX = NUM_RATEGROUPMEMBEROUT_OUTPUT_PORTS;

Check notice

Code scanning / CodeQL

Use of basic integral type Note

CONNECTION_COUNT_MAX uses the basic integral type int rather than a typedef with size and signedness.

//! \brief ActiveRateGroup constructor
//!
Expand Down
4 changes: 2 additions & 2 deletions Svc/ComQueue/ComQueue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
m_allocator(nullptr),
m_allocation(nullptr) {
// Initialize throttles to "off"
for (NATIVE_UINT_TYPE i = 0; i < TOTAL_PORT_COUNT; i++) {
for (FwIndexType i = 0; i < TOTAL_PORT_COUNT; i++) {

Check notice

Code scanning / CodeQL

Use of basic integral type Note

i uses the basic integral type int rather than a typedef with size and signedness.
this->m_throttle[i] = false;
}
}
Expand Down Expand Up @@ -131,7 +131,7 @@
}

void ComQueue::buffQueueIn_handler(const FwIndexType portNum, Fw::Buffer& fwBuffer) {
const NATIVE_INT_TYPE queueNum = portNum + COM_PORT_COUNT;
const FwIndexType queueNum = portNum + COM_PORT_COUNT;

Check notice

Code scanning / CodeQL

Use of basic integral type Note

queueNum uses the basic integral type int rather than a typedef with size and signedness.

Check warning

Code scanning / CodeQL

Unchecked function argument Warning

This use of parameter portNum has not been checked.
// Ensure that the port number of buffQueueIn is consistent with the expectation
FW_ASSERT(portNum >= 0 && portNum < BUFFER_PORT_COUNT, portNum);
FW_ASSERT(queueNum < TOTAL_PORT_COUNT);
Expand Down
3 changes: 3 additions & 0 deletions Svc/ComQueue/ComQueue.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <Utils/Types/Queue.hpp>
#include "Fw/Types/MemAllocator.hpp"
#include "Os/Mutex.hpp"
#include <limits>

namespace Svc {

Expand All @@ -28,6 +29,8 @@ class ComQueue : public ComQueueComponentBase {
//!< Count of Fw::Buffer input ports and thus Fw::Buffer queues
static const FwIndexType BUFFER_PORT_COUNT = ComQueueComponentBase::NUM_BUFFQUEUEIN_INPUT_PORTS;

static_assert((COM_PORT_COUNT + BUFFER_PORT_COUNT) <= std::numeric_limits<FwIndexType>::max(),
"FwIndexType not large enough to hold com and buffer ports");
//!< Total count of input buffer ports and thus total queues
static const FwIndexType TOTAL_PORT_COUNT = COM_PORT_COUNT + BUFFER_PORT_COUNT;

Expand Down
12 changes: 6 additions & 6 deletions Svc/ComQueue/test/ut/ComQueueTester.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ void ComQueueTester ::dispatchAll() {

void ComQueueTester ::configure() {
ComQueue::QueueConfigurationTable configurationTable;
for (NATIVE_UINT_TYPE i = 0; i < ComQueue::TOTAL_PORT_COUNT; i++){
for (FwIndexType i = 0; i < ComQueue::TOTAL_PORT_COUNT; i++){
configurationTable.entries[i].priority = i;
configurationTable.entries[i].depth = 3;
}
Expand Down Expand Up @@ -135,7 +135,7 @@ void ComQueueTester ::testPrioritySend() {

ComQueue::QueueConfigurationTable configurationTable;

for (NATIVE_UINT_TYPE i = 0; i < ComQueue::TOTAL_PORT_COUNT; i++) {
for (FwIndexType i = 0; i < ComQueue::TOTAL_PORT_COUNT; i++) {
configurationTable.entries[i].priority = ComQueue::TOTAL_PORT_COUNT - i - 1;
configurationTable.entries[i].depth = 3;
data[i][0] = ComQueue::TOTAL_PORT_COUNT - i - 1;
Expand All @@ -162,7 +162,7 @@ void ComQueueTester ::testPrioritySend() {
ASSERT_from_buffQueueSend_SIZE(0);
ASSERT_from_comQueueSend_SIZE(0);

for (NATIVE_INT_TYPE index = 0; index < ComQueue::TOTAL_PORT_COUNT; index++) {
for (FwIndexType index = 0; index < ComQueue::TOTAL_PORT_COUNT; index++) {
U8 orderKey;
U32 previousComSize = fromPortHistory_comQueueSend->size();
U32 previousBufSize = fromPortHistory_buffQueueSend->size();
Expand Down Expand Up @@ -192,7 +192,7 @@ void ComQueueTester::testExternalQueueOverflow() {
ComQueueDepth expectedComDepth;
BuffQueueDepth expectedBuffDepth;

for (NATIVE_UINT_TYPE i = 0; i < ComQueue::TOTAL_PORT_COUNT; i++) {
for (FwIndexType i = 0; i < ComQueue::TOTAL_PORT_COUNT; i++) {
configurationTable.entries[i].priority = i;
configurationTable.entries[i].depth = 2;

Expand All @@ -209,7 +209,7 @@ void ComQueueTester::testExternalQueueOverflow() {
U8 data[BUFFER_LENGTH] = {0xde, 0xad, 0xbe};
Fw::Buffer buffer(&data[0], sizeof(data));

for (NATIVE_INT_TYPE queueNum = 0; queueNum < ComQueue::TOTAL_PORT_COUNT; queueNum++) {
for (FwIndexType queueNum = 0; queueNum < ComQueue::TOTAL_PORT_COUNT; queueNum++) {
QueueType overflow_type;
FwIndexType portNum;
// queue[portNum].depth + 2 to deliberately cause overflow and check throttle of exactly 1
Expand Down Expand Up @@ -263,7 +263,7 @@ void ComQueueTester::testInternalQueueOverflow() {
U8 data[BUFFER_LENGTH] = {0xde, 0xad, 0xbe};
Fw::Buffer buffer(data, sizeof(data));

const NATIVE_INT_TYPE queueNum = ComQueue::COM_PORT_COUNT;
const FwIndexType queueNum = ComQueue::COM_PORT_COUNT;
const FwSizeType msgCountMax = this->component.m_queue.getDepth();
QueueType overflow_type;
FwIndexType portNum;
Expand Down
2 changes: 1 addition & 1 deletion Svc/Health/HealthComponentImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
NATIVE_INT_TYPE HealthImpl::findEntry(const Fw::CmdStringArg& entry) {

// walk through entries
for (NATIVE_UINT_TYPE tableEntry = 0; tableEntry < NUM_PINGSEND_OUTPUT_PORTS; tableEntry++) {
for (FwIndexType tableEntry = 0; tableEntry < NUM_PINGSEND_OUTPUT_PORTS; tableEntry++) {

Check notice

Code scanning / CodeQL

Use of basic integral type Note

tableEntry uses the basic integral type int rather than a typedef with size and signedness.
if (entry == this->m_pingTrackerEntries[tableEntry].entry.entryName) {
return static_cast<NATIVE_INT_TYPE>(tableEntry);
}
Expand Down
44 changes: 22 additions & 22 deletions Svc/Health/test/ut/HealthTester.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ namespace Svc {
QUEUE_DEPTH, INSTANCE
);

for (NATIVE_UINT_TYPE entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
for (FwIndexType entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
this->pingEntries[entry].warnCycles = Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS+entry;
this->pingEntries[entry].fatalCycles = Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS*2+entry+1;
this->pingEntries[entry].entryName.format("task%d",entry);
Expand Down Expand Up @@ -209,14 +209,14 @@ namespace Svc {
ASSERT_TLM_SIZE(0);
ASSERT_CMD_RESPONSE_SIZE(0);

for (NATIVE_UINT_TYPE port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
for (FwIndexType port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
this->keys[port] = port;
}

//invoke run handler same number as number of ports
for (U32 i = 0; i < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; i++) {
this->invoke_to_Run(0,0);
for (NATIVE_UINT_TYPE port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
for (FwIndexType port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
this->keys[port] += Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS;
}

Expand Down Expand Up @@ -248,7 +248,7 @@ namespace Svc {
//invoke run handler enough times for warnings
for (U32 i = 0; i < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS*2; i++) {
this->invoke_to_Run(0,0);
for (NATIVE_UINT_TYPE port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
for (FwIndexType port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
ASSERT_EQ(i+1,this->component.m_pingTrackerEntries[port].cycleCount);
}
}
Expand All @@ -258,7 +258,7 @@ namespace Svc {
ASSERT_TLM_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);
ASSERT_EVENTS_HLTH_PING_WARN_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);

for (NATIVE_UINT_TYPE port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
for (FwIndexType port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
char name[80];
snprintf(name, sizeof(name), "task%d",port);
ASSERT_EVENTS_HLTH_PING_WARN(port,name);
Expand All @@ -282,7 +282,7 @@ namespace Svc {
//invoke run handler enough times for warnings
for (U32 i = 0; i < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS*2; i++) {
this->invoke_to_Run(0,0);
for (NATIVE_UINT_TYPE port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
for (FwIndexType port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
ASSERT_EQ(i+1,this->component.m_pingTrackerEntries[port].cycleCount);
}
}
Expand All @@ -292,7 +292,7 @@ namespace Svc {
ASSERT_TLM_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);
ASSERT_EVENTS_HLTH_PING_WARN_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);

for (NATIVE_UINT_TYPE port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
for (FwIndexType port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
char name[80];
snprintf(name, sizeof(name), "task%d",port);
ASSERT_EVENTS_HLTH_PING_WARN(port,name);
Expand All @@ -304,7 +304,7 @@ namespace Svc {
//invoke run handler enough times for FATALs
for (U32 i = 0; i < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; i++) {
this->invoke_to_Run(0,0);
for (NATIVE_UINT_TYPE port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
for (FwIndexType port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
ASSERT_EQ(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS*2+i+1,this->component.m_pingTrackerEntries[port].cycleCount);
}
}
Expand All @@ -314,7 +314,7 @@ namespace Svc {
ASSERT_EVENTS_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);
ASSERT_EVENTS_HLTH_PING_LATE_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);

for (NATIVE_UINT_TYPE port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
for (FwIndexType port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
char name[80];
snprintf(name, sizeof(name), "task%d",port);
ASSERT_EVENTS_HLTH_PING_LATE(port,name);
Expand All @@ -337,14 +337,14 @@ namespace Svc {
//invoke run handler
for (U32 i = 0; i < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS*2; i++) {
this->invoke_to_Run(0,0);
for (NATIVE_INT_TYPE entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
for (FwIndexType entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
ASSERT_EQ(i+1,this->component.m_pingTrackerEntries[entry].cycleCount);
}
}

ASSERT_EVENTS_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);
ASSERT_EVENTS_HLTH_PING_WARN_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);
for (NATIVE_INT_TYPE entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
for (FwIndexType entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
char name[80];
snprintf(name, sizeof(name), "task%d",entry);
ASSERT_EVENTS_HLTH_PING_WARN(entry, name);
Expand Down Expand Up @@ -395,7 +395,7 @@ namespace Svc {
// check that cycle counts increase again
for (U32 i = 0; i < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; i++) {
this->invoke_to_Run(0,0);
for (NATIVE_INT_TYPE entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
for (FwIndexType entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
ASSERT_EQ(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS*2+1+i,this->component.m_pingTrackerEntries[entry].cycleCount);
}
}
Expand All @@ -404,7 +404,7 @@ namespace Svc {
// Should be FATAL timeouts
ASSERT_EVENTS_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);
ASSERT_EVENTS_HLTH_PING_LATE_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);
for (NATIVE_INT_TYPE entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
for (FwIndexType entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
char name[80];
snprintf(name,sizeof(name), "task%d",entry);
ASSERT_EVENTS_HLTH_PING_LATE(entry,name);
Expand All @@ -426,11 +426,11 @@ namespace Svc {

// disable monitoring one at a time

for (NATIVE_INT_TYPE entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
for (FwIndexType entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
this->clearEvents();
this->clearHistory();
// reset cycle count
for (NATIVE_INT_TYPE e2 = 0; e2 < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; e2++) {
for (FwIndexType e2 = 0; e2 < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; e2++) {
this->component.m_pingTrackerEntries[e2].cycleCount = 0;
}
// disable entry
Expand All @@ -446,13 +446,13 @@ namespace Svc {
ASSERT_EVENTS_HLTH_CHECK_PING(0,Fw::Enabled::DISABLED,name);

// run a few cycles
for (NATIVE_INT_TYPE cycle = 0; cycle < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; cycle++) {
for (FwIndexType cycle = 0; cycle < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; cycle++) {

// run a cycle
this->invoke_to_Run(0,0);

// verify only enable entries count up
for (NATIVE_INT_TYPE e3 = 0; e3 < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; e3++) {
for (FwIndexType e3 = 0; e3 < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; e3++) {
if (e3 == entry) {
// shouldn't be counting up
ASSERT_EQ(0u,this->component.m_pingTrackerEntries[e3].cycleCount);
Expand Down Expand Up @@ -488,7 +488,7 @@ namespace Svc {
ASSERT_TLM_SIZE(0);
ASSERT_CMD_RESPONSE_SIZE(0);

for (NATIVE_UINT_TYPE entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
for (FwIndexType entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
this->clearEvents();
this->clearHistory();
// verify previous value
Expand Down Expand Up @@ -596,7 +596,7 @@ namespace Svc {
ASSERT_EVENTS_SIZE(0);
ASSERT_TLM_SIZE(0);

for (NATIVE_INT_TYPE entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
for (FwIndexType entry = 0; entry < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; entry++) {
this->keys[entry] = entry;
}

Expand Down Expand Up @@ -654,7 +654,7 @@ namespace Svc {
//check for expected EVRs
ASSERT_EVENTS_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);
ASSERT_EVENTS_HLTH_PING_WRONG_KEY_SIZE(Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS);
for (NATIVE_INT_TYPE port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
for (FwIndexType port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS; port++) {
char name[80];
snprintf(name, sizeof(name), "task%d",port);
ASSERT_EVENTS_HLTH_PING_WRONG_KEY(port,name,FLAG_KEY_VALUE);
Expand Down Expand Up @@ -717,7 +717,7 @@ namespace Svc {
ASSERT_EVENTS_SIZE(0);

//set up the correct keys for all ports except last
for (NATIVE_INT_TYPE port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS - 1; port++) {
for (FwIndexType port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS - 1; port++) {
this->keys[port] = port;
}
this->keys[Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS - 1] = 9999;
Expand All @@ -735,7 +735,7 @@ namespace Svc {
//invoke schedIn
this->invoke_to_Run(0,0);

for (NATIVE_INT_TYPE port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS - 1; port++) {
for (FwIndexType port = 0; port < Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS - 1; port++) {
if (i == 0) {
this->keys[port] += Svc::HealthComponentBase::NUM_PINGSEND_OUTPUT_PORTS;
} else {
Expand Down
2 changes: 1 addition & 1 deletion Svc/RateGroupDriver/RateGroupDriver.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

public:
//! Size of the divider table, provided as a constants to users passing the table in
static const NATIVE_UINT_TYPE DIVIDER_SIZE = NUM_CYCLEOUT_OUTPUT_PORTS;
static const FwIndexType DIVIDER_SIZE = NUM_CYCLEOUT_OUTPUT_PORTS;

Check notice

Code scanning / CodeQL

Use of basic integral type Note

DIVIDER_SIZE uses the basic integral type int rather than a typedef with size and signedness.

//! \class Divider
//! \brief Struct describing a divider
Expand Down
4 changes: 2 additions & 2 deletions Svc/StaticMemory/test/ut/StaticMemoryTester.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@ namespace Svc {
{

// bufferDeallocate
for (NATIVE_INT_TYPE i = 0; i < StaticMemoryComponentBase::NUM_BUFFERALLOCATE_INPUT_PORTS; ++i) {
for (FwIndexType i = 0; i < StaticMemoryComponentBase::NUM_BUFFERALLOCATE_INPUT_PORTS; ++i) {
this->connect_to_bufferDeallocate(
i,
this->component.get_bufferDeallocate_InputPort(i)
);
}

// bufferAllocate
for (NATIVE_INT_TYPE i = 0; i < StaticMemoryComponentBase::NUM_BUFFERALLOCATE_INPUT_PORTS; ++i) {
for (FwIndexType i = 0; i < StaticMemoryComponentBase::NUM_BUFFERALLOCATE_INPUT_PORTS; ++i) {
this->connect_to_bufferAllocate(
i,
this->component.get_bufferAllocate_InputPort(i)
Expand Down
2 changes: 1 addition & 1 deletion Svc/UdpReceiver/test/ut/Tester.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ namespace Svc {
);

// Output serial ports
for (NATIVE_UINT_TYPE port = 0; port < UdpReceiverComponentImpl::NUM_PORTSOUT_OUTPUT_PORTS; port++) {
for (FwIndexType port = 0; port < UdpReceiverComponentImpl::NUM_PORTSOUT_OUTPUT_PORTS; port++) {
this->component.set_PortsOut_OutputPort(port,this->get_from_PortsOut(port));
}

Expand Down
Loading