diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCommands.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCommands.scala index eeacbff77..4d442f6bc 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCommands.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCommands.scala @@ -163,14 +163,14 @@ case class ComponentCommands ( |Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; | |// Serialize for IPC - |_status = msg.serialize(static_cast(${commandCppConstantName(cmd)})); + |_status = msg.serialize(static_cast(${commandCppConstantName(cmd)})); |FW_ASSERT ( | _status == Fw::FW_SERIALIZE_OK, | static_cast(_status) |); | |// Fake port number to make message dequeue work - |NATIVE_INT_TYPE port = 0; + |FwIndexType port = 0; |""" ), intersperseBlankLines( diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala index 7038534b6..fca455f50 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala @@ -357,11 +357,11 @@ case class ComponentCppWriter ( | // Max. message size = size of data + message id + port | SERIALIZATION_SIZE =${if (buffUnion.nonEmpty) """ | sizeof(BuffUnion) +""" else "" } - | sizeof(NATIVE_INT_TYPE) + - | sizeof(NATIVE_INT_TYPE) + | sizeof(FwEnumStoreType) + + | sizeof(FwIndexType) | }; | - | NATIVE_UINT_TYPE getBuffCapacity() const { + | Fw::Serializable::SizeType getBuffCapacity() const { | return sizeof(m_buff); | } | @@ -410,12 +410,11 @@ case class ComponentCppWriter ( case _ => List.concat( if hasSerialAsyncInputPorts then lines( """|// Passed-in size added to port number and message type enumeration sizes. - |// NATIVE_INT_TYPE cast because of compiler warning. |this->m_msgSize = FW_MAX( | msgSize + - | static_cast(sizeof(NATIVE_INT_TYPE)) + - | static_cast(sizeof(I32)), - | static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) + | static_cast(sizeof(FwIndexType)) + + | static_cast(sizeof(FwEnumStoreType)), + | static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) |); | |Os::Queue::QueueStatus qStat = this->createQueue(queueDepth, this->m_msgSize); @@ -760,7 +759,7 @@ case class ComponentCppWriter ( ) else lines("ComponentIpcSerializableBuffer msg;"), lines( - s"""|NATIVE_INT_TYPE priority = 0; + s"""|FwQueuePriorityType priority = 0; | |Os::Queue::QueueStatus msgStatus = this->m_queue.receive( | msg, @@ -780,7 +779,7 @@ case class ComponentCppWriter ( |// Reset to beginning of buffer |msg.resetDeser(); | - |NATIVE_INT_TYPE desMsg = 0; + |FwEnumStoreType desMsg = 0; |Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); |FW_ASSERT( | deserStatus == Fw::FW_SERIALIZE_OK, @@ -796,7 +795,7 @@ case class ComponentCppWriter ( ), lines( """| - |NATIVE_INT_TYPE portNum = 0; + |FwIndexType portNum = 0; |deserStatus = msg.deserialize(portNum); |FW_ASSERT( | deserStatus == Fw::FW_SERIALIZE_OK, @@ -875,7 +874,7 @@ case class ComponentCppWriter ( lines( """| |//! Stores max message size - |NATIVE_INT_TYPE m_msgSize; + |FwSizeType m_msgSize; |""" ) ).flatten @@ -947,8 +946,8 @@ object ComponentCppWriter extends CppWriterUtils { val body = line(s"// Connect ${d.toString} port ${port.getUnqualifiedName}") :: wrapInForLoopStaggered( - "PlatformIntType port = 0", - s"port < static_cast(this->${numGetterName(port)}())", + "FwIndexType port = 0", + s"port < static_cast(this->${numGetterName(port)}())", "port++", List( lines( diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriterUtils.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriterUtils.scala index fc906ccf4..cbd5fe2b2 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriterUtils.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriterUtils.scala @@ -34,7 +34,7 @@ abstract class ComponentCppWriterUtils( /** Port number param as a CppDoc Function Param */ val portNumParam: CppDoc.Function.Param = CppDoc.Function.Param( - CppDoc.Type("NATIVE_INT_TYPE"), + CppDoc.Type("FwIndexType"), "portNum", Some("The port number") ) @@ -276,7 +276,7 @@ abstract class ComponentCppWriterUtils( val initParams: List[CppDoc.Function.Param] = List.concat( if data.kind != Ast.ComponentKind.Passive then List( CppDoc.Function.Param( - CppDoc.Type("NATIVE_INT_TYPE"), + CppDoc.Type("FwQueueSizeType"), "queueDepth", Some("The queue depth") ) @@ -284,7 +284,7 @@ abstract class ComponentCppWriterUtils( else Nil, if hasSerialAsyncInputPorts then List( CppDoc.Function.Param( - CppDoc.Type("NATIVE_INT_TYPE"), + CppDoc.Type("FwSizeType"), "msgSize", Some("The message size") ) @@ -292,7 +292,7 @@ abstract class ComponentCppWriterUtils( else Nil, List( CppDoc.Function.Param( - CppDoc.Type("NATIVE_INT_TYPE"), + CppDoc.Type("FwEnumStoreType"), "instance", Some("The instance number"), Some("0") diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentDataProducts.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentDataProducts.scala index 72938403e..5e17cd7a3 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentDataProducts.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentDataProducts.scala @@ -185,7 +185,7 @@ case class ComponentDataProducts ( s"${portName}_handler", List( CppDoc.Function.Param( - CppDoc.Type("const NATIVE_INT_TYPE"), + CppDoc.Type("const FwIndexType"), "portNum", Some("The port number") ), diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentEvents.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentEvents.scala index 4ec978453..f87a5a538 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentEvents.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentEvents.scala @@ -64,7 +64,7 @@ case class ComponentEvents ( linesClassMember( Line.blank :: lines( s"""|//! Throttle for ${event.getName} - |NATIVE_UINT_TYPE ${eventThrottleCounterName(event.getName)}; + |FwIndexType ${eventThrottleCounterName(event.getName)}; |""" ) ) @@ -337,4 +337,4 @@ case class ComponentEvents ( private def eventThrottleResetName(event: Event) = s"${eventLogName(event)}_ThrottleClear" -} \ No newline at end of file +} diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentInputPorts.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentInputPorts.scala index 67fd885d7..270a7fefc 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentInputPorts.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentInputPorts.scala @@ -130,7 +130,7 @@ case class ComponentInputPorts( lines( s"""|// Serialize message ID |_status = $bufferName.serialize( - | static_cast(${portCppConstantName(p)}) + | static_cast(${portCppConstantName(p)}) |); |FW_ASSERT( | _status == Fw::FW_SERIALIZE_OK, diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentInternalPort.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentInternalPort.scala index a346df9e2..eea1519cc 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentInternalPort.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentInternalPort.scala @@ -56,14 +56,14 @@ case class ComponentInternalPort ( |Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; | |// Serialize the message ID - |_status = msg.serialize(static_cast(${internalPortCppConstantName(p)})); + |_status = msg.serialize(static_cast(${internalPortCppConstantName(p)})); |FW_ASSERT ( | _status == Fw::FW_SERIALIZE_OK, | static_cast(_status) |); | |// Fake port number to make message dequeue work - |_status = msg.serialize(static_cast(0)); + |_status = msg.serialize(static_cast(0)); |FW_ASSERT ( | _status == Fw::FW_SERIALIZE_OK, | static_cast(_status) @@ -94,4 +94,4 @@ case class ComponentInternalPort ( private def internalInterfaceHandlerBaseName(name: String) = s"${name}_internalInterfaceInvoke" -} \ No newline at end of file +} diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentPorts.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentPorts.scala index 6425334f1..83bd9acdc 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentPorts.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentPorts.scala @@ -119,9 +119,9 @@ case class ComponentPorts( ), numGetterName(p), Nil, - CppDoc.Type("NATIVE_INT_TYPE"), + CppDoc.Type("FwIndexType"), lines( - s"return static_cast(FW_NUM_ARRAY_ELEMENTS(this->${variableName(p)}));" + s"return static_cast(FW_NUM_ARRAY_ELEMENTS(this->${variableName(p)}));" ), CppDoc.Function.NonSV, CppDoc.Function.Const diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTestImplWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTestImplWriter.scala index 40296268c..8cb0f7e25 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTestImplWriter.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTestImplWriter.scala @@ -85,17 +85,17 @@ case class ComponentTestImplWriter( List.concat( Line.blank :: lines( s"""|// Maximum size of histories storing events, telemetry, and port outputs - |static const NATIVE_INT_TYPE $historySizeConstantName = 10; + |static const FwSizeType $historySizeConstantName = 10; | |// Instance ID supplied to the component instance under test - |static const NATIVE_INT_TYPE $idConstantName = 0; + |static const FwEnumStoreType $idConstantName = 0; |""" ), guardedList (data.kind != Ast.ComponentKind.Passive) ( lines( s"""| |// Queue depth supplied to the component instance under test - |static const NATIVE_INT_TYPE $queueDepthConstantName = 10; + |static const FwQueueSizeType $queueDepthConstantName = 10; |""" ) ) @@ -194,7 +194,7 @@ case class ComponentTestImplWriter( p => p.getArraySize match { case 1 => writeConnection(p, "0") case size => wrapInForLoop( - "NATIVE_UINT_TYPE i = 0", + "FwIndexType i = 0", s"i < $size", "i++", writeConnection(p, "i") diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala index 7f84605d1..41c727ee8 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala @@ -160,7 +160,7 @@ case class ComponentTesterBaseWriter( "init", List( CppDoc.Function.Param( - CppDoc.Type("NATIVE_INT_TYPE"), + CppDoc.Type("FwEnumStoreType"), "instance", Some("The instance number"), Some("0") @@ -607,7 +607,7 @@ case class ComponentTesterBaseWriter( List.concat( List( CppDoc.Function.Param( - CppDoc.Type("const NATIVE_INT_TYPE"), + CppDoc.Type("const FwEnumStoreType"), "instance", Some("The instance number") ), @@ -1097,7 +1097,7 @@ case class ComponentTesterBaseWriter( paramSendName(prm.getName), List( CppDoc.Function.Param( - CppDoc.Type("NATIVE_INT_TYPE"), + CppDoc.Type("FwEnumStoreType"), "instance", Some("The component instance") ), @@ -1137,7 +1137,7 @@ case class ComponentTesterBaseWriter( paramSaveName(prm.getName), List( CppDoc.Function.Param( - CppDoc.Type("NATIVE_INT_TYPE"), + CppDoc.Type("FwEnumStoreType"), "instance", Some("The component instance") ), diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterState.scala b/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterState.scala index a8069e900..cfc4f652e 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterState.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterState.scala @@ -201,7 +201,6 @@ object CppWriterState { * default values */ val zero: Value.Integer = Value.Integer(0) val builtInTypes: Map[String,Value.Integer] = Map( - "FwBuffSizeType" -> zero, "FwChanIdType" -> zero, "FwDpIdType" -> zero, "FwDpPriorityType" -> zero, @@ -211,17 +210,12 @@ object CppWriterState { "FwOpcodeType" -> zero, "FwPacketDescriptorType" -> zero, "FwPrmIdType" -> zero, + "FwSignedSizeType" -> zero, + "FwSizeStoreType" -> zero, "FwSizeType" -> zero, "FwTimeBaseStoreType" -> zero, "FwTimeContextStoreType" -> zero, "FwTlmPacketizeIdType" -> zero, - // For compatibility with the current F Prime code. - // Eventually we should remove these machine-dependent types - // from the FPP model and from the FPP-facing interface - // in F Prime. - "NATIVE_INT_TYPE" -> zero, - "NATIVE_UINT_TYPE" -> zero, - "POINTER_CAST" -> zero, ) } diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/PortCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/PortCppWriter.scala index 5e1fa73a4..c418a6d41 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/PortCppWriter.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/PortCppWriter.scala @@ -213,7 +213,7 @@ case class PortCppWriter ( List( CppDocHppWriter.writeAccessTag("public"), Line.blank :: lines( - s"""|NATIVE_UINT_TYPE getBuffCapacity() const { + s"""|Fw::Serializable::SizeType getBuffCapacity() const { | return ${PortCppWriter.inputPortName(name)}::SERIALIZED_SIZE; |} | @@ -271,9 +271,9 @@ case class PortCppWriter ( val compFuncParams = line("Fw::PassiveComponentBase* callComp,") :: (if params.isEmpty then - lines("NATIVE_INT_TYPE portNum") + lines("FwIndexType portNum") else - line("NATIVE_INT_TYPE portNum,") :: + line("FwIndexType portNum,") :: lines(params.map(p => { s"${formalParamsCppWriter.getFormalParamType(p._2.data, None, List(strNamespace)).hppType} ${p._2.data.name}" }).mkString(",\n"))) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/StringCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/StringCppWriter.scala index 6589a80fa..5172ec5e3 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/StringCppWriter.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/StringCppWriter.scala @@ -219,7 +219,7 @@ case class StringCppWriter( None, "getCapacity", Nil, - CppDoc.Type("NATIVE_UINT_TYPE"), + CppDoc.Type("Fw::StringBase::SizeType"), lines("return sizeof(this->m_buf);"), CppDoc.Function.NonSV, CppDoc.Function.Const diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/StructCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/StructCppWriter.scala index 0144c1183..c454e8d2d 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/StructCppWriter.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/StructCppWriter.scala @@ -691,7 +691,7 @@ case class StructCppWriter( // Writes a for loop that iterates n times private def iterateN(n: Int, ll: List[Line]) = wrapInForLoop( - "NATIVE_UINT_TYPE i = 0", + "FwSizeType i = 0", s"i < $n", "i++", ll diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/TopologyCppWriter/TopHelperFns.scala b/compiler/lib/src/main/scala/codegen/CppWriter/TopologyCppWriter/TopHelperFns.scala index d751b47a3..9591a831b 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/TopologyCppWriter/TopHelperFns.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/TopologyCppWriter/TopHelperFns.scala @@ -195,15 +195,15 @@ case class TopHelperFns( if (isActive(ci)) { val name = getNameAsIdent(ci.qualifiedName) val priority = ci.priority match { - case Some(_) => s"static_cast(Priorities::$name)," + case Some(_) => s"static_cast(Priorities::$name)," case None => "Os::Task::TASK_DEFAULT, // Default priority" } val stackSize = ci.stackSize match { - case Some(_) => s"static_cast(StackSizes::$name)," + case Some(_) => s"static_cast(StackSizes::$name)," case None => "Os::Task::TASK_DEFAULT, // Default stack size" } val cpu = ci.cpu match { - case Some(_) => s"static_cast(CPUs::$name)," + case Some(_) => s"static_cast(CPUs::$name)," case None => "Os::Task::TASK_DEFAULT, // Default CPU" } wrapInScope( @@ -213,7 +213,7 @@ case class TopHelperFns( priority, stackSize, cpu, - s"static_cast(TaskIds::$name)", + s"static_cast(TaskIds::$name)", ) ).map(line), ");" diff --git a/compiler/scripts/fprime-gcc b/compiler/scripts/fprime-gcc index 67863f68d..cf609a138 100755 --- a/compiler/scripts/fprime-gcc +++ b/compiler/scripts/fprime-gcc @@ -32,4 +32,5 @@ case "$os" in ;; esac -g++ --std=c++11 -Wall -Wextra -Wconversion $os_flags -DTGT_OS_TYPE_$os_type -I $FPRIME -I $FPRIME/config -I $FPRIME/cmake/platform/types -I . $FPRIME_GCC_FLAGS $@ +# Removing -Wconversion because of many implicit casts of size type in F Prime +g++ --std=c++11 -Wall -Wextra $os_flags -DTGT_OS_TYPE_$os_type -I $FPRIME -I $FPRIME/config -I $FPRIME/cmake/platform/types -I . $FPRIME_GCC_FLAGS $@ diff --git a/compiler/tools/fpp-to-cpp/test/array/S1SerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/S1SerializableAc.ref.cpp index 1c6df7691..e67d65e89 100644 --- a/compiler/tools/fpp-to-cpp/test/array/S1SerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/S1SerializableAc.ref.cpp @@ -86,7 +86,7 @@ namespace M { return this->m_buf; } - NATIVE_UINT_TYPE S1::StringSize80 :: + Fw::StringBase::SizeType S1::StringSize80 :: getCapacity() const { return sizeof(this->m_buf); diff --git a/compiler/tools/fpp-to-cpp/test/array/S1SerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/S1SerializableAc.ref.hpp index 67834fa14..bc6b88853 100644 --- a/compiler/tools/fpp-to-cpp/test/array/S1SerializableAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/array/S1SerializableAc.ref.hpp @@ -61,7 +61,7 @@ namespace M { //! Retrieves char buffer of string const char* toChar() const; - NATIVE_UINT_TYPE getCapacity() const; + Fw::StringBase::SizeType getCapacity() const; private: diff --git a/compiler/tools/fpp-to-cpp/test/array/S3SerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/S3SerializableAc.ref.cpp index 8a7fa9248..090cd50b2 100644 --- a/compiler/tools/fpp-to-cpp/test/array/S3SerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/S3SerializableAc.ref.cpp @@ -22,7 +22,7 @@ namespace S { Serializable(), m_mF64(0.0) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_mU32Array[i] = 0; } } @@ -35,7 +35,7 @@ namespace S { Serializable(), m_mF64(mF64) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_mU32Array[i] = mU32Array[i]; } } @@ -45,7 +45,7 @@ namespace S { Serializable(), m_mF64(obj.m_mF64) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_mU32Array[i] = obj.m_mU32Array[i]; } } @@ -58,7 +58,7 @@ namespace S { Serializable(), m_mF64(mF64) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_mU32Array[i] = mU32Array; } } @@ -88,7 +88,7 @@ namespace S { // Compare array members if (!(this->m_mU32Array == obj.m_mU32Array)) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { if (!(this->m_mU32Array[i] == obj.m_mU32Array[i])) { return false; } @@ -124,7 +124,7 @@ namespace S { { Fw::SerializeStatus status; - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { status = buffer.serialize(this->m_mU32Array[i]); if (status != Fw::FW_SERIALIZE_OK) { return status; @@ -143,7 +143,7 @@ namespace S { { Fw::SerializeStatus status; - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { status = buffer.deserialize(this->m_mU32Array[i]); if (status != Fw::FW_SERIALIZE_OK) { return status; @@ -199,7 +199,7 @@ namespace S { { this->m_mF64 = mF64; - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_mU32Array[i] = mU32Array[i]; } } @@ -207,7 +207,7 @@ namespace S { void S3 :: setmU32Array(const Type_of_mU32Array& mU32Array) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_mU32Array[i] = mU32Array[i]; } } diff --git a/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.cpp index a8f30c88f..b9ec7f91c 100644 --- a/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.cpp @@ -84,7 +84,7 @@ const char* String1::StringSize80 :: return this->m_buf; } -NATIVE_UINT_TYPE String1::StringSize80 :: +Fw::StringBase::SizeType String1::StringSize80 :: getCapacity() const { return sizeof(this->m_buf); diff --git a/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.hpp index 2ffca368a..3171ff983 100644 --- a/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.hpp @@ -60,7 +60,7 @@ class String1 : //! Retrieves char buffer of string const char* toChar() const; - NATIVE_UINT_TYPE getCapacity() const; + Fw::StringBase::SizeType getCapacity() const; private: diff --git a/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.cpp index 0c2c003d5..f2ca70018 100644 --- a/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.cpp @@ -84,7 +84,7 @@ const char* String2::StringSize80 :: return this->m_buf; } -NATIVE_UINT_TYPE String2::StringSize80 :: +Fw::StringBase::SizeType String2::StringSize80 :: getCapacity() const { return sizeof(this->m_buf); diff --git a/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.hpp index d039e24bd..785d64384 100644 --- a/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.hpp @@ -60,7 +60,7 @@ class String2 : //! Retrieves char buffer of string const char* toChar() const; - NATIVE_UINT_TYPE getCapacity() const; + Fw::StringBase::SizeType getCapacity() const; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductPortsOnlyComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductPortsOnlyComponentAc.ref.cpp index d101736cf..fdb95289c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductPortsOnlyComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductPortsOnlyComponentAc.ref.cpp @@ -36,11 +36,11 @@ namespace { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = sizeof(BuffUnion) + - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -65,8 +65,8 @@ namespace { void ActiveAsyncProductPortsOnlyComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwEnumStoreType instance ) { // Initialize base class @@ -74,8 +74,8 @@ void ActiveAsyncProductPortsOnlyComponentBase :: // Connect input port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRecvIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRecvIn_InputPorts()); port++ ) { this->m_productRecvIn_InputPort[port].init(); @@ -98,8 +98,8 @@ void ActiveAsyncProductPortsOnlyComponentBase :: // Connect output port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRequestOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRequestOut_OutputPorts()); port++ ) { this->m_productRequestOut_OutputPort[port].init(); @@ -117,8 +117,8 @@ void ActiveAsyncProductPortsOnlyComponentBase :: // Connect output port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productSendOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productSendOut_OutputPorts()); port++ ) { this->m_productSendOut_OutputPort[port].init(); @@ -149,7 +149,7 @@ void ActiveAsyncProductPortsOnlyComponentBase :: // ---------------------------------------------------------------------- Fw::InputDpResponsePort* ActiveAsyncProductPortsOnlyComponentBase :: - get_productRecvIn_InputPort(NATIVE_INT_TYPE portNum) + get_productRecvIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRecvIn_InputPorts(), @@ -165,7 +165,7 @@ Fw::InputDpResponsePort* ActiveAsyncProductPortsOnlyComponentBase :: void ActiveAsyncProductPortsOnlyComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpRequestPort* port ) { @@ -179,7 +179,7 @@ void ActiveAsyncProductPortsOnlyComponentBase :: void ActiveAsyncProductPortsOnlyComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpSendPort* port ) { @@ -199,7 +199,7 @@ void ActiveAsyncProductPortsOnlyComponentBase :: void ActiveAsyncProductPortsOnlyComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -213,7 +213,7 @@ void ActiveAsyncProductPortsOnlyComponentBase :: void ActiveAsyncProductPortsOnlyComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -248,26 +248,26 @@ ActiveAsyncProductPortsOnlyComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveAsyncProductPortsOnlyComponentBase :: +FwIndexType ActiveAsyncProductPortsOnlyComponentBase :: getNum_productRecvIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveAsyncProductPortsOnlyComponentBase :: +FwIndexType ActiveAsyncProductPortsOnlyComponentBase :: getNum_productRequestOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductPortsOnlyComponentBase :: +FwIndexType ActiveAsyncProductPortsOnlyComponentBase :: getNum_productSendOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -275,7 +275,7 @@ NATIVE_INT_TYPE ActiveAsyncProductPortsOnlyComponentBase :: // ---------------------------------------------------------------------- bool ActiveAsyncProductPortsOnlyComponentBase :: - isConnected_productRequestOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productRequestOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRequestOut_OutputPorts(), @@ -286,7 +286,7 @@ bool ActiveAsyncProductPortsOnlyComponentBase :: } bool ActiveAsyncProductPortsOnlyComponentBase :: - isConnected_productSendOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productSendOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productSendOut_OutputPorts(), @@ -304,7 +304,7 @@ bool ActiveAsyncProductPortsOnlyComponentBase :: void ActiveAsyncProductPortsOnlyComponentBase :: productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -328,7 +328,7 @@ void ActiveAsyncProductPortsOnlyComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(PRODUCTRECVIN_DPRESPONSE) + static_cast(PRODUCTRECVIN_DPRESPONSE) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -383,7 +383,7 @@ void ActiveAsyncProductPortsOnlyComponentBase :: void ActiveAsyncProductPortsOnlyComponentBase :: productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -398,7 +398,7 @@ void ActiveAsyncProductPortsOnlyComponentBase :: void ActiveAsyncProductPortsOnlyComponentBase :: productRequestOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -415,7 +415,7 @@ void ActiveAsyncProductPortsOnlyComponentBase :: void ActiveAsyncProductPortsOnlyComponentBase :: productSendOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -438,7 +438,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveAsyncProductPortsOnlyComponentB doDispatch() { ComponentIpcSerializableBuffer msg; - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -453,7 +453,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveAsyncProductPortsOnlyComponentB // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -466,7 +466,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveAsyncProductPortsOnlyComponentB return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -524,7 +524,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveAsyncProductPortsOnlyComponentB void ActiveAsyncProductPortsOnlyComponentBase :: m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -546,7 +546,7 @@ void ActiveAsyncProductPortsOnlyComponentBase :: void ActiveAsyncProductPortsOnlyComponentBase :: productRecvIn_handler( - const NATIVE_INT_TYPE portNum, + const FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductPortsOnlyComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductPortsOnlyComponentAc.ref.hpp index a18bef1e4..20d8fe946 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductPortsOnlyComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductPortsOnlyComponentAc.ref.hpp @@ -55,8 +55,8 @@ class ActiveAsyncProductPortsOnlyComponentBase : //! Initialize ActiveAsyncProductPortsOnlyComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -69,7 +69,7 @@ class ActiveAsyncProductPortsOnlyComponentBase : //! //! \return productRecvIn[portNum] Fw::InputDpResponsePort* get_productRecvIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -80,13 +80,13 @@ class ActiveAsyncProductPortsOnlyComponentBase : //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpRequestPort* port //!< The input port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpSendPort* port //!< The input port ); @@ -100,13 +100,13 @@ class ActiveAsyncProductPortsOnlyComponentBase : //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -135,7 +135,7 @@ class ActiveAsyncProductPortsOnlyComponentBase : //! Get the number of productRecvIn input ports //! //! \return The number of productRecvIn input ports - NATIVE_INT_TYPE getNum_productRecvIn_InputPorts() const; + FwIndexType getNum_productRecvIn_InputPorts() const; PROTECTED: @@ -146,12 +146,12 @@ class ActiveAsyncProductPortsOnlyComponentBase : //! Get the number of productRequestOut output ports //! //! \return The number of productRequestOut output ports - NATIVE_INT_TYPE getNum_productRequestOut_OutputPorts() const; + FwIndexType getNum_productRequestOut_OutputPorts() const; //! Get the number of productSendOut output ports //! //! \return The number of productSendOut output ports - NATIVE_INT_TYPE getNum_productSendOut_OutputPorts() const; + FwIndexType getNum_productSendOut_OutputPorts() const; PROTECTED: @@ -163,14 +163,14 @@ class ActiveAsyncProductPortsOnlyComponentBase : //! //! \return Whether port productRequestOut is connected bool isConnected_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productSendOut is connected //! //! \return Whether port productSendOut is connected bool isConnected_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -183,7 +183,7 @@ class ActiveAsyncProductPortsOnlyComponentBase : //! Handler base-class function for input port productRecvIn void productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -201,7 +201,7 @@ class ActiveAsyncProductPortsOnlyComponentBase : //! Pre-message hook for async input port productRecvIn virtual void productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -215,14 +215,14 @@ class ActiveAsyncProductPortsOnlyComponentBase : //! Invoke output port productRequestOut void productRequestOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); //! Invoke output port productSendOut void productSendOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -245,7 +245,7 @@ class ActiveAsyncProductPortsOnlyComponentBase : //! Callback for port productRecvIn static void m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -259,7 +259,7 @@ class ActiveAsyncProductPortsOnlyComponentBase : //! Handler implementation for productRecvIn void productRecvIn_handler( - const NATIVE_INT_TYPE portNum, //!< The port number + const FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container id const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The buffer status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.cpp index 5e14c0311..9a002ef13 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.cpp @@ -46,11 +46,11 @@ namespace { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = sizeof(BuffUnion) + - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -229,8 +229,8 @@ Fw::SerializeStatus ActiveAsyncProductsComponentBase::DpContainer :: void ActiveAsyncProductsComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwEnumStoreType instance ) { // Initialize base class @@ -238,8 +238,8 @@ void ActiveAsyncProductsComponentBase :: // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -262,8 +262,8 @@ void ActiveAsyncProductsComponentBase :: // Connect input port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRecvIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRecvIn_InputPorts()); port++ ) { this->m_productRecvIn_InputPort[port].init(); @@ -286,8 +286,8 @@ void ActiveAsyncProductsComponentBase :: // Connect input port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsAsync_InputPorts()); port++ ) { this->m_noArgsAsync_InputPort[port].init(); @@ -310,8 +310,8 @@ void ActiveAsyncProductsComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -334,8 +334,8 @@ void ActiveAsyncProductsComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -358,8 +358,8 @@ void ActiveAsyncProductsComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -382,8 +382,8 @@ void ActiveAsyncProductsComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -406,8 +406,8 @@ void ActiveAsyncProductsComponentBase :: // Connect input port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsync_InputPorts()); port++ ) { this->m_typedAsync_InputPort[port].init(); @@ -430,8 +430,8 @@ void ActiveAsyncProductsComponentBase :: // Connect input port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); port++ ) { this->m_typedAsyncAssert_InputPort[port].init(); @@ -454,8 +454,8 @@ void ActiveAsyncProductsComponentBase :: // Connect input port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); port++ ) { this->m_typedAsyncBlockPriority_InputPort[port].init(); @@ -478,8 +478,8 @@ void ActiveAsyncProductsComponentBase :: // Connect input port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); port++ ) { this->m_typedAsyncDropPriority_InputPort[port].init(); @@ -502,8 +502,8 @@ void ActiveAsyncProductsComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -526,8 +526,8 @@ void ActiveAsyncProductsComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -550,8 +550,8 @@ void ActiveAsyncProductsComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -574,8 +574,8 @@ void ActiveAsyncProductsComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -598,8 +598,8 @@ void ActiveAsyncProductsComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -617,8 +617,8 @@ void ActiveAsyncProductsComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -636,8 +636,8 @@ void ActiveAsyncProductsComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -655,8 +655,8 @@ void ActiveAsyncProductsComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -674,8 +674,8 @@ void ActiveAsyncProductsComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -693,8 +693,8 @@ void ActiveAsyncProductsComponentBase :: // Connect output port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRequestOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRequestOut_OutputPorts()); port++ ) { this->m_productRequestOut_OutputPort[port].init(); @@ -712,8 +712,8 @@ void ActiveAsyncProductsComponentBase :: // Connect output port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productSendOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productSendOut_OutputPorts()); port++ ) { this->m_productSendOut_OutputPort[port].init(); @@ -732,8 +732,8 @@ void ActiveAsyncProductsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -752,8 +752,8 @@ void ActiveAsyncProductsComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -771,8 +771,8 @@ void ActiveAsyncProductsComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -790,8 +790,8 @@ void ActiveAsyncProductsComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -809,8 +809,8 @@ void ActiveAsyncProductsComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -828,8 +828,8 @@ void ActiveAsyncProductsComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -847,8 +847,8 @@ void ActiveAsyncProductsComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -879,7 +879,7 @@ void ActiveAsyncProductsComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* ActiveAsyncProductsComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -890,7 +890,7 @@ Fw::InputCmdPort* ActiveAsyncProductsComponentBase :: } Fw::InputDpResponsePort* ActiveAsyncProductsComponentBase :: - get_productRecvIn_InputPort(NATIVE_INT_TYPE portNum) + get_productRecvIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRecvIn_InputPorts(), @@ -905,7 +905,7 @@ Fw::InputDpResponsePort* ActiveAsyncProductsComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* ActiveAsyncProductsComponentBase :: - get_noArgsAsync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsAsync_InputPorts(), @@ -916,7 +916,7 @@ Ports::InputNoArgsPort* ActiveAsyncProductsComponentBase :: } Ports::InputNoArgsPort* ActiveAsyncProductsComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -927,7 +927,7 @@ Ports::InputNoArgsPort* ActiveAsyncProductsComponentBase :: } Ports::InputNoArgsReturnPort* ActiveAsyncProductsComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -938,7 +938,7 @@ Ports::InputNoArgsReturnPort* ActiveAsyncProductsComponentBase :: } Ports::InputNoArgsReturnPort* ActiveAsyncProductsComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -949,7 +949,7 @@ Ports::InputNoArgsReturnPort* ActiveAsyncProductsComponentBase :: } Ports::InputNoArgsPort* ActiveAsyncProductsComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -960,7 +960,7 @@ Ports::InputNoArgsPort* ActiveAsyncProductsComponentBase :: } Ports::InputTypedPort* ActiveAsyncProductsComponentBase :: - get_typedAsync_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsync_InputPorts(), @@ -971,7 +971,7 @@ Ports::InputTypedPort* ActiveAsyncProductsComponentBase :: } Ports::InputTypedPort* ActiveAsyncProductsComponentBase :: - get_typedAsyncAssert_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncAssert_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncAssert_InputPorts(), @@ -982,7 +982,7 @@ Ports::InputTypedPort* ActiveAsyncProductsComponentBase :: } Ports::InputTypedPort* ActiveAsyncProductsComponentBase :: - get_typedAsyncBlockPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncBlockPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncBlockPriority_InputPorts(), @@ -993,7 +993,7 @@ Ports::InputTypedPort* ActiveAsyncProductsComponentBase :: } Ports::InputTypedPort* ActiveAsyncProductsComponentBase :: - get_typedAsyncDropPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncDropPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncDropPriority_InputPorts(), @@ -1004,7 +1004,7 @@ Ports::InputTypedPort* ActiveAsyncProductsComponentBase :: } Ports::InputTypedPort* ActiveAsyncProductsComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -1015,7 +1015,7 @@ Ports::InputTypedPort* ActiveAsyncProductsComponentBase :: } Ports::InputTypedReturnPort* ActiveAsyncProductsComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -1026,7 +1026,7 @@ Ports::InputTypedReturnPort* ActiveAsyncProductsComponentBase :: } Ports::InputTypedReturnPort* ActiveAsyncProductsComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -1037,7 +1037,7 @@ Ports::InputTypedReturnPort* ActiveAsyncProductsComponentBase :: } Ports::InputTypedPort* ActiveAsyncProductsComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -1053,7 +1053,7 @@ Ports::InputTypedPort* ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -1067,7 +1067,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -1081,7 +1081,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -1095,7 +1095,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -1109,7 +1109,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -1123,7 +1123,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpRequestPort* port ) { @@ -1137,7 +1137,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpSendPort* port ) { @@ -1153,7 +1153,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -1169,7 +1169,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -1183,7 +1183,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -1201,7 +1201,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -1215,7 +1215,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -1229,7 +1229,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -1243,7 +1243,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -1263,7 +1263,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1277,7 +1277,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1291,7 +1291,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1305,7 +1305,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1319,7 +1319,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1333,7 +1333,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1349,7 +1349,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1365,7 +1365,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1379,7 +1379,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1401,7 +1401,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1415,7 +1415,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1450,194 +1450,194 @@ ActiveAsyncProductsComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_productRecvIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_noArgsAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_typedAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_typedAsyncAssert_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_typedAsyncBlockPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_typedAsyncDropPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_productRequestOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_productSendOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: +FwIndexType ActiveAsyncProductsComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1645,7 +1645,7 @@ NATIVE_INT_TYPE ActiveAsyncProductsComponentBase :: // ---------------------------------------------------------------------- bool ActiveAsyncProductsComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1656,7 +1656,7 @@ bool ActiveAsyncProductsComponentBase :: } bool ActiveAsyncProductsComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1667,7 +1667,7 @@ bool ActiveAsyncProductsComponentBase :: } bool ActiveAsyncProductsComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1678,7 +1678,7 @@ bool ActiveAsyncProductsComponentBase :: } bool ActiveAsyncProductsComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1689,7 +1689,7 @@ bool ActiveAsyncProductsComponentBase :: } bool ActiveAsyncProductsComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1700,7 +1700,7 @@ bool ActiveAsyncProductsComponentBase :: } bool ActiveAsyncProductsComponentBase :: - isConnected_productRequestOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productRequestOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRequestOut_OutputPorts(), @@ -1711,7 +1711,7 @@ bool ActiveAsyncProductsComponentBase :: } bool ActiveAsyncProductsComponentBase :: - isConnected_productSendOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productSendOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productSendOut_OutputPorts(), @@ -1724,7 +1724,7 @@ bool ActiveAsyncProductsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool ActiveAsyncProductsComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1737,7 +1737,7 @@ bool ActiveAsyncProductsComponentBase :: #endif bool ActiveAsyncProductsComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1748,7 +1748,7 @@ bool ActiveAsyncProductsComponentBase :: } bool ActiveAsyncProductsComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1763,7 +1763,7 @@ bool ActiveAsyncProductsComponentBase :: // ---------------------------------------------------------------------- bool ActiveAsyncProductsComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1774,7 +1774,7 @@ bool ActiveAsyncProductsComponentBase :: } bool ActiveAsyncProductsComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1785,7 +1785,7 @@ bool ActiveAsyncProductsComponentBase :: } bool ActiveAsyncProductsComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1796,7 +1796,7 @@ bool ActiveAsyncProductsComponentBase :: } bool ActiveAsyncProductsComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1814,7 +1814,7 @@ bool ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -1838,7 +1838,7 @@ void ActiveAsyncProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(PRODUCTRECVIN_DPRESPONSE) + static_cast(PRODUCTRECVIN_DPRESPONSE) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1890,7 +1890,7 @@ void ActiveAsyncProductsComponentBase :: // ---------------------------------------------------------------------- void ActiveAsyncProductsComponentBase :: - noArgsAsync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsAsync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1905,7 +1905,7 @@ void ActiveAsyncProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(NOARGSASYNC_NOARGS) + static_cast(NOARGSASYNC_NOARGS) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1930,7 +1930,7 @@ void ActiveAsyncProductsComponentBase :: } void ActiveAsyncProductsComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1949,7 +1949,7 @@ void ActiveAsyncProductsComponentBase :: } U32 ActiveAsyncProductsComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1972,7 +1972,7 @@ U32 ActiveAsyncProductsComponentBase :: } U32 ActiveAsyncProductsComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1989,7 +1989,7 @@ U32 ActiveAsyncProductsComponentBase :: } void ActiveAsyncProductsComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -2003,7 +2003,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2035,7 +2035,7 @@ void ActiveAsyncProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNC_TYPED) + static_cast(TYPEDASYNC_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2110,7 +2110,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2142,7 +2142,7 @@ void ActiveAsyncProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCASSERT_TYPED) + static_cast(TYPEDASYNCASSERT_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2217,7 +2217,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2249,7 +2249,7 @@ void ActiveAsyncProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) + static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2324,7 +2324,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2356,7 +2356,7 @@ void ActiveAsyncProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCDROPPRIORITY_TYPED) + static_cast(TYPEDASYNCDROPPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2436,7 +2436,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2473,7 +2473,7 @@ void ActiveAsyncProductsComponentBase :: F32 ActiveAsyncProductsComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2514,7 +2514,7 @@ F32 ActiveAsyncProductsComponentBase :: F32 ActiveAsyncProductsComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2549,7 +2549,7 @@ F32 ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2588,7 +2588,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -2606,14 +2606,14 @@ void ActiveAsyncProductsComponentBase :: // ---------------------------------------------------------------------- void ActiveAsyncProductsComponentBase :: - noArgsAsync_preMsgHook(NATIVE_INT_TYPE portNum) + noArgsAsync_preMsgHook(FwIndexType portNum) { // Default: no-op } void ActiveAsyncProductsComponentBase :: typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2628,7 +2628,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2643,7 +2643,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2658,7 +2658,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2677,7 +2677,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: productRequestOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -2694,7 +2694,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: productSendOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -2714,7 +2714,7 @@ void ActiveAsyncProductsComponentBase :: // ---------------------------------------------------------------------- void ActiveAsyncProductsComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -2724,7 +2724,7 @@ void ActiveAsyncProductsComponentBase :: } U32 ActiveAsyncProductsComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -2735,7 +2735,7 @@ U32 ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2762,7 +2762,7 @@ void ActiveAsyncProductsComponentBase :: F32 ActiveAsyncProductsComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2861,7 +2861,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveAsyncProductsComponentBase :: doDispatch() { ComponentIpcSerializableBuffer msg; - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -2876,7 +2876,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveAsyncProductsComponentBase :: // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -2889,7 +2889,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveAsyncProductsComponentBase :: return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -3243,7 +3243,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -3258,7 +3258,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -3281,7 +3281,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3292,7 +3292,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3303,7 +3303,7 @@ void ActiveAsyncProductsComponentBase :: U32 ActiveAsyncProductsComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3314,7 +3314,7 @@ U32 ActiveAsyncProductsComponentBase :: U32 ActiveAsyncProductsComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3325,7 +3325,7 @@ U32 ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3336,7 +3336,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3363,7 +3363,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3390,7 +3390,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3417,7 +3417,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3444,7 +3444,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3471,7 +3471,7 @@ void ActiveAsyncProductsComponentBase :: F32 ActiveAsyncProductsComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3498,7 +3498,7 @@ F32 ActiveAsyncProductsComponentBase :: F32 ActiveAsyncProductsComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3525,7 +3525,7 @@ F32 ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3566,7 +3566,7 @@ void ActiveAsyncProductsComponentBase :: void ActiveAsyncProductsComponentBase :: productRecvIn_handler( - const NATIVE_INT_TYPE portNum, + const FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.hpp index 2be194891..88abc4054 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.hpp @@ -209,8 +209,8 @@ class ActiveAsyncProductsComponentBase : //! Initialize ActiveAsyncProductsComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -223,14 +223,14 @@ class ActiveAsyncProductsComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get special input port at index //! //! \return productRecvIn[portNum] Fw::InputDpResponsePort* get_productRecvIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -243,91 +243,91 @@ class ActiveAsyncProductsComponentBase : //! //! \return noArgsAsync[portNum] Ports::InputNoArgsPort* get_noArgsAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsync[portNum] Ports::InputTypedPort* get_typedAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncAssert[portNum] Ports::InputTypedPort* get_typedAsyncAssert_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncBlockPriority[portNum] Ports::InputTypedPort* get_typedAsyncBlockPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncDropPriority[portNum] Ports::InputTypedPort* get_typedAsyncDropPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -338,43 +338,43 @@ class ActiveAsyncProductsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpRequestPort* port //!< The input port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpSendPort* port //!< The input port ); @@ -382,7 +382,7 @@ class ActiveAsyncProductsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -390,13 +390,13 @@ class ActiveAsyncProductsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -408,25 +408,25 @@ class ActiveAsyncProductsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -440,37 +440,37 @@ class ActiveAsyncProductsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -478,7 +478,7 @@ class ActiveAsyncProductsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -486,13 +486,13 @@ class ActiveAsyncProductsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -508,13 +508,13 @@ class ActiveAsyncProductsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -543,12 +543,12 @@ class ActiveAsyncProductsComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; //! Get the number of productRecvIn input ports //! //! \return The number of productRecvIn input ports - NATIVE_INT_TYPE getNum_productRecvIn_InputPorts() const; + FwIndexType getNum_productRecvIn_InputPorts() const; PROTECTED: @@ -559,67 +559,67 @@ class ActiveAsyncProductsComponentBase : //! Get the number of noArgsAsync input ports //! //! \return The number of noArgsAsync input ports - NATIVE_INT_TYPE getNum_noArgsAsync_InputPorts() const; + FwIndexType getNum_noArgsAsync_InputPorts() const; //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedAsync input ports //! //! \return The number of typedAsync input ports - NATIVE_INT_TYPE getNum_typedAsync_InputPorts() const; + FwIndexType getNum_typedAsync_InputPorts() const; //! Get the number of typedAsyncAssert input ports //! //! \return The number of typedAsyncAssert input ports - NATIVE_INT_TYPE getNum_typedAsyncAssert_InputPorts() const; + FwIndexType getNum_typedAsyncAssert_InputPorts() const; //! Get the number of typedAsyncBlockPriority input ports //! //! \return The number of typedAsyncBlockPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncBlockPriority_InputPorts() const; + FwIndexType getNum_typedAsyncBlockPriority_InputPorts() const; //! Get the number of typedAsyncDropPriority input ports //! //! \return The number of typedAsyncDropPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncDropPriority_InputPorts() const; + FwIndexType getNum_typedAsyncDropPriority_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -630,56 +630,56 @@ class ActiveAsyncProductsComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; //! Get the number of productRequestOut output ports //! //! \return The number of productRequestOut output ports - NATIVE_INT_TYPE getNum_productRequestOut_OutputPorts() const; + FwIndexType getNum_productRequestOut_OutputPorts() const; //! Get the number of productSendOut output ports //! //! \return The number of productSendOut output ports - NATIVE_INT_TYPE getNum_productSendOut_OutputPorts() const; + FwIndexType getNum_productSendOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -690,22 +690,22 @@ class ActiveAsyncProductsComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -717,49 +717,49 @@ class ActiveAsyncProductsComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productRequestOut is connected //! //! \return Whether port productRequestOut is connected bool isConnected_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productSendOut is connected //! //! \return Whether port productSendOut is connected bool isConnected_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -768,7 +768,7 @@ class ActiveAsyncProductsComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -777,14 +777,14 @@ class ActiveAsyncProductsComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -797,28 +797,28 @@ class ActiveAsyncProductsComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -831,7 +831,7 @@ class ActiveAsyncProductsComponentBase : //! Handler base-class function for input port productRecvIn void productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -845,32 +845,32 @@ class ActiveAsyncProductsComponentBase : //! Handler for input port noArgsAsync virtual void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedAsync virtual void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -882,7 +882,7 @@ class ActiveAsyncProductsComponentBase : //! Handler for input port typedAsyncAssert virtual void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -894,7 +894,7 @@ class ActiveAsyncProductsComponentBase : //! Handler for input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -906,7 +906,7 @@ class ActiveAsyncProductsComponentBase : //! Handler for input port typedAsyncDropPriority virtual void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -918,7 +918,7 @@ class ActiveAsyncProductsComponentBase : //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -930,7 +930,7 @@ class ActiveAsyncProductsComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -942,7 +942,7 @@ class ActiveAsyncProductsComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -954,7 +954,7 @@ class ActiveAsyncProductsComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -974,32 +974,32 @@ class ActiveAsyncProductsComponentBase : //! Handler base-class function for input port noArgsAsync void noArgsAsync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedAsync void typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1011,7 +1011,7 @@ class ActiveAsyncProductsComponentBase : //! Handler base-class function for input port typedAsyncAssert void typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1023,7 +1023,7 @@ class ActiveAsyncProductsComponentBase : //! Handler base-class function for input port typedAsyncBlockPriority void typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1035,7 +1035,7 @@ class ActiveAsyncProductsComponentBase : //! Handler base-class function for input port typedAsyncDropPriority void typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1047,7 +1047,7 @@ class ActiveAsyncProductsComponentBase : //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1059,7 +1059,7 @@ class ActiveAsyncProductsComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1071,7 +1071,7 @@ class ActiveAsyncProductsComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1083,7 +1083,7 @@ class ActiveAsyncProductsComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1105,7 +1105,7 @@ class ActiveAsyncProductsComponentBase : //! Pre-message hook for async input port productRecvIn virtual void productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -1123,12 +1123,12 @@ class ActiveAsyncProductsComponentBase : //! Pre-message hook for async input port noArgsAsync virtual void noArgsAsync_preMsgHook( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Pre-message hook for async input port typedAsync virtual void typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1140,7 +1140,7 @@ class ActiveAsyncProductsComponentBase : //! Pre-message hook for async input port typedAsyncAssert virtual void typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1152,7 +1152,7 @@ class ActiveAsyncProductsComponentBase : //! Pre-message hook for async input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1164,7 +1164,7 @@ class ActiveAsyncProductsComponentBase : //! Pre-message hook for async input port typedAsyncDropPriority virtual void typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1182,14 +1182,14 @@ class ActiveAsyncProductsComponentBase : //! Invoke output port productRequestOut void productRequestOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); //! Invoke output port productSendOut void productSendOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -1202,17 +1202,17 @@ class ActiveAsyncProductsComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1224,7 +1224,7 @@ class ActiveAsyncProductsComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1361,7 +1361,7 @@ class ActiveAsyncProductsComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -1370,7 +1370,7 @@ class ActiveAsyncProductsComponentBase : //! Callback for port productRecvIn static void m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -1385,37 +1385,37 @@ class ActiveAsyncProductsComponentBase : //! Callback for port noArgsAsync static void m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedAsync static void m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1428,7 +1428,7 @@ class ActiveAsyncProductsComponentBase : //! Callback for port typedAsyncAssert static void m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1441,7 +1441,7 @@ class ActiveAsyncProductsComponentBase : //! Callback for port typedAsyncBlockPriority static void m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1454,7 +1454,7 @@ class ActiveAsyncProductsComponentBase : //! Callback for port typedAsyncDropPriority static void m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1467,7 +1467,7 @@ class ActiveAsyncProductsComponentBase : //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1480,7 +1480,7 @@ class ActiveAsyncProductsComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1493,7 +1493,7 @@ class ActiveAsyncProductsComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1506,7 +1506,7 @@ class ActiveAsyncProductsComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1530,7 +1530,7 @@ class ActiveAsyncProductsComponentBase : //! Handler implementation for productRecvIn void productRecvIn_handler( - const NATIVE_INT_TYPE portNum, //!< The port number + const FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container id const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The buffer status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveCommandsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveCommandsComponentAc.ref.cpp index 6686984a8..44cf73d23 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveCommandsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveCommandsComponentAc.ref.cpp @@ -49,11 +49,11 @@ namespace { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = sizeof(BuffUnion) + - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -78,8 +78,8 @@ namespace { void ActiveCommandsComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwEnumStoreType instance ) { // Initialize base class @@ -87,8 +87,8 @@ void ActiveCommandsComponentBase :: // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -111,8 +111,8 @@ void ActiveCommandsComponentBase :: // Connect input port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsAsync_InputPorts()); port++ ) { this->m_noArgsAsync_InputPort[port].init(); @@ -135,8 +135,8 @@ void ActiveCommandsComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -159,8 +159,8 @@ void ActiveCommandsComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -183,8 +183,8 @@ void ActiveCommandsComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -207,8 +207,8 @@ void ActiveCommandsComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -231,8 +231,8 @@ void ActiveCommandsComponentBase :: // Connect input port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsync_InputPorts()); port++ ) { this->m_typedAsync_InputPort[port].init(); @@ -255,8 +255,8 @@ void ActiveCommandsComponentBase :: // Connect input port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); port++ ) { this->m_typedAsyncAssert_InputPort[port].init(); @@ -279,8 +279,8 @@ void ActiveCommandsComponentBase :: // Connect input port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); port++ ) { this->m_typedAsyncBlockPriority_InputPort[port].init(); @@ -303,8 +303,8 @@ void ActiveCommandsComponentBase :: // Connect input port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); port++ ) { this->m_typedAsyncDropPriority_InputPort[port].init(); @@ -327,8 +327,8 @@ void ActiveCommandsComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -351,8 +351,8 @@ void ActiveCommandsComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -375,8 +375,8 @@ void ActiveCommandsComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -399,8 +399,8 @@ void ActiveCommandsComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -423,8 +423,8 @@ void ActiveCommandsComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -442,8 +442,8 @@ void ActiveCommandsComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -461,8 +461,8 @@ void ActiveCommandsComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -480,8 +480,8 @@ void ActiveCommandsComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -499,8 +499,8 @@ void ActiveCommandsComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -519,8 +519,8 @@ void ActiveCommandsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -539,8 +539,8 @@ void ActiveCommandsComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -558,8 +558,8 @@ void ActiveCommandsComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -577,8 +577,8 @@ void ActiveCommandsComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -596,8 +596,8 @@ void ActiveCommandsComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -615,8 +615,8 @@ void ActiveCommandsComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -634,8 +634,8 @@ void ActiveCommandsComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -666,7 +666,7 @@ void ActiveCommandsComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* ActiveCommandsComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -681,7 +681,7 @@ Fw::InputCmdPort* ActiveCommandsComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* ActiveCommandsComponentBase :: - get_noArgsAsync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsAsync_InputPorts(), @@ -692,7 +692,7 @@ Ports::InputNoArgsPort* ActiveCommandsComponentBase :: } Ports::InputNoArgsPort* ActiveCommandsComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -703,7 +703,7 @@ Ports::InputNoArgsPort* ActiveCommandsComponentBase :: } Ports::InputNoArgsReturnPort* ActiveCommandsComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -714,7 +714,7 @@ Ports::InputNoArgsReturnPort* ActiveCommandsComponentBase :: } Ports::InputNoArgsReturnPort* ActiveCommandsComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -725,7 +725,7 @@ Ports::InputNoArgsReturnPort* ActiveCommandsComponentBase :: } Ports::InputNoArgsPort* ActiveCommandsComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -736,7 +736,7 @@ Ports::InputNoArgsPort* ActiveCommandsComponentBase :: } Ports::InputTypedPort* ActiveCommandsComponentBase :: - get_typedAsync_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsync_InputPorts(), @@ -747,7 +747,7 @@ Ports::InputTypedPort* ActiveCommandsComponentBase :: } Ports::InputTypedPort* ActiveCommandsComponentBase :: - get_typedAsyncAssert_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncAssert_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncAssert_InputPorts(), @@ -758,7 +758,7 @@ Ports::InputTypedPort* ActiveCommandsComponentBase :: } Ports::InputTypedPort* ActiveCommandsComponentBase :: - get_typedAsyncBlockPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncBlockPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncBlockPriority_InputPorts(), @@ -769,7 +769,7 @@ Ports::InputTypedPort* ActiveCommandsComponentBase :: } Ports::InputTypedPort* ActiveCommandsComponentBase :: - get_typedAsyncDropPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncDropPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncDropPriority_InputPorts(), @@ -780,7 +780,7 @@ Ports::InputTypedPort* ActiveCommandsComponentBase :: } Ports::InputTypedPort* ActiveCommandsComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -791,7 +791,7 @@ Ports::InputTypedPort* ActiveCommandsComponentBase :: } Ports::InputTypedReturnPort* ActiveCommandsComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -802,7 +802,7 @@ Ports::InputTypedReturnPort* ActiveCommandsComponentBase :: } Ports::InputTypedReturnPort* ActiveCommandsComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -813,7 +813,7 @@ Ports::InputTypedReturnPort* ActiveCommandsComponentBase :: } Ports::InputTypedPort* ActiveCommandsComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -829,7 +829,7 @@ Ports::InputTypedPort* ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -843,7 +843,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -857,7 +857,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -871,7 +871,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -885,7 +885,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -901,7 +901,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -917,7 +917,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -931,7 +931,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -949,7 +949,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -963,7 +963,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -977,7 +977,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -991,7 +991,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -1011,7 +1011,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1025,7 +1025,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1039,7 +1039,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1053,7 +1053,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1069,7 +1069,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1085,7 +1085,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1099,7 +1099,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1121,7 +1121,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1135,7 +1135,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1248,176 +1248,176 @@ ActiveCommandsComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_noArgsAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); } -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_typedAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); } -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_typedAsyncAssert_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); } -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_typedAsyncBlockPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); } -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_typedAsyncDropPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); } -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE ActiveCommandsComponentBase :: +FwIndexType ActiveCommandsComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1425,7 +1425,7 @@ NATIVE_INT_TYPE ActiveCommandsComponentBase :: // ---------------------------------------------------------------------- bool ActiveCommandsComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1436,7 +1436,7 @@ bool ActiveCommandsComponentBase :: } bool ActiveCommandsComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1447,7 +1447,7 @@ bool ActiveCommandsComponentBase :: } bool ActiveCommandsComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1458,7 +1458,7 @@ bool ActiveCommandsComponentBase :: } bool ActiveCommandsComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1469,7 +1469,7 @@ bool ActiveCommandsComponentBase :: } bool ActiveCommandsComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1482,7 +1482,7 @@ bool ActiveCommandsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool ActiveCommandsComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1495,7 +1495,7 @@ bool ActiveCommandsComponentBase :: #endif bool ActiveCommandsComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1506,7 +1506,7 @@ bool ActiveCommandsComponentBase :: } bool ActiveCommandsComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1521,7 +1521,7 @@ bool ActiveCommandsComponentBase :: // ---------------------------------------------------------------------- bool ActiveCommandsComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1532,7 +1532,7 @@ bool ActiveCommandsComponentBase :: } bool ActiveCommandsComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1543,7 +1543,7 @@ bool ActiveCommandsComponentBase :: } bool ActiveCommandsComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1554,7 +1554,7 @@ bool ActiveCommandsComponentBase :: } bool ActiveCommandsComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1571,7 +1571,7 @@ bool ActiveCommandsComponentBase :: // ---------------------------------------------------------------------- void ActiveCommandsComponentBase :: - noArgsAsync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsAsync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1586,7 +1586,7 @@ void ActiveCommandsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(NOARGSASYNC_NOARGS) + static_cast(NOARGSASYNC_NOARGS) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1611,7 +1611,7 @@ void ActiveCommandsComponentBase :: } void ActiveCommandsComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1630,7 +1630,7 @@ void ActiveCommandsComponentBase :: } U32 ActiveCommandsComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1653,7 +1653,7 @@ U32 ActiveCommandsComponentBase :: } U32 ActiveCommandsComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1670,7 +1670,7 @@ U32 ActiveCommandsComponentBase :: } void ActiveCommandsComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1684,7 +1684,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1716,7 +1716,7 @@ void ActiveCommandsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNC_TYPED) + static_cast(TYPEDASYNC_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1791,7 +1791,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1823,7 +1823,7 @@ void ActiveCommandsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCASSERT_TYPED) + static_cast(TYPEDASYNCASSERT_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1898,7 +1898,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1930,7 +1930,7 @@ void ActiveCommandsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) + static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2005,7 +2005,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2037,7 +2037,7 @@ void ActiveCommandsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCDROPPRIORITY_TYPED) + static_cast(TYPEDASYNCDROPPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2117,7 +2117,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2154,7 +2154,7 @@ void ActiveCommandsComponentBase :: F32 ActiveCommandsComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2195,7 +2195,7 @@ F32 ActiveCommandsComponentBase :: F32 ActiveCommandsComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2230,7 +2230,7 @@ F32 ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2268,14 +2268,14 @@ void ActiveCommandsComponentBase :: // ---------------------------------------------------------------------- void ActiveCommandsComponentBase :: - noArgsAsync_preMsgHook(NATIVE_INT_TYPE portNum) + noArgsAsync_preMsgHook(FwIndexType portNum) { // Default: no-op } void ActiveCommandsComponentBase :: typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2290,7 +2290,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2305,7 +2305,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2320,7 +2320,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2338,7 +2338,7 @@ void ActiveCommandsComponentBase :: // ---------------------------------------------------------------------- void ActiveCommandsComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -2348,7 +2348,7 @@ void ActiveCommandsComponentBase :: } U32 ActiveCommandsComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -2359,7 +2359,7 @@ U32 ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2386,7 +2386,7 @@ void ActiveCommandsComponentBase :: F32 ActiveCommandsComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3076,14 +3076,14 @@ void ActiveCommandsComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_ASYNC)); + _status = msg.serialize(static_cast(CMD_CMD_ASYNC)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -3135,14 +3135,14 @@ void ActiveCommandsComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_PRIORITY)); + _status = msg.serialize(static_cast(CMD_CMD_PRIORITY)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -3194,14 +3194,14 @@ void ActiveCommandsComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY)); + _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -3253,14 +3253,14 @@ void ActiveCommandsComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_DROP)); + _status = msg.serialize(static_cast(CMD_CMD_DROP)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -3317,14 +3317,14 @@ void ActiveCommandsComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY_DROP)); + _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY_DROP)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -3472,7 +3472,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveCommandsComponentBase :: doDispatch() { ComponentIpcSerializableBuffer msg; - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -3487,7 +3487,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveCommandsComponentBase :: // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -3500,7 +3500,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveCommandsComponentBase :: return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -4089,7 +4089,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -4265,7 +4265,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -4276,7 +4276,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -4287,7 +4287,7 @@ void ActiveCommandsComponentBase :: U32 ActiveCommandsComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -4298,7 +4298,7 @@ U32 ActiveCommandsComponentBase :: U32 ActiveCommandsComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -4309,7 +4309,7 @@ U32 ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -4320,7 +4320,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4347,7 +4347,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4374,7 +4374,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4401,7 +4401,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4428,7 +4428,7 @@ void ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4455,7 +4455,7 @@ void ActiveCommandsComponentBase :: F32 ActiveCommandsComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4482,7 +4482,7 @@ F32 ActiveCommandsComponentBase :: F32 ActiveCommandsComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4509,7 +4509,7 @@ F32 ActiveCommandsComponentBase :: void ActiveCommandsComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveCommandsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveCommandsComponentAc.ref.hpp index c08930a02..27c15a122 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveCommandsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveCommandsComponentAc.ref.hpp @@ -124,8 +124,8 @@ class ActiveCommandsComponentBase : //! Initialize ActiveCommandsComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -138,7 +138,7 @@ class ActiveCommandsComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -151,91 +151,91 @@ class ActiveCommandsComponentBase : //! //! \return noArgsAsync[portNum] Ports::InputNoArgsPort* get_noArgsAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsync[portNum] Ports::InputTypedPort* get_typedAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncAssert[portNum] Ports::InputTypedPort* get_typedAsyncAssert_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncBlockPriority[portNum] Ports::InputTypedPort* get_typedAsyncBlockPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncDropPriority[portNum] Ports::InputTypedPort* get_typedAsyncDropPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -246,31 +246,31 @@ class ActiveCommandsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); @@ -278,7 +278,7 @@ class ActiveCommandsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -286,13 +286,13 @@ class ActiveCommandsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -304,25 +304,25 @@ class ActiveCommandsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -336,25 +336,25 @@ class ActiveCommandsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -362,7 +362,7 @@ class ActiveCommandsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -370,13 +370,13 @@ class ActiveCommandsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -392,13 +392,13 @@ class ActiveCommandsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -438,7 +438,7 @@ class ActiveCommandsComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; PROTECTED: @@ -449,67 +449,67 @@ class ActiveCommandsComponentBase : //! Get the number of noArgsAsync input ports //! //! \return The number of noArgsAsync input ports - NATIVE_INT_TYPE getNum_noArgsAsync_InputPorts() const; + FwIndexType getNum_noArgsAsync_InputPorts() const; //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedAsync input ports //! //! \return The number of typedAsync input ports - NATIVE_INT_TYPE getNum_typedAsync_InputPorts() const; + FwIndexType getNum_typedAsync_InputPorts() const; //! Get the number of typedAsyncAssert input ports //! //! \return The number of typedAsyncAssert input ports - NATIVE_INT_TYPE getNum_typedAsyncAssert_InputPorts() const; + FwIndexType getNum_typedAsyncAssert_InputPorts() const; //! Get the number of typedAsyncBlockPriority input ports //! //! \return The number of typedAsyncBlockPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncBlockPriority_InputPorts() const; + FwIndexType getNum_typedAsyncBlockPriority_InputPorts() const; //! Get the number of typedAsyncDropPriority input ports //! //! \return The number of typedAsyncDropPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncDropPriority_InputPorts() const; + FwIndexType getNum_typedAsyncDropPriority_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -520,46 +520,46 @@ class ActiveCommandsComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -570,22 +570,22 @@ class ActiveCommandsComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -597,35 +597,35 @@ class ActiveCommandsComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -634,7 +634,7 @@ class ActiveCommandsComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -643,14 +643,14 @@ class ActiveCommandsComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -663,28 +663,28 @@ class ActiveCommandsComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -695,32 +695,32 @@ class ActiveCommandsComponentBase : //! Handler for input port noArgsAsync virtual void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedAsync virtual void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -732,7 +732,7 @@ class ActiveCommandsComponentBase : //! Handler for input port typedAsyncAssert virtual void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -744,7 +744,7 @@ class ActiveCommandsComponentBase : //! Handler for input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -756,7 +756,7 @@ class ActiveCommandsComponentBase : //! Handler for input port typedAsyncDropPriority virtual void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -768,7 +768,7 @@ class ActiveCommandsComponentBase : //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -780,7 +780,7 @@ class ActiveCommandsComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -792,7 +792,7 @@ class ActiveCommandsComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -804,7 +804,7 @@ class ActiveCommandsComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -824,32 +824,32 @@ class ActiveCommandsComponentBase : //! Handler base-class function for input port noArgsAsync void noArgsAsync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedAsync void typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -861,7 +861,7 @@ class ActiveCommandsComponentBase : //! Handler base-class function for input port typedAsyncAssert void typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -873,7 +873,7 @@ class ActiveCommandsComponentBase : //! Handler base-class function for input port typedAsyncBlockPriority void typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -885,7 +885,7 @@ class ActiveCommandsComponentBase : //! Handler base-class function for input port typedAsyncDropPriority void typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -897,7 +897,7 @@ class ActiveCommandsComponentBase : //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -909,7 +909,7 @@ class ActiveCommandsComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -921,7 +921,7 @@ class ActiveCommandsComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -933,7 +933,7 @@ class ActiveCommandsComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -955,12 +955,12 @@ class ActiveCommandsComponentBase : //! Pre-message hook for async input port noArgsAsync virtual void noArgsAsync_preMsgHook( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Pre-message hook for async input port typedAsync virtual void typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -972,7 +972,7 @@ class ActiveCommandsComponentBase : //! Pre-message hook for async input port typedAsyncAssert virtual void typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -984,7 +984,7 @@ class ActiveCommandsComponentBase : //! Pre-message hook for async input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -996,7 +996,7 @@ class ActiveCommandsComponentBase : //! Pre-message hook for async input port typedAsyncDropPriority virtual void typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1014,17 +1014,17 @@ class ActiveCommandsComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1036,7 +1036,7 @@ class ActiveCommandsComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1464,7 +1464,7 @@ class ActiveCommandsComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -1479,37 +1479,37 @@ class ActiveCommandsComponentBase : //! Callback for port noArgsAsync static void m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedAsync static void m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1522,7 +1522,7 @@ class ActiveCommandsComponentBase : //! Callback for port typedAsyncAssert static void m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1535,7 +1535,7 @@ class ActiveCommandsComponentBase : //! Callback for port typedAsyncBlockPriority static void m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1548,7 +1548,7 @@ class ActiveCommandsComponentBase : //! Callback for port typedAsyncDropPriority static void m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1561,7 +1561,7 @@ class ActiveCommandsComponentBase : //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1574,7 +1574,7 @@ class ActiveCommandsComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1587,7 +1587,7 @@ class ActiveCommandsComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1600,7 +1600,7 @@ class ActiveCommandsComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveEventsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveEventsComponentAc.ref.cpp index 0461b3b4d..b9f44855a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveEventsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveEventsComponentAc.ref.cpp @@ -44,11 +44,11 @@ namespace { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = sizeof(BuffUnion) + - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -73,8 +73,8 @@ namespace { void ActiveEventsComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwEnumStoreType instance ) { // Initialize base class @@ -82,8 +82,8 @@ void ActiveEventsComponentBase :: // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -106,8 +106,8 @@ void ActiveEventsComponentBase :: // Connect input port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsAsync_InputPorts()); port++ ) { this->m_noArgsAsync_InputPort[port].init(); @@ -130,8 +130,8 @@ void ActiveEventsComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -154,8 +154,8 @@ void ActiveEventsComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -178,8 +178,8 @@ void ActiveEventsComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -202,8 +202,8 @@ void ActiveEventsComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -226,8 +226,8 @@ void ActiveEventsComponentBase :: // Connect input port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsync_InputPorts()); port++ ) { this->m_typedAsync_InputPort[port].init(); @@ -250,8 +250,8 @@ void ActiveEventsComponentBase :: // Connect input port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); port++ ) { this->m_typedAsyncAssert_InputPort[port].init(); @@ -274,8 +274,8 @@ void ActiveEventsComponentBase :: // Connect input port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); port++ ) { this->m_typedAsyncBlockPriority_InputPort[port].init(); @@ -298,8 +298,8 @@ void ActiveEventsComponentBase :: // Connect input port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); port++ ) { this->m_typedAsyncDropPriority_InputPort[port].init(); @@ -322,8 +322,8 @@ void ActiveEventsComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -346,8 +346,8 @@ void ActiveEventsComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -370,8 +370,8 @@ void ActiveEventsComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -394,8 +394,8 @@ void ActiveEventsComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -418,8 +418,8 @@ void ActiveEventsComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -437,8 +437,8 @@ void ActiveEventsComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -456,8 +456,8 @@ void ActiveEventsComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -475,8 +475,8 @@ void ActiveEventsComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -494,8 +494,8 @@ void ActiveEventsComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -514,8 +514,8 @@ void ActiveEventsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -534,8 +534,8 @@ void ActiveEventsComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -553,8 +553,8 @@ void ActiveEventsComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -572,8 +572,8 @@ void ActiveEventsComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -591,8 +591,8 @@ void ActiveEventsComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -610,8 +610,8 @@ void ActiveEventsComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -629,8 +629,8 @@ void ActiveEventsComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -661,7 +661,7 @@ void ActiveEventsComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* ActiveEventsComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -676,7 +676,7 @@ Fw::InputCmdPort* ActiveEventsComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* ActiveEventsComponentBase :: - get_noArgsAsync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsAsync_InputPorts(), @@ -687,7 +687,7 @@ Ports::InputNoArgsPort* ActiveEventsComponentBase :: } Ports::InputNoArgsPort* ActiveEventsComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -698,7 +698,7 @@ Ports::InputNoArgsPort* ActiveEventsComponentBase :: } Ports::InputNoArgsReturnPort* ActiveEventsComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -709,7 +709,7 @@ Ports::InputNoArgsReturnPort* ActiveEventsComponentBase :: } Ports::InputNoArgsReturnPort* ActiveEventsComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -720,7 +720,7 @@ Ports::InputNoArgsReturnPort* ActiveEventsComponentBase :: } Ports::InputNoArgsPort* ActiveEventsComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -731,7 +731,7 @@ Ports::InputNoArgsPort* ActiveEventsComponentBase :: } Ports::InputTypedPort* ActiveEventsComponentBase :: - get_typedAsync_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsync_InputPorts(), @@ -742,7 +742,7 @@ Ports::InputTypedPort* ActiveEventsComponentBase :: } Ports::InputTypedPort* ActiveEventsComponentBase :: - get_typedAsyncAssert_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncAssert_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncAssert_InputPorts(), @@ -753,7 +753,7 @@ Ports::InputTypedPort* ActiveEventsComponentBase :: } Ports::InputTypedPort* ActiveEventsComponentBase :: - get_typedAsyncBlockPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncBlockPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncBlockPriority_InputPorts(), @@ -764,7 +764,7 @@ Ports::InputTypedPort* ActiveEventsComponentBase :: } Ports::InputTypedPort* ActiveEventsComponentBase :: - get_typedAsyncDropPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncDropPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncDropPriority_InputPorts(), @@ -775,7 +775,7 @@ Ports::InputTypedPort* ActiveEventsComponentBase :: } Ports::InputTypedPort* ActiveEventsComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -786,7 +786,7 @@ Ports::InputTypedPort* ActiveEventsComponentBase :: } Ports::InputTypedReturnPort* ActiveEventsComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -797,7 +797,7 @@ Ports::InputTypedReturnPort* ActiveEventsComponentBase :: } Ports::InputTypedReturnPort* ActiveEventsComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -808,7 +808,7 @@ Ports::InputTypedReturnPort* ActiveEventsComponentBase :: } Ports::InputTypedPort* ActiveEventsComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -824,7 +824,7 @@ Ports::InputTypedPort* ActiveEventsComponentBase :: void ActiveEventsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -838,7 +838,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -852,7 +852,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -866,7 +866,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -880,7 +880,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -896,7 +896,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -912,7 +912,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -926,7 +926,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -944,7 +944,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -958,7 +958,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -972,7 +972,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -986,7 +986,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -1006,7 +1006,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1020,7 +1020,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1034,7 +1034,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1048,7 +1048,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1064,7 +1064,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1080,7 +1080,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1094,7 +1094,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1116,7 +1116,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1130,7 +1130,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1167,176 +1167,176 @@ ActiveEventsComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_noArgsAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); } -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_typedAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); } -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_typedAsyncAssert_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); } -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_typedAsyncBlockPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); } -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_typedAsyncDropPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); } -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE ActiveEventsComponentBase :: +FwIndexType ActiveEventsComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1344,7 +1344,7 @@ NATIVE_INT_TYPE ActiveEventsComponentBase :: // ---------------------------------------------------------------------- bool ActiveEventsComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1355,7 +1355,7 @@ bool ActiveEventsComponentBase :: } bool ActiveEventsComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1366,7 +1366,7 @@ bool ActiveEventsComponentBase :: } bool ActiveEventsComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1377,7 +1377,7 @@ bool ActiveEventsComponentBase :: } bool ActiveEventsComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1388,7 +1388,7 @@ bool ActiveEventsComponentBase :: } bool ActiveEventsComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1401,7 +1401,7 @@ bool ActiveEventsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool ActiveEventsComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1414,7 +1414,7 @@ bool ActiveEventsComponentBase :: #endif bool ActiveEventsComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1425,7 +1425,7 @@ bool ActiveEventsComponentBase :: } bool ActiveEventsComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1440,7 +1440,7 @@ bool ActiveEventsComponentBase :: // ---------------------------------------------------------------------- bool ActiveEventsComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1451,7 +1451,7 @@ bool ActiveEventsComponentBase :: } bool ActiveEventsComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1462,7 +1462,7 @@ bool ActiveEventsComponentBase :: } bool ActiveEventsComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1473,7 +1473,7 @@ bool ActiveEventsComponentBase :: } bool ActiveEventsComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1490,7 +1490,7 @@ bool ActiveEventsComponentBase :: // ---------------------------------------------------------------------- void ActiveEventsComponentBase :: - noArgsAsync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsAsync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1505,7 +1505,7 @@ void ActiveEventsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(NOARGSASYNC_NOARGS) + static_cast(NOARGSASYNC_NOARGS) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1530,7 +1530,7 @@ void ActiveEventsComponentBase :: } void ActiveEventsComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1549,7 +1549,7 @@ void ActiveEventsComponentBase :: } U32 ActiveEventsComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1572,7 +1572,7 @@ U32 ActiveEventsComponentBase :: } U32 ActiveEventsComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1589,7 +1589,7 @@ U32 ActiveEventsComponentBase :: } void ActiveEventsComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1603,7 +1603,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1635,7 +1635,7 @@ void ActiveEventsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNC_TYPED) + static_cast(TYPEDASYNC_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1710,7 +1710,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1742,7 +1742,7 @@ void ActiveEventsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCASSERT_TYPED) + static_cast(TYPEDASYNCASSERT_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1817,7 +1817,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1849,7 +1849,7 @@ void ActiveEventsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) + static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1924,7 +1924,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1956,7 +1956,7 @@ void ActiveEventsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCDROPPRIORITY_TYPED) + static_cast(TYPEDASYNCDROPPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2036,7 +2036,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2073,7 +2073,7 @@ void ActiveEventsComponentBase :: F32 ActiveEventsComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2114,7 +2114,7 @@ F32 ActiveEventsComponentBase :: F32 ActiveEventsComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2149,7 +2149,7 @@ F32 ActiveEventsComponentBase :: void ActiveEventsComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2187,14 +2187,14 @@ void ActiveEventsComponentBase :: // ---------------------------------------------------------------------- void ActiveEventsComponentBase :: - noArgsAsync_preMsgHook(NATIVE_INT_TYPE portNum) + noArgsAsync_preMsgHook(FwIndexType portNum) { // Default: no-op } void ActiveEventsComponentBase :: typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2209,7 +2209,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2224,7 +2224,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2239,7 +2239,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2257,7 +2257,7 @@ void ActiveEventsComponentBase :: // ---------------------------------------------------------------------- void ActiveEventsComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -2267,7 +2267,7 @@ void ActiveEventsComponentBase :: } U32 ActiveEventsComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -2278,7 +2278,7 @@ U32 ActiveEventsComponentBase :: void ActiveEventsComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2305,7 +2305,7 @@ void ActiveEventsComponentBase :: F32 ActiveEventsComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3069,7 +3069,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveEventsComponentBase :: doDispatch() { ComponentIpcSerializableBuffer msg; - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -3084,7 +3084,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveEventsComponentBase :: // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -3097,7 +3097,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveEventsComponentBase :: return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -3415,7 +3415,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveEventsComponentBase :: void ActiveEventsComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -3434,7 +3434,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3445,7 +3445,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3456,7 +3456,7 @@ void ActiveEventsComponentBase :: U32 ActiveEventsComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3467,7 +3467,7 @@ U32 ActiveEventsComponentBase :: U32 ActiveEventsComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3478,7 +3478,7 @@ U32 ActiveEventsComponentBase :: void ActiveEventsComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3489,7 +3489,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3516,7 +3516,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3543,7 +3543,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3570,7 +3570,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3597,7 +3597,7 @@ void ActiveEventsComponentBase :: void ActiveEventsComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3624,7 +3624,7 @@ void ActiveEventsComponentBase :: F32 ActiveEventsComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3651,7 +3651,7 @@ F32 ActiveEventsComponentBase :: F32 ActiveEventsComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3678,7 +3678,7 @@ F32 ActiveEventsComponentBase :: void ActiveEventsComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveEventsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveEventsComponentAc.ref.hpp index ae131fdef..2a8c7ee27 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveEventsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveEventsComponentAc.ref.hpp @@ -121,8 +121,8 @@ class ActiveEventsComponentBase : //! Initialize ActiveEventsComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -135,7 +135,7 @@ class ActiveEventsComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -148,91 +148,91 @@ class ActiveEventsComponentBase : //! //! \return noArgsAsync[portNum] Ports::InputNoArgsPort* get_noArgsAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsync[portNum] Ports::InputTypedPort* get_typedAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncAssert[portNum] Ports::InputTypedPort* get_typedAsyncAssert_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncBlockPriority[portNum] Ports::InputTypedPort* get_typedAsyncBlockPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncDropPriority[portNum] Ports::InputTypedPort* get_typedAsyncDropPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -243,31 +243,31 @@ class ActiveEventsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); @@ -275,7 +275,7 @@ class ActiveEventsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -283,13 +283,13 @@ class ActiveEventsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -301,25 +301,25 @@ class ActiveEventsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -333,25 +333,25 @@ class ActiveEventsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -359,7 +359,7 @@ class ActiveEventsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -367,13 +367,13 @@ class ActiveEventsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -389,13 +389,13 @@ class ActiveEventsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -424,7 +424,7 @@ class ActiveEventsComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; PROTECTED: @@ -435,67 +435,67 @@ class ActiveEventsComponentBase : //! Get the number of noArgsAsync input ports //! //! \return The number of noArgsAsync input ports - NATIVE_INT_TYPE getNum_noArgsAsync_InputPorts() const; + FwIndexType getNum_noArgsAsync_InputPorts() const; //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedAsync input ports //! //! \return The number of typedAsync input ports - NATIVE_INT_TYPE getNum_typedAsync_InputPorts() const; + FwIndexType getNum_typedAsync_InputPorts() const; //! Get the number of typedAsyncAssert input ports //! //! \return The number of typedAsyncAssert input ports - NATIVE_INT_TYPE getNum_typedAsyncAssert_InputPorts() const; + FwIndexType getNum_typedAsyncAssert_InputPorts() const; //! Get the number of typedAsyncBlockPriority input ports //! //! \return The number of typedAsyncBlockPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncBlockPriority_InputPorts() const; + FwIndexType getNum_typedAsyncBlockPriority_InputPorts() const; //! Get the number of typedAsyncDropPriority input ports //! //! \return The number of typedAsyncDropPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncDropPriority_InputPorts() const; + FwIndexType getNum_typedAsyncDropPriority_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -506,46 +506,46 @@ class ActiveEventsComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -556,22 +556,22 @@ class ActiveEventsComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -583,35 +583,35 @@ class ActiveEventsComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -620,7 +620,7 @@ class ActiveEventsComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -629,14 +629,14 @@ class ActiveEventsComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -649,28 +649,28 @@ class ActiveEventsComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -681,32 +681,32 @@ class ActiveEventsComponentBase : //! Handler for input port noArgsAsync virtual void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedAsync virtual void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -718,7 +718,7 @@ class ActiveEventsComponentBase : //! Handler for input port typedAsyncAssert virtual void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -730,7 +730,7 @@ class ActiveEventsComponentBase : //! Handler for input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -742,7 +742,7 @@ class ActiveEventsComponentBase : //! Handler for input port typedAsyncDropPriority virtual void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -754,7 +754,7 @@ class ActiveEventsComponentBase : //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -766,7 +766,7 @@ class ActiveEventsComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -778,7 +778,7 @@ class ActiveEventsComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -790,7 +790,7 @@ class ActiveEventsComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -810,32 +810,32 @@ class ActiveEventsComponentBase : //! Handler base-class function for input port noArgsAsync void noArgsAsync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedAsync void typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -847,7 +847,7 @@ class ActiveEventsComponentBase : //! Handler base-class function for input port typedAsyncAssert void typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -859,7 +859,7 @@ class ActiveEventsComponentBase : //! Handler base-class function for input port typedAsyncBlockPriority void typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -871,7 +871,7 @@ class ActiveEventsComponentBase : //! Handler base-class function for input port typedAsyncDropPriority void typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -883,7 +883,7 @@ class ActiveEventsComponentBase : //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -895,7 +895,7 @@ class ActiveEventsComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -907,7 +907,7 @@ class ActiveEventsComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -919,7 +919,7 @@ class ActiveEventsComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -941,12 +941,12 @@ class ActiveEventsComponentBase : //! Pre-message hook for async input port noArgsAsync virtual void noArgsAsync_preMsgHook( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Pre-message hook for async input port typedAsync virtual void typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -958,7 +958,7 @@ class ActiveEventsComponentBase : //! Pre-message hook for async input port typedAsyncAssert virtual void typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -970,7 +970,7 @@ class ActiveEventsComponentBase : //! Pre-message hook for async input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -982,7 +982,7 @@ class ActiveEventsComponentBase : //! Pre-message hook for async input port typedAsyncDropPriority virtual void typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1000,17 +1000,17 @@ class ActiveEventsComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1022,7 +1022,7 @@ class ActiveEventsComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1145,7 +1145,7 @@ class ActiveEventsComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -1160,37 +1160,37 @@ class ActiveEventsComponentBase : //! Callback for port noArgsAsync static void m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedAsync static void m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1203,7 +1203,7 @@ class ActiveEventsComponentBase : //! Callback for port typedAsyncAssert static void m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1216,7 +1216,7 @@ class ActiveEventsComponentBase : //! Callback for port typedAsyncBlockPriority static void m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1229,7 +1229,7 @@ class ActiveEventsComponentBase : //! Callback for port typedAsyncDropPriority static void m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1242,7 +1242,7 @@ class ActiveEventsComponentBase : //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1255,7 +1255,7 @@ class ActiveEventsComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1268,7 +1268,7 @@ class ActiveEventsComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1281,7 +1281,7 @@ class ActiveEventsComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1404,13 +1404,13 @@ class ActiveEventsComponentBase : // ---------------------------------------------------------------------- //! Throttle for EventActivityLowThrottled - NATIVE_UINT_TYPE m_EventActivityLowThrottledThrottle; + FwIndexType m_EventActivityLowThrottledThrottle; //! Throttle for EventFatalThrottled - NATIVE_UINT_TYPE m_EventFatalThrottledThrottle; + FwIndexType m_EventFatalThrottledThrottle; //! Throttle for EventWarningLowThrottled - NATIVE_UINT_TYPE m_EventWarningLowThrottledThrottle; + FwIndexType m_EventWarningLowThrottledThrottle; PRIVATE: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.cpp index e58e47452..4cdade732 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.cpp @@ -44,11 +44,11 @@ namespace { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = sizeof(BuffUnion) + - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -227,8 +227,8 @@ Fw::SerializeStatus ActiveGetProductsComponentBase::DpContainer :: void ActiveGetProductsComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwEnumStoreType instance ) { // Initialize base class @@ -236,8 +236,8 @@ void ActiveGetProductsComponentBase :: // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -260,8 +260,8 @@ void ActiveGetProductsComponentBase :: // Connect input port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsAsync_InputPorts()); port++ ) { this->m_noArgsAsync_InputPort[port].init(); @@ -284,8 +284,8 @@ void ActiveGetProductsComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -308,8 +308,8 @@ void ActiveGetProductsComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -332,8 +332,8 @@ void ActiveGetProductsComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -356,8 +356,8 @@ void ActiveGetProductsComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -380,8 +380,8 @@ void ActiveGetProductsComponentBase :: // Connect input port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsync_InputPorts()); port++ ) { this->m_typedAsync_InputPort[port].init(); @@ -404,8 +404,8 @@ void ActiveGetProductsComponentBase :: // Connect input port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); port++ ) { this->m_typedAsyncAssert_InputPort[port].init(); @@ -428,8 +428,8 @@ void ActiveGetProductsComponentBase :: // Connect input port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); port++ ) { this->m_typedAsyncBlockPriority_InputPort[port].init(); @@ -452,8 +452,8 @@ void ActiveGetProductsComponentBase :: // Connect input port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); port++ ) { this->m_typedAsyncDropPriority_InputPort[port].init(); @@ -476,8 +476,8 @@ void ActiveGetProductsComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -500,8 +500,8 @@ void ActiveGetProductsComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -524,8 +524,8 @@ void ActiveGetProductsComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -548,8 +548,8 @@ void ActiveGetProductsComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -572,8 +572,8 @@ void ActiveGetProductsComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -591,8 +591,8 @@ void ActiveGetProductsComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -610,8 +610,8 @@ void ActiveGetProductsComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -629,8 +629,8 @@ void ActiveGetProductsComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -648,8 +648,8 @@ void ActiveGetProductsComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -667,8 +667,8 @@ void ActiveGetProductsComponentBase :: // Connect output port productGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productGetOut_OutputPorts()); port++ ) { this->m_productGetOut_OutputPort[port].init(); @@ -686,8 +686,8 @@ void ActiveGetProductsComponentBase :: // Connect output port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productSendOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productSendOut_OutputPorts()); port++ ) { this->m_productSendOut_OutputPort[port].init(); @@ -706,8 +706,8 @@ void ActiveGetProductsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -726,8 +726,8 @@ void ActiveGetProductsComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -745,8 +745,8 @@ void ActiveGetProductsComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -764,8 +764,8 @@ void ActiveGetProductsComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -783,8 +783,8 @@ void ActiveGetProductsComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -802,8 +802,8 @@ void ActiveGetProductsComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -821,8 +821,8 @@ void ActiveGetProductsComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -853,7 +853,7 @@ void ActiveGetProductsComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* ActiveGetProductsComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -868,7 +868,7 @@ Fw::InputCmdPort* ActiveGetProductsComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* ActiveGetProductsComponentBase :: - get_noArgsAsync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsAsync_InputPorts(), @@ -879,7 +879,7 @@ Ports::InputNoArgsPort* ActiveGetProductsComponentBase :: } Ports::InputNoArgsPort* ActiveGetProductsComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -890,7 +890,7 @@ Ports::InputNoArgsPort* ActiveGetProductsComponentBase :: } Ports::InputNoArgsReturnPort* ActiveGetProductsComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -901,7 +901,7 @@ Ports::InputNoArgsReturnPort* ActiveGetProductsComponentBase :: } Ports::InputNoArgsReturnPort* ActiveGetProductsComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -912,7 +912,7 @@ Ports::InputNoArgsReturnPort* ActiveGetProductsComponentBase :: } Ports::InputNoArgsPort* ActiveGetProductsComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -923,7 +923,7 @@ Ports::InputNoArgsPort* ActiveGetProductsComponentBase :: } Ports::InputTypedPort* ActiveGetProductsComponentBase :: - get_typedAsync_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsync_InputPorts(), @@ -934,7 +934,7 @@ Ports::InputTypedPort* ActiveGetProductsComponentBase :: } Ports::InputTypedPort* ActiveGetProductsComponentBase :: - get_typedAsyncAssert_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncAssert_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncAssert_InputPorts(), @@ -945,7 +945,7 @@ Ports::InputTypedPort* ActiveGetProductsComponentBase :: } Ports::InputTypedPort* ActiveGetProductsComponentBase :: - get_typedAsyncBlockPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncBlockPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncBlockPriority_InputPorts(), @@ -956,7 +956,7 @@ Ports::InputTypedPort* ActiveGetProductsComponentBase :: } Ports::InputTypedPort* ActiveGetProductsComponentBase :: - get_typedAsyncDropPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncDropPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncDropPriority_InputPorts(), @@ -967,7 +967,7 @@ Ports::InputTypedPort* ActiveGetProductsComponentBase :: } Ports::InputTypedPort* ActiveGetProductsComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -978,7 +978,7 @@ Ports::InputTypedPort* ActiveGetProductsComponentBase :: } Ports::InputTypedReturnPort* ActiveGetProductsComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -989,7 +989,7 @@ Ports::InputTypedReturnPort* ActiveGetProductsComponentBase :: } Ports::InputTypedReturnPort* ActiveGetProductsComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -1000,7 +1000,7 @@ Ports::InputTypedReturnPort* ActiveGetProductsComponentBase :: } Ports::InputTypedPort* ActiveGetProductsComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -1016,7 +1016,7 @@ Ports::InputTypedPort* ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -1030,7 +1030,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -1044,7 +1044,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -1058,7 +1058,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -1072,7 +1072,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -1086,7 +1086,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_productGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpGetPort* port ) { @@ -1100,7 +1100,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpSendPort* port ) { @@ -1116,7 +1116,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -1132,7 +1132,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -1146,7 +1146,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -1164,7 +1164,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -1178,7 +1178,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -1192,7 +1192,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -1206,7 +1206,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -1226,7 +1226,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1240,7 +1240,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1254,7 +1254,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1268,7 +1268,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1282,7 +1282,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1298,7 +1298,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1314,7 +1314,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1328,7 +1328,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1350,7 +1350,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1364,7 +1364,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1399,188 +1399,188 @@ ActiveGetProductsComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_noArgsAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); } -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_typedAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); } -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_typedAsyncAssert_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); } -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_typedAsyncBlockPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); } -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_typedAsyncDropPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); } -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_productGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productGetOut_OutputPort)); } -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_productSendOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE ActiveGetProductsComponentBase :: +FwIndexType ActiveGetProductsComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1588,7 +1588,7 @@ NATIVE_INT_TYPE ActiveGetProductsComponentBase :: // ---------------------------------------------------------------------- bool ActiveGetProductsComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1599,7 +1599,7 @@ bool ActiveGetProductsComponentBase :: } bool ActiveGetProductsComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1610,7 +1610,7 @@ bool ActiveGetProductsComponentBase :: } bool ActiveGetProductsComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1621,7 +1621,7 @@ bool ActiveGetProductsComponentBase :: } bool ActiveGetProductsComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1632,7 +1632,7 @@ bool ActiveGetProductsComponentBase :: } bool ActiveGetProductsComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1643,7 +1643,7 @@ bool ActiveGetProductsComponentBase :: } bool ActiveGetProductsComponentBase :: - isConnected_productGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productGetOut_OutputPorts(), @@ -1654,7 +1654,7 @@ bool ActiveGetProductsComponentBase :: } bool ActiveGetProductsComponentBase :: - isConnected_productSendOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productSendOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productSendOut_OutputPorts(), @@ -1667,7 +1667,7 @@ bool ActiveGetProductsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool ActiveGetProductsComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1680,7 +1680,7 @@ bool ActiveGetProductsComponentBase :: #endif bool ActiveGetProductsComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1691,7 +1691,7 @@ bool ActiveGetProductsComponentBase :: } bool ActiveGetProductsComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1706,7 +1706,7 @@ bool ActiveGetProductsComponentBase :: // ---------------------------------------------------------------------- bool ActiveGetProductsComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1717,7 +1717,7 @@ bool ActiveGetProductsComponentBase :: } bool ActiveGetProductsComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1728,7 +1728,7 @@ bool ActiveGetProductsComponentBase :: } bool ActiveGetProductsComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1739,7 +1739,7 @@ bool ActiveGetProductsComponentBase :: } bool ActiveGetProductsComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1756,7 +1756,7 @@ bool ActiveGetProductsComponentBase :: // ---------------------------------------------------------------------- void ActiveGetProductsComponentBase :: - noArgsAsync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsAsync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1771,7 +1771,7 @@ void ActiveGetProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(NOARGSASYNC_NOARGS) + static_cast(NOARGSASYNC_NOARGS) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1796,7 +1796,7 @@ void ActiveGetProductsComponentBase :: } void ActiveGetProductsComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1815,7 +1815,7 @@ void ActiveGetProductsComponentBase :: } U32 ActiveGetProductsComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1838,7 +1838,7 @@ U32 ActiveGetProductsComponentBase :: } U32 ActiveGetProductsComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1855,7 +1855,7 @@ U32 ActiveGetProductsComponentBase :: } void ActiveGetProductsComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1869,7 +1869,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1901,7 +1901,7 @@ void ActiveGetProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNC_TYPED) + static_cast(TYPEDASYNC_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1976,7 +1976,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2008,7 +2008,7 @@ void ActiveGetProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCASSERT_TYPED) + static_cast(TYPEDASYNCASSERT_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2083,7 +2083,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2115,7 +2115,7 @@ void ActiveGetProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) + static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2190,7 +2190,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2222,7 +2222,7 @@ void ActiveGetProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCDROPPRIORITY_TYPED) + static_cast(TYPEDASYNCDROPPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2302,7 +2302,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2339,7 +2339,7 @@ void ActiveGetProductsComponentBase :: F32 ActiveGetProductsComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2380,7 +2380,7 @@ F32 ActiveGetProductsComponentBase :: F32 ActiveGetProductsComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2415,7 +2415,7 @@ F32 ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2453,14 +2453,14 @@ void ActiveGetProductsComponentBase :: // ---------------------------------------------------------------------- void ActiveGetProductsComponentBase :: - noArgsAsync_preMsgHook(NATIVE_INT_TYPE portNum) + noArgsAsync_preMsgHook(FwIndexType portNum) { // Default: no-op } void ActiveGetProductsComponentBase :: typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2475,7 +2475,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2490,7 +2490,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2505,7 +2505,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2524,7 +2524,7 @@ void ActiveGetProductsComponentBase :: Fw::Success ActiveGetProductsComponentBase :: productGetOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize, Fw::Buffer& buffer @@ -2543,7 +2543,7 @@ Fw::Success ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: productSendOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -2563,7 +2563,7 @@ void ActiveGetProductsComponentBase :: // ---------------------------------------------------------------------- void ActiveGetProductsComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -2573,7 +2573,7 @@ void ActiveGetProductsComponentBase :: } U32 ActiveGetProductsComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -2584,7 +2584,7 @@ U32 ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2611,7 +2611,7 @@ void ActiveGetProductsComponentBase :: F32 ActiveGetProductsComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2710,7 +2710,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveGetProductsComponentBase :: doDispatch() { ComponentIpcSerializableBuffer msg; - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -2725,7 +2725,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveGetProductsComponentBase :: // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -2738,7 +2738,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveGetProductsComponentBase :: return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -3056,7 +3056,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -3075,7 +3075,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3086,7 +3086,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3097,7 +3097,7 @@ void ActiveGetProductsComponentBase :: U32 ActiveGetProductsComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3108,7 +3108,7 @@ U32 ActiveGetProductsComponentBase :: U32 ActiveGetProductsComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3119,7 +3119,7 @@ U32 ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3130,7 +3130,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3157,7 +3157,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3184,7 +3184,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3211,7 +3211,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3238,7 +3238,7 @@ void ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3265,7 +3265,7 @@ void ActiveGetProductsComponentBase :: F32 ActiveGetProductsComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3292,7 +3292,7 @@ F32 ActiveGetProductsComponentBase :: F32 ActiveGetProductsComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3319,7 +3319,7 @@ F32 ActiveGetProductsComponentBase :: void ActiveGetProductsComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.hpp index f05daa32a..48d0dc278 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.hpp @@ -207,8 +207,8 @@ class ActiveGetProductsComponentBase : //! Initialize ActiveGetProductsComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -221,7 +221,7 @@ class ActiveGetProductsComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -234,91 +234,91 @@ class ActiveGetProductsComponentBase : //! //! \return noArgsAsync[portNum] Ports::InputNoArgsPort* get_noArgsAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsync[portNum] Ports::InputTypedPort* get_typedAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncAssert[portNum] Ports::InputTypedPort* get_typedAsyncAssert_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncBlockPriority[portNum] Ports::InputTypedPort* get_typedAsyncBlockPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncDropPriority[portNum] Ports::InputTypedPort* get_typedAsyncDropPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -329,43 +329,43 @@ class ActiveGetProductsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); //! Connect port to productGetOut[portNum] void set_productGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpGetPort* port //!< The input port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpSendPort* port //!< The input port ); @@ -373,7 +373,7 @@ class ActiveGetProductsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -381,13 +381,13 @@ class ActiveGetProductsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -399,25 +399,25 @@ class ActiveGetProductsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -431,31 +431,31 @@ class ActiveGetProductsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -463,7 +463,7 @@ class ActiveGetProductsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -471,13 +471,13 @@ class ActiveGetProductsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -493,13 +493,13 @@ class ActiveGetProductsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -528,7 +528,7 @@ class ActiveGetProductsComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; PROTECTED: @@ -539,67 +539,67 @@ class ActiveGetProductsComponentBase : //! Get the number of noArgsAsync input ports //! //! \return The number of noArgsAsync input ports - NATIVE_INT_TYPE getNum_noArgsAsync_InputPorts() const; + FwIndexType getNum_noArgsAsync_InputPorts() const; //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedAsync input ports //! //! \return The number of typedAsync input ports - NATIVE_INT_TYPE getNum_typedAsync_InputPorts() const; + FwIndexType getNum_typedAsync_InputPorts() const; //! Get the number of typedAsyncAssert input ports //! //! \return The number of typedAsyncAssert input ports - NATIVE_INT_TYPE getNum_typedAsyncAssert_InputPorts() const; + FwIndexType getNum_typedAsyncAssert_InputPorts() const; //! Get the number of typedAsyncBlockPriority input ports //! //! \return The number of typedAsyncBlockPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncBlockPriority_InputPorts() const; + FwIndexType getNum_typedAsyncBlockPriority_InputPorts() const; //! Get the number of typedAsyncDropPriority input ports //! //! \return The number of typedAsyncDropPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncDropPriority_InputPorts() const; + FwIndexType getNum_typedAsyncDropPriority_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -610,56 +610,56 @@ class ActiveGetProductsComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; //! Get the number of productGetOut output ports //! //! \return The number of productGetOut output ports - NATIVE_INT_TYPE getNum_productGetOut_OutputPorts() const; + FwIndexType getNum_productGetOut_OutputPorts() const; //! Get the number of productSendOut output ports //! //! \return The number of productSendOut output ports - NATIVE_INT_TYPE getNum_productSendOut_OutputPorts() const; + FwIndexType getNum_productSendOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -670,22 +670,22 @@ class ActiveGetProductsComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -697,49 +697,49 @@ class ActiveGetProductsComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productGetOut is connected //! //! \return Whether port productGetOut is connected bool isConnected_productGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productSendOut is connected //! //! \return Whether port productSendOut is connected bool isConnected_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -748,7 +748,7 @@ class ActiveGetProductsComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -757,14 +757,14 @@ class ActiveGetProductsComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -777,28 +777,28 @@ class ActiveGetProductsComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -809,32 +809,32 @@ class ActiveGetProductsComponentBase : //! Handler for input port noArgsAsync virtual void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedAsync virtual void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -846,7 +846,7 @@ class ActiveGetProductsComponentBase : //! Handler for input port typedAsyncAssert virtual void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -858,7 +858,7 @@ class ActiveGetProductsComponentBase : //! Handler for input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -870,7 +870,7 @@ class ActiveGetProductsComponentBase : //! Handler for input port typedAsyncDropPriority virtual void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -882,7 +882,7 @@ class ActiveGetProductsComponentBase : //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -894,7 +894,7 @@ class ActiveGetProductsComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -906,7 +906,7 @@ class ActiveGetProductsComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -918,7 +918,7 @@ class ActiveGetProductsComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -938,32 +938,32 @@ class ActiveGetProductsComponentBase : //! Handler base-class function for input port noArgsAsync void noArgsAsync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedAsync void typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -975,7 +975,7 @@ class ActiveGetProductsComponentBase : //! Handler base-class function for input port typedAsyncAssert void typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -987,7 +987,7 @@ class ActiveGetProductsComponentBase : //! Handler base-class function for input port typedAsyncBlockPriority void typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -999,7 +999,7 @@ class ActiveGetProductsComponentBase : //! Handler base-class function for input port typedAsyncDropPriority void typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1011,7 +1011,7 @@ class ActiveGetProductsComponentBase : //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1023,7 +1023,7 @@ class ActiveGetProductsComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1035,7 +1035,7 @@ class ActiveGetProductsComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1047,7 +1047,7 @@ class ActiveGetProductsComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1069,12 +1069,12 @@ class ActiveGetProductsComponentBase : //! Pre-message hook for async input port noArgsAsync virtual void noArgsAsync_preMsgHook( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Pre-message hook for async input port typedAsync virtual void typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1086,7 +1086,7 @@ class ActiveGetProductsComponentBase : //! Pre-message hook for async input port typedAsyncAssert virtual void typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1098,7 +1098,7 @@ class ActiveGetProductsComponentBase : //! Pre-message hook for async input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1110,7 +1110,7 @@ class ActiveGetProductsComponentBase : //! Pre-message hook for async input port typedAsyncDropPriority virtual void typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1128,7 +1128,7 @@ class ActiveGetProductsComponentBase : //! Invoke output port productGetOut Fw::Success productGetOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID (input) FwSizeType dataSize, //!< The data size of the requested buffer (input) Fw::Buffer& buffer //!< The buffer (output) @@ -1136,7 +1136,7 @@ class ActiveGetProductsComponentBase : //! Invoke output port productSendOut void productSendOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -1149,17 +1149,17 @@ class ActiveGetProductsComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1171,7 +1171,7 @@ class ActiveGetProductsComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1318,7 +1318,7 @@ class ActiveGetProductsComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -1333,37 +1333,37 @@ class ActiveGetProductsComponentBase : //! Callback for port noArgsAsync static void m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedAsync static void m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1376,7 +1376,7 @@ class ActiveGetProductsComponentBase : //! Callback for port typedAsyncAssert static void m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1389,7 +1389,7 @@ class ActiveGetProductsComponentBase : //! Callback for port typedAsyncBlockPriority static void m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1402,7 +1402,7 @@ class ActiveGetProductsComponentBase : //! Callback for port typedAsyncDropPriority static void m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1415,7 +1415,7 @@ class ActiveGetProductsComponentBase : //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1428,7 +1428,7 @@ class ActiveGetProductsComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1441,7 +1441,7 @@ class ActiveGetProductsComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1454,7 +1454,7 @@ class ActiveGetProductsComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.cpp index f4bb961de..394b54bf6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.cpp @@ -44,11 +44,11 @@ namespace { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = sizeof(BuffUnion) + - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -227,8 +227,8 @@ Fw::SerializeStatus ActiveGuardedProductsComponentBase::DpContainer :: void ActiveGuardedProductsComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwEnumStoreType instance ) { // Initialize base class @@ -236,8 +236,8 @@ void ActiveGuardedProductsComponentBase :: // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -260,8 +260,8 @@ void ActiveGuardedProductsComponentBase :: // Connect input port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRecvIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRecvIn_InputPorts()); port++ ) { this->m_productRecvIn_InputPort[port].init(); @@ -284,8 +284,8 @@ void ActiveGuardedProductsComponentBase :: // Connect input port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsAsync_InputPorts()); port++ ) { this->m_noArgsAsync_InputPort[port].init(); @@ -308,8 +308,8 @@ void ActiveGuardedProductsComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -332,8 +332,8 @@ void ActiveGuardedProductsComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -356,8 +356,8 @@ void ActiveGuardedProductsComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -380,8 +380,8 @@ void ActiveGuardedProductsComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -404,8 +404,8 @@ void ActiveGuardedProductsComponentBase :: // Connect input port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsync_InputPorts()); port++ ) { this->m_typedAsync_InputPort[port].init(); @@ -428,8 +428,8 @@ void ActiveGuardedProductsComponentBase :: // Connect input port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); port++ ) { this->m_typedAsyncAssert_InputPort[port].init(); @@ -452,8 +452,8 @@ void ActiveGuardedProductsComponentBase :: // Connect input port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); port++ ) { this->m_typedAsyncBlockPriority_InputPort[port].init(); @@ -476,8 +476,8 @@ void ActiveGuardedProductsComponentBase :: // Connect input port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); port++ ) { this->m_typedAsyncDropPriority_InputPort[port].init(); @@ -500,8 +500,8 @@ void ActiveGuardedProductsComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -524,8 +524,8 @@ void ActiveGuardedProductsComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -548,8 +548,8 @@ void ActiveGuardedProductsComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -572,8 +572,8 @@ void ActiveGuardedProductsComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -596,8 +596,8 @@ void ActiveGuardedProductsComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -615,8 +615,8 @@ void ActiveGuardedProductsComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -634,8 +634,8 @@ void ActiveGuardedProductsComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -653,8 +653,8 @@ void ActiveGuardedProductsComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -672,8 +672,8 @@ void ActiveGuardedProductsComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -691,8 +691,8 @@ void ActiveGuardedProductsComponentBase :: // Connect output port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRequestOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRequestOut_OutputPorts()); port++ ) { this->m_productRequestOut_OutputPort[port].init(); @@ -710,8 +710,8 @@ void ActiveGuardedProductsComponentBase :: // Connect output port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productSendOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productSendOut_OutputPorts()); port++ ) { this->m_productSendOut_OutputPort[port].init(); @@ -730,8 +730,8 @@ void ActiveGuardedProductsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -750,8 +750,8 @@ void ActiveGuardedProductsComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -769,8 +769,8 @@ void ActiveGuardedProductsComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -788,8 +788,8 @@ void ActiveGuardedProductsComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -807,8 +807,8 @@ void ActiveGuardedProductsComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -826,8 +826,8 @@ void ActiveGuardedProductsComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -845,8 +845,8 @@ void ActiveGuardedProductsComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -877,7 +877,7 @@ void ActiveGuardedProductsComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* ActiveGuardedProductsComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -888,7 +888,7 @@ Fw::InputCmdPort* ActiveGuardedProductsComponentBase :: } Fw::InputDpResponsePort* ActiveGuardedProductsComponentBase :: - get_productRecvIn_InputPort(NATIVE_INT_TYPE portNum) + get_productRecvIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRecvIn_InputPorts(), @@ -903,7 +903,7 @@ Fw::InputDpResponsePort* ActiveGuardedProductsComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* ActiveGuardedProductsComponentBase :: - get_noArgsAsync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsAsync_InputPorts(), @@ -914,7 +914,7 @@ Ports::InputNoArgsPort* ActiveGuardedProductsComponentBase :: } Ports::InputNoArgsPort* ActiveGuardedProductsComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -925,7 +925,7 @@ Ports::InputNoArgsPort* ActiveGuardedProductsComponentBase :: } Ports::InputNoArgsReturnPort* ActiveGuardedProductsComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -936,7 +936,7 @@ Ports::InputNoArgsReturnPort* ActiveGuardedProductsComponentBase :: } Ports::InputNoArgsReturnPort* ActiveGuardedProductsComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -947,7 +947,7 @@ Ports::InputNoArgsReturnPort* ActiveGuardedProductsComponentBase :: } Ports::InputNoArgsPort* ActiveGuardedProductsComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -958,7 +958,7 @@ Ports::InputNoArgsPort* ActiveGuardedProductsComponentBase :: } Ports::InputTypedPort* ActiveGuardedProductsComponentBase :: - get_typedAsync_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsync_InputPorts(), @@ -969,7 +969,7 @@ Ports::InputTypedPort* ActiveGuardedProductsComponentBase :: } Ports::InputTypedPort* ActiveGuardedProductsComponentBase :: - get_typedAsyncAssert_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncAssert_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncAssert_InputPorts(), @@ -980,7 +980,7 @@ Ports::InputTypedPort* ActiveGuardedProductsComponentBase :: } Ports::InputTypedPort* ActiveGuardedProductsComponentBase :: - get_typedAsyncBlockPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncBlockPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncBlockPriority_InputPorts(), @@ -991,7 +991,7 @@ Ports::InputTypedPort* ActiveGuardedProductsComponentBase :: } Ports::InputTypedPort* ActiveGuardedProductsComponentBase :: - get_typedAsyncDropPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncDropPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncDropPriority_InputPorts(), @@ -1002,7 +1002,7 @@ Ports::InputTypedPort* ActiveGuardedProductsComponentBase :: } Ports::InputTypedPort* ActiveGuardedProductsComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -1013,7 +1013,7 @@ Ports::InputTypedPort* ActiveGuardedProductsComponentBase :: } Ports::InputTypedReturnPort* ActiveGuardedProductsComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -1024,7 +1024,7 @@ Ports::InputTypedReturnPort* ActiveGuardedProductsComponentBase :: } Ports::InputTypedReturnPort* ActiveGuardedProductsComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -1035,7 +1035,7 @@ Ports::InputTypedReturnPort* ActiveGuardedProductsComponentBase :: } Ports::InputTypedPort* ActiveGuardedProductsComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -1051,7 +1051,7 @@ Ports::InputTypedPort* ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -1065,7 +1065,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -1079,7 +1079,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -1093,7 +1093,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -1107,7 +1107,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -1121,7 +1121,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpRequestPort* port ) { @@ -1135,7 +1135,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpSendPort* port ) { @@ -1151,7 +1151,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -1167,7 +1167,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -1181,7 +1181,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -1199,7 +1199,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -1213,7 +1213,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -1227,7 +1227,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -1241,7 +1241,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -1261,7 +1261,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1275,7 +1275,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1289,7 +1289,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1303,7 +1303,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1317,7 +1317,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1331,7 +1331,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1347,7 +1347,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1363,7 +1363,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1377,7 +1377,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1399,7 +1399,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1413,7 +1413,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1448,194 +1448,194 @@ ActiveGuardedProductsComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_productRecvIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_noArgsAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); } -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_typedAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); } -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_typedAsyncAssert_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); } -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_typedAsyncBlockPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); } -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_typedAsyncDropPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); } -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_productRequestOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); } -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_productSendOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: +FwIndexType ActiveGuardedProductsComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1643,7 +1643,7 @@ NATIVE_INT_TYPE ActiveGuardedProductsComponentBase :: // ---------------------------------------------------------------------- bool ActiveGuardedProductsComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1654,7 +1654,7 @@ bool ActiveGuardedProductsComponentBase :: } bool ActiveGuardedProductsComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1665,7 +1665,7 @@ bool ActiveGuardedProductsComponentBase :: } bool ActiveGuardedProductsComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1676,7 +1676,7 @@ bool ActiveGuardedProductsComponentBase :: } bool ActiveGuardedProductsComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1687,7 +1687,7 @@ bool ActiveGuardedProductsComponentBase :: } bool ActiveGuardedProductsComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1698,7 +1698,7 @@ bool ActiveGuardedProductsComponentBase :: } bool ActiveGuardedProductsComponentBase :: - isConnected_productRequestOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productRequestOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRequestOut_OutputPorts(), @@ -1709,7 +1709,7 @@ bool ActiveGuardedProductsComponentBase :: } bool ActiveGuardedProductsComponentBase :: - isConnected_productSendOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productSendOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productSendOut_OutputPorts(), @@ -1722,7 +1722,7 @@ bool ActiveGuardedProductsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool ActiveGuardedProductsComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1735,7 +1735,7 @@ bool ActiveGuardedProductsComponentBase :: #endif bool ActiveGuardedProductsComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1746,7 +1746,7 @@ bool ActiveGuardedProductsComponentBase :: } bool ActiveGuardedProductsComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1761,7 +1761,7 @@ bool ActiveGuardedProductsComponentBase :: // ---------------------------------------------------------------------- bool ActiveGuardedProductsComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1772,7 +1772,7 @@ bool ActiveGuardedProductsComponentBase :: } bool ActiveGuardedProductsComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1783,7 +1783,7 @@ bool ActiveGuardedProductsComponentBase :: } bool ActiveGuardedProductsComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1794,7 +1794,7 @@ bool ActiveGuardedProductsComponentBase :: } bool ActiveGuardedProductsComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1812,7 +1812,7 @@ bool ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -1846,7 +1846,7 @@ void ActiveGuardedProductsComponentBase :: // ---------------------------------------------------------------------- void ActiveGuardedProductsComponentBase :: - noArgsAsync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsAsync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1861,7 +1861,7 @@ void ActiveGuardedProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(NOARGSASYNC_NOARGS) + static_cast(NOARGSASYNC_NOARGS) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1886,7 +1886,7 @@ void ActiveGuardedProductsComponentBase :: } void ActiveGuardedProductsComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1905,7 +1905,7 @@ void ActiveGuardedProductsComponentBase :: } U32 ActiveGuardedProductsComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1928,7 +1928,7 @@ U32 ActiveGuardedProductsComponentBase :: } U32 ActiveGuardedProductsComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1945,7 +1945,7 @@ U32 ActiveGuardedProductsComponentBase :: } void ActiveGuardedProductsComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1959,7 +1959,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1991,7 +1991,7 @@ void ActiveGuardedProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNC_TYPED) + static_cast(TYPEDASYNC_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2066,7 +2066,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2098,7 +2098,7 @@ void ActiveGuardedProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCASSERT_TYPED) + static_cast(TYPEDASYNCASSERT_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2173,7 +2173,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2205,7 +2205,7 @@ void ActiveGuardedProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) + static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2280,7 +2280,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2312,7 +2312,7 @@ void ActiveGuardedProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCDROPPRIORITY_TYPED) + static_cast(TYPEDASYNCDROPPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2392,7 +2392,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2429,7 +2429,7 @@ void ActiveGuardedProductsComponentBase :: F32 ActiveGuardedProductsComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2470,7 +2470,7 @@ F32 ActiveGuardedProductsComponentBase :: F32 ActiveGuardedProductsComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2505,7 +2505,7 @@ F32 ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2544,7 +2544,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -2562,14 +2562,14 @@ void ActiveGuardedProductsComponentBase :: // ---------------------------------------------------------------------- void ActiveGuardedProductsComponentBase :: - noArgsAsync_preMsgHook(NATIVE_INT_TYPE portNum) + noArgsAsync_preMsgHook(FwIndexType portNum) { // Default: no-op } void ActiveGuardedProductsComponentBase :: typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2584,7 +2584,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2599,7 +2599,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2614,7 +2614,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2633,7 +2633,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: productRequestOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -2650,7 +2650,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: productSendOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -2670,7 +2670,7 @@ void ActiveGuardedProductsComponentBase :: // ---------------------------------------------------------------------- void ActiveGuardedProductsComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -2680,7 +2680,7 @@ void ActiveGuardedProductsComponentBase :: } U32 ActiveGuardedProductsComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -2691,7 +2691,7 @@ U32 ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2718,7 +2718,7 @@ void ActiveGuardedProductsComponentBase :: F32 ActiveGuardedProductsComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2817,7 +2817,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveGuardedProductsComponentBase :: doDispatch() { ComponentIpcSerializableBuffer msg; - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -2832,7 +2832,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveGuardedProductsComponentBase :: // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -2845,7 +2845,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveGuardedProductsComponentBase :: return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -3163,7 +3163,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -3178,7 +3178,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -3201,7 +3201,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3212,7 +3212,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3223,7 +3223,7 @@ void ActiveGuardedProductsComponentBase :: U32 ActiveGuardedProductsComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3234,7 +3234,7 @@ U32 ActiveGuardedProductsComponentBase :: U32 ActiveGuardedProductsComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3245,7 +3245,7 @@ U32 ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3256,7 +3256,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3283,7 +3283,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3310,7 +3310,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3337,7 +3337,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3364,7 +3364,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3391,7 +3391,7 @@ void ActiveGuardedProductsComponentBase :: F32 ActiveGuardedProductsComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3418,7 +3418,7 @@ F32 ActiveGuardedProductsComponentBase :: F32 ActiveGuardedProductsComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3445,7 +3445,7 @@ F32 ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3486,7 +3486,7 @@ void ActiveGuardedProductsComponentBase :: void ActiveGuardedProductsComponentBase :: productRecvIn_handler( - const NATIVE_INT_TYPE portNum, + const FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp index bbc9c7498..bafda607f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp @@ -209,8 +209,8 @@ class ActiveGuardedProductsComponentBase : //! Initialize ActiveGuardedProductsComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -223,14 +223,14 @@ class ActiveGuardedProductsComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get special input port at index //! //! \return productRecvIn[portNum] Fw::InputDpResponsePort* get_productRecvIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -243,91 +243,91 @@ class ActiveGuardedProductsComponentBase : //! //! \return noArgsAsync[portNum] Ports::InputNoArgsPort* get_noArgsAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsync[portNum] Ports::InputTypedPort* get_typedAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncAssert[portNum] Ports::InputTypedPort* get_typedAsyncAssert_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncBlockPriority[portNum] Ports::InputTypedPort* get_typedAsyncBlockPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncDropPriority[portNum] Ports::InputTypedPort* get_typedAsyncDropPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -338,43 +338,43 @@ class ActiveGuardedProductsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpRequestPort* port //!< The input port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpSendPort* port //!< The input port ); @@ -382,7 +382,7 @@ class ActiveGuardedProductsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -390,13 +390,13 @@ class ActiveGuardedProductsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -408,25 +408,25 @@ class ActiveGuardedProductsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -440,37 +440,37 @@ class ActiveGuardedProductsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -478,7 +478,7 @@ class ActiveGuardedProductsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -486,13 +486,13 @@ class ActiveGuardedProductsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -508,13 +508,13 @@ class ActiveGuardedProductsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -543,12 +543,12 @@ class ActiveGuardedProductsComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; //! Get the number of productRecvIn input ports //! //! \return The number of productRecvIn input ports - NATIVE_INT_TYPE getNum_productRecvIn_InputPorts() const; + FwIndexType getNum_productRecvIn_InputPorts() const; PROTECTED: @@ -559,67 +559,67 @@ class ActiveGuardedProductsComponentBase : //! Get the number of noArgsAsync input ports //! //! \return The number of noArgsAsync input ports - NATIVE_INT_TYPE getNum_noArgsAsync_InputPorts() const; + FwIndexType getNum_noArgsAsync_InputPorts() const; //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedAsync input ports //! //! \return The number of typedAsync input ports - NATIVE_INT_TYPE getNum_typedAsync_InputPorts() const; + FwIndexType getNum_typedAsync_InputPorts() const; //! Get the number of typedAsyncAssert input ports //! //! \return The number of typedAsyncAssert input ports - NATIVE_INT_TYPE getNum_typedAsyncAssert_InputPorts() const; + FwIndexType getNum_typedAsyncAssert_InputPorts() const; //! Get the number of typedAsyncBlockPriority input ports //! //! \return The number of typedAsyncBlockPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncBlockPriority_InputPorts() const; + FwIndexType getNum_typedAsyncBlockPriority_InputPorts() const; //! Get the number of typedAsyncDropPriority input ports //! //! \return The number of typedAsyncDropPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncDropPriority_InputPorts() const; + FwIndexType getNum_typedAsyncDropPriority_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -630,56 +630,56 @@ class ActiveGuardedProductsComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; //! Get the number of productRequestOut output ports //! //! \return The number of productRequestOut output ports - NATIVE_INT_TYPE getNum_productRequestOut_OutputPorts() const; + FwIndexType getNum_productRequestOut_OutputPorts() const; //! Get the number of productSendOut output ports //! //! \return The number of productSendOut output ports - NATIVE_INT_TYPE getNum_productSendOut_OutputPorts() const; + FwIndexType getNum_productSendOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -690,22 +690,22 @@ class ActiveGuardedProductsComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -717,49 +717,49 @@ class ActiveGuardedProductsComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productRequestOut is connected //! //! \return Whether port productRequestOut is connected bool isConnected_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productSendOut is connected //! //! \return Whether port productSendOut is connected bool isConnected_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -768,7 +768,7 @@ class ActiveGuardedProductsComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -777,14 +777,14 @@ class ActiveGuardedProductsComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -797,28 +797,28 @@ class ActiveGuardedProductsComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -831,7 +831,7 @@ class ActiveGuardedProductsComponentBase : //! Handler base-class function for input port productRecvIn void productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -845,32 +845,32 @@ class ActiveGuardedProductsComponentBase : //! Handler for input port noArgsAsync virtual void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedAsync virtual void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -882,7 +882,7 @@ class ActiveGuardedProductsComponentBase : //! Handler for input port typedAsyncAssert virtual void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -894,7 +894,7 @@ class ActiveGuardedProductsComponentBase : //! Handler for input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -906,7 +906,7 @@ class ActiveGuardedProductsComponentBase : //! Handler for input port typedAsyncDropPriority virtual void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -918,7 +918,7 @@ class ActiveGuardedProductsComponentBase : //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -930,7 +930,7 @@ class ActiveGuardedProductsComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -942,7 +942,7 @@ class ActiveGuardedProductsComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -954,7 +954,7 @@ class ActiveGuardedProductsComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -974,32 +974,32 @@ class ActiveGuardedProductsComponentBase : //! Handler base-class function for input port noArgsAsync void noArgsAsync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedAsync void typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1011,7 +1011,7 @@ class ActiveGuardedProductsComponentBase : //! Handler base-class function for input port typedAsyncAssert void typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1023,7 +1023,7 @@ class ActiveGuardedProductsComponentBase : //! Handler base-class function for input port typedAsyncBlockPriority void typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1035,7 +1035,7 @@ class ActiveGuardedProductsComponentBase : //! Handler base-class function for input port typedAsyncDropPriority void typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1047,7 +1047,7 @@ class ActiveGuardedProductsComponentBase : //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1059,7 +1059,7 @@ class ActiveGuardedProductsComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1071,7 +1071,7 @@ class ActiveGuardedProductsComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1083,7 +1083,7 @@ class ActiveGuardedProductsComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1105,7 +1105,7 @@ class ActiveGuardedProductsComponentBase : //! Pre-message hook for async input port productRecvIn virtual void productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -1123,12 +1123,12 @@ class ActiveGuardedProductsComponentBase : //! Pre-message hook for async input port noArgsAsync virtual void noArgsAsync_preMsgHook( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Pre-message hook for async input port typedAsync virtual void typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1140,7 +1140,7 @@ class ActiveGuardedProductsComponentBase : //! Pre-message hook for async input port typedAsyncAssert virtual void typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1152,7 +1152,7 @@ class ActiveGuardedProductsComponentBase : //! Pre-message hook for async input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1164,7 +1164,7 @@ class ActiveGuardedProductsComponentBase : //! Pre-message hook for async input port typedAsyncDropPriority virtual void typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1182,14 +1182,14 @@ class ActiveGuardedProductsComponentBase : //! Invoke output port productRequestOut void productRequestOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); //! Invoke output port productSendOut void productSendOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -1202,17 +1202,17 @@ class ActiveGuardedProductsComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1224,7 +1224,7 @@ class ActiveGuardedProductsComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1361,7 +1361,7 @@ class ActiveGuardedProductsComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -1370,7 +1370,7 @@ class ActiveGuardedProductsComponentBase : //! Callback for port productRecvIn static void m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -1385,37 +1385,37 @@ class ActiveGuardedProductsComponentBase : //! Callback for port noArgsAsync static void m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedAsync static void m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1428,7 +1428,7 @@ class ActiveGuardedProductsComponentBase : //! Callback for port typedAsyncAssert static void m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1441,7 +1441,7 @@ class ActiveGuardedProductsComponentBase : //! Callback for port typedAsyncBlockPriority static void m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1454,7 +1454,7 @@ class ActiveGuardedProductsComponentBase : //! Callback for port typedAsyncDropPriority static void m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1467,7 +1467,7 @@ class ActiveGuardedProductsComponentBase : //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1480,7 +1480,7 @@ class ActiveGuardedProductsComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1493,7 +1493,7 @@ class ActiveGuardedProductsComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1506,7 +1506,7 @@ class ActiveGuardedProductsComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1530,7 +1530,7 @@ class ActiveGuardedProductsComponentBase : //! Handler implementation for productRecvIn void productRecvIn_handler( - const NATIVE_INT_TYPE portNum, //!< The port number + const FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container id const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The buffer status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveNoArgsPortsOnlyComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveNoArgsPortsOnlyComponentAc.ref.cpp index f5c996219..c076b9a2d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveNoArgsPortsOnlyComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveNoArgsPortsOnlyComponentAc.ref.cpp @@ -29,11 +29,11 @@ namespace { enum { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -58,8 +58,8 @@ namespace { void ActiveNoArgsPortsOnlyComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwEnumStoreType instance ) { // Initialize base class @@ -67,8 +67,8 @@ void ActiveNoArgsPortsOnlyComponentBase :: // Connect input port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsAsync_InputPorts()); port++ ) { this->m_noArgsAsync_InputPort[port].init(); @@ -91,8 +91,8 @@ void ActiveNoArgsPortsOnlyComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -115,8 +115,8 @@ void ActiveNoArgsPortsOnlyComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -139,8 +139,8 @@ void ActiveNoArgsPortsOnlyComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -163,8 +163,8 @@ void ActiveNoArgsPortsOnlyComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -182,8 +182,8 @@ void ActiveNoArgsPortsOnlyComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -214,7 +214,7 @@ void ActiveNoArgsPortsOnlyComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* ActiveNoArgsPortsOnlyComponentBase :: - get_noArgsAsync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsAsync_InputPorts(), @@ -225,7 +225,7 @@ Ports::InputNoArgsPort* ActiveNoArgsPortsOnlyComponentBase :: } Ports::InputNoArgsPort* ActiveNoArgsPortsOnlyComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -236,7 +236,7 @@ Ports::InputNoArgsPort* ActiveNoArgsPortsOnlyComponentBase :: } Ports::InputNoArgsReturnPort* ActiveNoArgsPortsOnlyComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -247,7 +247,7 @@ Ports::InputNoArgsReturnPort* ActiveNoArgsPortsOnlyComponentBase :: } Ports::InputNoArgsReturnPort* ActiveNoArgsPortsOnlyComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -263,7 +263,7 @@ Ports::InputNoArgsReturnPort* ActiveNoArgsPortsOnlyComponentBase :: void ActiveNoArgsPortsOnlyComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -277,7 +277,7 @@ void ActiveNoArgsPortsOnlyComponentBase :: void ActiveNoArgsPortsOnlyComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -297,7 +297,7 @@ void ActiveNoArgsPortsOnlyComponentBase :: void ActiveNoArgsPortsOnlyComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -332,44 +332,44 @@ ActiveNoArgsPortsOnlyComponentBase :: // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveNoArgsPortsOnlyComponentBase :: +FwIndexType ActiveNoArgsPortsOnlyComponentBase :: getNum_noArgsAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); } -NATIVE_INT_TYPE ActiveNoArgsPortsOnlyComponentBase :: +FwIndexType ActiveNoArgsPortsOnlyComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveNoArgsPortsOnlyComponentBase :: +FwIndexType ActiveNoArgsPortsOnlyComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveNoArgsPortsOnlyComponentBase :: +FwIndexType ActiveNoArgsPortsOnlyComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveNoArgsPortsOnlyComponentBase :: +FwIndexType ActiveNoArgsPortsOnlyComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE ActiveNoArgsPortsOnlyComponentBase :: +FwIndexType ActiveNoArgsPortsOnlyComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -377,7 +377,7 @@ NATIVE_INT_TYPE ActiveNoArgsPortsOnlyComponentBase :: // ---------------------------------------------------------------------- bool ActiveNoArgsPortsOnlyComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -388,7 +388,7 @@ bool ActiveNoArgsPortsOnlyComponentBase :: } bool ActiveNoArgsPortsOnlyComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -405,7 +405,7 @@ bool ActiveNoArgsPortsOnlyComponentBase :: // ---------------------------------------------------------------------- void ActiveNoArgsPortsOnlyComponentBase :: - noArgsAsync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsAsync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -420,7 +420,7 @@ void ActiveNoArgsPortsOnlyComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(NOARGSASYNC_NOARGS) + static_cast(NOARGSASYNC_NOARGS) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -445,7 +445,7 @@ void ActiveNoArgsPortsOnlyComponentBase :: } void ActiveNoArgsPortsOnlyComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -464,7 +464,7 @@ void ActiveNoArgsPortsOnlyComponentBase :: } U32 ActiveNoArgsPortsOnlyComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -487,7 +487,7 @@ U32 ActiveNoArgsPortsOnlyComponentBase :: } U32 ActiveNoArgsPortsOnlyComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -512,7 +512,7 @@ U32 ActiveNoArgsPortsOnlyComponentBase :: // ---------------------------------------------------------------------- void ActiveNoArgsPortsOnlyComponentBase :: - noArgsAsync_preMsgHook(NATIVE_INT_TYPE portNum) + noArgsAsync_preMsgHook(FwIndexType portNum) { // Default: no-op } @@ -522,7 +522,7 @@ void ActiveNoArgsPortsOnlyComponentBase :: // ---------------------------------------------------------------------- void ActiveNoArgsPortsOnlyComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -532,7 +532,7 @@ void ActiveNoArgsPortsOnlyComponentBase :: } U32 ActiveNoArgsPortsOnlyComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -568,7 +568,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveNoArgsPortsOnlyComponentBase :: doDispatch() { ComponentIpcSerializableBuffer msg; - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -583,7 +583,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveNoArgsPortsOnlyComponentBase :: // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -596,7 +596,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveNoArgsPortsOnlyComponentBase :: return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -626,7 +626,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveNoArgsPortsOnlyComponentBase :: void ActiveNoArgsPortsOnlyComponentBase :: m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -637,7 +637,7 @@ void ActiveNoArgsPortsOnlyComponentBase :: void ActiveNoArgsPortsOnlyComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -648,7 +648,7 @@ void ActiveNoArgsPortsOnlyComponentBase :: U32 ActiveNoArgsPortsOnlyComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -659,7 +659,7 @@ U32 ActiveNoArgsPortsOnlyComponentBase :: U32 ActiveNoArgsPortsOnlyComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveNoArgsPortsOnlyComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveNoArgsPortsOnlyComponentAc.ref.hpp index babef3b55..2863ccdc9 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveNoArgsPortsOnlyComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveNoArgsPortsOnlyComponentAc.ref.hpp @@ -58,8 +58,8 @@ class ActiveNoArgsPortsOnlyComponentBase : //! Initialize ActiveNoArgsPortsOnlyComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -72,28 +72,28 @@ class ActiveNoArgsPortsOnlyComponentBase : //! //! \return noArgsAsync[portNum] Ports::InputNoArgsPort* get_noArgsAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -104,13 +104,13 @@ class ActiveNoArgsPortsOnlyComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); @@ -124,7 +124,7 @@ class ActiveNoArgsPortsOnlyComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -153,22 +153,22 @@ class ActiveNoArgsPortsOnlyComponentBase : //! Get the number of noArgsAsync input ports //! //! \return The number of noArgsAsync input ports - NATIVE_INT_TYPE getNum_noArgsAsync_InputPorts() const; + FwIndexType getNum_noArgsAsync_InputPorts() const; //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; PROTECTED: @@ -179,12 +179,12 @@ class ActiveNoArgsPortsOnlyComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; PROTECTED: @@ -196,14 +196,14 @@ class ActiveNoArgsPortsOnlyComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -214,22 +214,22 @@ class ActiveNoArgsPortsOnlyComponentBase : //! Handler for input port noArgsAsync virtual void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; PROTECTED: @@ -242,22 +242,22 @@ class ActiveNoArgsPortsOnlyComponentBase : //! Handler base-class function for input port noArgsAsync void noArgsAsync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -272,7 +272,7 @@ class ActiveNoArgsPortsOnlyComponentBase : //! Pre-message hook for async input port noArgsAsync virtual void noArgsAsync_preMsgHook( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -283,12 +283,12 @@ class ActiveNoArgsPortsOnlyComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -324,25 +324,25 @@ class ActiveNoArgsPortsOnlyComponentBase : //! Callback for port noArgsAsync static void m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PRIVATE: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp index 6c9148966..12397c2af 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp @@ -44,11 +44,11 @@ namespace { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = sizeof(BuffUnion) + - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -73,8 +73,8 @@ namespace { void ActiveParamsComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwEnumStoreType instance ) { // Initialize base class @@ -82,8 +82,8 @@ void ActiveParamsComponentBase :: // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -106,8 +106,8 @@ void ActiveParamsComponentBase :: // Connect input port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsAsync_InputPorts()); port++ ) { this->m_noArgsAsync_InputPort[port].init(); @@ -130,8 +130,8 @@ void ActiveParamsComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -154,8 +154,8 @@ void ActiveParamsComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -178,8 +178,8 @@ void ActiveParamsComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -202,8 +202,8 @@ void ActiveParamsComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -226,8 +226,8 @@ void ActiveParamsComponentBase :: // Connect input port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsync_InputPorts()); port++ ) { this->m_typedAsync_InputPort[port].init(); @@ -250,8 +250,8 @@ void ActiveParamsComponentBase :: // Connect input port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); port++ ) { this->m_typedAsyncAssert_InputPort[port].init(); @@ -274,8 +274,8 @@ void ActiveParamsComponentBase :: // Connect input port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); port++ ) { this->m_typedAsyncBlockPriority_InputPort[port].init(); @@ -298,8 +298,8 @@ void ActiveParamsComponentBase :: // Connect input port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); port++ ) { this->m_typedAsyncDropPriority_InputPort[port].init(); @@ -322,8 +322,8 @@ void ActiveParamsComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -346,8 +346,8 @@ void ActiveParamsComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -370,8 +370,8 @@ void ActiveParamsComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -394,8 +394,8 @@ void ActiveParamsComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -418,8 +418,8 @@ void ActiveParamsComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -437,8 +437,8 @@ void ActiveParamsComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -456,8 +456,8 @@ void ActiveParamsComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -475,8 +475,8 @@ void ActiveParamsComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -494,8 +494,8 @@ void ActiveParamsComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -514,8 +514,8 @@ void ActiveParamsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -534,8 +534,8 @@ void ActiveParamsComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -553,8 +553,8 @@ void ActiveParamsComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -572,8 +572,8 @@ void ActiveParamsComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -591,8 +591,8 @@ void ActiveParamsComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -610,8 +610,8 @@ void ActiveParamsComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -629,8 +629,8 @@ void ActiveParamsComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -661,7 +661,7 @@ void ActiveParamsComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* ActiveParamsComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -676,7 +676,7 @@ Fw::InputCmdPort* ActiveParamsComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* ActiveParamsComponentBase :: - get_noArgsAsync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsAsync_InputPorts(), @@ -687,7 +687,7 @@ Ports::InputNoArgsPort* ActiveParamsComponentBase :: } Ports::InputNoArgsPort* ActiveParamsComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -698,7 +698,7 @@ Ports::InputNoArgsPort* ActiveParamsComponentBase :: } Ports::InputNoArgsReturnPort* ActiveParamsComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -709,7 +709,7 @@ Ports::InputNoArgsReturnPort* ActiveParamsComponentBase :: } Ports::InputNoArgsReturnPort* ActiveParamsComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -720,7 +720,7 @@ Ports::InputNoArgsReturnPort* ActiveParamsComponentBase :: } Ports::InputNoArgsPort* ActiveParamsComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -731,7 +731,7 @@ Ports::InputNoArgsPort* ActiveParamsComponentBase :: } Ports::InputTypedPort* ActiveParamsComponentBase :: - get_typedAsync_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsync_InputPorts(), @@ -742,7 +742,7 @@ Ports::InputTypedPort* ActiveParamsComponentBase :: } Ports::InputTypedPort* ActiveParamsComponentBase :: - get_typedAsyncAssert_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncAssert_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncAssert_InputPorts(), @@ -753,7 +753,7 @@ Ports::InputTypedPort* ActiveParamsComponentBase :: } Ports::InputTypedPort* ActiveParamsComponentBase :: - get_typedAsyncBlockPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncBlockPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncBlockPriority_InputPorts(), @@ -764,7 +764,7 @@ Ports::InputTypedPort* ActiveParamsComponentBase :: } Ports::InputTypedPort* ActiveParamsComponentBase :: - get_typedAsyncDropPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncDropPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncDropPriority_InputPorts(), @@ -775,7 +775,7 @@ Ports::InputTypedPort* ActiveParamsComponentBase :: } Ports::InputTypedPort* ActiveParamsComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -786,7 +786,7 @@ Ports::InputTypedPort* ActiveParamsComponentBase :: } Ports::InputTypedReturnPort* ActiveParamsComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -797,7 +797,7 @@ Ports::InputTypedReturnPort* ActiveParamsComponentBase :: } Ports::InputTypedReturnPort* ActiveParamsComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -808,7 +808,7 @@ Ports::InputTypedReturnPort* ActiveParamsComponentBase :: } Ports::InputTypedPort* ActiveParamsComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -824,7 +824,7 @@ Ports::InputTypedPort* ActiveParamsComponentBase :: void ActiveParamsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -838,7 +838,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -852,7 +852,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -866,7 +866,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -880,7 +880,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -896,7 +896,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -912,7 +912,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -926,7 +926,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -944,7 +944,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -958,7 +958,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -972,7 +972,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -986,7 +986,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -1006,7 +1006,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1020,7 +1020,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1034,7 +1034,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1048,7 +1048,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1064,7 +1064,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1080,7 +1080,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1094,7 +1094,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1116,7 +1116,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1130,7 +1130,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1403,176 +1403,176 @@ ActiveParamsComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_noArgsAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); } -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_typedAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); } -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_typedAsyncAssert_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); } -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_typedAsyncBlockPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); } -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_typedAsyncDropPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); } -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE ActiveParamsComponentBase :: +FwIndexType ActiveParamsComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1580,7 +1580,7 @@ NATIVE_INT_TYPE ActiveParamsComponentBase :: // ---------------------------------------------------------------------- bool ActiveParamsComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1591,7 +1591,7 @@ bool ActiveParamsComponentBase :: } bool ActiveParamsComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1602,7 +1602,7 @@ bool ActiveParamsComponentBase :: } bool ActiveParamsComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1613,7 +1613,7 @@ bool ActiveParamsComponentBase :: } bool ActiveParamsComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1624,7 +1624,7 @@ bool ActiveParamsComponentBase :: } bool ActiveParamsComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1637,7 +1637,7 @@ bool ActiveParamsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool ActiveParamsComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1650,7 +1650,7 @@ bool ActiveParamsComponentBase :: #endif bool ActiveParamsComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1661,7 +1661,7 @@ bool ActiveParamsComponentBase :: } bool ActiveParamsComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1676,7 +1676,7 @@ bool ActiveParamsComponentBase :: // ---------------------------------------------------------------------- bool ActiveParamsComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1687,7 +1687,7 @@ bool ActiveParamsComponentBase :: } bool ActiveParamsComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1698,7 +1698,7 @@ bool ActiveParamsComponentBase :: } bool ActiveParamsComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1709,7 +1709,7 @@ bool ActiveParamsComponentBase :: } bool ActiveParamsComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1726,7 +1726,7 @@ bool ActiveParamsComponentBase :: // ---------------------------------------------------------------------- void ActiveParamsComponentBase :: - noArgsAsync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsAsync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1741,7 +1741,7 @@ void ActiveParamsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(NOARGSASYNC_NOARGS) + static_cast(NOARGSASYNC_NOARGS) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1766,7 +1766,7 @@ void ActiveParamsComponentBase :: } void ActiveParamsComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1785,7 +1785,7 @@ void ActiveParamsComponentBase :: } U32 ActiveParamsComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1808,7 +1808,7 @@ U32 ActiveParamsComponentBase :: } U32 ActiveParamsComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1825,7 +1825,7 @@ U32 ActiveParamsComponentBase :: } void ActiveParamsComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1839,7 +1839,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1871,7 +1871,7 @@ void ActiveParamsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNC_TYPED) + static_cast(TYPEDASYNC_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1946,7 +1946,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1978,7 +1978,7 @@ void ActiveParamsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCASSERT_TYPED) + static_cast(TYPEDASYNCASSERT_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2053,7 +2053,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2085,7 +2085,7 @@ void ActiveParamsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) + static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2160,7 +2160,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2192,7 +2192,7 @@ void ActiveParamsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCDROPPRIORITY_TYPED) + static_cast(TYPEDASYNCDROPPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2272,7 +2272,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2309,7 +2309,7 @@ void ActiveParamsComponentBase :: F32 ActiveParamsComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2350,7 +2350,7 @@ F32 ActiveParamsComponentBase :: F32 ActiveParamsComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2385,7 +2385,7 @@ F32 ActiveParamsComponentBase :: void ActiveParamsComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2423,14 +2423,14 @@ void ActiveParamsComponentBase :: // ---------------------------------------------------------------------- void ActiveParamsComponentBase :: - noArgsAsync_preMsgHook(NATIVE_INT_TYPE portNum) + noArgsAsync_preMsgHook(FwIndexType portNum) { // Default: no-op } void ActiveParamsComponentBase :: typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2445,7 +2445,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2460,7 +2460,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2475,7 +2475,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2493,7 +2493,7 @@ void ActiveParamsComponentBase :: // ---------------------------------------------------------------------- void ActiveParamsComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -2503,7 +2503,7 @@ void ActiveParamsComponentBase :: } U32 ActiveParamsComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -2514,7 +2514,7 @@ U32 ActiveParamsComponentBase :: void ActiveParamsComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2541,7 +2541,7 @@ void ActiveParamsComponentBase :: F32 ActiveParamsComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2711,7 +2711,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveParamsComponentBase :: doDispatch() { ComponentIpcSerializableBuffer msg; - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -2726,7 +2726,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveParamsComponentBase :: // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -2739,7 +2739,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveParamsComponentBase :: return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -3057,7 +3057,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveParamsComponentBase :: void ActiveParamsComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -3200,7 +3200,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3211,7 +3211,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3222,7 +3222,7 @@ void ActiveParamsComponentBase :: U32 ActiveParamsComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3233,7 +3233,7 @@ U32 ActiveParamsComponentBase :: U32 ActiveParamsComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3244,7 +3244,7 @@ U32 ActiveParamsComponentBase :: void ActiveParamsComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3255,7 +3255,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3282,7 +3282,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3309,7 +3309,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3336,7 +3336,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3363,7 +3363,7 @@ void ActiveParamsComponentBase :: void ActiveParamsComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3390,7 +3390,7 @@ void ActiveParamsComponentBase :: F32 ActiveParamsComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3417,7 +3417,7 @@ F32 ActiveParamsComponentBase :: F32 ActiveParamsComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3444,7 +3444,7 @@ F32 ActiveParamsComponentBase :: void ActiveParamsComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp index 62d91e9bc..236d01c95 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp @@ -131,8 +131,8 @@ class ActiveParamsComponentBase : //! Initialize ActiveParamsComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -145,7 +145,7 @@ class ActiveParamsComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -158,91 +158,91 @@ class ActiveParamsComponentBase : //! //! \return noArgsAsync[portNum] Ports::InputNoArgsPort* get_noArgsAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsync[portNum] Ports::InputTypedPort* get_typedAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncAssert[portNum] Ports::InputTypedPort* get_typedAsyncAssert_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncBlockPriority[portNum] Ports::InputTypedPort* get_typedAsyncBlockPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncDropPriority[portNum] Ports::InputTypedPort* get_typedAsyncDropPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -253,31 +253,31 @@ class ActiveParamsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); @@ -285,7 +285,7 @@ class ActiveParamsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -293,13 +293,13 @@ class ActiveParamsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -311,25 +311,25 @@ class ActiveParamsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -343,25 +343,25 @@ class ActiveParamsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -369,7 +369,7 @@ class ActiveParamsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -377,13 +377,13 @@ class ActiveParamsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -399,13 +399,13 @@ class ActiveParamsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -456,7 +456,7 @@ class ActiveParamsComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; PROTECTED: @@ -467,67 +467,67 @@ class ActiveParamsComponentBase : //! Get the number of noArgsAsync input ports //! //! \return The number of noArgsAsync input ports - NATIVE_INT_TYPE getNum_noArgsAsync_InputPorts() const; + FwIndexType getNum_noArgsAsync_InputPorts() const; //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedAsync input ports //! //! \return The number of typedAsync input ports - NATIVE_INT_TYPE getNum_typedAsync_InputPorts() const; + FwIndexType getNum_typedAsync_InputPorts() const; //! Get the number of typedAsyncAssert input ports //! //! \return The number of typedAsyncAssert input ports - NATIVE_INT_TYPE getNum_typedAsyncAssert_InputPorts() const; + FwIndexType getNum_typedAsyncAssert_InputPorts() const; //! Get the number of typedAsyncBlockPriority input ports //! //! \return The number of typedAsyncBlockPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncBlockPriority_InputPorts() const; + FwIndexType getNum_typedAsyncBlockPriority_InputPorts() const; //! Get the number of typedAsyncDropPriority input ports //! //! \return The number of typedAsyncDropPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncDropPriority_InputPorts() const; + FwIndexType getNum_typedAsyncDropPriority_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -538,46 +538,46 @@ class ActiveParamsComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -588,22 +588,22 @@ class ActiveParamsComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -615,35 +615,35 @@ class ActiveParamsComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -652,7 +652,7 @@ class ActiveParamsComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -661,14 +661,14 @@ class ActiveParamsComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -681,28 +681,28 @@ class ActiveParamsComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -713,32 +713,32 @@ class ActiveParamsComponentBase : //! Handler for input port noArgsAsync virtual void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedAsync virtual void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -750,7 +750,7 @@ class ActiveParamsComponentBase : //! Handler for input port typedAsyncAssert virtual void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -762,7 +762,7 @@ class ActiveParamsComponentBase : //! Handler for input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -774,7 +774,7 @@ class ActiveParamsComponentBase : //! Handler for input port typedAsyncDropPriority virtual void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -786,7 +786,7 @@ class ActiveParamsComponentBase : //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -798,7 +798,7 @@ class ActiveParamsComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -810,7 +810,7 @@ class ActiveParamsComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -822,7 +822,7 @@ class ActiveParamsComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -842,32 +842,32 @@ class ActiveParamsComponentBase : //! Handler base-class function for input port noArgsAsync void noArgsAsync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedAsync void typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -879,7 +879,7 @@ class ActiveParamsComponentBase : //! Handler base-class function for input port typedAsyncAssert void typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -891,7 +891,7 @@ class ActiveParamsComponentBase : //! Handler base-class function for input port typedAsyncBlockPriority void typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -903,7 +903,7 @@ class ActiveParamsComponentBase : //! Handler base-class function for input port typedAsyncDropPriority void typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -915,7 +915,7 @@ class ActiveParamsComponentBase : //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -927,7 +927,7 @@ class ActiveParamsComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -939,7 +939,7 @@ class ActiveParamsComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -951,7 +951,7 @@ class ActiveParamsComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -973,12 +973,12 @@ class ActiveParamsComponentBase : //! Pre-message hook for async input port noArgsAsync virtual void noArgsAsync_preMsgHook( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Pre-message hook for async input port typedAsync virtual void typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -990,7 +990,7 @@ class ActiveParamsComponentBase : //! Pre-message hook for async input port typedAsyncAssert virtual void typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1002,7 +1002,7 @@ class ActiveParamsComponentBase : //! Pre-message hook for async input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1014,7 +1014,7 @@ class ActiveParamsComponentBase : //! Pre-message hook for async input port typedAsyncDropPriority virtual void typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1032,17 +1032,17 @@ class ActiveParamsComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1054,7 +1054,7 @@ class ActiveParamsComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1204,7 +1204,7 @@ class ActiveParamsComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -1219,37 +1219,37 @@ class ActiveParamsComponentBase : //! Callback for port noArgsAsync static void m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedAsync static void m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1262,7 +1262,7 @@ class ActiveParamsComponentBase : //! Callback for port typedAsyncAssert static void m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1275,7 +1275,7 @@ class ActiveParamsComponentBase : //! Callback for port typedAsyncBlockPriority static void m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1288,7 +1288,7 @@ class ActiveParamsComponentBase : //! Callback for port typedAsyncDropPriority static void m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1301,7 +1301,7 @@ class ActiveParamsComponentBase : //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1314,7 +1314,7 @@ class ActiveParamsComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1327,7 +1327,7 @@ class ActiveParamsComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1340,7 +1340,7 @@ class ActiveParamsComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index 4850001ea..581367ac2 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -82,11 +82,11 @@ namespace { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = sizeof(BuffUnion) + - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -111,9 +111,9 @@ namespace { void ActiveSerialComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE msgSize, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwSizeType msgSize, + FwEnumStoreType instance ) { // Initialize base class @@ -121,8 +121,8 @@ void ActiveSerialComponentBase :: // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -145,8 +145,8 @@ void ActiveSerialComponentBase :: // Connect input port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsAsync_InputPorts()); port++ ) { this->m_noArgsAsync_InputPort[port].init(); @@ -169,8 +169,8 @@ void ActiveSerialComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -193,8 +193,8 @@ void ActiveSerialComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -217,8 +217,8 @@ void ActiveSerialComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -241,8 +241,8 @@ void ActiveSerialComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -265,8 +265,8 @@ void ActiveSerialComponentBase :: // Connect input port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsync_InputPorts()); port++ ) { this->m_typedAsync_InputPort[port].init(); @@ -289,8 +289,8 @@ void ActiveSerialComponentBase :: // Connect input port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); port++ ) { this->m_typedAsyncAssert_InputPort[port].init(); @@ -313,8 +313,8 @@ void ActiveSerialComponentBase :: // Connect input port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); port++ ) { this->m_typedAsyncBlockPriority_InputPort[port].init(); @@ -337,8 +337,8 @@ void ActiveSerialComponentBase :: // Connect input port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); port++ ) { this->m_typedAsyncDropPriority_InputPort[port].init(); @@ -361,8 +361,8 @@ void ActiveSerialComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -385,8 +385,8 @@ void ActiveSerialComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -409,8 +409,8 @@ void ActiveSerialComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -433,8 +433,8 @@ void ActiveSerialComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -457,8 +457,8 @@ void ActiveSerialComponentBase :: // Connect input port serialAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_serialAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_serialAsync_InputPorts()); port++ ) { this->m_serialAsync_InputPort[port].init(); @@ -481,8 +481,8 @@ void ActiveSerialComponentBase :: // Connect input port serialAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_serialAsyncAssert_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_serialAsyncAssert_InputPorts()); port++ ) { this->m_serialAsyncAssert_InputPort[port].init(); @@ -505,8 +505,8 @@ void ActiveSerialComponentBase :: // Connect input port serialAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_serialAsyncBlockPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_serialAsyncBlockPriority_InputPorts()); port++ ) { this->m_serialAsyncBlockPriority_InputPort[port].init(); @@ -529,8 +529,8 @@ void ActiveSerialComponentBase :: // Connect input port serialAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_serialAsyncDropPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_serialAsyncDropPriority_InputPorts()); port++ ) { this->m_serialAsyncDropPriority_InputPort[port].init(); @@ -553,8 +553,8 @@ void ActiveSerialComponentBase :: // Connect input port serialGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_serialGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_serialGuarded_InputPorts()); port++ ) { this->m_serialGuarded_InputPort[port].init(); @@ -577,8 +577,8 @@ void ActiveSerialComponentBase :: // Connect input port serialSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_serialSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_serialSync_InputPorts()); port++ ) { this->m_serialSync_InputPort[port].init(); @@ -601,8 +601,8 @@ void ActiveSerialComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -620,8 +620,8 @@ void ActiveSerialComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -639,8 +639,8 @@ void ActiveSerialComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -658,8 +658,8 @@ void ActiveSerialComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -677,8 +677,8 @@ void ActiveSerialComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -697,8 +697,8 @@ void ActiveSerialComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -717,8 +717,8 @@ void ActiveSerialComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -736,8 +736,8 @@ void ActiveSerialComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -755,8 +755,8 @@ void ActiveSerialComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -774,8 +774,8 @@ void ActiveSerialComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -793,8 +793,8 @@ void ActiveSerialComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -812,8 +812,8 @@ void ActiveSerialComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -831,8 +831,8 @@ void ActiveSerialComponentBase :: // Connect output port serialOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_serialOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_serialOut_OutputPorts()); port++ ) { this->m_serialOut_OutputPort[port].init(); @@ -849,12 +849,11 @@ void ActiveSerialComponentBase :: } // Passed-in size added to port number and message type enumeration sizes. - // NATIVE_INT_TYPE cast because of compiler warning. this->m_msgSize = FW_MAX( msgSize + - static_cast(sizeof(NATIVE_INT_TYPE)) + - static_cast(sizeof(I32)), - static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) + static_cast(sizeof(FwIndexType)) + + static_cast(sizeof(FwEnumStoreType)), + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); Os::Queue::QueueStatus qStat = this->createQueue(queueDepth, this->m_msgSize); @@ -869,7 +868,7 @@ void ActiveSerialComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* ActiveSerialComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -884,7 +883,7 @@ Fw::InputCmdPort* ActiveSerialComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* ActiveSerialComponentBase :: - get_noArgsAsync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsAsync_InputPorts(), @@ -895,7 +894,7 @@ Ports::InputNoArgsPort* ActiveSerialComponentBase :: } Ports::InputNoArgsPort* ActiveSerialComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -906,7 +905,7 @@ Ports::InputNoArgsPort* ActiveSerialComponentBase :: } Ports::InputNoArgsReturnPort* ActiveSerialComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -917,7 +916,7 @@ Ports::InputNoArgsReturnPort* ActiveSerialComponentBase :: } Ports::InputNoArgsReturnPort* ActiveSerialComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -928,7 +927,7 @@ Ports::InputNoArgsReturnPort* ActiveSerialComponentBase :: } Ports::InputNoArgsPort* ActiveSerialComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -939,7 +938,7 @@ Ports::InputNoArgsPort* ActiveSerialComponentBase :: } Ports::InputTypedPort* ActiveSerialComponentBase :: - get_typedAsync_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsync_InputPorts(), @@ -950,7 +949,7 @@ Ports::InputTypedPort* ActiveSerialComponentBase :: } Ports::InputTypedPort* ActiveSerialComponentBase :: - get_typedAsyncAssert_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncAssert_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncAssert_InputPorts(), @@ -961,7 +960,7 @@ Ports::InputTypedPort* ActiveSerialComponentBase :: } Ports::InputTypedPort* ActiveSerialComponentBase :: - get_typedAsyncBlockPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncBlockPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncBlockPriority_InputPorts(), @@ -972,7 +971,7 @@ Ports::InputTypedPort* ActiveSerialComponentBase :: } Ports::InputTypedPort* ActiveSerialComponentBase :: - get_typedAsyncDropPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncDropPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncDropPriority_InputPorts(), @@ -983,7 +982,7 @@ Ports::InputTypedPort* ActiveSerialComponentBase :: } Ports::InputTypedPort* ActiveSerialComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -994,7 +993,7 @@ Ports::InputTypedPort* ActiveSerialComponentBase :: } Ports::InputTypedReturnPort* ActiveSerialComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -1005,7 +1004,7 @@ Ports::InputTypedReturnPort* ActiveSerialComponentBase :: } Ports::InputTypedReturnPort* ActiveSerialComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -1016,7 +1015,7 @@ Ports::InputTypedReturnPort* ActiveSerialComponentBase :: } Ports::InputTypedPort* ActiveSerialComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -1031,7 +1030,7 @@ Ports::InputTypedPort* ActiveSerialComponentBase :: // ---------------------------------------------------------------------- Fw::InputSerializePort* ActiveSerialComponentBase :: - get_serialAsync_InputPort(NATIVE_INT_TYPE portNum) + get_serialAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_serialAsync_InputPorts(), @@ -1042,7 +1041,7 @@ Fw::InputSerializePort* ActiveSerialComponentBase :: } Fw::InputSerializePort* ActiveSerialComponentBase :: - get_serialAsyncAssert_InputPort(NATIVE_INT_TYPE portNum) + get_serialAsyncAssert_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_serialAsyncAssert_InputPorts(), @@ -1053,7 +1052,7 @@ Fw::InputSerializePort* ActiveSerialComponentBase :: } Fw::InputSerializePort* ActiveSerialComponentBase :: - get_serialAsyncBlockPriority_InputPort(NATIVE_INT_TYPE portNum) + get_serialAsyncBlockPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_serialAsyncBlockPriority_InputPorts(), @@ -1064,7 +1063,7 @@ Fw::InputSerializePort* ActiveSerialComponentBase :: } Fw::InputSerializePort* ActiveSerialComponentBase :: - get_serialAsyncDropPriority_InputPort(NATIVE_INT_TYPE portNum) + get_serialAsyncDropPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_serialAsyncDropPriority_InputPorts(), @@ -1075,7 +1074,7 @@ Fw::InputSerializePort* ActiveSerialComponentBase :: } Fw::InputSerializePort* ActiveSerialComponentBase :: - get_serialGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_serialGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_serialGuarded_InputPorts(), @@ -1086,7 +1085,7 @@ Fw::InputSerializePort* ActiveSerialComponentBase :: } Fw::InputSerializePort* ActiveSerialComponentBase :: - get_serialSync_InputPort(NATIVE_INT_TYPE portNum) + get_serialSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_serialSync_InputPorts(), @@ -1102,7 +1101,7 @@ Fw::InputSerializePort* ActiveSerialComponentBase :: void ActiveSerialComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -1116,7 +1115,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -1130,7 +1129,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -1144,7 +1143,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -1158,7 +1157,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -1174,7 +1173,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -1190,7 +1189,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -1204,7 +1203,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -1222,7 +1221,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -1236,7 +1235,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -1250,7 +1249,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -1264,7 +1263,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -1284,7 +1283,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1298,7 +1297,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1312,7 +1311,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1326,7 +1325,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1342,7 +1341,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1358,7 +1357,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1372,7 +1371,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1394,7 +1393,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1408,7 +1407,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1430,7 +1429,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: set_serialOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPortBase* port ) { @@ -1782,226 +1781,226 @@ ActiveSerialComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_noArgsAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_typedAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_typedAsyncAssert_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_typedAsyncBlockPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_typedAsyncDropPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of serial input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_serialAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialAsync_InputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_serialAsyncAssert_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialAsyncAssert_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialAsyncAssert_InputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_serialAsyncBlockPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialAsyncBlockPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialAsyncBlockPriority_InputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_serialAsyncDropPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialAsyncDropPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialAsyncDropPriority_InputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_serialGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_serialSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of serial output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveSerialComponentBase :: +FwIndexType ActiveSerialComponentBase :: getNum_serialOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -2009,7 +2008,7 @@ NATIVE_INT_TYPE ActiveSerialComponentBase :: // ---------------------------------------------------------------------- bool ActiveSerialComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -2020,7 +2019,7 @@ bool ActiveSerialComponentBase :: } bool ActiveSerialComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -2031,7 +2030,7 @@ bool ActiveSerialComponentBase :: } bool ActiveSerialComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -2042,7 +2041,7 @@ bool ActiveSerialComponentBase :: } bool ActiveSerialComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -2053,7 +2052,7 @@ bool ActiveSerialComponentBase :: } bool ActiveSerialComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -2066,7 +2065,7 @@ bool ActiveSerialComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool ActiveSerialComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -2079,7 +2078,7 @@ bool ActiveSerialComponentBase :: #endif bool ActiveSerialComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -2090,7 +2089,7 @@ bool ActiveSerialComponentBase :: } bool ActiveSerialComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -2105,7 +2104,7 @@ bool ActiveSerialComponentBase :: // ---------------------------------------------------------------------- bool ActiveSerialComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -2116,7 +2115,7 @@ bool ActiveSerialComponentBase :: } bool ActiveSerialComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -2127,7 +2126,7 @@ bool ActiveSerialComponentBase :: } bool ActiveSerialComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -2138,7 +2137,7 @@ bool ActiveSerialComponentBase :: } bool ActiveSerialComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -2153,7 +2152,7 @@ bool ActiveSerialComponentBase :: // ---------------------------------------------------------------------- bool ActiveSerialComponentBase :: - isConnected_serialOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_serialOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_serialOut_OutputPorts(), @@ -2170,7 +2169,7 @@ bool ActiveSerialComponentBase :: // ---------------------------------------------------------------------- void ActiveSerialComponentBase :: - noArgsAsync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsAsync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -2185,7 +2184,7 @@ void ActiveSerialComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(NOARGSASYNC_NOARGS) + static_cast(NOARGSASYNC_NOARGS) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2210,7 +2209,7 @@ void ActiveSerialComponentBase :: } void ActiveSerialComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -2229,7 +2228,7 @@ void ActiveSerialComponentBase :: } U32 ActiveSerialComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -2252,7 +2251,7 @@ U32 ActiveSerialComponentBase :: } U32 ActiveSerialComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -2269,7 +2268,7 @@ U32 ActiveSerialComponentBase :: } void ActiveSerialComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -2283,7 +2282,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2315,7 +2314,7 @@ void ActiveSerialComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNC_TYPED) + static_cast(TYPEDASYNC_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2390,7 +2389,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2422,7 +2421,7 @@ void ActiveSerialComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCASSERT_TYPED) + static_cast(TYPEDASYNCASSERT_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2497,7 +2496,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2529,7 +2528,7 @@ void ActiveSerialComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) + static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2604,7 +2603,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2636,7 +2635,7 @@ void ActiveSerialComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCDROPPRIORITY_TYPED) + static_cast(TYPEDASYNCDROPPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2716,7 +2715,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2753,7 +2752,7 @@ void ActiveSerialComponentBase :: F32 ActiveSerialComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2794,7 +2793,7 @@ F32 ActiveSerialComponentBase :: F32 ActiveSerialComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2829,7 +2828,7 @@ F32 ActiveSerialComponentBase :: void ActiveSerialComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2866,7 +2865,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: serialAsync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -2883,7 +2882,7 @@ void ActiveSerialComponentBase :: // Serialize message ID _status = msgSerBuff.serialize( - static_cast(SERIALASYNC_SERIAL) + static_cast(SERIALASYNC_SERIAL) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2916,7 +2915,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: serialAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -2933,7 +2932,7 @@ void ActiveSerialComponentBase :: // Serialize message ID _status = msgSerBuff.serialize( - static_cast(SERIALASYNCASSERT_SERIAL) + static_cast(SERIALASYNCASSERT_SERIAL) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2966,7 +2965,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: serialAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -2983,7 +2982,7 @@ void ActiveSerialComponentBase :: // Serialize message ID _status = msgSerBuff.serialize( - static_cast(SERIALASYNCBLOCKPRIORITY_SERIAL) + static_cast(SERIALASYNCBLOCKPRIORITY_SERIAL) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -3016,7 +3015,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: serialAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -3033,7 +3032,7 @@ void ActiveSerialComponentBase :: // Serialize message ID _status = msgSerBuff.serialize( - static_cast(SERIALASYNCDROPPRIORITY_SERIAL) + static_cast(SERIALASYNCDROPPRIORITY_SERIAL) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -3071,7 +3070,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: serialGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -3096,7 +3095,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: serialSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -3122,14 +3121,14 @@ void ActiveSerialComponentBase :: // ---------------------------------------------------------------------- void ActiveSerialComponentBase :: - noArgsAsync_preMsgHook(NATIVE_INT_TYPE portNum) + noArgsAsync_preMsgHook(FwIndexType portNum) { // Default: no-op } void ActiveSerialComponentBase :: typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3144,7 +3143,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3159,7 +3158,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3174,7 +3173,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3197,7 +3196,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: serialAsync_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -3206,7 +3205,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: serialAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -3215,7 +3214,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: serialAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -3224,7 +3223,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: serialAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -3236,7 +3235,7 @@ void ActiveSerialComponentBase :: // ---------------------------------------------------------------------- void ActiveSerialComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -3246,7 +3245,7 @@ void ActiveSerialComponentBase :: } U32 ActiveSerialComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -3257,7 +3256,7 @@ U32 ActiveSerialComponentBase :: void ActiveSerialComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3284,7 +3283,7 @@ void ActiveSerialComponentBase :: F32 ActiveSerialComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3315,7 +3314,7 @@ F32 ActiveSerialComponentBase :: Fw::SerializeStatus ActiveSerialComponentBase :: serialOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -3339,14 +3338,14 @@ void ActiveSerialComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALARRAY)); + _status = msg.serialize(static_cast(INT_IF_INTERNALARRAY)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3375,14 +3374,14 @@ void ActiveSerialComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALENUM)); + _status = msg.serialize(static_cast(INT_IF_INTERNALENUM)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3415,14 +3414,14 @@ void ActiveSerialComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALPRIMITIVE)); + _status = msg.serialize(static_cast(INT_IF_INTERNALPRIMITIVE)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3463,14 +3462,14 @@ void ActiveSerialComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALPRIORITYDROP)); + _status = msg.serialize(static_cast(INT_IF_INTERNALPRIORITYDROP)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3501,14 +3500,14 @@ void ActiveSerialComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALSTRING)); + _status = msg.serialize(static_cast(INT_IF_INTERNALSTRING)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3543,14 +3542,14 @@ void ActiveSerialComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALSTRUCT)); + _status = msg.serialize(static_cast(INT_IF_INTERNALSTRUCT)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -4242,14 +4241,14 @@ void ActiveSerialComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_ASYNC)); + _status = msg.serialize(static_cast(CMD_CMD_ASYNC)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -4301,14 +4300,14 @@ void ActiveSerialComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_PRIORITY)); + _status = msg.serialize(static_cast(CMD_CMD_PRIORITY)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -4360,14 +4359,14 @@ void ActiveSerialComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY)); + _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -4419,14 +4418,14 @@ void ActiveSerialComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_DROP)); + _status = msg.serialize(static_cast(CMD_CMD_DROP)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -4483,14 +4482,14 @@ void ActiveSerialComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY_DROP)); + _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY_DROP)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -5817,7 +5816,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveSerialComponentBase :: { U8 msgBuff[this->m_msgSize]; Fw::ExternalSerializeBuffer msg(msgBuff,this->m_msgSize); - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -5832,7 +5831,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveSerialComponentBase :: // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -5845,7 +5844,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveSerialComponentBase :: return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -6669,7 +6668,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveSerialComponentBase :: void ActiveSerialComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -6965,7 +6964,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -6976,7 +6975,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -6987,7 +6986,7 @@ void ActiveSerialComponentBase :: U32 ActiveSerialComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -6998,7 +6997,7 @@ U32 ActiveSerialComponentBase :: U32 ActiveSerialComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -7009,7 +7008,7 @@ U32 ActiveSerialComponentBase :: void ActiveSerialComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -7020,7 +7019,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -7047,7 +7046,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -7074,7 +7073,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -7101,7 +7100,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -7128,7 +7127,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -7155,7 +7154,7 @@ void ActiveSerialComponentBase :: F32 ActiveSerialComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -7182,7 +7181,7 @@ F32 ActiveSerialComponentBase :: F32 ActiveSerialComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -7209,7 +7208,7 @@ F32 ActiveSerialComponentBase :: void ActiveSerialComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -7242,7 +7241,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: m_p_serialAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -7257,7 +7256,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: m_p_serialAsyncAssert_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -7272,7 +7271,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: m_p_serialAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -7287,7 +7286,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: m_p_serialAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -7302,7 +7301,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: m_p_serialGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -7317,7 +7316,7 @@ void ActiveSerialComponentBase :: void ActiveSerialComponentBase :: m_p_serialSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp index 4e5f434ed..646026a7f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp @@ -204,9 +204,9 @@ class ActiveSerialComponentBase : //! Initialize ActiveSerialComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE msgSize, //!< The message size - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType msgSize, //!< The message size + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -219,7 +219,7 @@ class ActiveSerialComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -232,91 +232,91 @@ class ActiveSerialComponentBase : //! //! \return noArgsAsync[portNum] Ports::InputNoArgsPort* get_noArgsAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsync[portNum] Ports::InputTypedPort* get_typedAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncAssert[portNum] Ports::InputTypedPort* get_typedAsyncAssert_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncBlockPriority[portNum] Ports::InputTypedPort* get_typedAsyncBlockPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncDropPriority[portNum] Ports::InputTypedPort* get_typedAsyncDropPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -329,42 +329,42 @@ class ActiveSerialComponentBase : //! //! \return serialAsync[portNum] Fw::InputSerializePort* get_serialAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get serial input port at index //! //! \return serialAsyncAssert[portNum] Fw::InputSerializePort* get_serialAsyncAssert_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get serial input port at index //! //! \return serialAsyncBlockPriority[portNum] Fw::InputSerializePort* get_serialAsyncBlockPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get serial input port at index //! //! \return serialAsyncDropPriority[portNum] Fw::InputSerializePort* get_serialAsyncDropPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get serial input port at index //! //! \return serialGuarded[portNum] Fw::InputSerializePort* get_serialGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get serial input port at index //! //! \return serialSync[portNum] Fw::InputSerializePort* get_serialSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -375,31 +375,31 @@ class ActiveSerialComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); @@ -407,7 +407,7 @@ class ActiveSerialComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -415,13 +415,13 @@ class ActiveSerialComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -433,25 +433,25 @@ class ActiveSerialComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -465,25 +465,25 @@ class ActiveSerialComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -491,7 +491,7 @@ class ActiveSerialComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -499,13 +499,13 @@ class ActiveSerialComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -521,13 +521,13 @@ class ActiveSerialComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -543,7 +543,7 @@ class ActiveSerialComponentBase : //! Connect port to serialOut[portNum] void set_serialOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPortBase* port //!< The port ); @@ -594,7 +594,7 @@ class ActiveSerialComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; PROTECTED: @@ -605,67 +605,67 @@ class ActiveSerialComponentBase : //! Get the number of noArgsAsync input ports //! //! \return The number of noArgsAsync input ports - NATIVE_INT_TYPE getNum_noArgsAsync_InputPorts() const; + FwIndexType getNum_noArgsAsync_InputPorts() const; //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedAsync input ports //! //! \return The number of typedAsync input ports - NATIVE_INT_TYPE getNum_typedAsync_InputPorts() const; + FwIndexType getNum_typedAsync_InputPorts() const; //! Get the number of typedAsyncAssert input ports //! //! \return The number of typedAsyncAssert input ports - NATIVE_INT_TYPE getNum_typedAsyncAssert_InputPorts() const; + FwIndexType getNum_typedAsyncAssert_InputPorts() const; //! Get the number of typedAsyncBlockPriority input ports //! //! \return The number of typedAsyncBlockPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncBlockPriority_InputPorts() const; + FwIndexType getNum_typedAsyncBlockPriority_InputPorts() const; //! Get the number of typedAsyncDropPriority input ports //! //! \return The number of typedAsyncDropPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncDropPriority_InputPorts() const; + FwIndexType getNum_typedAsyncDropPriority_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -676,32 +676,32 @@ class ActiveSerialComponentBase : //! Get the number of serialAsync input ports //! //! \return The number of serialAsync input ports - NATIVE_INT_TYPE getNum_serialAsync_InputPorts() const; + FwIndexType getNum_serialAsync_InputPorts() const; //! Get the number of serialAsyncAssert input ports //! //! \return The number of serialAsyncAssert input ports - NATIVE_INT_TYPE getNum_serialAsyncAssert_InputPorts() const; + FwIndexType getNum_serialAsyncAssert_InputPorts() const; //! Get the number of serialAsyncBlockPriority input ports //! //! \return The number of serialAsyncBlockPriority input ports - NATIVE_INT_TYPE getNum_serialAsyncBlockPriority_InputPorts() const; + FwIndexType getNum_serialAsyncBlockPriority_InputPorts() const; //! Get the number of serialAsyncDropPriority input ports //! //! \return The number of serialAsyncDropPriority input ports - NATIVE_INT_TYPE getNum_serialAsyncDropPriority_InputPorts() const; + FwIndexType getNum_serialAsyncDropPriority_InputPorts() const; //! Get the number of serialGuarded input ports //! //! \return The number of serialGuarded input ports - NATIVE_INT_TYPE getNum_serialGuarded_InputPorts() const; + FwIndexType getNum_serialGuarded_InputPorts() const; //! Get the number of serialSync input ports //! //! \return The number of serialSync input ports - NATIVE_INT_TYPE getNum_serialSync_InputPorts() const; + FwIndexType getNum_serialSync_InputPorts() const; PROTECTED: @@ -712,46 +712,46 @@ class ActiveSerialComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -762,22 +762,22 @@ class ActiveSerialComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -788,7 +788,7 @@ class ActiveSerialComponentBase : //! Get the number of serialOut output ports //! //! \return The number of serialOut output ports - NATIVE_INT_TYPE getNum_serialOut_OutputPorts() const; + FwIndexType getNum_serialOut_OutputPorts() const; PROTECTED: @@ -800,35 +800,35 @@ class ActiveSerialComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -837,7 +837,7 @@ class ActiveSerialComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -846,14 +846,14 @@ class ActiveSerialComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -866,28 +866,28 @@ class ActiveSerialComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -900,7 +900,7 @@ class ActiveSerialComponentBase : //! //! \return Whether port serialOut is connected bool isConnected_serialOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -911,32 +911,32 @@ class ActiveSerialComponentBase : //! Handler for input port noArgsAsync virtual void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedAsync virtual void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -948,7 +948,7 @@ class ActiveSerialComponentBase : //! Handler for input port typedAsyncAssert virtual void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -960,7 +960,7 @@ class ActiveSerialComponentBase : //! Handler for input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -972,7 +972,7 @@ class ActiveSerialComponentBase : //! Handler for input port typedAsyncDropPriority virtual void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -984,7 +984,7 @@ class ActiveSerialComponentBase : //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -996,7 +996,7 @@ class ActiveSerialComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1008,7 +1008,7 @@ class ActiveSerialComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1020,7 +1020,7 @@ class ActiveSerialComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1040,32 +1040,32 @@ class ActiveSerialComponentBase : //! Handler base-class function for input port noArgsAsync void noArgsAsync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedAsync void typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1077,7 +1077,7 @@ class ActiveSerialComponentBase : //! Handler base-class function for input port typedAsyncAssert void typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1089,7 +1089,7 @@ class ActiveSerialComponentBase : //! Handler base-class function for input port typedAsyncBlockPriority void typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1101,7 +1101,7 @@ class ActiveSerialComponentBase : //! Handler base-class function for input port typedAsyncDropPriority void typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1113,7 +1113,7 @@ class ActiveSerialComponentBase : //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1125,7 +1125,7 @@ class ActiveSerialComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1137,7 +1137,7 @@ class ActiveSerialComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1149,7 +1149,7 @@ class ActiveSerialComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1167,37 +1167,37 @@ class ActiveSerialComponentBase : //! Handler for input port serialAsync virtual void serialAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) = 0; //! Handler for input port serialAsyncAssert virtual void serialAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) = 0; //! Handler for input port serialAsyncBlockPriority virtual void serialAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) = 0; //! Handler for input port serialAsyncDropPriority virtual void serialAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) = 0; //! Handler for input port serialGuarded virtual void serialGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) = 0; //! Handler for input port serialSync virtual void serialSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) = 0; @@ -1211,37 +1211,37 @@ class ActiveSerialComponentBase : //! Handler base-class function for input port serialAsync void serialAsync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Handler base-class function for input port serialAsyncAssert void serialAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Handler base-class function for input port serialAsyncBlockPriority void serialAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Handler base-class function for input port serialAsyncDropPriority void serialAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Handler base-class function for input port serialGuarded void serialGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Handler base-class function for input port serialSync void serialSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); @@ -1257,12 +1257,12 @@ class ActiveSerialComponentBase : //! Pre-message hook for async input port noArgsAsync virtual void noArgsAsync_preMsgHook( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Pre-message hook for async input port typedAsync virtual void typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1274,7 +1274,7 @@ class ActiveSerialComponentBase : //! Pre-message hook for async input port typedAsyncAssert virtual void typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1286,7 +1286,7 @@ class ActiveSerialComponentBase : //! Pre-message hook for async input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1298,7 +1298,7 @@ class ActiveSerialComponentBase : //! Pre-message hook for async input port typedAsyncDropPriority virtual void typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1320,25 +1320,25 @@ class ActiveSerialComponentBase : //! Pre-message hook for async input port serialAsync virtual void serialAsync_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Pre-message hook for async input port serialAsyncAssert virtual void serialAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Pre-message hook for async input port serialAsyncBlockPriority virtual void serialAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Pre-message hook for async input port serialAsyncDropPriority virtual void serialAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); @@ -1350,17 +1350,17 @@ class ActiveSerialComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1372,7 +1372,7 @@ class ActiveSerialComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1390,7 +1390,7 @@ class ActiveSerialComponentBase : //! Invoke output port serialOut Fw::SerializeStatus serialOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); @@ -2132,7 +2132,7 @@ class ActiveSerialComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -2147,37 +2147,37 @@ class ActiveSerialComponentBase : //! Callback for port noArgsAsync static void m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedAsync static void m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2190,7 +2190,7 @@ class ActiveSerialComponentBase : //! Callback for port typedAsyncAssert static void m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2203,7 +2203,7 @@ class ActiveSerialComponentBase : //! Callback for port typedAsyncBlockPriority static void m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2216,7 +2216,7 @@ class ActiveSerialComponentBase : //! Callback for port typedAsyncDropPriority static void m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2229,7 +2229,7 @@ class ActiveSerialComponentBase : //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2242,7 +2242,7 @@ class ActiveSerialComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2255,7 +2255,7 @@ class ActiveSerialComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2268,7 +2268,7 @@ class ActiveSerialComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2289,42 +2289,42 @@ class ActiveSerialComponentBase : //! Callback for port serialAsync static void m_p_serialAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Callback for port serialAsyncAssert static void m_p_serialAsyncAssert_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Callback for port serialAsyncBlockPriority static void m_p_serialAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Callback for port serialAsyncDropPriority static void m_p_serialAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Callback for port serialGuarded static void m_p_serialGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Callback for port serialSync static void m_p_serialSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); @@ -2560,13 +2560,13 @@ class ActiveSerialComponentBase : // ---------------------------------------------------------------------- //! Throttle for EventActivityLowThrottled - NATIVE_UINT_TYPE m_EventActivityLowThrottledThrottle; + FwIndexType m_EventActivityLowThrottledThrottle; //! Throttle for EventFatalThrottled - NATIVE_UINT_TYPE m_EventFatalThrottledThrottle; + FwIndexType m_EventFatalThrottledThrottle; //! Throttle for EventWarningLowThrottled - NATIVE_UINT_TYPE m_EventWarningLowThrottledThrottle; + FwIndexType m_EventWarningLowThrottledThrottle; PRIVATE: @@ -2656,7 +2656,7 @@ class ActiveSerialComponentBase : PRIVATE: //! Stores max message size - NATIVE_INT_TYPE m_msgSize; + FwSizeType m_msgSize; PRIVATE: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.cpp index d2972f10a..8e0398cdd 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.cpp @@ -44,11 +44,11 @@ namespace { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = sizeof(BuffUnion) + - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -227,8 +227,8 @@ Fw::SerializeStatus ActiveSyncProductsComponentBase::DpContainer :: void ActiveSyncProductsComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwEnumStoreType instance ) { // Initialize base class @@ -236,8 +236,8 @@ void ActiveSyncProductsComponentBase :: // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -260,8 +260,8 @@ void ActiveSyncProductsComponentBase :: // Connect input port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRecvIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRecvIn_InputPorts()); port++ ) { this->m_productRecvIn_InputPort[port].init(); @@ -284,8 +284,8 @@ void ActiveSyncProductsComponentBase :: // Connect input port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsAsync_InputPorts()); port++ ) { this->m_noArgsAsync_InputPort[port].init(); @@ -308,8 +308,8 @@ void ActiveSyncProductsComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -332,8 +332,8 @@ void ActiveSyncProductsComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -356,8 +356,8 @@ void ActiveSyncProductsComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -380,8 +380,8 @@ void ActiveSyncProductsComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -404,8 +404,8 @@ void ActiveSyncProductsComponentBase :: // Connect input port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsync_InputPorts()); port++ ) { this->m_typedAsync_InputPort[port].init(); @@ -428,8 +428,8 @@ void ActiveSyncProductsComponentBase :: // Connect input port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); port++ ) { this->m_typedAsyncAssert_InputPort[port].init(); @@ -452,8 +452,8 @@ void ActiveSyncProductsComponentBase :: // Connect input port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); port++ ) { this->m_typedAsyncBlockPriority_InputPort[port].init(); @@ -476,8 +476,8 @@ void ActiveSyncProductsComponentBase :: // Connect input port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); port++ ) { this->m_typedAsyncDropPriority_InputPort[port].init(); @@ -500,8 +500,8 @@ void ActiveSyncProductsComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -524,8 +524,8 @@ void ActiveSyncProductsComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -548,8 +548,8 @@ void ActiveSyncProductsComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -572,8 +572,8 @@ void ActiveSyncProductsComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -596,8 +596,8 @@ void ActiveSyncProductsComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -615,8 +615,8 @@ void ActiveSyncProductsComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -634,8 +634,8 @@ void ActiveSyncProductsComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -653,8 +653,8 @@ void ActiveSyncProductsComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -672,8 +672,8 @@ void ActiveSyncProductsComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -691,8 +691,8 @@ void ActiveSyncProductsComponentBase :: // Connect output port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRequestOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRequestOut_OutputPorts()); port++ ) { this->m_productRequestOut_OutputPort[port].init(); @@ -710,8 +710,8 @@ void ActiveSyncProductsComponentBase :: // Connect output port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productSendOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productSendOut_OutputPorts()); port++ ) { this->m_productSendOut_OutputPort[port].init(); @@ -730,8 +730,8 @@ void ActiveSyncProductsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -750,8 +750,8 @@ void ActiveSyncProductsComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -769,8 +769,8 @@ void ActiveSyncProductsComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -788,8 +788,8 @@ void ActiveSyncProductsComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -807,8 +807,8 @@ void ActiveSyncProductsComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -826,8 +826,8 @@ void ActiveSyncProductsComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -845,8 +845,8 @@ void ActiveSyncProductsComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -877,7 +877,7 @@ void ActiveSyncProductsComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* ActiveSyncProductsComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -888,7 +888,7 @@ Fw::InputCmdPort* ActiveSyncProductsComponentBase :: } Fw::InputDpResponsePort* ActiveSyncProductsComponentBase :: - get_productRecvIn_InputPort(NATIVE_INT_TYPE portNum) + get_productRecvIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRecvIn_InputPorts(), @@ -903,7 +903,7 @@ Fw::InputDpResponsePort* ActiveSyncProductsComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* ActiveSyncProductsComponentBase :: - get_noArgsAsync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsAsync_InputPorts(), @@ -914,7 +914,7 @@ Ports::InputNoArgsPort* ActiveSyncProductsComponentBase :: } Ports::InputNoArgsPort* ActiveSyncProductsComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -925,7 +925,7 @@ Ports::InputNoArgsPort* ActiveSyncProductsComponentBase :: } Ports::InputNoArgsReturnPort* ActiveSyncProductsComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -936,7 +936,7 @@ Ports::InputNoArgsReturnPort* ActiveSyncProductsComponentBase :: } Ports::InputNoArgsReturnPort* ActiveSyncProductsComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -947,7 +947,7 @@ Ports::InputNoArgsReturnPort* ActiveSyncProductsComponentBase :: } Ports::InputNoArgsPort* ActiveSyncProductsComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -958,7 +958,7 @@ Ports::InputNoArgsPort* ActiveSyncProductsComponentBase :: } Ports::InputTypedPort* ActiveSyncProductsComponentBase :: - get_typedAsync_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsync_InputPorts(), @@ -969,7 +969,7 @@ Ports::InputTypedPort* ActiveSyncProductsComponentBase :: } Ports::InputTypedPort* ActiveSyncProductsComponentBase :: - get_typedAsyncAssert_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncAssert_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncAssert_InputPorts(), @@ -980,7 +980,7 @@ Ports::InputTypedPort* ActiveSyncProductsComponentBase :: } Ports::InputTypedPort* ActiveSyncProductsComponentBase :: - get_typedAsyncBlockPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncBlockPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncBlockPriority_InputPorts(), @@ -991,7 +991,7 @@ Ports::InputTypedPort* ActiveSyncProductsComponentBase :: } Ports::InputTypedPort* ActiveSyncProductsComponentBase :: - get_typedAsyncDropPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncDropPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncDropPriority_InputPorts(), @@ -1002,7 +1002,7 @@ Ports::InputTypedPort* ActiveSyncProductsComponentBase :: } Ports::InputTypedPort* ActiveSyncProductsComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -1013,7 +1013,7 @@ Ports::InputTypedPort* ActiveSyncProductsComponentBase :: } Ports::InputTypedReturnPort* ActiveSyncProductsComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -1024,7 +1024,7 @@ Ports::InputTypedReturnPort* ActiveSyncProductsComponentBase :: } Ports::InputTypedReturnPort* ActiveSyncProductsComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -1035,7 +1035,7 @@ Ports::InputTypedReturnPort* ActiveSyncProductsComponentBase :: } Ports::InputTypedPort* ActiveSyncProductsComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -1051,7 +1051,7 @@ Ports::InputTypedPort* ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -1065,7 +1065,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -1079,7 +1079,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -1093,7 +1093,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -1107,7 +1107,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -1121,7 +1121,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpRequestPort* port ) { @@ -1135,7 +1135,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpSendPort* port ) { @@ -1151,7 +1151,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -1167,7 +1167,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -1181,7 +1181,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -1199,7 +1199,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -1213,7 +1213,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -1227,7 +1227,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -1241,7 +1241,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -1261,7 +1261,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1275,7 +1275,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1289,7 +1289,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1303,7 +1303,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1317,7 +1317,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1331,7 +1331,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1347,7 +1347,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1363,7 +1363,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1377,7 +1377,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1399,7 +1399,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1413,7 +1413,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1448,194 +1448,194 @@ ActiveSyncProductsComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_productRecvIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_noArgsAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); } -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_typedAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); } -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_typedAsyncAssert_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); } -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_typedAsyncBlockPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); } -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_typedAsyncDropPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); } -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_productRequestOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); } -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_productSendOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: +FwIndexType ActiveSyncProductsComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1643,7 +1643,7 @@ NATIVE_INT_TYPE ActiveSyncProductsComponentBase :: // ---------------------------------------------------------------------- bool ActiveSyncProductsComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1654,7 +1654,7 @@ bool ActiveSyncProductsComponentBase :: } bool ActiveSyncProductsComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1665,7 +1665,7 @@ bool ActiveSyncProductsComponentBase :: } bool ActiveSyncProductsComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1676,7 +1676,7 @@ bool ActiveSyncProductsComponentBase :: } bool ActiveSyncProductsComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1687,7 +1687,7 @@ bool ActiveSyncProductsComponentBase :: } bool ActiveSyncProductsComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1698,7 +1698,7 @@ bool ActiveSyncProductsComponentBase :: } bool ActiveSyncProductsComponentBase :: - isConnected_productRequestOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productRequestOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRequestOut_OutputPorts(), @@ -1709,7 +1709,7 @@ bool ActiveSyncProductsComponentBase :: } bool ActiveSyncProductsComponentBase :: - isConnected_productSendOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productSendOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productSendOut_OutputPorts(), @@ -1722,7 +1722,7 @@ bool ActiveSyncProductsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool ActiveSyncProductsComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1735,7 +1735,7 @@ bool ActiveSyncProductsComponentBase :: #endif bool ActiveSyncProductsComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1746,7 +1746,7 @@ bool ActiveSyncProductsComponentBase :: } bool ActiveSyncProductsComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1761,7 +1761,7 @@ bool ActiveSyncProductsComponentBase :: // ---------------------------------------------------------------------- bool ActiveSyncProductsComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1772,7 +1772,7 @@ bool ActiveSyncProductsComponentBase :: } bool ActiveSyncProductsComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1783,7 +1783,7 @@ bool ActiveSyncProductsComponentBase :: } bool ActiveSyncProductsComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1794,7 +1794,7 @@ bool ActiveSyncProductsComponentBase :: } bool ActiveSyncProductsComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1812,7 +1812,7 @@ bool ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -1840,7 +1840,7 @@ void ActiveSyncProductsComponentBase :: // ---------------------------------------------------------------------- void ActiveSyncProductsComponentBase :: - noArgsAsync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsAsync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1855,7 +1855,7 @@ void ActiveSyncProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(NOARGSASYNC_NOARGS) + static_cast(NOARGSASYNC_NOARGS) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1880,7 +1880,7 @@ void ActiveSyncProductsComponentBase :: } void ActiveSyncProductsComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1899,7 +1899,7 @@ void ActiveSyncProductsComponentBase :: } U32 ActiveSyncProductsComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1922,7 +1922,7 @@ U32 ActiveSyncProductsComponentBase :: } U32 ActiveSyncProductsComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1939,7 +1939,7 @@ U32 ActiveSyncProductsComponentBase :: } void ActiveSyncProductsComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1953,7 +1953,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1985,7 +1985,7 @@ void ActiveSyncProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNC_TYPED) + static_cast(TYPEDASYNC_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2060,7 +2060,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2092,7 +2092,7 @@ void ActiveSyncProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCASSERT_TYPED) + static_cast(TYPEDASYNCASSERT_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2167,7 +2167,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2199,7 +2199,7 @@ void ActiveSyncProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) + static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2274,7 +2274,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2306,7 +2306,7 @@ void ActiveSyncProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCDROPPRIORITY_TYPED) + static_cast(TYPEDASYNCDROPPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2386,7 +2386,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2423,7 +2423,7 @@ void ActiveSyncProductsComponentBase :: F32 ActiveSyncProductsComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2464,7 +2464,7 @@ F32 ActiveSyncProductsComponentBase :: F32 ActiveSyncProductsComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2499,7 +2499,7 @@ F32 ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2538,7 +2538,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -2556,14 +2556,14 @@ void ActiveSyncProductsComponentBase :: // ---------------------------------------------------------------------- void ActiveSyncProductsComponentBase :: - noArgsAsync_preMsgHook(NATIVE_INT_TYPE portNum) + noArgsAsync_preMsgHook(FwIndexType portNum) { // Default: no-op } void ActiveSyncProductsComponentBase :: typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2578,7 +2578,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2593,7 +2593,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2608,7 +2608,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2627,7 +2627,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: productRequestOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -2644,7 +2644,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: productSendOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -2664,7 +2664,7 @@ void ActiveSyncProductsComponentBase :: // ---------------------------------------------------------------------- void ActiveSyncProductsComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -2674,7 +2674,7 @@ void ActiveSyncProductsComponentBase :: } U32 ActiveSyncProductsComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -2685,7 +2685,7 @@ U32 ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2712,7 +2712,7 @@ void ActiveSyncProductsComponentBase :: F32 ActiveSyncProductsComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2811,7 +2811,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveSyncProductsComponentBase :: doDispatch() { ComponentIpcSerializableBuffer msg; - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -2826,7 +2826,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveSyncProductsComponentBase :: // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -2839,7 +2839,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveSyncProductsComponentBase :: return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -3157,7 +3157,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -3172,7 +3172,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -3195,7 +3195,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3206,7 +3206,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3217,7 +3217,7 @@ void ActiveSyncProductsComponentBase :: U32 ActiveSyncProductsComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3228,7 +3228,7 @@ U32 ActiveSyncProductsComponentBase :: U32 ActiveSyncProductsComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3239,7 +3239,7 @@ U32 ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3250,7 +3250,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3277,7 +3277,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3304,7 +3304,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3331,7 +3331,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3358,7 +3358,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3385,7 +3385,7 @@ void ActiveSyncProductsComponentBase :: F32 ActiveSyncProductsComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3412,7 +3412,7 @@ F32 ActiveSyncProductsComponentBase :: F32 ActiveSyncProductsComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3439,7 +3439,7 @@ F32 ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3480,7 +3480,7 @@ void ActiveSyncProductsComponentBase :: void ActiveSyncProductsComponentBase :: productRecvIn_handler( - const NATIVE_INT_TYPE portNum, + const FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp index 7a478ed8c..9f882711e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp @@ -209,8 +209,8 @@ class ActiveSyncProductsComponentBase : //! Initialize ActiveSyncProductsComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -223,14 +223,14 @@ class ActiveSyncProductsComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get special input port at index //! //! \return productRecvIn[portNum] Fw::InputDpResponsePort* get_productRecvIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -243,91 +243,91 @@ class ActiveSyncProductsComponentBase : //! //! \return noArgsAsync[portNum] Ports::InputNoArgsPort* get_noArgsAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsync[portNum] Ports::InputTypedPort* get_typedAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncAssert[portNum] Ports::InputTypedPort* get_typedAsyncAssert_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncBlockPriority[portNum] Ports::InputTypedPort* get_typedAsyncBlockPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncDropPriority[portNum] Ports::InputTypedPort* get_typedAsyncDropPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -338,43 +338,43 @@ class ActiveSyncProductsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpRequestPort* port //!< The input port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpSendPort* port //!< The input port ); @@ -382,7 +382,7 @@ class ActiveSyncProductsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -390,13 +390,13 @@ class ActiveSyncProductsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -408,25 +408,25 @@ class ActiveSyncProductsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -440,37 +440,37 @@ class ActiveSyncProductsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -478,7 +478,7 @@ class ActiveSyncProductsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -486,13 +486,13 @@ class ActiveSyncProductsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -508,13 +508,13 @@ class ActiveSyncProductsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -543,12 +543,12 @@ class ActiveSyncProductsComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; //! Get the number of productRecvIn input ports //! //! \return The number of productRecvIn input ports - NATIVE_INT_TYPE getNum_productRecvIn_InputPorts() const; + FwIndexType getNum_productRecvIn_InputPorts() const; PROTECTED: @@ -559,67 +559,67 @@ class ActiveSyncProductsComponentBase : //! Get the number of noArgsAsync input ports //! //! \return The number of noArgsAsync input ports - NATIVE_INT_TYPE getNum_noArgsAsync_InputPorts() const; + FwIndexType getNum_noArgsAsync_InputPorts() const; //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedAsync input ports //! //! \return The number of typedAsync input ports - NATIVE_INT_TYPE getNum_typedAsync_InputPorts() const; + FwIndexType getNum_typedAsync_InputPorts() const; //! Get the number of typedAsyncAssert input ports //! //! \return The number of typedAsyncAssert input ports - NATIVE_INT_TYPE getNum_typedAsyncAssert_InputPorts() const; + FwIndexType getNum_typedAsyncAssert_InputPorts() const; //! Get the number of typedAsyncBlockPriority input ports //! //! \return The number of typedAsyncBlockPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncBlockPriority_InputPorts() const; + FwIndexType getNum_typedAsyncBlockPriority_InputPorts() const; //! Get the number of typedAsyncDropPriority input ports //! //! \return The number of typedAsyncDropPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncDropPriority_InputPorts() const; + FwIndexType getNum_typedAsyncDropPriority_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -630,56 +630,56 @@ class ActiveSyncProductsComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; //! Get the number of productRequestOut output ports //! //! \return The number of productRequestOut output ports - NATIVE_INT_TYPE getNum_productRequestOut_OutputPorts() const; + FwIndexType getNum_productRequestOut_OutputPorts() const; //! Get the number of productSendOut output ports //! //! \return The number of productSendOut output ports - NATIVE_INT_TYPE getNum_productSendOut_OutputPorts() const; + FwIndexType getNum_productSendOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -690,22 +690,22 @@ class ActiveSyncProductsComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -717,49 +717,49 @@ class ActiveSyncProductsComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productRequestOut is connected //! //! \return Whether port productRequestOut is connected bool isConnected_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productSendOut is connected //! //! \return Whether port productSendOut is connected bool isConnected_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -768,7 +768,7 @@ class ActiveSyncProductsComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -777,14 +777,14 @@ class ActiveSyncProductsComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -797,28 +797,28 @@ class ActiveSyncProductsComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -831,7 +831,7 @@ class ActiveSyncProductsComponentBase : //! Handler base-class function for input port productRecvIn void productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -845,32 +845,32 @@ class ActiveSyncProductsComponentBase : //! Handler for input port noArgsAsync virtual void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedAsync virtual void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -882,7 +882,7 @@ class ActiveSyncProductsComponentBase : //! Handler for input port typedAsyncAssert virtual void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -894,7 +894,7 @@ class ActiveSyncProductsComponentBase : //! Handler for input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -906,7 +906,7 @@ class ActiveSyncProductsComponentBase : //! Handler for input port typedAsyncDropPriority virtual void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -918,7 +918,7 @@ class ActiveSyncProductsComponentBase : //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -930,7 +930,7 @@ class ActiveSyncProductsComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -942,7 +942,7 @@ class ActiveSyncProductsComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -954,7 +954,7 @@ class ActiveSyncProductsComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -974,32 +974,32 @@ class ActiveSyncProductsComponentBase : //! Handler base-class function for input port noArgsAsync void noArgsAsync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedAsync void typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1011,7 +1011,7 @@ class ActiveSyncProductsComponentBase : //! Handler base-class function for input port typedAsyncAssert void typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1023,7 +1023,7 @@ class ActiveSyncProductsComponentBase : //! Handler base-class function for input port typedAsyncBlockPriority void typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1035,7 +1035,7 @@ class ActiveSyncProductsComponentBase : //! Handler base-class function for input port typedAsyncDropPriority void typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1047,7 +1047,7 @@ class ActiveSyncProductsComponentBase : //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1059,7 +1059,7 @@ class ActiveSyncProductsComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1071,7 +1071,7 @@ class ActiveSyncProductsComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1083,7 +1083,7 @@ class ActiveSyncProductsComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1105,7 +1105,7 @@ class ActiveSyncProductsComponentBase : //! Pre-message hook for async input port productRecvIn virtual void productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -1123,12 +1123,12 @@ class ActiveSyncProductsComponentBase : //! Pre-message hook for async input port noArgsAsync virtual void noArgsAsync_preMsgHook( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Pre-message hook for async input port typedAsync virtual void typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1140,7 +1140,7 @@ class ActiveSyncProductsComponentBase : //! Pre-message hook for async input port typedAsyncAssert virtual void typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1152,7 +1152,7 @@ class ActiveSyncProductsComponentBase : //! Pre-message hook for async input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1164,7 +1164,7 @@ class ActiveSyncProductsComponentBase : //! Pre-message hook for async input port typedAsyncDropPriority virtual void typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1182,14 +1182,14 @@ class ActiveSyncProductsComponentBase : //! Invoke output port productRequestOut void productRequestOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); //! Invoke output port productSendOut void productSendOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -1202,17 +1202,17 @@ class ActiveSyncProductsComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1224,7 +1224,7 @@ class ActiveSyncProductsComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1361,7 +1361,7 @@ class ActiveSyncProductsComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -1370,7 +1370,7 @@ class ActiveSyncProductsComponentBase : //! Callback for port productRecvIn static void m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -1385,37 +1385,37 @@ class ActiveSyncProductsComponentBase : //! Callback for port noArgsAsync static void m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedAsync static void m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1428,7 +1428,7 @@ class ActiveSyncProductsComponentBase : //! Callback for port typedAsyncAssert static void m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1441,7 +1441,7 @@ class ActiveSyncProductsComponentBase : //! Callback for port typedAsyncBlockPriority static void m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1454,7 +1454,7 @@ class ActiveSyncProductsComponentBase : //! Callback for port typedAsyncDropPriority static void m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1467,7 +1467,7 @@ class ActiveSyncProductsComponentBase : //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1480,7 +1480,7 @@ class ActiveSyncProductsComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1493,7 +1493,7 @@ class ActiveSyncProductsComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1506,7 +1506,7 @@ class ActiveSyncProductsComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1530,7 +1530,7 @@ class ActiveSyncProductsComponentBase : //! Handler implementation for productRecvIn void productRecvIn_handler( - const NATIVE_INT_TYPE portNum, //!< The port number + const FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container id const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The buffer status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTelemetryComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTelemetryComponentAc.ref.cpp index fff232bf0..3a2e4c547 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTelemetryComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTelemetryComponentAc.ref.cpp @@ -44,11 +44,11 @@ namespace { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = sizeof(BuffUnion) + - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -73,8 +73,8 @@ namespace { void ActiveTelemetryComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwEnumStoreType instance ) { // Initialize base class @@ -82,8 +82,8 @@ void ActiveTelemetryComponentBase :: // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -106,8 +106,8 @@ void ActiveTelemetryComponentBase :: // Connect input port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsAsync_InputPorts()); port++ ) { this->m_noArgsAsync_InputPort[port].init(); @@ -130,8 +130,8 @@ void ActiveTelemetryComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -154,8 +154,8 @@ void ActiveTelemetryComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -178,8 +178,8 @@ void ActiveTelemetryComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -202,8 +202,8 @@ void ActiveTelemetryComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -226,8 +226,8 @@ void ActiveTelemetryComponentBase :: // Connect input port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsync_InputPorts()); port++ ) { this->m_typedAsync_InputPort[port].init(); @@ -250,8 +250,8 @@ void ActiveTelemetryComponentBase :: // Connect input port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); port++ ) { this->m_typedAsyncAssert_InputPort[port].init(); @@ -274,8 +274,8 @@ void ActiveTelemetryComponentBase :: // Connect input port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); port++ ) { this->m_typedAsyncBlockPriority_InputPort[port].init(); @@ -298,8 +298,8 @@ void ActiveTelemetryComponentBase :: // Connect input port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); port++ ) { this->m_typedAsyncDropPriority_InputPort[port].init(); @@ -322,8 +322,8 @@ void ActiveTelemetryComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -346,8 +346,8 @@ void ActiveTelemetryComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -370,8 +370,8 @@ void ActiveTelemetryComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -394,8 +394,8 @@ void ActiveTelemetryComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -418,8 +418,8 @@ void ActiveTelemetryComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -437,8 +437,8 @@ void ActiveTelemetryComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -456,8 +456,8 @@ void ActiveTelemetryComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -475,8 +475,8 @@ void ActiveTelemetryComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -494,8 +494,8 @@ void ActiveTelemetryComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -514,8 +514,8 @@ void ActiveTelemetryComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -534,8 +534,8 @@ void ActiveTelemetryComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -553,8 +553,8 @@ void ActiveTelemetryComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -572,8 +572,8 @@ void ActiveTelemetryComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -591,8 +591,8 @@ void ActiveTelemetryComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -610,8 +610,8 @@ void ActiveTelemetryComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -629,8 +629,8 @@ void ActiveTelemetryComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -661,7 +661,7 @@ void ActiveTelemetryComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* ActiveTelemetryComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -676,7 +676,7 @@ Fw::InputCmdPort* ActiveTelemetryComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* ActiveTelemetryComponentBase :: - get_noArgsAsync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsAsync_InputPorts(), @@ -687,7 +687,7 @@ Ports::InputNoArgsPort* ActiveTelemetryComponentBase :: } Ports::InputNoArgsPort* ActiveTelemetryComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -698,7 +698,7 @@ Ports::InputNoArgsPort* ActiveTelemetryComponentBase :: } Ports::InputNoArgsReturnPort* ActiveTelemetryComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -709,7 +709,7 @@ Ports::InputNoArgsReturnPort* ActiveTelemetryComponentBase :: } Ports::InputNoArgsReturnPort* ActiveTelemetryComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -720,7 +720,7 @@ Ports::InputNoArgsReturnPort* ActiveTelemetryComponentBase :: } Ports::InputNoArgsPort* ActiveTelemetryComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -731,7 +731,7 @@ Ports::InputNoArgsPort* ActiveTelemetryComponentBase :: } Ports::InputTypedPort* ActiveTelemetryComponentBase :: - get_typedAsync_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsync_InputPorts(), @@ -742,7 +742,7 @@ Ports::InputTypedPort* ActiveTelemetryComponentBase :: } Ports::InputTypedPort* ActiveTelemetryComponentBase :: - get_typedAsyncAssert_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncAssert_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncAssert_InputPorts(), @@ -753,7 +753,7 @@ Ports::InputTypedPort* ActiveTelemetryComponentBase :: } Ports::InputTypedPort* ActiveTelemetryComponentBase :: - get_typedAsyncBlockPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncBlockPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncBlockPriority_InputPorts(), @@ -764,7 +764,7 @@ Ports::InputTypedPort* ActiveTelemetryComponentBase :: } Ports::InputTypedPort* ActiveTelemetryComponentBase :: - get_typedAsyncDropPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncDropPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncDropPriority_InputPorts(), @@ -775,7 +775,7 @@ Ports::InputTypedPort* ActiveTelemetryComponentBase :: } Ports::InputTypedPort* ActiveTelemetryComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -786,7 +786,7 @@ Ports::InputTypedPort* ActiveTelemetryComponentBase :: } Ports::InputTypedReturnPort* ActiveTelemetryComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -797,7 +797,7 @@ Ports::InputTypedReturnPort* ActiveTelemetryComponentBase :: } Ports::InputTypedReturnPort* ActiveTelemetryComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -808,7 +808,7 @@ Ports::InputTypedReturnPort* ActiveTelemetryComponentBase :: } Ports::InputTypedPort* ActiveTelemetryComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -824,7 +824,7 @@ Ports::InputTypedPort* ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -838,7 +838,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -852,7 +852,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -866,7 +866,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -880,7 +880,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -896,7 +896,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -912,7 +912,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -926,7 +926,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -944,7 +944,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -958,7 +958,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -972,7 +972,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -986,7 +986,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -1006,7 +1006,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1020,7 +1020,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1034,7 +1034,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1048,7 +1048,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1064,7 +1064,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1080,7 +1080,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1094,7 +1094,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1116,7 +1116,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1130,7 +1130,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1170,176 +1170,176 @@ ActiveTelemetryComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_noArgsAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); } -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_typedAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); } -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_typedAsyncAssert_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); } -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_typedAsyncBlockPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); } -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_typedAsyncDropPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); } -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE ActiveTelemetryComponentBase :: +FwIndexType ActiveTelemetryComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1347,7 +1347,7 @@ NATIVE_INT_TYPE ActiveTelemetryComponentBase :: // ---------------------------------------------------------------------- bool ActiveTelemetryComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1358,7 +1358,7 @@ bool ActiveTelemetryComponentBase :: } bool ActiveTelemetryComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1369,7 +1369,7 @@ bool ActiveTelemetryComponentBase :: } bool ActiveTelemetryComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1380,7 +1380,7 @@ bool ActiveTelemetryComponentBase :: } bool ActiveTelemetryComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1391,7 +1391,7 @@ bool ActiveTelemetryComponentBase :: } bool ActiveTelemetryComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1404,7 +1404,7 @@ bool ActiveTelemetryComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool ActiveTelemetryComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1417,7 +1417,7 @@ bool ActiveTelemetryComponentBase :: #endif bool ActiveTelemetryComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1428,7 +1428,7 @@ bool ActiveTelemetryComponentBase :: } bool ActiveTelemetryComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1443,7 +1443,7 @@ bool ActiveTelemetryComponentBase :: // ---------------------------------------------------------------------- bool ActiveTelemetryComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1454,7 +1454,7 @@ bool ActiveTelemetryComponentBase :: } bool ActiveTelemetryComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1465,7 +1465,7 @@ bool ActiveTelemetryComponentBase :: } bool ActiveTelemetryComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1476,7 +1476,7 @@ bool ActiveTelemetryComponentBase :: } bool ActiveTelemetryComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1493,7 +1493,7 @@ bool ActiveTelemetryComponentBase :: // ---------------------------------------------------------------------- void ActiveTelemetryComponentBase :: - noArgsAsync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsAsync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1508,7 +1508,7 @@ void ActiveTelemetryComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(NOARGSASYNC_NOARGS) + static_cast(NOARGSASYNC_NOARGS) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1533,7 +1533,7 @@ void ActiveTelemetryComponentBase :: } void ActiveTelemetryComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1552,7 +1552,7 @@ void ActiveTelemetryComponentBase :: } U32 ActiveTelemetryComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1575,7 +1575,7 @@ U32 ActiveTelemetryComponentBase :: } U32 ActiveTelemetryComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1592,7 +1592,7 @@ U32 ActiveTelemetryComponentBase :: } void ActiveTelemetryComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1606,7 +1606,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1638,7 +1638,7 @@ void ActiveTelemetryComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNC_TYPED) + static_cast(TYPEDASYNC_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1713,7 +1713,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1745,7 +1745,7 @@ void ActiveTelemetryComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCASSERT_TYPED) + static_cast(TYPEDASYNCASSERT_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1820,7 +1820,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1852,7 +1852,7 @@ void ActiveTelemetryComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) + static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1927,7 +1927,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1959,7 +1959,7 @@ void ActiveTelemetryComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCDROPPRIORITY_TYPED) + static_cast(TYPEDASYNCDROPPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2039,7 +2039,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2076,7 +2076,7 @@ void ActiveTelemetryComponentBase :: F32 ActiveTelemetryComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2117,7 +2117,7 @@ F32 ActiveTelemetryComponentBase :: F32 ActiveTelemetryComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2152,7 +2152,7 @@ F32 ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2190,14 +2190,14 @@ void ActiveTelemetryComponentBase :: // ---------------------------------------------------------------------- void ActiveTelemetryComponentBase :: - noArgsAsync_preMsgHook(NATIVE_INT_TYPE portNum) + noArgsAsync_preMsgHook(FwIndexType portNum) { // Default: no-op } void ActiveTelemetryComponentBase :: typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2212,7 +2212,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2227,7 +2227,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2242,7 +2242,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2260,7 +2260,7 @@ void ActiveTelemetryComponentBase :: // ---------------------------------------------------------------------- void ActiveTelemetryComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -2270,7 +2270,7 @@ void ActiveTelemetryComponentBase :: } U32 ActiveTelemetryComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -2281,7 +2281,7 @@ U32 ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2308,7 +2308,7 @@ void ActiveTelemetryComponentBase :: F32 ActiveTelemetryComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2774,7 +2774,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveTelemetryComponentBase :: doDispatch() { ComponentIpcSerializableBuffer msg; - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -2789,7 +2789,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveTelemetryComponentBase :: // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -2802,7 +2802,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveTelemetryComponentBase :: return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -3120,7 +3120,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -3139,7 +3139,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3150,7 +3150,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3161,7 +3161,7 @@ void ActiveTelemetryComponentBase :: U32 ActiveTelemetryComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3172,7 +3172,7 @@ U32 ActiveTelemetryComponentBase :: U32 ActiveTelemetryComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3183,7 +3183,7 @@ U32 ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3194,7 +3194,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3221,7 +3221,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3248,7 +3248,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3275,7 +3275,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3302,7 +3302,7 @@ void ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3329,7 +3329,7 @@ void ActiveTelemetryComponentBase :: F32 ActiveTelemetryComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3356,7 +3356,7 @@ F32 ActiveTelemetryComponentBase :: F32 ActiveTelemetryComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3383,7 +3383,7 @@ F32 ActiveTelemetryComponentBase :: void ActiveTelemetryComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTelemetryComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTelemetryComponentAc.ref.hpp index 2c8a5dd0f..5220f6387 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTelemetryComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTelemetryComponentAc.ref.hpp @@ -118,8 +118,8 @@ class ActiveTelemetryComponentBase : //! Initialize ActiveTelemetryComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -132,7 +132,7 @@ class ActiveTelemetryComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -145,91 +145,91 @@ class ActiveTelemetryComponentBase : //! //! \return noArgsAsync[portNum] Ports::InputNoArgsPort* get_noArgsAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsync[portNum] Ports::InputTypedPort* get_typedAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncAssert[portNum] Ports::InputTypedPort* get_typedAsyncAssert_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncBlockPriority[portNum] Ports::InputTypedPort* get_typedAsyncBlockPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncDropPriority[portNum] Ports::InputTypedPort* get_typedAsyncDropPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -240,31 +240,31 @@ class ActiveTelemetryComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); @@ -272,7 +272,7 @@ class ActiveTelemetryComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -280,13 +280,13 @@ class ActiveTelemetryComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -298,25 +298,25 @@ class ActiveTelemetryComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -330,25 +330,25 @@ class ActiveTelemetryComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -356,7 +356,7 @@ class ActiveTelemetryComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -364,13 +364,13 @@ class ActiveTelemetryComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -386,13 +386,13 @@ class ActiveTelemetryComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -421,7 +421,7 @@ class ActiveTelemetryComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; PROTECTED: @@ -432,67 +432,67 @@ class ActiveTelemetryComponentBase : //! Get the number of noArgsAsync input ports //! //! \return The number of noArgsAsync input ports - NATIVE_INT_TYPE getNum_noArgsAsync_InputPorts() const; + FwIndexType getNum_noArgsAsync_InputPorts() const; //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedAsync input ports //! //! \return The number of typedAsync input ports - NATIVE_INT_TYPE getNum_typedAsync_InputPorts() const; + FwIndexType getNum_typedAsync_InputPorts() const; //! Get the number of typedAsyncAssert input ports //! //! \return The number of typedAsyncAssert input ports - NATIVE_INT_TYPE getNum_typedAsyncAssert_InputPorts() const; + FwIndexType getNum_typedAsyncAssert_InputPorts() const; //! Get the number of typedAsyncBlockPriority input ports //! //! \return The number of typedAsyncBlockPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncBlockPriority_InputPorts() const; + FwIndexType getNum_typedAsyncBlockPriority_InputPorts() const; //! Get the number of typedAsyncDropPriority input ports //! //! \return The number of typedAsyncDropPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncDropPriority_InputPorts() const; + FwIndexType getNum_typedAsyncDropPriority_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -503,46 +503,46 @@ class ActiveTelemetryComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -553,22 +553,22 @@ class ActiveTelemetryComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -580,35 +580,35 @@ class ActiveTelemetryComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -617,7 +617,7 @@ class ActiveTelemetryComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -626,14 +626,14 @@ class ActiveTelemetryComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -646,28 +646,28 @@ class ActiveTelemetryComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -678,32 +678,32 @@ class ActiveTelemetryComponentBase : //! Handler for input port noArgsAsync virtual void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedAsync virtual void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -715,7 +715,7 @@ class ActiveTelemetryComponentBase : //! Handler for input port typedAsyncAssert virtual void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -727,7 +727,7 @@ class ActiveTelemetryComponentBase : //! Handler for input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -739,7 +739,7 @@ class ActiveTelemetryComponentBase : //! Handler for input port typedAsyncDropPriority virtual void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -751,7 +751,7 @@ class ActiveTelemetryComponentBase : //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -763,7 +763,7 @@ class ActiveTelemetryComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -775,7 +775,7 @@ class ActiveTelemetryComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -787,7 +787,7 @@ class ActiveTelemetryComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -807,32 +807,32 @@ class ActiveTelemetryComponentBase : //! Handler base-class function for input port noArgsAsync void noArgsAsync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedAsync void typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -844,7 +844,7 @@ class ActiveTelemetryComponentBase : //! Handler base-class function for input port typedAsyncAssert void typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -856,7 +856,7 @@ class ActiveTelemetryComponentBase : //! Handler base-class function for input port typedAsyncBlockPriority void typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -868,7 +868,7 @@ class ActiveTelemetryComponentBase : //! Handler base-class function for input port typedAsyncDropPriority void typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -880,7 +880,7 @@ class ActiveTelemetryComponentBase : //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -892,7 +892,7 @@ class ActiveTelemetryComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -904,7 +904,7 @@ class ActiveTelemetryComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -916,7 +916,7 @@ class ActiveTelemetryComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -938,12 +938,12 @@ class ActiveTelemetryComponentBase : //! Pre-message hook for async input port noArgsAsync virtual void noArgsAsync_preMsgHook( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Pre-message hook for async input port typedAsync virtual void typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -955,7 +955,7 @@ class ActiveTelemetryComponentBase : //! Pre-message hook for async input port typedAsyncAssert virtual void typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -967,7 +967,7 @@ class ActiveTelemetryComponentBase : //! Pre-message hook for async input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -979,7 +979,7 @@ class ActiveTelemetryComponentBase : //! Pre-message hook for async input port typedAsyncDropPriority virtual void typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -997,17 +997,17 @@ class ActiveTelemetryComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1019,7 +1019,7 @@ class ActiveTelemetryComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1167,7 +1167,7 @@ class ActiveTelemetryComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -1182,37 +1182,37 @@ class ActiveTelemetryComponentBase : //! Callback for port noArgsAsync static void m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedAsync static void m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1225,7 +1225,7 @@ class ActiveTelemetryComponentBase : //! Callback for port typedAsyncAssert static void m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1238,7 +1238,7 @@ class ActiveTelemetryComponentBase : //! Callback for port typedAsyncBlockPriority static void m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1251,7 +1251,7 @@ class ActiveTelemetryComponentBase : //! Callback for port typedAsyncDropPriority static void m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1264,7 +1264,7 @@ class ActiveTelemetryComponentBase : //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1277,7 +1277,7 @@ class ActiveTelemetryComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1290,7 +1290,7 @@ class ActiveTelemetryComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1303,7 +1303,7 @@ class ActiveTelemetryComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index 789ed96ba..eff30b7a0 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -82,11 +82,11 @@ namespace M { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = sizeof(BuffUnion) + - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -265,8 +265,8 @@ namespace M { void ActiveTestComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwEnumStoreType instance ) { // Initialize base class @@ -274,8 +274,8 @@ namespace M { // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -298,8 +298,8 @@ namespace M { // Connect input port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRecvIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRecvIn_InputPorts()); port++ ) { this->m_productRecvIn_InputPort[port].init(); @@ -322,8 +322,8 @@ namespace M { // Connect input port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsAsync_InputPorts()); port++ ) { this->m_noArgsAsync_InputPort[port].init(); @@ -346,8 +346,8 @@ namespace M { // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -370,8 +370,8 @@ namespace M { // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -394,8 +394,8 @@ namespace M { // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -418,8 +418,8 @@ namespace M { // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -442,8 +442,8 @@ namespace M { // Connect input port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsync_InputPorts()); port++ ) { this->m_typedAsync_InputPort[port].init(); @@ -466,8 +466,8 @@ namespace M { // Connect input port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); port++ ) { this->m_typedAsyncAssert_InputPort[port].init(); @@ -490,8 +490,8 @@ namespace M { // Connect input port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); port++ ) { this->m_typedAsyncBlockPriority_InputPort[port].init(); @@ -514,8 +514,8 @@ namespace M { // Connect input port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); port++ ) { this->m_typedAsyncDropPriority_InputPort[port].init(); @@ -538,8 +538,8 @@ namespace M { // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -562,8 +562,8 @@ namespace M { // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -586,8 +586,8 @@ namespace M { // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -610,8 +610,8 @@ namespace M { // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -634,8 +634,8 @@ namespace M { // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -653,8 +653,8 @@ namespace M { // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -672,8 +672,8 @@ namespace M { // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -691,8 +691,8 @@ namespace M { // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -710,8 +710,8 @@ namespace M { // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -729,8 +729,8 @@ namespace M { // Connect output port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRequestOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRequestOut_OutputPorts()); port++ ) { this->m_productRequestOut_OutputPort[port].init(); @@ -748,8 +748,8 @@ namespace M { // Connect output port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productSendOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productSendOut_OutputPorts()); port++ ) { this->m_productSendOut_OutputPort[port].init(); @@ -768,8 +768,8 @@ namespace M { #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -788,8 +788,8 @@ namespace M { // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -807,8 +807,8 @@ namespace M { // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -826,8 +826,8 @@ namespace M { // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -845,8 +845,8 @@ namespace M { // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -864,8 +864,8 @@ namespace M { // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -883,8 +883,8 @@ namespace M { // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -915,7 +915,7 @@ namespace M { // ---------------------------------------------------------------------- Fw::InputCmdPort* ActiveTestComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -926,7 +926,7 @@ namespace M { } Fw::InputDpResponsePort* ActiveTestComponentBase :: - get_productRecvIn_InputPort(NATIVE_INT_TYPE portNum) + get_productRecvIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRecvIn_InputPorts(), @@ -941,7 +941,7 @@ namespace M { // ---------------------------------------------------------------------- Ports::InputNoArgsPort* ActiveTestComponentBase :: - get_noArgsAsync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsAsync_InputPorts(), @@ -952,7 +952,7 @@ namespace M { } Ports::InputNoArgsPort* ActiveTestComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -963,7 +963,7 @@ namespace M { } Ports::InputNoArgsReturnPort* ActiveTestComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -974,7 +974,7 @@ namespace M { } Ports::InputNoArgsReturnPort* ActiveTestComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -985,7 +985,7 @@ namespace M { } Ports::InputNoArgsPort* ActiveTestComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -996,7 +996,7 @@ namespace M { } Ports::InputTypedPort* ActiveTestComponentBase :: - get_typedAsync_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsync_InputPorts(), @@ -1007,7 +1007,7 @@ namespace M { } Ports::InputTypedPort* ActiveTestComponentBase :: - get_typedAsyncAssert_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncAssert_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncAssert_InputPorts(), @@ -1018,7 +1018,7 @@ namespace M { } Ports::InputTypedPort* ActiveTestComponentBase :: - get_typedAsyncBlockPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncBlockPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncBlockPriority_InputPorts(), @@ -1029,7 +1029,7 @@ namespace M { } Ports::InputTypedPort* ActiveTestComponentBase :: - get_typedAsyncDropPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncDropPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncDropPriority_InputPorts(), @@ -1040,7 +1040,7 @@ namespace M { } Ports::InputTypedPort* ActiveTestComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -1051,7 +1051,7 @@ namespace M { } Ports::InputTypedReturnPort* ActiveTestComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -1062,7 +1062,7 @@ namespace M { } Ports::InputTypedReturnPort* ActiveTestComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -1073,7 +1073,7 @@ namespace M { } Ports::InputTypedPort* ActiveTestComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -1089,7 +1089,7 @@ namespace M { void ActiveTestComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -1103,7 +1103,7 @@ namespace M { void ActiveTestComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -1117,7 +1117,7 @@ namespace M { void ActiveTestComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -1131,7 +1131,7 @@ namespace M { void ActiveTestComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -1145,7 +1145,7 @@ namespace M { void ActiveTestComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -1159,7 +1159,7 @@ namespace M { void ActiveTestComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpRequestPort* port ) { @@ -1173,7 +1173,7 @@ namespace M { void ActiveTestComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpSendPort* port ) { @@ -1189,7 +1189,7 @@ namespace M { void ActiveTestComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -1205,7 +1205,7 @@ namespace M { void ActiveTestComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -1219,7 +1219,7 @@ namespace M { void ActiveTestComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -1237,7 +1237,7 @@ namespace M { void ActiveTestComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -1251,7 +1251,7 @@ namespace M { void ActiveTestComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -1265,7 +1265,7 @@ namespace M { void ActiveTestComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -1279,7 +1279,7 @@ namespace M { void ActiveTestComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -1299,7 +1299,7 @@ namespace M { void ActiveTestComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1313,7 +1313,7 @@ namespace M { void ActiveTestComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1327,7 +1327,7 @@ namespace M { void ActiveTestComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1341,7 +1341,7 @@ namespace M { void ActiveTestComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1355,7 +1355,7 @@ namespace M { void ActiveTestComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1369,7 +1369,7 @@ namespace M { void ActiveTestComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1385,7 +1385,7 @@ namespace M { void ActiveTestComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1401,7 +1401,7 @@ namespace M { void ActiveTestComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1415,7 +1415,7 @@ namespace M { void ActiveTestComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1437,7 +1437,7 @@ namespace M { void ActiveTestComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1451,7 +1451,7 @@ namespace M { void ActiveTestComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1803,194 +1803,194 @@ namespace M { // Getters for numbers of special input ports // ---------------------------------------------------------------------- - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_productRecvIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_noArgsAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); } - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_typedAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); } - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_typedAsyncAssert_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); } - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_typedAsyncBlockPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); } - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_typedAsyncDropPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); } - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_productRequestOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); } - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_productSendOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } - NATIVE_INT_TYPE ActiveTestComponentBase :: + FwIndexType ActiveTestComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1998,7 +1998,7 @@ namespace M { // ---------------------------------------------------------------------- bool ActiveTestComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -2009,7 +2009,7 @@ namespace M { } bool ActiveTestComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -2020,7 +2020,7 @@ namespace M { } bool ActiveTestComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -2031,7 +2031,7 @@ namespace M { } bool ActiveTestComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -2042,7 +2042,7 @@ namespace M { } bool ActiveTestComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -2053,7 +2053,7 @@ namespace M { } bool ActiveTestComponentBase :: - isConnected_productRequestOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productRequestOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRequestOut_OutputPorts(), @@ -2064,7 +2064,7 @@ namespace M { } bool ActiveTestComponentBase :: - isConnected_productSendOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productSendOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productSendOut_OutputPorts(), @@ -2077,7 +2077,7 @@ namespace M { #if FW_ENABLE_TEXT_LOGGING == 1 bool ActiveTestComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -2090,7 +2090,7 @@ namespace M { #endif bool ActiveTestComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -2101,7 +2101,7 @@ namespace M { } bool ActiveTestComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -2116,7 +2116,7 @@ namespace M { // ---------------------------------------------------------------------- bool ActiveTestComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -2127,7 +2127,7 @@ namespace M { } bool ActiveTestComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -2138,7 +2138,7 @@ namespace M { } bool ActiveTestComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -2149,7 +2149,7 @@ namespace M { } bool ActiveTestComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -2167,7 +2167,7 @@ namespace M { void ActiveTestComponentBase :: productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -2191,7 +2191,7 @@ namespace M { // Serialize message ID _status = msg.serialize( - static_cast(PRODUCTRECVIN_DPRESPONSE) + static_cast(PRODUCTRECVIN_DPRESPONSE) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2243,7 +2243,7 @@ namespace M { // ---------------------------------------------------------------------- void ActiveTestComponentBase :: - noArgsAsync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsAsync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -2258,7 +2258,7 @@ namespace M { // Serialize message ID _status = msg.serialize( - static_cast(NOARGSASYNC_NOARGS) + static_cast(NOARGSASYNC_NOARGS) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2283,7 +2283,7 @@ namespace M { } void ActiveTestComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -2302,7 +2302,7 @@ namespace M { } U32 ActiveTestComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -2325,7 +2325,7 @@ namespace M { } U32 ActiveTestComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -2342,7 +2342,7 @@ namespace M { } void ActiveTestComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -2356,7 +2356,7 @@ namespace M { void ActiveTestComponentBase :: typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2388,7 +2388,7 @@ namespace M { // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNC_TYPED) + static_cast(TYPEDASYNC_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2463,7 +2463,7 @@ namespace M { void ActiveTestComponentBase :: typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2495,7 +2495,7 @@ namespace M { // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCASSERT_TYPED) + static_cast(TYPEDASYNCASSERT_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2570,7 +2570,7 @@ namespace M { void ActiveTestComponentBase :: typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2602,7 +2602,7 @@ namespace M { // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) + static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2677,7 +2677,7 @@ namespace M { void ActiveTestComponentBase :: typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2709,7 +2709,7 @@ namespace M { // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCDROPPRIORITY_TYPED) + static_cast(TYPEDASYNCDROPPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2789,7 +2789,7 @@ namespace M { void ActiveTestComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2826,7 +2826,7 @@ namespace M { F32 ActiveTestComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2867,7 +2867,7 @@ namespace M { F32 ActiveTestComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2902,7 +2902,7 @@ namespace M { void ActiveTestComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2941,7 +2941,7 @@ namespace M { void ActiveTestComponentBase :: productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -2959,14 +2959,14 @@ namespace M { // ---------------------------------------------------------------------- void ActiveTestComponentBase :: - noArgsAsync_preMsgHook(NATIVE_INT_TYPE portNum) + noArgsAsync_preMsgHook(FwIndexType portNum) { // Default: no-op } void ActiveTestComponentBase :: typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2981,7 +2981,7 @@ namespace M { void ActiveTestComponentBase :: typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2996,7 +2996,7 @@ namespace M { void ActiveTestComponentBase :: typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3011,7 +3011,7 @@ namespace M { void ActiveTestComponentBase :: typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3030,7 +3030,7 @@ namespace M { void ActiveTestComponentBase :: productRequestOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -3047,7 +3047,7 @@ namespace M { void ActiveTestComponentBase :: productSendOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -3067,7 +3067,7 @@ namespace M { // ---------------------------------------------------------------------- void ActiveTestComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -3077,7 +3077,7 @@ namespace M { } U32 ActiveTestComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -3088,7 +3088,7 @@ namespace M { void ActiveTestComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3115,7 +3115,7 @@ namespace M { F32 ActiveTestComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3151,14 +3151,14 @@ namespace M { Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALARRAY)); + _status = msg.serialize(static_cast(INT_IF_INTERNALARRAY)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3187,14 +3187,14 @@ namespace M { Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALENUM)); + _status = msg.serialize(static_cast(INT_IF_INTERNALENUM)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3227,14 +3227,14 @@ namespace M { Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALPRIMITIVE)); + _status = msg.serialize(static_cast(INT_IF_INTERNALPRIMITIVE)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3275,14 +3275,14 @@ namespace M { Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALPRIORITYDROP)); + _status = msg.serialize(static_cast(INT_IF_INTERNALPRIORITYDROP)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3313,14 +3313,14 @@ namespace M { Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALSTRING)); + _status = msg.serialize(static_cast(INT_IF_INTERNALSTRING)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3355,14 +3355,14 @@ namespace M { Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALSTRUCT)); + _status = msg.serialize(static_cast(INT_IF_INTERNALSTRUCT)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -4054,14 +4054,14 @@ namespace M { Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_ASYNC)); + _status = msg.serialize(static_cast(CMD_CMD_ASYNC)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -4113,14 +4113,14 @@ namespace M { Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_PRIORITY)); + _status = msg.serialize(static_cast(CMD_CMD_PRIORITY)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -4172,14 +4172,14 @@ namespace M { Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY)); + _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -4231,14 +4231,14 @@ namespace M { Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_DROP)); + _status = msg.serialize(static_cast(CMD_CMD_DROP)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -4295,14 +4295,14 @@ namespace M { Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY_DROP)); + _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY_DROP)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -5658,7 +5658,7 @@ namespace M { doDispatch() { ComponentIpcSerializableBuffer msg; - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -5673,7 +5673,7 @@ namespace M { // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -5686,7 +5686,7 @@ namespace M { return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -6486,7 +6486,7 @@ namespace M { void ActiveTestComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -6778,7 +6778,7 @@ namespace M { void ActiveTestComponentBase :: m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -6801,7 +6801,7 @@ namespace M { void ActiveTestComponentBase :: m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -6812,7 +6812,7 @@ namespace M { void ActiveTestComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -6823,7 +6823,7 @@ namespace M { U32 ActiveTestComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -6834,7 +6834,7 @@ namespace M { U32 ActiveTestComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -6845,7 +6845,7 @@ namespace M { void ActiveTestComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -6856,7 +6856,7 @@ namespace M { void ActiveTestComponentBase :: m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -6883,7 +6883,7 @@ namespace M { void ActiveTestComponentBase :: m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -6910,7 +6910,7 @@ namespace M { void ActiveTestComponentBase :: m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -6937,7 +6937,7 @@ namespace M { void ActiveTestComponentBase :: m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -6964,7 +6964,7 @@ namespace M { void ActiveTestComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -6991,7 +6991,7 @@ namespace M { F32 ActiveTestComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -7018,7 +7018,7 @@ namespace M { F32 ActiveTestComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -7045,7 +7045,7 @@ namespace M { void ActiveTestComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -7388,7 +7388,7 @@ namespace M { void ActiveTestComponentBase :: productRecvIn_handler( - const NATIVE_INT_TYPE portNum, + const FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp index c12f2a86d..66ff2f3eb 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp @@ -296,8 +296,8 @@ namespace M { //! Initialize ActiveTestComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -310,14 +310,14 @@ namespace M { //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get special input port at index //! //! \return productRecvIn[portNum] Fw::InputDpResponsePort* get_productRecvIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -330,91 +330,91 @@ namespace M { //! //! \return noArgsAsync[portNum] Ports::InputNoArgsPort* get_noArgsAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsync[portNum] Ports::InputTypedPort* get_typedAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncAssert[portNum] Ports::InputTypedPort* get_typedAsyncAssert_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncBlockPriority[portNum] Ports::InputTypedPort* get_typedAsyncBlockPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncDropPriority[portNum] Ports::InputTypedPort* get_typedAsyncDropPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -425,43 +425,43 @@ namespace M { //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpRequestPort* port //!< The input port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpSendPort* port //!< The input port ); @@ -469,7 +469,7 @@ namespace M { //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -477,13 +477,13 @@ namespace M { //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -495,25 +495,25 @@ namespace M { //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -527,37 +527,37 @@ namespace M { //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -565,7 +565,7 @@ namespace M { //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -573,13 +573,13 @@ namespace M { //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -595,13 +595,13 @@ namespace M { //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -652,12 +652,12 @@ namespace M { //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; //! Get the number of productRecvIn input ports //! //! \return The number of productRecvIn input ports - NATIVE_INT_TYPE getNum_productRecvIn_InputPorts() const; + FwIndexType getNum_productRecvIn_InputPorts() const; PROTECTED: @@ -668,67 +668,67 @@ namespace M { //! Get the number of noArgsAsync input ports //! //! \return The number of noArgsAsync input ports - NATIVE_INT_TYPE getNum_noArgsAsync_InputPorts() const; + FwIndexType getNum_noArgsAsync_InputPorts() const; //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedAsync input ports //! //! \return The number of typedAsync input ports - NATIVE_INT_TYPE getNum_typedAsync_InputPorts() const; + FwIndexType getNum_typedAsync_InputPorts() const; //! Get the number of typedAsyncAssert input ports //! //! \return The number of typedAsyncAssert input ports - NATIVE_INT_TYPE getNum_typedAsyncAssert_InputPorts() const; + FwIndexType getNum_typedAsyncAssert_InputPorts() const; //! Get the number of typedAsyncBlockPriority input ports //! //! \return The number of typedAsyncBlockPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncBlockPriority_InputPorts() const; + FwIndexType getNum_typedAsyncBlockPriority_InputPorts() const; //! Get the number of typedAsyncDropPriority input ports //! //! \return The number of typedAsyncDropPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncDropPriority_InputPorts() const; + FwIndexType getNum_typedAsyncDropPriority_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -739,56 +739,56 @@ namespace M { //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; //! Get the number of productRequestOut output ports //! //! \return The number of productRequestOut output ports - NATIVE_INT_TYPE getNum_productRequestOut_OutputPorts() const; + FwIndexType getNum_productRequestOut_OutputPorts() const; //! Get the number of productSendOut output ports //! //! \return The number of productSendOut output ports - NATIVE_INT_TYPE getNum_productSendOut_OutputPorts() const; + FwIndexType getNum_productSendOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -799,22 +799,22 @@ namespace M { //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -826,49 +826,49 @@ namespace M { //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productRequestOut is connected //! //! \return Whether port productRequestOut is connected bool isConnected_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productSendOut is connected //! //! \return Whether port productSendOut is connected bool isConnected_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -877,7 +877,7 @@ namespace M { //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -886,14 +886,14 @@ namespace M { //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -906,28 +906,28 @@ namespace M { //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -940,7 +940,7 @@ namespace M { //! Handler base-class function for input port productRecvIn void productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -954,32 +954,32 @@ namespace M { //! Handler for input port noArgsAsync virtual void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedAsync virtual void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -991,7 +991,7 @@ namespace M { //! Handler for input port typedAsyncAssert virtual void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1003,7 +1003,7 @@ namespace M { //! Handler for input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1015,7 +1015,7 @@ namespace M { //! Handler for input port typedAsyncDropPriority virtual void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1027,7 +1027,7 @@ namespace M { //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1039,7 +1039,7 @@ namespace M { //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1051,7 +1051,7 @@ namespace M { //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1063,7 +1063,7 @@ namespace M { //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1083,32 +1083,32 @@ namespace M { //! Handler base-class function for input port noArgsAsync void noArgsAsync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedAsync void typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1120,7 +1120,7 @@ namespace M { //! Handler base-class function for input port typedAsyncAssert void typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1132,7 +1132,7 @@ namespace M { //! Handler base-class function for input port typedAsyncBlockPriority void typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1144,7 +1144,7 @@ namespace M { //! Handler base-class function for input port typedAsyncDropPriority void typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1156,7 +1156,7 @@ namespace M { //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1168,7 +1168,7 @@ namespace M { //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1180,7 +1180,7 @@ namespace M { //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1192,7 +1192,7 @@ namespace M { //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1214,7 +1214,7 @@ namespace M { //! Pre-message hook for async input port productRecvIn virtual void productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -1232,12 +1232,12 @@ namespace M { //! Pre-message hook for async input port noArgsAsync virtual void noArgsAsync_preMsgHook( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Pre-message hook for async input port typedAsync virtual void typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1249,7 +1249,7 @@ namespace M { //! Pre-message hook for async input port typedAsyncAssert virtual void typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1261,7 +1261,7 @@ namespace M { //! Pre-message hook for async input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1273,7 +1273,7 @@ namespace M { //! Pre-message hook for async input port typedAsyncDropPriority virtual void typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1291,14 +1291,14 @@ namespace M { //! Invoke output port productRequestOut void productRequestOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); //! Invoke output port productSendOut void productSendOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -1311,17 +1311,17 @@ namespace M { //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1333,7 +1333,7 @@ namespace M { //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2164,7 +2164,7 @@ namespace M { //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -2173,7 +2173,7 @@ namespace M { //! Callback for port productRecvIn static void m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -2188,37 +2188,37 @@ namespace M { //! Callback for port noArgsAsync static void m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedAsync static void m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2231,7 +2231,7 @@ namespace M { //! Callback for port typedAsyncAssert static void m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2244,7 +2244,7 @@ namespace M { //! Callback for port typedAsyncBlockPriority static void m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2257,7 +2257,7 @@ namespace M { //! Callback for port typedAsyncDropPriority static void m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2270,7 +2270,7 @@ namespace M { //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2283,7 +2283,7 @@ namespace M { //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2296,7 +2296,7 @@ namespace M { //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2309,7 +2309,7 @@ namespace M { //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2417,7 +2417,7 @@ namespace M { //! Handler implementation for productRecvIn void productRecvIn_handler( - const NATIVE_INT_TYPE portNum, //!< The port number + const FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container id const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The buffer status @@ -2545,13 +2545,13 @@ namespace M { // ---------------------------------------------------------------------- //! Throttle for EventActivityLowThrottled - NATIVE_UINT_TYPE m_EventActivityLowThrottledThrottle; + FwIndexType m_EventActivityLowThrottledThrottle; //! Throttle for EventFatalThrottled - NATIVE_UINT_TYPE m_EventFatalThrottledThrottle; + FwIndexType m_EventFatalThrottledThrottle; //! Throttle for EventWarningLowThrottled - NATIVE_UINT_TYPE m_EventWarningLowThrottledThrottle; + FwIndexType m_EventWarningLowThrottledThrottle; PRIVATE: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/EmptyComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/EmptyComponentAc.ref.cpp index d75055022..bce5eaccf 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/EmptyComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/EmptyComponentAc.ref.cpp @@ -17,7 +17,7 @@ // ---------------------------------------------------------------------- void EmptyComponentBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/EmptyComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/EmptyComponentAc.ref.hpp index 9444c5ebb..46f6cf019 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/EmptyComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/EmptyComponentAc.ref.hpp @@ -33,7 +33,7 @@ class EmptyComponentBase : //! Initialize EmptyComponentBase object void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); PROTECTED: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/NoArgsPortAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/NoArgsPortAc.ref.cpp index 7128c1997..7ba637261 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/NoArgsPortAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/NoArgsPortAc.ref.cpp @@ -20,7 +20,7 @@ namespace Ports { public: - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return InputNoArgsPort::SERIALIZED_SIZE; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/NoArgsPortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/NoArgsPortAc.ref.hpp index 399cc9ff8..5eae4cb55 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/NoArgsPortAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/NoArgsPortAc.ref.hpp @@ -45,7 +45,7 @@ namespace Ports { //! The port callback function type typedef void (*CompFuncPtr)( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ); public: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/NoArgsReturnPortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/NoArgsReturnPortAc.ref.hpp index 8d688de2c..e56e6ff67 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/NoArgsReturnPortAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/NoArgsReturnPortAc.ref.hpp @@ -44,7 +44,7 @@ namespace Ports { //! The port callback function type typedef U32 (*CompFuncPtr)( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ); public: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveCommandsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveCommandsComponentAc.ref.cpp index f069dfa77..f2da9a896 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveCommandsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveCommandsComponentAc.ref.cpp @@ -17,15 +17,15 @@ // ---------------------------------------------------------------------- void PassiveCommandsComponentBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -48,8 +48,8 @@ void PassiveCommandsComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -72,8 +72,8 @@ void PassiveCommandsComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -96,8 +96,8 @@ void PassiveCommandsComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -120,8 +120,8 @@ void PassiveCommandsComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -144,8 +144,8 @@ void PassiveCommandsComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -168,8 +168,8 @@ void PassiveCommandsComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -192,8 +192,8 @@ void PassiveCommandsComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -216,8 +216,8 @@ void PassiveCommandsComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -240,8 +240,8 @@ void PassiveCommandsComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -259,8 +259,8 @@ void PassiveCommandsComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -278,8 +278,8 @@ void PassiveCommandsComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -297,8 +297,8 @@ void PassiveCommandsComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -316,8 +316,8 @@ void PassiveCommandsComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -336,8 +336,8 @@ void PassiveCommandsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -356,8 +356,8 @@ void PassiveCommandsComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -375,8 +375,8 @@ void PassiveCommandsComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -394,8 +394,8 @@ void PassiveCommandsComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -413,8 +413,8 @@ void PassiveCommandsComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -432,8 +432,8 @@ void PassiveCommandsComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -451,8 +451,8 @@ void PassiveCommandsComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -474,7 +474,7 @@ void PassiveCommandsComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* PassiveCommandsComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -489,7 +489,7 @@ Fw::InputCmdPort* PassiveCommandsComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* PassiveCommandsComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -500,7 +500,7 @@ Ports::InputNoArgsPort* PassiveCommandsComponentBase :: } Ports::InputNoArgsReturnPort* PassiveCommandsComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -511,7 +511,7 @@ Ports::InputNoArgsReturnPort* PassiveCommandsComponentBase :: } Ports::InputNoArgsReturnPort* PassiveCommandsComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -522,7 +522,7 @@ Ports::InputNoArgsReturnPort* PassiveCommandsComponentBase :: } Ports::InputNoArgsPort* PassiveCommandsComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -533,7 +533,7 @@ Ports::InputNoArgsPort* PassiveCommandsComponentBase :: } Ports::InputTypedPort* PassiveCommandsComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -544,7 +544,7 @@ Ports::InputTypedPort* PassiveCommandsComponentBase :: } Ports::InputTypedReturnPort* PassiveCommandsComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -555,7 +555,7 @@ Ports::InputTypedReturnPort* PassiveCommandsComponentBase :: } Ports::InputTypedReturnPort* PassiveCommandsComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -566,7 +566,7 @@ Ports::InputTypedReturnPort* PassiveCommandsComponentBase :: } Ports::InputTypedPort* PassiveCommandsComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -582,7 +582,7 @@ Ports::InputTypedPort* PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -596,7 +596,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -610,7 +610,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -624,7 +624,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -638,7 +638,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -654,7 +654,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -670,7 +670,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -684,7 +684,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -702,7 +702,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -716,7 +716,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -730,7 +730,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -744,7 +744,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -764,7 +764,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -778,7 +778,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -792,7 +792,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -806,7 +806,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -822,7 +822,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -838,7 +838,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -852,7 +852,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -874,7 +874,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -888,7 +888,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -981,146 +981,146 @@ PassiveCommandsComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveCommandsComponentBase :: +FwIndexType PassiveCommandsComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveCommandsComponentBase :: +FwIndexType PassiveCommandsComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveCommandsComponentBase :: +FwIndexType PassiveCommandsComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveCommandsComponentBase :: +FwIndexType PassiveCommandsComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE PassiveCommandsComponentBase :: +FwIndexType PassiveCommandsComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE PassiveCommandsComponentBase :: +FwIndexType PassiveCommandsComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveCommandsComponentBase :: +FwIndexType PassiveCommandsComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveCommandsComponentBase :: +FwIndexType PassiveCommandsComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE PassiveCommandsComponentBase :: +FwIndexType PassiveCommandsComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveCommandsComponentBase :: +FwIndexType PassiveCommandsComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE PassiveCommandsComponentBase :: +FwIndexType PassiveCommandsComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE PassiveCommandsComponentBase :: +FwIndexType PassiveCommandsComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE PassiveCommandsComponentBase :: +FwIndexType PassiveCommandsComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveCommandsComponentBase :: +FwIndexType PassiveCommandsComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE PassiveCommandsComponentBase :: +FwIndexType PassiveCommandsComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE PassiveCommandsComponentBase :: +FwIndexType PassiveCommandsComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveCommandsComponentBase :: +FwIndexType PassiveCommandsComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveCommandsComponentBase :: +FwIndexType PassiveCommandsComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE PassiveCommandsComponentBase :: +FwIndexType PassiveCommandsComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE PassiveCommandsComponentBase :: +FwIndexType PassiveCommandsComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE PassiveCommandsComponentBase :: +FwIndexType PassiveCommandsComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1128,7 +1128,7 @@ NATIVE_INT_TYPE PassiveCommandsComponentBase :: // ---------------------------------------------------------------------- bool PassiveCommandsComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1139,7 +1139,7 @@ bool PassiveCommandsComponentBase :: } bool PassiveCommandsComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1150,7 +1150,7 @@ bool PassiveCommandsComponentBase :: } bool PassiveCommandsComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1161,7 +1161,7 @@ bool PassiveCommandsComponentBase :: } bool PassiveCommandsComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1172,7 +1172,7 @@ bool PassiveCommandsComponentBase :: } bool PassiveCommandsComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1185,7 +1185,7 @@ bool PassiveCommandsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool PassiveCommandsComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1198,7 +1198,7 @@ bool PassiveCommandsComponentBase :: #endif bool PassiveCommandsComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1209,7 +1209,7 @@ bool PassiveCommandsComponentBase :: } bool PassiveCommandsComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1224,7 +1224,7 @@ bool PassiveCommandsComponentBase :: // ---------------------------------------------------------------------- bool PassiveCommandsComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1235,7 +1235,7 @@ bool PassiveCommandsComponentBase :: } bool PassiveCommandsComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1246,7 +1246,7 @@ bool PassiveCommandsComponentBase :: } bool PassiveCommandsComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1257,7 +1257,7 @@ bool PassiveCommandsComponentBase :: } bool PassiveCommandsComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1274,7 +1274,7 @@ bool PassiveCommandsComponentBase :: // ---------------------------------------------------------------------- void PassiveCommandsComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1293,7 +1293,7 @@ void PassiveCommandsComponentBase :: } U32 PassiveCommandsComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1316,7 +1316,7 @@ U32 PassiveCommandsComponentBase :: } U32 PassiveCommandsComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1333,7 +1333,7 @@ U32 PassiveCommandsComponentBase :: } void PassiveCommandsComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1347,7 +1347,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1384,7 +1384,7 @@ void PassiveCommandsComponentBase :: F32 PassiveCommandsComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1425,7 +1425,7 @@ F32 PassiveCommandsComponentBase :: F32 PassiveCommandsComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1460,7 +1460,7 @@ F32 PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1494,7 +1494,7 @@ void PassiveCommandsComponentBase :: // ---------------------------------------------------------------------- void PassiveCommandsComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1504,7 +1504,7 @@ void PassiveCommandsComponentBase :: } U32 PassiveCommandsComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1515,7 +1515,7 @@ U32 PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1542,7 +1542,7 @@ void PassiveCommandsComponentBase :: F32 PassiveCommandsComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2259,7 +2259,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -2390,7 +2390,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -2401,7 +2401,7 @@ void PassiveCommandsComponentBase :: U32 PassiveCommandsComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -2412,7 +2412,7 @@ U32 PassiveCommandsComponentBase :: U32 PassiveCommandsComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -2423,7 +2423,7 @@ U32 PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -2434,7 +2434,7 @@ void PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2461,7 +2461,7 @@ void PassiveCommandsComponentBase :: F32 PassiveCommandsComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2488,7 +2488,7 @@ F32 PassiveCommandsComponentBase :: F32 PassiveCommandsComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2515,7 +2515,7 @@ F32 PassiveCommandsComponentBase :: void PassiveCommandsComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveCommandsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveCommandsComponentAc.ref.hpp index cdea59e2d..9230603cb 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveCommandsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveCommandsComponentAc.ref.hpp @@ -114,7 +114,7 @@ class PassiveCommandsComponentBase : //! Initialize PassiveCommandsComponentBase object void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -127,7 +127,7 @@ class PassiveCommandsComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -140,56 +140,56 @@ class PassiveCommandsComponentBase : //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -200,31 +200,31 @@ class PassiveCommandsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); @@ -232,7 +232,7 @@ class PassiveCommandsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -240,13 +240,13 @@ class PassiveCommandsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -258,25 +258,25 @@ class PassiveCommandsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -290,25 +290,25 @@ class PassiveCommandsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -316,7 +316,7 @@ class PassiveCommandsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -324,13 +324,13 @@ class PassiveCommandsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -346,13 +346,13 @@ class PassiveCommandsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -392,7 +392,7 @@ class PassiveCommandsComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; PROTECTED: @@ -403,42 +403,42 @@ class PassiveCommandsComponentBase : //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -449,46 +449,46 @@ class PassiveCommandsComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -499,22 +499,22 @@ class PassiveCommandsComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -526,35 +526,35 @@ class PassiveCommandsComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -563,7 +563,7 @@ class PassiveCommandsComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -572,14 +572,14 @@ class PassiveCommandsComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -592,28 +592,28 @@ class PassiveCommandsComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -624,27 +624,27 @@ class PassiveCommandsComponentBase : //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -656,7 +656,7 @@ class PassiveCommandsComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -668,7 +668,7 @@ class PassiveCommandsComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -680,7 +680,7 @@ class PassiveCommandsComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -700,27 +700,27 @@ class PassiveCommandsComponentBase : //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -732,7 +732,7 @@ class PassiveCommandsComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -744,7 +744,7 @@ class PassiveCommandsComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -756,7 +756,7 @@ class PassiveCommandsComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -774,17 +774,17 @@ class PassiveCommandsComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -796,7 +796,7 @@ class PassiveCommandsComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1088,7 +1088,7 @@ class PassiveCommandsComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -1103,31 +1103,31 @@ class PassiveCommandsComponentBase : //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1140,7 +1140,7 @@ class PassiveCommandsComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1153,7 +1153,7 @@ class PassiveCommandsComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1166,7 +1166,7 @@ class PassiveCommandsComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveEventsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveEventsComponentAc.ref.cpp index fe2252b26..b95c1b6c8 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveEventsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveEventsComponentAc.ref.cpp @@ -17,15 +17,15 @@ // ---------------------------------------------------------------------- void PassiveEventsComponentBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -48,8 +48,8 @@ void PassiveEventsComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -72,8 +72,8 @@ void PassiveEventsComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -96,8 +96,8 @@ void PassiveEventsComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -120,8 +120,8 @@ void PassiveEventsComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -144,8 +144,8 @@ void PassiveEventsComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -168,8 +168,8 @@ void PassiveEventsComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -192,8 +192,8 @@ void PassiveEventsComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -216,8 +216,8 @@ void PassiveEventsComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -240,8 +240,8 @@ void PassiveEventsComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -259,8 +259,8 @@ void PassiveEventsComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -278,8 +278,8 @@ void PassiveEventsComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -297,8 +297,8 @@ void PassiveEventsComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -316,8 +316,8 @@ void PassiveEventsComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -336,8 +336,8 @@ void PassiveEventsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -356,8 +356,8 @@ void PassiveEventsComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -375,8 +375,8 @@ void PassiveEventsComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -394,8 +394,8 @@ void PassiveEventsComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -413,8 +413,8 @@ void PassiveEventsComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -432,8 +432,8 @@ void PassiveEventsComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -451,8 +451,8 @@ void PassiveEventsComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -474,7 +474,7 @@ void PassiveEventsComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* PassiveEventsComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -489,7 +489,7 @@ Fw::InputCmdPort* PassiveEventsComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* PassiveEventsComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -500,7 +500,7 @@ Ports::InputNoArgsPort* PassiveEventsComponentBase :: } Ports::InputNoArgsReturnPort* PassiveEventsComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -511,7 +511,7 @@ Ports::InputNoArgsReturnPort* PassiveEventsComponentBase :: } Ports::InputNoArgsReturnPort* PassiveEventsComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -522,7 +522,7 @@ Ports::InputNoArgsReturnPort* PassiveEventsComponentBase :: } Ports::InputNoArgsPort* PassiveEventsComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -533,7 +533,7 @@ Ports::InputNoArgsPort* PassiveEventsComponentBase :: } Ports::InputTypedPort* PassiveEventsComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -544,7 +544,7 @@ Ports::InputTypedPort* PassiveEventsComponentBase :: } Ports::InputTypedReturnPort* PassiveEventsComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -555,7 +555,7 @@ Ports::InputTypedReturnPort* PassiveEventsComponentBase :: } Ports::InputTypedReturnPort* PassiveEventsComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -566,7 +566,7 @@ Ports::InputTypedReturnPort* PassiveEventsComponentBase :: } Ports::InputTypedPort* PassiveEventsComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -582,7 +582,7 @@ Ports::InputTypedPort* PassiveEventsComponentBase :: void PassiveEventsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -596,7 +596,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -610,7 +610,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -624,7 +624,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -638,7 +638,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -654,7 +654,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -670,7 +670,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -684,7 +684,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -702,7 +702,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -716,7 +716,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -730,7 +730,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -744,7 +744,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -764,7 +764,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -778,7 +778,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -792,7 +792,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -806,7 +806,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -822,7 +822,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -838,7 +838,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -852,7 +852,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -874,7 +874,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -888,7 +888,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -925,146 +925,146 @@ PassiveEventsComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveEventsComponentBase :: +FwIndexType PassiveEventsComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveEventsComponentBase :: +FwIndexType PassiveEventsComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveEventsComponentBase :: +FwIndexType PassiveEventsComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveEventsComponentBase :: +FwIndexType PassiveEventsComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE PassiveEventsComponentBase :: +FwIndexType PassiveEventsComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE PassiveEventsComponentBase :: +FwIndexType PassiveEventsComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveEventsComponentBase :: +FwIndexType PassiveEventsComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveEventsComponentBase :: +FwIndexType PassiveEventsComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE PassiveEventsComponentBase :: +FwIndexType PassiveEventsComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveEventsComponentBase :: +FwIndexType PassiveEventsComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE PassiveEventsComponentBase :: +FwIndexType PassiveEventsComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE PassiveEventsComponentBase :: +FwIndexType PassiveEventsComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE PassiveEventsComponentBase :: +FwIndexType PassiveEventsComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveEventsComponentBase :: +FwIndexType PassiveEventsComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE PassiveEventsComponentBase :: +FwIndexType PassiveEventsComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE PassiveEventsComponentBase :: +FwIndexType PassiveEventsComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveEventsComponentBase :: +FwIndexType PassiveEventsComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveEventsComponentBase :: +FwIndexType PassiveEventsComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE PassiveEventsComponentBase :: +FwIndexType PassiveEventsComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE PassiveEventsComponentBase :: +FwIndexType PassiveEventsComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE PassiveEventsComponentBase :: +FwIndexType PassiveEventsComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1072,7 +1072,7 @@ NATIVE_INT_TYPE PassiveEventsComponentBase :: // ---------------------------------------------------------------------- bool PassiveEventsComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1083,7 +1083,7 @@ bool PassiveEventsComponentBase :: } bool PassiveEventsComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1094,7 +1094,7 @@ bool PassiveEventsComponentBase :: } bool PassiveEventsComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1105,7 +1105,7 @@ bool PassiveEventsComponentBase :: } bool PassiveEventsComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1116,7 +1116,7 @@ bool PassiveEventsComponentBase :: } bool PassiveEventsComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1129,7 +1129,7 @@ bool PassiveEventsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool PassiveEventsComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1142,7 +1142,7 @@ bool PassiveEventsComponentBase :: #endif bool PassiveEventsComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1153,7 +1153,7 @@ bool PassiveEventsComponentBase :: } bool PassiveEventsComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1168,7 +1168,7 @@ bool PassiveEventsComponentBase :: // ---------------------------------------------------------------------- bool PassiveEventsComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1179,7 +1179,7 @@ bool PassiveEventsComponentBase :: } bool PassiveEventsComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1190,7 +1190,7 @@ bool PassiveEventsComponentBase :: } bool PassiveEventsComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1201,7 +1201,7 @@ bool PassiveEventsComponentBase :: } bool PassiveEventsComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1218,7 +1218,7 @@ bool PassiveEventsComponentBase :: // ---------------------------------------------------------------------- void PassiveEventsComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1237,7 +1237,7 @@ void PassiveEventsComponentBase :: } U32 PassiveEventsComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1260,7 +1260,7 @@ U32 PassiveEventsComponentBase :: } U32 PassiveEventsComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1277,7 +1277,7 @@ U32 PassiveEventsComponentBase :: } void PassiveEventsComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1291,7 +1291,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1328,7 +1328,7 @@ void PassiveEventsComponentBase :: F32 PassiveEventsComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1369,7 +1369,7 @@ F32 PassiveEventsComponentBase :: F32 PassiveEventsComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1404,7 +1404,7 @@ F32 PassiveEventsComponentBase :: void PassiveEventsComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1438,7 +1438,7 @@ void PassiveEventsComponentBase :: // ---------------------------------------------------------------------- void PassiveEventsComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1448,7 +1448,7 @@ void PassiveEventsComponentBase :: } U32 PassiveEventsComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1459,7 +1459,7 @@ U32 PassiveEventsComponentBase :: void PassiveEventsComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1486,7 +1486,7 @@ void PassiveEventsComponentBase :: F32 PassiveEventsComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2249,7 +2249,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -2268,7 +2268,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -2279,7 +2279,7 @@ void PassiveEventsComponentBase :: U32 PassiveEventsComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -2290,7 +2290,7 @@ U32 PassiveEventsComponentBase :: U32 PassiveEventsComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -2301,7 +2301,7 @@ U32 PassiveEventsComponentBase :: void PassiveEventsComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -2312,7 +2312,7 @@ void PassiveEventsComponentBase :: void PassiveEventsComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2339,7 +2339,7 @@ void PassiveEventsComponentBase :: F32 PassiveEventsComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2366,7 +2366,7 @@ F32 PassiveEventsComponentBase :: F32 PassiveEventsComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2393,7 +2393,7 @@ F32 PassiveEventsComponentBase :: void PassiveEventsComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveEventsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveEventsComponentAc.ref.hpp index b0622088a..33f881d78 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveEventsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveEventsComponentAc.ref.hpp @@ -116,7 +116,7 @@ class PassiveEventsComponentBase : //! Initialize PassiveEventsComponentBase object void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -129,7 +129,7 @@ class PassiveEventsComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -142,56 +142,56 @@ class PassiveEventsComponentBase : //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -202,31 +202,31 @@ class PassiveEventsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); @@ -234,7 +234,7 @@ class PassiveEventsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -242,13 +242,13 @@ class PassiveEventsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -260,25 +260,25 @@ class PassiveEventsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -292,25 +292,25 @@ class PassiveEventsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -318,7 +318,7 @@ class PassiveEventsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -326,13 +326,13 @@ class PassiveEventsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -348,13 +348,13 @@ class PassiveEventsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -383,7 +383,7 @@ class PassiveEventsComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; PROTECTED: @@ -394,42 +394,42 @@ class PassiveEventsComponentBase : //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -440,46 +440,46 @@ class PassiveEventsComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -490,22 +490,22 @@ class PassiveEventsComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -517,35 +517,35 @@ class PassiveEventsComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -554,7 +554,7 @@ class PassiveEventsComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -563,14 +563,14 @@ class PassiveEventsComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -583,28 +583,28 @@ class PassiveEventsComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -615,27 +615,27 @@ class PassiveEventsComponentBase : //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -647,7 +647,7 @@ class PassiveEventsComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -659,7 +659,7 @@ class PassiveEventsComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -671,7 +671,7 @@ class PassiveEventsComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -691,27 +691,27 @@ class PassiveEventsComponentBase : //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -723,7 +723,7 @@ class PassiveEventsComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -735,7 +735,7 @@ class PassiveEventsComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -747,7 +747,7 @@ class PassiveEventsComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -765,17 +765,17 @@ class PassiveEventsComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -787,7 +787,7 @@ class PassiveEventsComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -901,7 +901,7 @@ class PassiveEventsComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -916,31 +916,31 @@ class PassiveEventsComponentBase : //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -953,7 +953,7 @@ class PassiveEventsComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -966,7 +966,7 @@ class PassiveEventsComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -979,7 +979,7 @@ class PassiveEventsComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1087,13 +1087,13 @@ class PassiveEventsComponentBase : // ---------------------------------------------------------------------- //! Throttle for EventActivityLowThrottled - NATIVE_UINT_TYPE m_EventActivityLowThrottledThrottle; + FwIndexType m_EventActivityLowThrottledThrottle; //! Throttle for EventFatalThrottled - NATIVE_UINT_TYPE m_EventFatalThrottledThrottle; + FwIndexType m_EventFatalThrottledThrottle; //! Throttle for EventWarningLowThrottled - NATIVE_UINT_TYPE m_EventWarningLowThrottledThrottle; + FwIndexType m_EventWarningLowThrottledThrottle; PRIVATE: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductPortsOnlyComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductPortsOnlyComponentAc.ref.cpp index c90e4f24e..25deafa55 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductPortsOnlyComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductPortsOnlyComponentAc.ref.cpp @@ -17,15 +17,15 @@ // ---------------------------------------------------------------------- void PassiveGetProductPortsOnlyComponentBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect output port productGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productGetOut_OutputPorts()); port++ ) { this->m_productGetOut_OutputPort[port].init(); @@ -43,8 +43,8 @@ void PassiveGetProductPortsOnlyComponentBase :: // Connect output port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productSendOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productSendOut_OutputPorts()); port++ ) { this->m_productSendOut_OutputPort[port].init(); @@ -67,7 +67,7 @@ void PassiveGetProductPortsOnlyComponentBase :: void PassiveGetProductPortsOnlyComponentBase :: set_productGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpGetPort* port ) { @@ -81,7 +81,7 @@ void PassiveGetProductPortsOnlyComponentBase :: void PassiveGetProductPortsOnlyComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpSendPort* port ) { @@ -101,7 +101,7 @@ void PassiveGetProductPortsOnlyComponentBase :: void PassiveGetProductPortsOnlyComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -136,16 +136,16 @@ PassiveGetProductPortsOnlyComponentBase :: // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveGetProductPortsOnlyComponentBase :: +FwIndexType PassiveGetProductPortsOnlyComponentBase :: getNum_productGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productGetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveGetProductPortsOnlyComponentBase :: +FwIndexType PassiveGetProductPortsOnlyComponentBase :: getNum_productSendOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -153,7 +153,7 @@ NATIVE_INT_TYPE PassiveGetProductPortsOnlyComponentBase :: // ---------------------------------------------------------------------- bool PassiveGetProductPortsOnlyComponentBase :: - isConnected_productGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productGetOut_OutputPorts(), @@ -164,7 +164,7 @@ bool PassiveGetProductPortsOnlyComponentBase :: } bool PassiveGetProductPortsOnlyComponentBase :: - isConnected_productSendOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productSendOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productSendOut_OutputPorts(), @@ -180,7 +180,7 @@ bool PassiveGetProductPortsOnlyComponentBase :: Fw::Success PassiveGetProductPortsOnlyComponentBase :: productGetOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize, Fw::Buffer& buffer @@ -199,7 +199,7 @@ Fw::Success PassiveGetProductPortsOnlyComponentBase :: void PassiveGetProductPortsOnlyComponentBase :: productSendOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductPortsOnlyComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductPortsOnlyComponentAc.ref.hpp index b055475f7..25b8f589a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductPortsOnlyComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductPortsOnlyComponentAc.ref.hpp @@ -49,7 +49,7 @@ class PassiveGetProductPortsOnlyComponentBase : //! Initialize PassiveGetProductPortsOnlyComponentBase object void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -60,13 +60,13 @@ class PassiveGetProductPortsOnlyComponentBase : //! Connect port to productGetOut[portNum] void set_productGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpGetPort* port //!< The input port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpSendPort* port //!< The input port ); @@ -80,7 +80,7 @@ class PassiveGetProductPortsOnlyComponentBase : //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -109,12 +109,12 @@ class PassiveGetProductPortsOnlyComponentBase : //! Get the number of productGetOut output ports //! //! \return The number of productGetOut output ports - NATIVE_INT_TYPE getNum_productGetOut_OutputPorts() const; + FwIndexType getNum_productGetOut_OutputPorts() const; //! Get the number of productSendOut output ports //! //! \return The number of productSendOut output ports - NATIVE_INT_TYPE getNum_productSendOut_OutputPorts() const; + FwIndexType getNum_productSendOut_OutputPorts() const; PROTECTED: @@ -126,14 +126,14 @@ class PassiveGetProductPortsOnlyComponentBase : //! //! \return Whether port productGetOut is connected bool isConnected_productGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productSendOut is connected //! //! \return Whether port productSendOut is connected bool isConnected_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -144,7 +144,7 @@ class PassiveGetProductPortsOnlyComponentBase : //! Invoke output port productGetOut Fw::Success productGetOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID (input) FwSizeType dataSize, //!< The data size of the requested buffer (input) Fw::Buffer& buffer //!< The buffer (output) @@ -152,7 +152,7 @@ class PassiveGetProductPortsOnlyComponentBase : //! Invoke output port productSendOut void productSendOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.cpp index b75066918..2468ec3cf 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.cpp @@ -171,15 +171,15 @@ Fw::SerializeStatus PassiveGetProductsComponentBase::DpContainer :: // ---------------------------------------------------------------------- void PassiveGetProductsComponentBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -202,8 +202,8 @@ void PassiveGetProductsComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -226,8 +226,8 @@ void PassiveGetProductsComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -250,8 +250,8 @@ void PassiveGetProductsComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -274,8 +274,8 @@ void PassiveGetProductsComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -298,8 +298,8 @@ void PassiveGetProductsComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -322,8 +322,8 @@ void PassiveGetProductsComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -346,8 +346,8 @@ void PassiveGetProductsComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -370,8 +370,8 @@ void PassiveGetProductsComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -394,8 +394,8 @@ void PassiveGetProductsComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -413,8 +413,8 @@ void PassiveGetProductsComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -432,8 +432,8 @@ void PassiveGetProductsComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -451,8 +451,8 @@ void PassiveGetProductsComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -470,8 +470,8 @@ void PassiveGetProductsComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -489,8 +489,8 @@ void PassiveGetProductsComponentBase :: // Connect output port productGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productGetOut_OutputPorts()); port++ ) { this->m_productGetOut_OutputPort[port].init(); @@ -508,8 +508,8 @@ void PassiveGetProductsComponentBase :: // Connect output port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productSendOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productSendOut_OutputPorts()); port++ ) { this->m_productSendOut_OutputPort[port].init(); @@ -528,8 +528,8 @@ void PassiveGetProductsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -548,8 +548,8 @@ void PassiveGetProductsComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -567,8 +567,8 @@ void PassiveGetProductsComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -586,8 +586,8 @@ void PassiveGetProductsComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -605,8 +605,8 @@ void PassiveGetProductsComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -624,8 +624,8 @@ void PassiveGetProductsComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -643,8 +643,8 @@ void PassiveGetProductsComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -666,7 +666,7 @@ void PassiveGetProductsComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* PassiveGetProductsComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -681,7 +681,7 @@ Fw::InputCmdPort* PassiveGetProductsComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* PassiveGetProductsComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -692,7 +692,7 @@ Ports::InputNoArgsPort* PassiveGetProductsComponentBase :: } Ports::InputNoArgsReturnPort* PassiveGetProductsComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -703,7 +703,7 @@ Ports::InputNoArgsReturnPort* PassiveGetProductsComponentBase :: } Ports::InputNoArgsReturnPort* PassiveGetProductsComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -714,7 +714,7 @@ Ports::InputNoArgsReturnPort* PassiveGetProductsComponentBase :: } Ports::InputNoArgsPort* PassiveGetProductsComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -725,7 +725,7 @@ Ports::InputNoArgsPort* PassiveGetProductsComponentBase :: } Ports::InputTypedPort* PassiveGetProductsComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -736,7 +736,7 @@ Ports::InputTypedPort* PassiveGetProductsComponentBase :: } Ports::InputTypedReturnPort* PassiveGetProductsComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -747,7 +747,7 @@ Ports::InputTypedReturnPort* PassiveGetProductsComponentBase :: } Ports::InputTypedReturnPort* PassiveGetProductsComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -758,7 +758,7 @@ Ports::InputTypedReturnPort* PassiveGetProductsComponentBase :: } Ports::InputTypedPort* PassiveGetProductsComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -774,7 +774,7 @@ Ports::InputTypedPort* PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -788,7 +788,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -802,7 +802,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -816,7 +816,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -830,7 +830,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -844,7 +844,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_productGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpGetPort* port ) { @@ -858,7 +858,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpSendPort* port ) { @@ -874,7 +874,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -890,7 +890,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -904,7 +904,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -922,7 +922,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -936,7 +936,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -950,7 +950,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -964,7 +964,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -984,7 +984,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -998,7 +998,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1012,7 +1012,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1026,7 +1026,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1040,7 +1040,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1056,7 +1056,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1072,7 +1072,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1086,7 +1086,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1108,7 +1108,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1122,7 +1122,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1157,158 +1157,158 @@ PassiveGetProductsComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveGetProductsComponentBase :: +FwIndexType PassiveGetProductsComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveGetProductsComponentBase :: +FwIndexType PassiveGetProductsComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveGetProductsComponentBase :: +FwIndexType PassiveGetProductsComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveGetProductsComponentBase :: +FwIndexType PassiveGetProductsComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE PassiveGetProductsComponentBase :: +FwIndexType PassiveGetProductsComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE PassiveGetProductsComponentBase :: +FwIndexType PassiveGetProductsComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveGetProductsComponentBase :: +FwIndexType PassiveGetProductsComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveGetProductsComponentBase :: +FwIndexType PassiveGetProductsComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE PassiveGetProductsComponentBase :: +FwIndexType PassiveGetProductsComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveGetProductsComponentBase :: +FwIndexType PassiveGetProductsComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE PassiveGetProductsComponentBase :: +FwIndexType PassiveGetProductsComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE PassiveGetProductsComponentBase :: +FwIndexType PassiveGetProductsComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE PassiveGetProductsComponentBase :: +FwIndexType PassiveGetProductsComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveGetProductsComponentBase :: +FwIndexType PassiveGetProductsComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveGetProductsComponentBase :: +FwIndexType PassiveGetProductsComponentBase :: getNum_productGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productGetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveGetProductsComponentBase :: +FwIndexType PassiveGetProductsComponentBase :: getNum_productSendOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE PassiveGetProductsComponentBase :: +FwIndexType PassiveGetProductsComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE PassiveGetProductsComponentBase :: +FwIndexType PassiveGetProductsComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveGetProductsComponentBase :: +FwIndexType PassiveGetProductsComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveGetProductsComponentBase :: +FwIndexType PassiveGetProductsComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE PassiveGetProductsComponentBase :: +FwIndexType PassiveGetProductsComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE PassiveGetProductsComponentBase :: +FwIndexType PassiveGetProductsComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE PassiveGetProductsComponentBase :: +FwIndexType PassiveGetProductsComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1316,7 +1316,7 @@ NATIVE_INT_TYPE PassiveGetProductsComponentBase :: // ---------------------------------------------------------------------- bool PassiveGetProductsComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1327,7 +1327,7 @@ bool PassiveGetProductsComponentBase :: } bool PassiveGetProductsComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1338,7 +1338,7 @@ bool PassiveGetProductsComponentBase :: } bool PassiveGetProductsComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1349,7 +1349,7 @@ bool PassiveGetProductsComponentBase :: } bool PassiveGetProductsComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1360,7 +1360,7 @@ bool PassiveGetProductsComponentBase :: } bool PassiveGetProductsComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1371,7 +1371,7 @@ bool PassiveGetProductsComponentBase :: } bool PassiveGetProductsComponentBase :: - isConnected_productGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productGetOut_OutputPorts(), @@ -1382,7 +1382,7 @@ bool PassiveGetProductsComponentBase :: } bool PassiveGetProductsComponentBase :: - isConnected_productSendOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productSendOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productSendOut_OutputPorts(), @@ -1395,7 +1395,7 @@ bool PassiveGetProductsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool PassiveGetProductsComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1408,7 +1408,7 @@ bool PassiveGetProductsComponentBase :: #endif bool PassiveGetProductsComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1419,7 +1419,7 @@ bool PassiveGetProductsComponentBase :: } bool PassiveGetProductsComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1434,7 +1434,7 @@ bool PassiveGetProductsComponentBase :: // ---------------------------------------------------------------------- bool PassiveGetProductsComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1445,7 +1445,7 @@ bool PassiveGetProductsComponentBase :: } bool PassiveGetProductsComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1456,7 +1456,7 @@ bool PassiveGetProductsComponentBase :: } bool PassiveGetProductsComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1467,7 +1467,7 @@ bool PassiveGetProductsComponentBase :: } bool PassiveGetProductsComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1484,7 +1484,7 @@ bool PassiveGetProductsComponentBase :: // ---------------------------------------------------------------------- void PassiveGetProductsComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1503,7 +1503,7 @@ void PassiveGetProductsComponentBase :: } U32 PassiveGetProductsComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1526,7 +1526,7 @@ U32 PassiveGetProductsComponentBase :: } U32 PassiveGetProductsComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1543,7 +1543,7 @@ U32 PassiveGetProductsComponentBase :: } void PassiveGetProductsComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1557,7 +1557,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1594,7 +1594,7 @@ void PassiveGetProductsComponentBase :: F32 PassiveGetProductsComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1635,7 +1635,7 @@ F32 PassiveGetProductsComponentBase :: F32 PassiveGetProductsComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1670,7 +1670,7 @@ F32 PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1705,7 +1705,7 @@ void PassiveGetProductsComponentBase :: Fw::Success PassiveGetProductsComponentBase :: productGetOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize, Fw::Buffer& buffer @@ -1724,7 +1724,7 @@ Fw::Success PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: productSendOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -1744,7 +1744,7 @@ void PassiveGetProductsComponentBase :: // ---------------------------------------------------------------------- void PassiveGetProductsComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1754,7 +1754,7 @@ void PassiveGetProductsComponentBase :: } U32 PassiveGetProductsComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1765,7 +1765,7 @@ U32 PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1792,7 +1792,7 @@ void PassiveGetProductsComponentBase :: F32 PassiveGetProductsComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1890,7 +1890,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -1909,7 +1909,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -1920,7 +1920,7 @@ void PassiveGetProductsComponentBase :: U32 PassiveGetProductsComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -1931,7 +1931,7 @@ U32 PassiveGetProductsComponentBase :: U32 PassiveGetProductsComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -1942,7 +1942,7 @@ U32 PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -1953,7 +1953,7 @@ void PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1980,7 +1980,7 @@ void PassiveGetProductsComponentBase :: F32 PassiveGetProductsComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2007,7 +2007,7 @@ F32 PassiveGetProductsComponentBase :: F32 PassiveGetProductsComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2034,7 +2034,7 @@ F32 PassiveGetProductsComponentBase :: void PassiveGetProductsComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.hpp index 31492d572..04b470ef6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.hpp @@ -202,7 +202,7 @@ class PassiveGetProductsComponentBase : //! Initialize PassiveGetProductsComponentBase object void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -215,7 +215,7 @@ class PassiveGetProductsComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -228,56 +228,56 @@ class PassiveGetProductsComponentBase : //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -288,43 +288,43 @@ class PassiveGetProductsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); //! Connect port to productGetOut[portNum] void set_productGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpGetPort* port //!< The input port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpSendPort* port //!< The input port ); @@ -332,7 +332,7 @@ class PassiveGetProductsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -340,13 +340,13 @@ class PassiveGetProductsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -358,25 +358,25 @@ class PassiveGetProductsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -390,31 +390,31 @@ class PassiveGetProductsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -422,7 +422,7 @@ class PassiveGetProductsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -430,13 +430,13 @@ class PassiveGetProductsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -452,13 +452,13 @@ class PassiveGetProductsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -487,7 +487,7 @@ class PassiveGetProductsComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; PROTECTED: @@ -498,42 +498,42 @@ class PassiveGetProductsComponentBase : //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -544,56 +544,56 @@ class PassiveGetProductsComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; //! Get the number of productGetOut output ports //! //! \return The number of productGetOut output ports - NATIVE_INT_TYPE getNum_productGetOut_OutputPorts() const; + FwIndexType getNum_productGetOut_OutputPorts() const; //! Get the number of productSendOut output ports //! //! \return The number of productSendOut output ports - NATIVE_INT_TYPE getNum_productSendOut_OutputPorts() const; + FwIndexType getNum_productSendOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -604,22 +604,22 @@ class PassiveGetProductsComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -631,49 +631,49 @@ class PassiveGetProductsComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productGetOut is connected //! //! \return Whether port productGetOut is connected bool isConnected_productGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productSendOut is connected //! //! \return Whether port productSendOut is connected bool isConnected_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -682,7 +682,7 @@ class PassiveGetProductsComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -691,14 +691,14 @@ class PassiveGetProductsComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -711,28 +711,28 @@ class PassiveGetProductsComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -743,27 +743,27 @@ class PassiveGetProductsComponentBase : //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -775,7 +775,7 @@ class PassiveGetProductsComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -787,7 +787,7 @@ class PassiveGetProductsComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -799,7 +799,7 @@ class PassiveGetProductsComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -819,27 +819,27 @@ class PassiveGetProductsComponentBase : //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -851,7 +851,7 @@ class PassiveGetProductsComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -863,7 +863,7 @@ class PassiveGetProductsComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -875,7 +875,7 @@ class PassiveGetProductsComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -893,7 +893,7 @@ class PassiveGetProductsComponentBase : //! Invoke output port productGetOut Fw::Success productGetOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID (input) FwSizeType dataSize, //!< The data size of the requested buffer (input) Fw::Buffer& buffer //!< The buffer (output) @@ -901,7 +901,7 @@ class PassiveGetProductsComponentBase : //! Invoke output port productSendOut void productSendOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -914,17 +914,17 @@ class PassiveGetProductsComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -936,7 +936,7 @@ class PassiveGetProductsComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1074,7 +1074,7 @@ class PassiveGetProductsComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -1089,31 +1089,31 @@ class PassiveGetProductsComponentBase : //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1126,7 +1126,7 @@ class PassiveGetProductsComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1139,7 +1139,7 @@ class PassiveGetProductsComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1152,7 +1152,7 @@ class PassiveGetProductsComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.cpp index 8da739897..81279a683 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.cpp @@ -171,15 +171,15 @@ Fw::SerializeStatus PassiveGuardedProductsComponentBase::DpContainer :: // ---------------------------------------------------------------------- void PassiveGuardedProductsComponentBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -202,8 +202,8 @@ void PassiveGuardedProductsComponentBase :: // Connect input port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRecvIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRecvIn_InputPorts()); port++ ) { this->m_productRecvIn_InputPort[port].init(); @@ -226,8 +226,8 @@ void PassiveGuardedProductsComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -250,8 +250,8 @@ void PassiveGuardedProductsComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -274,8 +274,8 @@ void PassiveGuardedProductsComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -298,8 +298,8 @@ void PassiveGuardedProductsComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -322,8 +322,8 @@ void PassiveGuardedProductsComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -346,8 +346,8 @@ void PassiveGuardedProductsComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -370,8 +370,8 @@ void PassiveGuardedProductsComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -394,8 +394,8 @@ void PassiveGuardedProductsComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -418,8 +418,8 @@ void PassiveGuardedProductsComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -437,8 +437,8 @@ void PassiveGuardedProductsComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -456,8 +456,8 @@ void PassiveGuardedProductsComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -475,8 +475,8 @@ void PassiveGuardedProductsComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -494,8 +494,8 @@ void PassiveGuardedProductsComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -513,8 +513,8 @@ void PassiveGuardedProductsComponentBase :: // Connect output port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRequestOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRequestOut_OutputPorts()); port++ ) { this->m_productRequestOut_OutputPort[port].init(); @@ -532,8 +532,8 @@ void PassiveGuardedProductsComponentBase :: // Connect output port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productSendOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productSendOut_OutputPorts()); port++ ) { this->m_productSendOut_OutputPort[port].init(); @@ -552,8 +552,8 @@ void PassiveGuardedProductsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -572,8 +572,8 @@ void PassiveGuardedProductsComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -591,8 +591,8 @@ void PassiveGuardedProductsComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -610,8 +610,8 @@ void PassiveGuardedProductsComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -629,8 +629,8 @@ void PassiveGuardedProductsComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -648,8 +648,8 @@ void PassiveGuardedProductsComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -667,8 +667,8 @@ void PassiveGuardedProductsComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -690,7 +690,7 @@ void PassiveGuardedProductsComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* PassiveGuardedProductsComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -701,7 +701,7 @@ Fw::InputCmdPort* PassiveGuardedProductsComponentBase :: } Fw::InputDpResponsePort* PassiveGuardedProductsComponentBase :: - get_productRecvIn_InputPort(NATIVE_INT_TYPE portNum) + get_productRecvIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRecvIn_InputPorts(), @@ -716,7 +716,7 @@ Fw::InputDpResponsePort* PassiveGuardedProductsComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* PassiveGuardedProductsComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -727,7 +727,7 @@ Ports::InputNoArgsPort* PassiveGuardedProductsComponentBase :: } Ports::InputNoArgsReturnPort* PassiveGuardedProductsComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -738,7 +738,7 @@ Ports::InputNoArgsReturnPort* PassiveGuardedProductsComponentBase :: } Ports::InputNoArgsReturnPort* PassiveGuardedProductsComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -749,7 +749,7 @@ Ports::InputNoArgsReturnPort* PassiveGuardedProductsComponentBase :: } Ports::InputNoArgsPort* PassiveGuardedProductsComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -760,7 +760,7 @@ Ports::InputNoArgsPort* PassiveGuardedProductsComponentBase :: } Ports::InputTypedPort* PassiveGuardedProductsComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -771,7 +771,7 @@ Ports::InputTypedPort* PassiveGuardedProductsComponentBase :: } Ports::InputTypedReturnPort* PassiveGuardedProductsComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -782,7 +782,7 @@ Ports::InputTypedReturnPort* PassiveGuardedProductsComponentBase :: } Ports::InputTypedReturnPort* PassiveGuardedProductsComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -793,7 +793,7 @@ Ports::InputTypedReturnPort* PassiveGuardedProductsComponentBase :: } Ports::InputTypedPort* PassiveGuardedProductsComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -809,7 +809,7 @@ Ports::InputTypedPort* PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -823,7 +823,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -837,7 +837,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -851,7 +851,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -865,7 +865,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -879,7 +879,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpRequestPort* port ) { @@ -893,7 +893,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpSendPort* port ) { @@ -909,7 +909,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -925,7 +925,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -939,7 +939,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -957,7 +957,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -971,7 +971,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -985,7 +985,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -999,7 +999,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -1019,7 +1019,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1033,7 +1033,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1047,7 +1047,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1061,7 +1061,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1075,7 +1075,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1089,7 +1089,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1105,7 +1105,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1121,7 +1121,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1135,7 +1135,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1157,7 +1157,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1171,7 +1171,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1206,164 +1206,164 @@ PassiveGuardedProductsComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_productRecvIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_productRequestOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); } -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_productSendOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: +FwIndexType PassiveGuardedProductsComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1371,7 +1371,7 @@ NATIVE_INT_TYPE PassiveGuardedProductsComponentBase :: // ---------------------------------------------------------------------- bool PassiveGuardedProductsComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1382,7 +1382,7 @@ bool PassiveGuardedProductsComponentBase :: } bool PassiveGuardedProductsComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1393,7 +1393,7 @@ bool PassiveGuardedProductsComponentBase :: } bool PassiveGuardedProductsComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1404,7 +1404,7 @@ bool PassiveGuardedProductsComponentBase :: } bool PassiveGuardedProductsComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1415,7 +1415,7 @@ bool PassiveGuardedProductsComponentBase :: } bool PassiveGuardedProductsComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1426,7 +1426,7 @@ bool PassiveGuardedProductsComponentBase :: } bool PassiveGuardedProductsComponentBase :: - isConnected_productRequestOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productRequestOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRequestOut_OutputPorts(), @@ -1437,7 +1437,7 @@ bool PassiveGuardedProductsComponentBase :: } bool PassiveGuardedProductsComponentBase :: - isConnected_productSendOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productSendOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productSendOut_OutputPorts(), @@ -1450,7 +1450,7 @@ bool PassiveGuardedProductsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool PassiveGuardedProductsComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1463,7 +1463,7 @@ bool PassiveGuardedProductsComponentBase :: #endif bool PassiveGuardedProductsComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1474,7 +1474,7 @@ bool PassiveGuardedProductsComponentBase :: } bool PassiveGuardedProductsComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1489,7 +1489,7 @@ bool PassiveGuardedProductsComponentBase :: // ---------------------------------------------------------------------- bool PassiveGuardedProductsComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1500,7 +1500,7 @@ bool PassiveGuardedProductsComponentBase :: } bool PassiveGuardedProductsComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1511,7 +1511,7 @@ bool PassiveGuardedProductsComponentBase :: } bool PassiveGuardedProductsComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1522,7 +1522,7 @@ bool PassiveGuardedProductsComponentBase :: } bool PassiveGuardedProductsComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1540,7 +1540,7 @@ bool PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -1574,7 +1574,7 @@ void PassiveGuardedProductsComponentBase :: // ---------------------------------------------------------------------- void PassiveGuardedProductsComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1593,7 +1593,7 @@ void PassiveGuardedProductsComponentBase :: } U32 PassiveGuardedProductsComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1616,7 +1616,7 @@ U32 PassiveGuardedProductsComponentBase :: } U32 PassiveGuardedProductsComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1633,7 +1633,7 @@ U32 PassiveGuardedProductsComponentBase :: } void PassiveGuardedProductsComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1647,7 +1647,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1684,7 +1684,7 @@ void PassiveGuardedProductsComponentBase :: F32 PassiveGuardedProductsComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1725,7 +1725,7 @@ F32 PassiveGuardedProductsComponentBase :: F32 PassiveGuardedProductsComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1760,7 +1760,7 @@ F32 PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1799,7 +1799,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -1814,7 +1814,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: productRequestOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -1831,7 +1831,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: productSendOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -1851,7 +1851,7 @@ void PassiveGuardedProductsComponentBase :: // ---------------------------------------------------------------------- void PassiveGuardedProductsComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1861,7 +1861,7 @@ void PassiveGuardedProductsComponentBase :: } U32 PassiveGuardedProductsComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1872,7 +1872,7 @@ U32 PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1899,7 +1899,7 @@ void PassiveGuardedProductsComponentBase :: F32 PassiveGuardedProductsComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1997,7 +1997,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -2012,7 +2012,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -2035,7 +2035,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -2046,7 +2046,7 @@ void PassiveGuardedProductsComponentBase :: U32 PassiveGuardedProductsComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -2057,7 +2057,7 @@ U32 PassiveGuardedProductsComponentBase :: U32 PassiveGuardedProductsComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -2068,7 +2068,7 @@ U32 PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -2079,7 +2079,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2106,7 +2106,7 @@ void PassiveGuardedProductsComponentBase :: F32 PassiveGuardedProductsComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2133,7 +2133,7 @@ F32 PassiveGuardedProductsComponentBase :: F32 PassiveGuardedProductsComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2160,7 +2160,7 @@ F32 PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2201,7 +2201,7 @@ void PassiveGuardedProductsComponentBase :: void PassiveGuardedProductsComponentBase :: productRecvIn_handler( - const NATIVE_INT_TYPE portNum, + const FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp index 0260818b4..5b535f980 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp @@ -204,7 +204,7 @@ class PassiveGuardedProductsComponentBase : //! Initialize PassiveGuardedProductsComponentBase object void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -217,14 +217,14 @@ class PassiveGuardedProductsComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get special input port at index //! //! \return productRecvIn[portNum] Fw::InputDpResponsePort* get_productRecvIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -237,56 +237,56 @@ class PassiveGuardedProductsComponentBase : //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -297,43 +297,43 @@ class PassiveGuardedProductsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpRequestPort* port //!< The input port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpSendPort* port //!< The input port ); @@ -341,7 +341,7 @@ class PassiveGuardedProductsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -349,13 +349,13 @@ class PassiveGuardedProductsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -367,25 +367,25 @@ class PassiveGuardedProductsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -399,37 +399,37 @@ class PassiveGuardedProductsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -437,7 +437,7 @@ class PassiveGuardedProductsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -445,13 +445,13 @@ class PassiveGuardedProductsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -467,13 +467,13 @@ class PassiveGuardedProductsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -502,12 +502,12 @@ class PassiveGuardedProductsComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; //! Get the number of productRecvIn input ports //! //! \return The number of productRecvIn input ports - NATIVE_INT_TYPE getNum_productRecvIn_InputPorts() const; + FwIndexType getNum_productRecvIn_InputPorts() const; PROTECTED: @@ -518,42 +518,42 @@ class PassiveGuardedProductsComponentBase : //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -564,56 +564,56 @@ class PassiveGuardedProductsComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; //! Get the number of productRequestOut output ports //! //! \return The number of productRequestOut output ports - NATIVE_INT_TYPE getNum_productRequestOut_OutputPorts() const; + FwIndexType getNum_productRequestOut_OutputPorts() const; //! Get the number of productSendOut output ports //! //! \return The number of productSendOut output ports - NATIVE_INT_TYPE getNum_productSendOut_OutputPorts() const; + FwIndexType getNum_productSendOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -624,22 +624,22 @@ class PassiveGuardedProductsComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -651,49 +651,49 @@ class PassiveGuardedProductsComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productRequestOut is connected //! //! \return Whether port productRequestOut is connected bool isConnected_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productSendOut is connected //! //! \return Whether port productSendOut is connected bool isConnected_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -702,7 +702,7 @@ class PassiveGuardedProductsComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -711,14 +711,14 @@ class PassiveGuardedProductsComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -731,28 +731,28 @@ class PassiveGuardedProductsComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -765,7 +765,7 @@ class PassiveGuardedProductsComponentBase : //! Handler base-class function for input port productRecvIn void productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -779,27 +779,27 @@ class PassiveGuardedProductsComponentBase : //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -811,7 +811,7 @@ class PassiveGuardedProductsComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -823,7 +823,7 @@ class PassiveGuardedProductsComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -835,7 +835,7 @@ class PassiveGuardedProductsComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -855,27 +855,27 @@ class PassiveGuardedProductsComponentBase : //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -887,7 +887,7 @@ class PassiveGuardedProductsComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -899,7 +899,7 @@ class PassiveGuardedProductsComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -911,7 +911,7 @@ class PassiveGuardedProductsComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -933,7 +933,7 @@ class PassiveGuardedProductsComponentBase : //! Pre-message hook for async input port productRecvIn virtual void productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -947,14 +947,14 @@ class PassiveGuardedProductsComponentBase : //! Invoke output port productRequestOut void productRequestOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); //! Invoke output port productSendOut void productSendOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -967,17 +967,17 @@ class PassiveGuardedProductsComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -989,7 +989,7 @@ class PassiveGuardedProductsComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1117,7 +1117,7 @@ class PassiveGuardedProductsComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -1126,7 +1126,7 @@ class PassiveGuardedProductsComponentBase : //! Callback for port productRecvIn static void m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -1141,31 +1141,31 @@ class PassiveGuardedProductsComponentBase : //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1178,7 +1178,7 @@ class PassiveGuardedProductsComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1191,7 +1191,7 @@ class PassiveGuardedProductsComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1204,7 +1204,7 @@ class PassiveGuardedProductsComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1228,7 +1228,7 @@ class PassiveGuardedProductsComponentBase : //! Handler implementation for productRecvIn void productRecvIn_handler( - const NATIVE_INT_TYPE portNum, //!< The port number + const FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container id const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The buffer status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp index ec69bcc2b..da6319d86 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp @@ -17,15 +17,15 @@ // ---------------------------------------------------------------------- void PassiveParamsComponentBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -48,8 +48,8 @@ void PassiveParamsComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -72,8 +72,8 @@ void PassiveParamsComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -96,8 +96,8 @@ void PassiveParamsComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -120,8 +120,8 @@ void PassiveParamsComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -144,8 +144,8 @@ void PassiveParamsComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -168,8 +168,8 @@ void PassiveParamsComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -192,8 +192,8 @@ void PassiveParamsComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -216,8 +216,8 @@ void PassiveParamsComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -240,8 +240,8 @@ void PassiveParamsComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -259,8 +259,8 @@ void PassiveParamsComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -278,8 +278,8 @@ void PassiveParamsComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -297,8 +297,8 @@ void PassiveParamsComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -316,8 +316,8 @@ void PassiveParamsComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -336,8 +336,8 @@ void PassiveParamsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -356,8 +356,8 @@ void PassiveParamsComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -375,8 +375,8 @@ void PassiveParamsComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -394,8 +394,8 @@ void PassiveParamsComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -413,8 +413,8 @@ void PassiveParamsComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -432,8 +432,8 @@ void PassiveParamsComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -451,8 +451,8 @@ void PassiveParamsComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -474,7 +474,7 @@ void PassiveParamsComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* PassiveParamsComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -489,7 +489,7 @@ Fw::InputCmdPort* PassiveParamsComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* PassiveParamsComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -500,7 +500,7 @@ Ports::InputNoArgsPort* PassiveParamsComponentBase :: } Ports::InputNoArgsReturnPort* PassiveParamsComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -511,7 +511,7 @@ Ports::InputNoArgsReturnPort* PassiveParamsComponentBase :: } Ports::InputNoArgsReturnPort* PassiveParamsComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -522,7 +522,7 @@ Ports::InputNoArgsReturnPort* PassiveParamsComponentBase :: } Ports::InputNoArgsPort* PassiveParamsComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -533,7 +533,7 @@ Ports::InputNoArgsPort* PassiveParamsComponentBase :: } Ports::InputTypedPort* PassiveParamsComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -544,7 +544,7 @@ Ports::InputTypedPort* PassiveParamsComponentBase :: } Ports::InputTypedReturnPort* PassiveParamsComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -555,7 +555,7 @@ Ports::InputTypedReturnPort* PassiveParamsComponentBase :: } Ports::InputTypedReturnPort* PassiveParamsComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -566,7 +566,7 @@ Ports::InputTypedReturnPort* PassiveParamsComponentBase :: } Ports::InputTypedPort* PassiveParamsComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -582,7 +582,7 @@ Ports::InputTypedPort* PassiveParamsComponentBase :: void PassiveParamsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -596,7 +596,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -610,7 +610,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -624,7 +624,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -638,7 +638,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -654,7 +654,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -670,7 +670,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -684,7 +684,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -702,7 +702,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -716,7 +716,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -730,7 +730,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -744,7 +744,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -764,7 +764,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -778,7 +778,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -792,7 +792,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -806,7 +806,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -822,7 +822,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -838,7 +838,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -852,7 +852,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -874,7 +874,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -888,7 +888,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1161,146 +1161,146 @@ PassiveParamsComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveParamsComponentBase :: +FwIndexType PassiveParamsComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveParamsComponentBase :: +FwIndexType PassiveParamsComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveParamsComponentBase :: +FwIndexType PassiveParamsComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveParamsComponentBase :: +FwIndexType PassiveParamsComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE PassiveParamsComponentBase :: +FwIndexType PassiveParamsComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE PassiveParamsComponentBase :: +FwIndexType PassiveParamsComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveParamsComponentBase :: +FwIndexType PassiveParamsComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveParamsComponentBase :: +FwIndexType PassiveParamsComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE PassiveParamsComponentBase :: +FwIndexType PassiveParamsComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveParamsComponentBase :: +FwIndexType PassiveParamsComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE PassiveParamsComponentBase :: +FwIndexType PassiveParamsComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE PassiveParamsComponentBase :: +FwIndexType PassiveParamsComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE PassiveParamsComponentBase :: +FwIndexType PassiveParamsComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveParamsComponentBase :: +FwIndexType PassiveParamsComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE PassiveParamsComponentBase :: +FwIndexType PassiveParamsComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE PassiveParamsComponentBase :: +FwIndexType PassiveParamsComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveParamsComponentBase :: +FwIndexType PassiveParamsComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveParamsComponentBase :: +FwIndexType PassiveParamsComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE PassiveParamsComponentBase :: +FwIndexType PassiveParamsComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE PassiveParamsComponentBase :: +FwIndexType PassiveParamsComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE PassiveParamsComponentBase :: +FwIndexType PassiveParamsComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1308,7 +1308,7 @@ NATIVE_INT_TYPE PassiveParamsComponentBase :: // ---------------------------------------------------------------------- bool PassiveParamsComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1319,7 +1319,7 @@ bool PassiveParamsComponentBase :: } bool PassiveParamsComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1330,7 +1330,7 @@ bool PassiveParamsComponentBase :: } bool PassiveParamsComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1341,7 +1341,7 @@ bool PassiveParamsComponentBase :: } bool PassiveParamsComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1352,7 +1352,7 @@ bool PassiveParamsComponentBase :: } bool PassiveParamsComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1365,7 +1365,7 @@ bool PassiveParamsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool PassiveParamsComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1378,7 +1378,7 @@ bool PassiveParamsComponentBase :: #endif bool PassiveParamsComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1389,7 +1389,7 @@ bool PassiveParamsComponentBase :: } bool PassiveParamsComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1404,7 +1404,7 @@ bool PassiveParamsComponentBase :: // ---------------------------------------------------------------------- bool PassiveParamsComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1415,7 +1415,7 @@ bool PassiveParamsComponentBase :: } bool PassiveParamsComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1426,7 +1426,7 @@ bool PassiveParamsComponentBase :: } bool PassiveParamsComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1437,7 +1437,7 @@ bool PassiveParamsComponentBase :: } bool PassiveParamsComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1454,7 +1454,7 @@ bool PassiveParamsComponentBase :: // ---------------------------------------------------------------------- void PassiveParamsComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1473,7 +1473,7 @@ void PassiveParamsComponentBase :: } U32 PassiveParamsComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1496,7 +1496,7 @@ U32 PassiveParamsComponentBase :: } U32 PassiveParamsComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1513,7 +1513,7 @@ U32 PassiveParamsComponentBase :: } void PassiveParamsComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1527,7 +1527,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1564,7 +1564,7 @@ void PassiveParamsComponentBase :: F32 PassiveParamsComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1605,7 +1605,7 @@ F32 PassiveParamsComponentBase :: F32 PassiveParamsComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1640,7 +1640,7 @@ F32 PassiveParamsComponentBase :: void PassiveParamsComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1674,7 +1674,7 @@ void PassiveParamsComponentBase :: // ---------------------------------------------------------------------- void PassiveParamsComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1684,7 +1684,7 @@ void PassiveParamsComponentBase :: } U32 PassiveParamsComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1695,7 +1695,7 @@ U32 PassiveParamsComponentBase :: void PassiveParamsComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1722,7 +1722,7 @@ void PassiveParamsComponentBase :: F32 PassiveParamsComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1891,7 +1891,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -2034,7 +2034,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -2045,7 +2045,7 @@ void PassiveParamsComponentBase :: U32 PassiveParamsComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -2056,7 +2056,7 @@ U32 PassiveParamsComponentBase :: U32 PassiveParamsComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -2067,7 +2067,7 @@ U32 PassiveParamsComponentBase :: void PassiveParamsComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -2078,7 +2078,7 @@ void PassiveParamsComponentBase :: void PassiveParamsComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2105,7 +2105,7 @@ void PassiveParamsComponentBase :: F32 PassiveParamsComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2132,7 +2132,7 @@ F32 PassiveParamsComponentBase :: F32 PassiveParamsComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2159,7 +2159,7 @@ F32 PassiveParamsComponentBase :: void PassiveParamsComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp index 57b3c992b..d9971ada9 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp @@ -126,7 +126,7 @@ class PassiveParamsComponentBase : //! Initialize PassiveParamsComponentBase object void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -139,7 +139,7 @@ class PassiveParamsComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -152,56 +152,56 @@ class PassiveParamsComponentBase : //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -212,31 +212,31 @@ class PassiveParamsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); @@ -244,7 +244,7 @@ class PassiveParamsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -252,13 +252,13 @@ class PassiveParamsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -270,25 +270,25 @@ class PassiveParamsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -302,25 +302,25 @@ class PassiveParamsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -328,7 +328,7 @@ class PassiveParamsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -336,13 +336,13 @@ class PassiveParamsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -358,13 +358,13 @@ class PassiveParamsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -415,7 +415,7 @@ class PassiveParamsComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; PROTECTED: @@ -426,42 +426,42 @@ class PassiveParamsComponentBase : //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -472,46 +472,46 @@ class PassiveParamsComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -522,22 +522,22 @@ class PassiveParamsComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -549,35 +549,35 @@ class PassiveParamsComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -586,7 +586,7 @@ class PassiveParamsComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -595,14 +595,14 @@ class PassiveParamsComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -615,28 +615,28 @@ class PassiveParamsComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -647,27 +647,27 @@ class PassiveParamsComponentBase : //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -679,7 +679,7 @@ class PassiveParamsComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -691,7 +691,7 @@ class PassiveParamsComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -703,7 +703,7 @@ class PassiveParamsComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -723,27 +723,27 @@ class PassiveParamsComponentBase : //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -755,7 +755,7 @@ class PassiveParamsComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -767,7 +767,7 @@ class PassiveParamsComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -779,7 +779,7 @@ class PassiveParamsComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -797,17 +797,17 @@ class PassiveParamsComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -819,7 +819,7 @@ class PassiveParamsComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -960,7 +960,7 @@ class PassiveParamsComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -975,31 +975,31 @@ class PassiveParamsComponentBase : //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1012,7 +1012,7 @@ class PassiveParamsComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1025,7 +1025,7 @@ class PassiveParamsComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1038,7 +1038,7 @@ class PassiveParamsComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp index 0ff7380ca..7dcee29eb 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp @@ -17,15 +17,15 @@ // ---------------------------------------------------------------------- void PassiveSerialComponentBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -48,8 +48,8 @@ void PassiveSerialComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -72,8 +72,8 @@ void PassiveSerialComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -96,8 +96,8 @@ void PassiveSerialComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -120,8 +120,8 @@ void PassiveSerialComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -144,8 +144,8 @@ void PassiveSerialComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -168,8 +168,8 @@ void PassiveSerialComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -192,8 +192,8 @@ void PassiveSerialComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -216,8 +216,8 @@ void PassiveSerialComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -240,8 +240,8 @@ void PassiveSerialComponentBase :: // Connect input port serialGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_serialGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_serialGuarded_InputPorts()); port++ ) { this->m_serialGuarded_InputPort[port].init(); @@ -264,8 +264,8 @@ void PassiveSerialComponentBase :: // Connect input port serialSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_serialSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_serialSync_InputPorts()); port++ ) { this->m_serialSync_InputPort[port].init(); @@ -288,8 +288,8 @@ void PassiveSerialComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -307,8 +307,8 @@ void PassiveSerialComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -326,8 +326,8 @@ void PassiveSerialComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -345,8 +345,8 @@ void PassiveSerialComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -364,8 +364,8 @@ void PassiveSerialComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -384,8 +384,8 @@ void PassiveSerialComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -404,8 +404,8 @@ void PassiveSerialComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -423,8 +423,8 @@ void PassiveSerialComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -442,8 +442,8 @@ void PassiveSerialComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -461,8 +461,8 @@ void PassiveSerialComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -480,8 +480,8 @@ void PassiveSerialComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -499,8 +499,8 @@ void PassiveSerialComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -518,8 +518,8 @@ void PassiveSerialComponentBase :: // Connect output port serialOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_serialOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_serialOut_OutputPorts()); port++ ) { this->m_serialOut_OutputPort[port].init(); @@ -541,7 +541,7 @@ void PassiveSerialComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* PassiveSerialComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -556,7 +556,7 @@ Fw::InputCmdPort* PassiveSerialComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* PassiveSerialComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -567,7 +567,7 @@ Ports::InputNoArgsPort* PassiveSerialComponentBase :: } Ports::InputNoArgsReturnPort* PassiveSerialComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -578,7 +578,7 @@ Ports::InputNoArgsReturnPort* PassiveSerialComponentBase :: } Ports::InputNoArgsReturnPort* PassiveSerialComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -589,7 +589,7 @@ Ports::InputNoArgsReturnPort* PassiveSerialComponentBase :: } Ports::InputNoArgsPort* PassiveSerialComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -600,7 +600,7 @@ Ports::InputNoArgsPort* PassiveSerialComponentBase :: } Ports::InputTypedPort* PassiveSerialComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -611,7 +611,7 @@ Ports::InputTypedPort* PassiveSerialComponentBase :: } Ports::InputTypedReturnPort* PassiveSerialComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -622,7 +622,7 @@ Ports::InputTypedReturnPort* PassiveSerialComponentBase :: } Ports::InputTypedReturnPort* PassiveSerialComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -633,7 +633,7 @@ Ports::InputTypedReturnPort* PassiveSerialComponentBase :: } Ports::InputTypedPort* PassiveSerialComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -648,7 +648,7 @@ Ports::InputTypedPort* PassiveSerialComponentBase :: // ---------------------------------------------------------------------- Fw::InputSerializePort* PassiveSerialComponentBase :: - get_serialGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_serialGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_serialGuarded_InputPorts(), @@ -659,7 +659,7 @@ Fw::InputSerializePort* PassiveSerialComponentBase :: } Fw::InputSerializePort* PassiveSerialComponentBase :: - get_serialSync_InputPort(NATIVE_INT_TYPE portNum) + get_serialSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_serialSync_InputPorts(), @@ -675,7 +675,7 @@ Fw::InputSerializePort* PassiveSerialComponentBase :: void PassiveSerialComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -689,7 +689,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -703,7 +703,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -717,7 +717,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -731,7 +731,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -747,7 +747,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -763,7 +763,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -777,7 +777,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -795,7 +795,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -809,7 +809,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -823,7 +823,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -837,7 +837,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -857,7 +857,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -871,7 +871,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -885,7 +885,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -899,7 +899,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -915,7 +915,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -931,7 +931,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -945,7 +945,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -967,7 +967,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -981,7 +981,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1003,7 +1003,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: set_serialOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPortBase* port ) { @@ -1335,172 +1335,172 @@ PassiveSerialComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of serial input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_serialGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_serialSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of serial output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveSerialComponentBase :: +FwIndexType PassiveSerialComponentBase :: getNum_serialOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1508,7 +1508,7 @@ NATIVE_INT_TYPE PassiveSerialComponentBase :: // ---------------------------------------------------------------------- bool PassiveSerialComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1519,7 +1519,7 @@ bool PassiveSerialComponentBase :: } bool PassiveSerialComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1530,7 +1530,7 @@ bool PassiveSerialComponentBase :: } bool PassiveSerialComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1541,7 +1541,7 @@ bool PassiveSerialComponentBase :: } bool PassiveSerialComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1552,7 +1552,7 @@ bool PassiveSerialComponentBase :: } bool PassiveSerialComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1565,7 +1565,7 @@ bool PassiveSerialComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool PassiveSerialComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1578,7 +1578,7 @@ bool PassiveSerialComponentBase :: #endif bool PassiveSerialComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1589,7 +1589,7 @@ bool PassiveSerialComponentBase :: } bool PassiveSerialComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1604,7 +1604,7 @@ bool PassiveSerialComponentBase :: // ---------------------------------------------------------------------- bool PassiveSerialComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1615,7 +1615,7 @@ bool PassiveSerialComponentBase :: } bool PassiveSerialComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1626,7 +1626,7 @@ bool PassiveSerialComponentBase :: } bool PassiveSerialComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1637,7 +1637,7 @@ bool PassiveSerialComponentBase :: } bool PassiveSerialComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1652,7 +1652,7 @@ bool PassiveSerialComponentBase :: // ---------------------------------------------------------------------- bool PassiveSerialComponentBase :: - isConnected_serialOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_serialOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_serialOut_OutputPorts(), @@ -1669,7 +1669,7 @@ bool PassiveSerialComponentBase :: // ---------------------------------------------------------------------- void PassiveSerialComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1688,7 +1688,7 @@ void PassiveSerialComponentBase :: } U32 PassiveSerialComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1711,7 +1711,7 @@ U32 PassiveSerialComponentBase :: } U32 PassiveSerialComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1728,7 +1728,7 @@ U32 PassiveSerialComponentBase :: } void PassiveSerialComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1742,7 +1742,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1779,7 +1779,7 @@ void PassiveSerialComponentBase :: F32 PassiveSerialComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1820,7 +1820,7 @@ F32 PassiveSerialComponentBase :: F32 PassiveSerialComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1855,7 +1855,7 @@ F32 PassiveSerialComponentBase :: void PassiveSerialComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1892,7 +1892,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: serialGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -1917,7 +1917,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: serialSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -1939,7 +1939,7 @@ void PassiveSerialComponentBase :: // ---------------------------------------------------------------------- void PassiveSerialComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1949,7 +1949,7 @@ void PassiveSerialComponentBase :: } U32 PassiveSerialComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1960,7 +1960,7 @@ U32 PassiveSerialComponentBase :: void PassiveSerialComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1987,7 +1987,7 @@ void PassiveSerialComponentBase :: F32 PassiveSerialComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2018,7 +2018,7 @@ F32 PassiveSerialComponentBase :: Fw::SerializeStatus PassiveSerialComponentBase :: serialOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -3901,7 +3901,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -4152,7 +4152,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -4163,7 +4163,7 @@ void PassiveSerialComponentBase :: U32 PassiveSerialComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -4174,7 +4174,7 @@ U32 PassiveSerialComponentBase :: U32 PassiveSerialComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -4185,7 +4185,7 @@ U32 PassiveSerialComponentBase :: void PassiveSerialComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -4196,7 +4196,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4223,7 +4223,7 @@ void PassiveSerialComponentBase :: F32 PassiveSerialComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4250,7 +4250,7 @@ F32 PassiveSerialComponentBase :: F32 PassiveSerialComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4277,7 +4277,7 @@ F32 PassiveSerialComponentBase :: void PassiveSerialComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4310,7 +4310,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: m_p_serialGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -4325,7 +4325,7 @@ void PassiveSerialComponentBase :: void PassiveSerialComponentBase :: m_p_serialSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp index 13bc9b696..17c457a34 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp @@ -189,7 +189,7 @@ class PassiveSerialComponentBase : //! Initialize PassiveSerialComponentBase object void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -202,7 +202,7 @@ class PassiveSerialComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -215,56 +215,56 @@ class PassiveSerialComponentBase : //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -277,14 +277,14 @@ class PassiveSerialComponentBase : //! //! \return serialGuarded[portNum] Fw::InputSerializePort* get_serialGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get serial input port at index //! //! \return serialSync[portNum] Fw::InputSerializePort* get_serialSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -295,31 +295,31 @@ class PassiveSerialComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); @@ -327,7 +327,7 @@ class PassiveSerialComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -335,13 +335,13 @@ class PassiveSerialComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -353,25 +353,25 @@ class PassiveSerialComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -385,25 +385,25 @@ class PassiveSerialComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -411,7 +411,7 @@ class PassiveSerialComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -419,13 +419,13 @@ class PassiveSerialComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -441,13 +441,13 @@ class PassiveSerialComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -463,7 +463,7 @@ class PassiveSerialComponentBase : //! Connect port to serialOut[portNum] void set_serialOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPortBase* port //!< The port ); @@ -514,7 +514,7 @@ class PassiveSerialComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; PROTECTED: @@ -525,42 +525,42 @@ class PassiveSerialComponentBase : //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -571,12 +571,12 @@ class PassiveSerialComponentBase : //! Get the number of serialGuarded input ports //! //! \return The number of serialGuarded input ports - NATIVE_INT_TYPE getNum_serialGuarded_InputPorts() const; + FwIndexType getNum_serialGuarded_InputPorts() const; //! Get the number of serialSync input ports //! //! \return The number of serialSync input ports - NATIVE_INT_TYPE getNum_serialSync_InputPorts() const; + FwIndexType getNum_serialSync_InputPorts() const; PROTECTED: @@ -587,46 +587,46 @@ class PassiveSerialComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -637,22 +637,22 @@ class PassiveSerialComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -663,7 +663,7 @@ class PassiveSerialComponentBase : //! Get the number of serialOut output ports //! //! \return The number of serialOut output ports - NATIVE_INT_TYPE getNum_serialOut_OutputPorts() const; + FwIndexType getNum_serialOut_OutputPorts() const; PROTECTED: @@ -675,35 +675,35 @@ class PassiveSerialComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -712,7 +712,7 @@ class PassiveSerialComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -721,14 +721,14 @@ class PassiveSerialComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -741,28 +741,28 @@ class PassiveSerialComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -775,7 +775,7 @@ class PassiveSerialComponentBase : //! //! \return Whether port serialOut is connected bool isConnected_serialOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -786,27 +786,27 @@ class PassiveSerialComponentBase : //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -818,7 +818,7 @@ class PassiveSerialComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -830,7 +830,7 @@ class PassiveSerialComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -842,7 +842,7 @@ class PassiveSerialComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -862,27 +862,27 @@ class PassiveSerialComponentBase : //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -894,7 +894,7 @@ class PassiveSerialComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -906,7 +906,7 @@ class PassiveSerialComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -918,7 +918,7 @@ class PassiveSerialComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -936,13 +936,13 @@ class PassiveSerialComponentBase : //! Handler for input port serialGuarded virtual void serialGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) = 0; //! Handler for input port serialSync virtual void serialSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) = 0; @@ -956,13 +956,13 @@ class PassiveSerialComponentBase : //! Handler base-class function for input port serialGuarded void serialGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Handler base-class function for input port serialSync void serialSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); @@ -974,17 +974,17 @@ class PassiveSerialComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -996,7 +996,7 @@ class PassiveSerialComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1014,7 +1014,7 @@ class PassiveSerialComponentBase : //! Invoke output port serialOut Fw::SerializeStatus serialOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); @@ -1546,7 +1546,7 @@ class PassiveSerialComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -1561,31 +1561,31 @@ class PassiveSerialComponentBase : //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1598,7 +1598,7 @@ class PassiveSerialComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1611,7 +1611,7 @@ class PassiveSerialComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1624,7 +1624,7 @@ class PassiveSerialComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1645,14 +1645,14 @@ class PassiveSerialComponentBase : //! Callback for port serialGuarded static void m_p_serialGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Callback for port serialSync static void m_p_serialSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); @@ -1861,13 +1861,13 @@ class PassiveSerialComponentBase : // ---------------------------------------------------------------------- //! Throttle for EventActivityLowThrottled - NATIVE_UINT_TYPE m_EventActivityLowThrottledThrottle; + FwIndexType m_EventActivityLowThrottledThrottle; //! Throttle for EventFatalThrottled - NATIVE_UINT_TYPE m_EventFatalThrottledThrottle; + FwIndexType m_EventFatalThrottledThrottle; //! Throttle for EventWarningLowThrottled - NATIVE_UINT_TYPE m_EventWarningLowThrottledThrottle; + FwIndexType m_EventWarningLowThrottledThrottle; PRIVATE: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductPortsOnlyComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductPortsOnlyComponentAc.ref.cpp index 811829fc2..801860ba0 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductPortsOnlyComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductPortsOnlyComponentAc.ref.cpp @@ -17,15 +17,15 @@ // ---------------------------------------------------------------------- void PassiveSyncProductPortsOnlyComponentBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRecvIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRecvIn_InputPorts()); port++ ) { this->m_productRecvIn_InputPort[port].init(); @@ -48,8 +48,8 @@ void PassiveSyncProductPortsOnlyComponentBase :: // Connect output port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRequestOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRequestOut_OutputPorts()); port++ ) { this->m_productRequestOut_OutputPort[port].init(); @@ -67,8 +67,8 @@ void PassiveSyncProductPortsOnlyComponentBase :: // Connect output port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productSendOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productSendOut_OutputPorts()); port++ ) { this->m_productSendOut_OutputPort[port].init(); @@ -90,7 +90,7 @@ void PassiveSyncProductPortsOnlyComponentBase :: // ---------------------------------------------------------------------- Fw::InputDpResponsePort* PassiveSyncProductPortsOnlyComponentBase :: - get_productRecvIn_InputPort(NATIVE_INT_TYPE portNum) + get_productRecvIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRecvIn_InputPorts(), @@ -106,7 +106,7 @@ Fw::InputDpResponsePort* PassiveSyncProductPortsOnlyComponentBase :: void PassiveSyncProductPortsOnlyComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpRequestPort* port ) { @@ -120,7 +120,7 @@ void PassiveSyncProductPortsOnlyComponentBase :: void PassiveSyncProductPortsOnlyComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpSendPort* port ) { @@ -140,7 +140,7 @@ void PassiveSyncProductPortsOnlyComponentBase :: void PassiveSyncProductPortsOnlyComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -154,7 +154,7 @@ void PassiveSyncProductPortsOnlyComponentBase :: void PassiveSyncProductPortsOnlyComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -189,26 +189,26 @@ PassiveSyncProductPortsOnlyComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveSyncProductPortsOnlyComponentBase :: +FwIndexType PassiveSyncProductPortsOnlyComponentBase :: getNum_productRecvIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveSyncProductPortsOnlyComponentBase :: +FwIndexType PassiveSyncProductPortsOnlyComponentBase :: getNum_productRequestOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); } -NATIVE_INT_TYPE PassiveSyncProductPortsOnlyComponentBase :: +FwIndexType PassiveSyncProductPortsOnlyComponentBase :: getNum_productSendOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -216,7 +216,7 @@ NATIVE_INT_TYPE PassiveSyncProductPortsOnlyComponentBase :: // ---------------------------------------------------------------------- bool PassiveSyncProductPortsOnlyComponentBase :: - isConnected_productRequestOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productRequestOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRequestOut_OutputPorts(), @@ -227,7 +227,7 @@ bool PassiveSyncProductPortsOnlyComponentBase :: } bool PassiveSyncProductPortsOnlyComponentBase :: - isConnected_productSendOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productSendOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productSendOut_OutputPorts(), @@ -245,7 +245,7 @@ bool PassiveSyncProductPortsOnlyComponentBase :: void PassiveSyncProductPortsOnlyComponentBase :: productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -276,7 +276,7 @@ void PassiveSyncProductPortsOnlyComponentBase :: void PassiveSyncProductPortsOnlyComponentBase :: productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -291,7 +291,7 @@ void PassiveSyncProductPortsOnlyComponentBase :: void PassiveSyncProductPortsOnlyComponentBase :: productRequestOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -308,7 +308,7 @@ void PassiveSyncProductPortsOnlyComponentBase :: void PassiveSyncProductPortsOnlyComponentBase :: productSendOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -330,7 +330,7 @@ void PassiveSyncProductPortsOnlyComponentBase :: void PassiveSyncProductPortsOnlyComponentBase :: m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -352,7 +352,7 @@ void PassiveSyncProductPortsOnlyComponentBase :: void PassiveSyncProductPortsOnlyComponentBase :: productRecvIn_handler( - const NATIVE_INT_TYPE portNum, + const FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductPortsOnlyComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductPortsOnlyComponentAc.ref.hpp index bb7e827ce..38365fb58 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductPortsOnlyComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductPortsOnlyComponentAc.ref.hpp @@ -55,7 +55,7 @@ class PassiveSyncProductPortsOnlyComponentBase : //! Initialize PassiveSyncProductPortsOnlyComponentBase object void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -68,7 +68,7 @@ class PassiveSyncProductPortsOnlyComponentBase : //! //! \return productRecvIn[portNum] Fw::InputDpResponsePort* get_productRecvIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -79,13 +79,13 @@ class PassiveSyncProductPortsOnlyComponentBase : //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpRequestPort* port //!< The input port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpSendPort* port //!< The input port ); @@ -99,13 +99,13 @@ class PassiveSyncProductPortsOnlyComponentBase : //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -134,7 +134,7 @@ class PassiveSyncProductPortsOnlyComponentBase : //! Get the number of productRecvIn input ports //! //! \return The number of productRecvIn input ports - NATIVE_INT_TYPE getNum_productRecvIn_InputPorts() const; + FwIndexType getNum_productRecvIn_InputPorts() const; PROTECTED: @@ -145,12 +145,12 @@ class PassiveSyncProductPortsOnlyComponentBase : //! Get the number of productRequestOut output ports //! //! \return The number of productRequestOut output ports - NATIVE_INT_TYPE getNum_productRequestOut_OutputPorts() const; + FwIndexType getNum_productRequestOut_OutputPorts() const; //! Get the number of productSendOut output ports //! //! \return The number of productSendOut output ports - NATIVE_INT_TYPE getNum_productSendOut_OutputPorts() const; + FwIndexType getNum_productSendOut_OutputPorts() const; PROTECTED: @@ -162,14 +162,14 @@ class PassiveSyncProductPortsOnlyComponentBase : //! //! \return Whether port productRequestOut is connected bool isConnected_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productSendOut is connected //! //! \return Whether port productSendOut is connected bool isConnected_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -182,7 +182,7 @@ class PassiveSyncProductPortsOnlyComponentBase : //! Handler base-class function for input port productRecvIn void productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -200,7 +200,7 @@ class PassiveSyncProductPortsOnlyComponentBase : //! Pre-message hook for async input port productRecvIn virtual void productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -214,14 +214,14 @@ class PassiveSyncProductPortsOnlyComponentBase : //! Invoke output port productRequestOut void productRequestOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); //! Invoke output port productSendOut void productSendOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -235,7 +235,7 @@ class PassiveSyncProductPortsOnlyComponentBase : //! Callback for port productRecvIn static void m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -249,7 +249,7 @@ class PassiveSyncProductPortsOnlyComponentBase : //! Handler implementation for productRecvIn void productRecvIn_handler( - const NATIVE_INT_TYPE portNum, //!< The port number + const FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container id const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The buffer status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.cpp index 248169c28..65c791042 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.cpp @@ -171,15 +171,15 @@ Fw::SerializeStatus PassiveSyncProductsComponentBase::DpContainer :: // ---------------------------------------------------------------------- void PassiveSyncProductsComponentBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -202,8 +202,8 @@ void PassiveSyncProductsComponentBase :: // Connect input port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRecvIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRecvIn_InputPorts()); port++ ) { this->m_productRecvIn_InputPort[port].init(); @@ -226,8 +226,8 @@ void PassiveSyncProductsComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -250,8 +250,8 @@ void PassiveSyncProductsComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -274,8 +274,8 @@ void PassiveSyncProductsComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -298,8 +298,8 @@ void PassiveSyncProductsComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -322,8 +322,8 @@ void PassiveSyncProductsComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -346,8 +346,8 @@ void PassiveSyncProductsComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -370,8 +370,8 @@ void PassiveSyncProductsComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -394,8 +394,8 @@ void PassiveSyncProductsComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -418,8 +418,8 @@ void PassiveSyncProductsComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -437,8 +437,8 @@ void PassiveSyncProductsComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -456,8 +456,8 @@ void PassiveSyncProductsComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -475,8 +475,8 @@ void PassiveSyncProductsComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -494,8 +494,8 @@ void PassiveSyncProductsComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -513,8 +513,8 @@ void PassiveSyncProductsComponentBase :: // Connect output port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRequestOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRequestOut_OutputPorts()); port++ ) { this->m_productRequestOut_OutputPort[port].init(); @@ -532,8 +532,8 @@ void PassiveSyncProductsComponentBase :: // Connect output port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productSendOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productSendOut_OutputPorts()); port++ ) { this->m_productSendOut_OutputPort[port].init(); @@ -552,8 +552,8 @@ void PassiveSyncProductsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -572,8 +572,8 @@ void PassiveSyncProductsComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -591,8 +591,8 @@ void PassiveSyncProductsComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -610,8 +610,8 @@ void PassiveSyncProductsComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -629,8 +629,8 @@ void PassiveSyncProductsComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -648,8 +648,8 @@ void PassiveSyncProductsComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -667,8 +667,8 @@ void PassiveSyncProductsComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -690,7 +690,7 @@ void PassiveSyncProductsComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* PassiveSyncProductsComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -701,7 +701,7 @@ Fw::InputCmdPort* PassiveSyncProductsComponentBase :: } Fw::InputDpResponsePort* PassiveSyncProductsComponentBase :: - get_productRecvIn_InputPort(NATIVE_INT_TYPE portNum) + get_productRecvIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRecvIn_InputPorts(), @@ -716,7 +716,7 @@ Fw::InputDpResponsePort* PassiveSyncProductsComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* PassiveSyncProductsComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -727,7 +727,7 @@ Ports::InputNoArgsPort* PassiveSyncProductsComponentBase :: } Ports::InputNoArgsReturnPort* PassiveSyncProductsComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -738,7 +738,7 @@ Ports::InputNoArgsReturnPort* PassiveSyncProductsComponentBase :: } Ports::InputNoArgsReturnPort* PassiveSyncProductsComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -749,7 +749,7 @@ Ports::InputNoArgsReturnPort* PassiveSyncProductsComponentBase :: } Ports::InputNoArgsPort* PassiveSyncProductsComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -760,7 +760,7 @@ Ports::InputNoArgsPort* PassiveSyncProductsComponentBase :: } Ports::InputTypedPort* PassiveSyncProductsComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -771,7 +771,7 @@ Ports::InputTypedPort* PassiveSyncProductsComponentBase :: } Ports::InputTypedReturnPort* PassiveSyncProductsComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -782,7 +782,7 @@ Ports::InputTypedReturnPort* PassiveSyncProductsComponentBase :: } Ports::InputTypedReturnPort* PassiveSyncProductsComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -793,7 +793,7 @@ Ports::InputTypedReturnPort* PassiveSyncProductsComponentBase :: } Ports::InputTypedPort* PassiveSyncProductsComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -809,7 +809,7 @@ Ports::InputTypedPort* PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -823,7 +823,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -837,7 +837,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -851,7 +851,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -865,7 +865,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -879,7 +879,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpRequestPort* port ) { @@ -893,7 +893,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpSendPort* port ) { @@ -909,7 +909,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -925,7 +925,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -939,7 +939,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -957,7 +957,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -971,7 +971,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -985,7 +985,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -999,7 +999,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -1019,7 +1019,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1033,7 +1033,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1047,7 +1047,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1061,7 +1061,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1075,7 +1075,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1089,7 +1089,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1105,7 +1105,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1121,7 +1121,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1135,7 +1135,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1157,7 +1157,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1171,7 +1171,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1206,164 +1206,164 @@ PassiveSyncProductsComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_productRecvIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_productRequestOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); } -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_productSendOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: +FwIndexType PassiveSyncProductsComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1371,7 +1371,7 @@ NATIVE_INT_TYPE PassiveSyncProductsComponentBase :: // ---------------------------------------------------------------------- bool PassiveSyncProductsComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1382,7 +1382,7 @@ bool PassiveSyncProductsComponentBase :: } bool PassiveSyncProductsComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1393,7 +1393,7 @@ bool PassiveSyncProductsComponentBase :: } bool PassiveSyncProductsComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1404,7 +1404,7 @@ bool PassiveSyncProductsComponentBase :: } bool PassiveSyncProductsComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1415,7 +1415,7 @@ bool PassiveSyncProductsComponentBase :: } bool PassiveSyncProductsComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1426,7 +1426,7 @@ bool PassiveSyncProductsComponentBase :: } bool PassiveSyncProductsComponentBase :: - isConnected_productRequestOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productRequestOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRequestOut_OutputPorts(), @@ -1437,7 +1437,7 @@ bool PassiveSyncProductsComponentBase :: } bool PassiveSyncProductsComponentBase :: - isConnected_productSendOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productSendOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productSendOut_OutputPorts(), @@ -1450,7 +1450,7 @@ bool PassiveSyncProductsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool PassiveSyncProductsComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1463,7 +1463,7 @@ bool PassiveSyncProductsComponentBase :: #endif bool PassiveSyncProductsComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1474,7 +1474,7 @@ bool PassiveSyncProductsComponentBase :: } bool PassiveSyncProductsComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1489,7 +1489,7 @@ bool PassiveSyncProductsComponentBase :: // ---------------------------------------------------------------------- bool PassiveSyncProductsComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1500,7 +1500,7 @@ bool PassiveSyncProductsComponentBase :: } bool PassiveSyncProductsComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1511,7 +1511,7 @@ bool PassiveSyncProductsComponentBase :: } bool PassiveSyncProductsComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1522,7 +1522,7 @@ bool PassiveSyncProductsComponentBase :: } bool PassiveSyncProductsComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1540,7 +1540,7 @@ bool PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -1568,7 +1568,7 @@ void PassiveSyncProductsComponentBase :: // ---------------------------------------------------------------------- void PassiveSyncProductsComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1587,7 +1587,7 @@ void PassiveSyncProductsComponentBase :: } U32 PassiveSyncProductsComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1610,7 +1610,7 @@ U32 PassiveSyncProductsComponentBase :: } U32 PassiveSyncProductsComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1627,7 +1627,7 @@ U32 PassiveSyncProductsComponentBase :: } void PassiveSyncProductsComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1641,7 +1641,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1678,7 +1678,7 @@ void PassiveSyncProductsComponentBase :: F32 PassiveSyncProductsComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1719,7 +1719,7 @@ F32 PassiveSyncProductsComponentBase :: F32 PassiveSyncProductsComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1754,7 +1754,7 @@ F32 PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1793,7 +1793,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -1808,7 +1808,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: productRequestOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -1825,7 +1825,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: productSendOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -1845,7 +1845,7 @@ void PassiveSyncProductsComponentBase :: // ---------------------------------------------------------------------- void PassiveSyncProductsComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1855,7 +1855,7 @@ void PassiveSyncProductsComponentBase :: } U32 PassiveSyncProductsComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1866,7 +1866,7 @@ U32 PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1893,7 +1893,7 @@ void PassiveSyncProductsComponentBase :: F32 PassiveSyncProductsComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1991,7 +1991,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -2006,7 +2006,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -2029,7 +2029,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -2040,7 +2040,7 @@ void PassiveSyncProductsComponentBase :: U32 PassiveSyncProductsComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -2051,7 +2051,7 @@ U32 PassiveSyncProductsComponentBase :: U32 PassiveSyncProductsComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -2062,7 +2062,7 @@ U32 PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -2073,7 +2073,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2100,7 +2100,7 @@ void PassiveSyncProductsComponentBase :: F32 PassiveSyncProductsComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2127,7 +2127,7 @@ F32 PassiveSyncProductsComponentBase :: F32 PassiveSyncProductsComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2154,7 +2154,7 @@ F32 PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2195,7 +2195,7 @@ void PassiveSyncProductsComponentBase :: void PassiveSyncProductsComponentBase :: productRecvIn_handler( - const NATIVE_INT_TYPE portNum, + const FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp index 6a4b5181f..44ee457ac 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp @@ -204,7 +204,7 @@ class PassiveSyncProductsComponentBase : //! Initialize PassiveSyncProductsComponentBase object void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -217,14 +217,14 @@ class PassiveSyncProductsComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get special input port at index //! //! \return productRecvIn[portNum] Fw::InputDpResponsePort* get_productRecvIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -237,56 +237,56 @@ class PassiveSyncProductsComponentBase : //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -297,43 +297,43 @@ class PassiveSyncProductsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpRequestPort* port //!< The input port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpSendPort* port //!< The input port ); @@ -341,7 +341,7 @@ class PassiveSyncProductsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -349,13 +349,13 @@ class PassiveSyncProductsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -367,25 +367,25 @@ class PassiveSyncProductsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -399,37 +399,37 @@ class PassiveSyncProductsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -437,7 +437,7 @@ class PassiveSyncProductsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -445,13 +445,13 @@ class PassiveSyncProductsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -467,13 +467,13 @@ class PassiveSyncProductsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -502,12 +502,12 @@ class PassiveSyncProductsComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; //! Get the number of productRecvIn input ports //! //! \return The number of productRecvIn input ports - NATIVE_INT_TYPE getNum_productRecvIn_InputPorts() const; + FwIndexType getNum_productRecvIn_InputPorts() const; PROTECTED: @@ -518,42 +518,42 @@ class PassiveSyncProductsComponentBase : //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -564,56 +564,56 @@ class PassiveSyncProductsComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; //! Get the number of productRequestOut output ports //! //! \return The number of productRequestOut output ports - NATIVE_INT_TYPE getNum_productRequestOut_OutputPorts() const; + FwIndexType getNum_productRequestOut_OutputPorts() const; //! Get the number of productSendOut output ports //! //! \return The number of productSendOut output ports - NATIVE_INT_TYPE getNum_productSendOut_OutputPorts() const; + FwIndexType getNum_productSendOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -624,22 +624,22 @@ class PassiveSyncProductsComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -651,49 +651,49 @@ class PassiveSyncProductsComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productRequestOut is connected //! //! \return Whether port productRequestOut is connected bool isConnected_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productSendOut is connected //! //! \return Whether port productSendOut is connected bool isConnected_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -702,7 +702,7 @@ class PassiveSyncProductsComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -711,14 +711,14 @@ class PassiveSyncProductsComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -731,28 +731,28 @@ class PassiveSyncProductsComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -765,7 +765,7 @@ class PassiveSyncProductsComponentBase : //! Handler base-class function for input port productRecvIn void productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -779,27 +779,27 @@ class PassiveSyncProductsComponentBase : //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -811,7 +811,7 @@ class PassiveSyncProductsComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -823,7 +823,7 @@ class PassiveSyncProductsComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -835,7 +835,7 @@ class PassiveSyncProductsComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -855,27 +855,27 @@ class PassiveSyncProductsComponentBase : //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -887,7 +887,7 @@ class PassiveSyncProductsComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -899,7 +899,7 @@ class PassiveSyncProductsComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -911,7 +911,7 @@ class PassiveSyncProductsComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -933,7 +933,7 @@ class PassiveSyncProductsComponentBase : //! Pre-message hook for async input port productRecvIn virtual void productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -947,14 +947,14 @@ class PassiveSyncProductsComponentBase : //! Invoke output port productRequestOut void productRequestOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); //! Invoke output port productSendOut void productSendOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -967,17 +967,17 @@ class PassiveSyncProductsComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -989,7 +989,7 @@ class PassiveSyncProductsComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1117,7 +1117,7 @@ class PassiveSyncProductsComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -1126,7 +1126,7 @@ class PassiveSyncProductsComponentBase : //! Callback for port productRecvIn static void m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -1141,31 +1141,31 @@ class PassiveSyncProductsComponentBase : //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1178,7 +1178,7 @@ class PassiveSyncProductsComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1191,7 +1191,7 @@ class PassiveSyncProductsComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1204,7 +1204,7 @@ class PassiveSyncProductsComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1228,7 +1228,7 @@ class PassiveSyncProductsComponentBase : //! Handler implementation for productRecvIn void productRecvIn_handler( - const NATIVE_INT_TYPE portNum, //!< The port number + const FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container id const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The buffer status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTelemetryComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTelemetryComponentAc.ref.cpp index 286e5c6b8..4c1bd3985 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTelemetryComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTelemetryComponentAc.ref.cpp @@ -17,15 +17,15 @@ // ---------------------------------------------------------------------- void PassiveTelemetryComponentBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -48,8 +48,8 @@ void PassiveTelemetryComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -72,8 +72,8 @@ void PassiveTelemetryComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -96,8 +96,8 @@ void PassiveTelemetryComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -120,8 +120,8 @@ void PassiveTelemetryComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -144,8 +144,8 @@ void PassiveTelemetryComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -168,8 +168,8 @@ void PassiveTelemetryComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -192,8 +192,8 @@ void PassiveTelemetryComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -216,8 +216,8 @@ void PassiveTelemetryComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -240,8 +240,8 @@ void PassiveTelemetryComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -259,8 +259,8 @@ void PassiveTelemetryComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -278,8 +278,8 @@ void PassiveTelemetryComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -297,8 +297,8 @@ void PassiveTelemetryComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -316,8 +316,8 @@ void PassiveTelemetryComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -336,8 +336,8 @@ void PassiveTelemetryComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -356,8 +356,8 @@ void PassiveTelemetryComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -375,8 +375,8 @@ void PassiveTelemetryComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -394,8 +394,8 @@ void PassiveTelemetryComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -413,8 +413,8 @@ void PassiveTelemetryComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -432,8 +432,8 @@ void PassiveTelemetryComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -451,8 +451,8 @@ void PassiveTelemetryComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -474,7 +474,7 @@ void PassiveTelemetryComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* PassiveTelemetryComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -489,7 +489,7 @@ Fw::InputCmdPort* PassiveTelemetryComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* PassiveTelemetryComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -500,7 +500,7 @@ Ports::InputNoArgsPort* PassiveTelemetryComponentBase :: } Ports::InputNoArgsReturnPort* PassiveTelemetryComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -511,7 +511,7 @@ Ports::InputNoArgsReturnPort* PassiveTelemetryComponentBase :: } Ports::InputNoArgsReturnPort* PassiveTelemetryComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -522,7 +522,7 @@ Ports::InputNoArgsReturnPort* PassiveTelemetryComponentBase :: } Ports::InputNoArgsPort* PassiveTelemetryComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -533,7 +533,7 @@ Ports::InputNoArgsPort* PassiveTelemetryComponentBase :: } Ports::InputTypedPort* PassiveTelemetryComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -544,7 +544,7 @@ Ports::InputTypedPort* PassiveTelemetryComponentBase :: } Ports::InputTypedReturnPort* PassiveTelemetryComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -555,7 +555,7 @@ Ports::InputTypedReturnPort* PassiveTelemetryComponentBase :: } Ports::InputTypedReturnPort* PassiveTelemetryComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -566,7 +566,7 @@ Ports::InputTypedReturnPort* PassiveTelemetryComponentBase :: } Ports::InputTypedPort* PassiveTelemetryComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -582,7 +582,7 @@ Ports::InputTypedPort* PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -596,7 +596,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -610,7 +610,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -624,7 +624,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -638,7 +638,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -654,7 +654,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -670,7 +670,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -684,7 +684,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -702,7 +702,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -716,7 +716,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -730,7 +730,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -744,7 +744,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -764,7 +764,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -778,7 +778,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -792,7 +792,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -806,7 +806,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -822,7 +822,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -838,7 +838,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -852,7 +852,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -874,7 +874,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -888,7 +888,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -928,146 +928,146 @@ PassiveTelemetryComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveTelemetryComponentBase :: +FwIndexType PassiveTelemetryComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveTelemetryComponentBase :: +FwIndexType PassiveTelemetryComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveTelemetryComponentBase :: +FwIndexType PassiveTelemetryComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveTelemetryComponentBase :: +FwIndexType PassiveTelemetryComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE PassiveTelemetryComponentBase :: +FwIndexType PassiveTelemetryComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE PassiveTelemetryComponentBase :: +FwIndexType PassiveTelemetryComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveTelemetryComponentBase :: +FwIndexType PassiveTelemetryComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveTelemetryComponentBase :: +FwIndexType PassiveTelemetryComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE PassiveTelemetryComponentBase :: +FwIndexType PassiveTelemetryComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveTelemetryComponentBase :: +FwIndexType PassiveTelemetryComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE PassiveTelemetryComponentBase :: +FwIndexType PassiveTelemetryComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE PassiveTelemetryComponentBase :: +FwIndexType PassiveTelemetryComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE PassiveTelemetryComponentBase :: +FwIndexType PassiveTelemetryComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveTelemetryComponentBase :: +FwIndexType PassiveTelemetryComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE PassiveTelemetryComponentBase :: +FwIndexType PassiveTelemetryComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE PassiveTelemetryComponentBase :: +FwIndexType PassiveTelemetryComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveTelemetryComponentBase :: +FwIndexType PassiveTelemetryComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveTelemetryComponentBase :: +FwIndexType PassiveTelemetryComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE PassiveTelemetryComponentBase :: +FwIndexType PassiveTelemetryComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE PassiveTelemetryComponentBase :: +FwIndexType PassiveTelemetryComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE PassiveTelemetryComponentBase :: +FwIndexType PassiveTelemetryComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1075,7 +1075,7 @@ NATIVE_INT_TYPE PassiveTelemetryComponentBase :: // ---------------------------------------------------------------------- bool PassiveTelemetryComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1086,7 +1086,7 @@ bool PassiveTelemetryComponentBase :: } bool PassiveTelemetryComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1097,7 +1097,7 @@ bool PassiveTelemetryComponentBase :: } bool PassiveTelemetryComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1108,7 +1108,7 @@ bool PassiveTelemetryComponentBase :: } bool PassiveTelemetryComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1119,7 +1119,7 @@ bool PassiveTelemetryComponentBase :: } bool PassiveTelemetryComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1132,7 +1132,7 @@ bool PassiveTelemetryComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool PassiveTelemetryComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1145,7 +1145,7 @@ bool PassiveTelemetryComponentBase :: #endif bool PassiveTelemetryComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1156,7 +1156,7 @@ bool PassiveTelemetryComponentBase :: } bool PassiveTelemetryComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1171,7 +1171,7 @@ bool PassiveTelemetryComponentBase :: // ---------------------------------------------------------------------- bool PassiveTelemetryComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1182,7 +1182,7 @@ bool PassiveTelemetryComponentBase :: } bool PassiveTelemetryComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1193,7 +1193,7 @@ bool PassiveTelemetryComponentBase :: } bool PassiveTelemetryComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1204,7 +1204,7 @@ bool PassiveTelemetryComponentBase :: } bool PassiveTelemetryComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1221,7 +1221,7 @@ bool PassiveTelemetryComponentBase :: // ---------------------------------------------------------------------- void PassiveTelemetryComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1240,7 +1240,7 @@ void PassiveTelemetryComponentBase :: } U32 PassiveTelemetryComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1263,7 +1263,7 @@ U32 PassiveTelemetryComponentBase :: } U32 PassiveTelemetryComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1280,7 +1280,7 @@ U32 PassiveTelemetryComponentBase :: } void PassiveTelemetryComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1294,7 +1294,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1331,7 +1331,7 @@ void PassiveTelemetryComponentBase :: F32 PassiveTelemetryComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1372,7 +1372,7 @@ F32 PassiveTelemetryComponentBase :: F32 PassiveTelemetryComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1407,7 +1407,7 @@ F32 PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1441,7 +1441,7 @@ void PassiveTelemetryComponentBase :: // ---------------------------------------------------------------------- void PassiveTelemetryComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1451,7 +1451,7 @@ void PassiveTelemetryComponentBase :: } U32 PassiveTelemetryComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1462,7 +1462,7 @@ U32 PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1489,7 +1489,7 @@ void PassiveTelemetryComponentBase :: F32 PassiveTelemetryComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1954,7 +1954,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -1973,7 +1973,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -1984,7 +1984,7 @@ void PassiveTelemetryComponentBase :: U32 PassiveTelemetryComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -1995,7 +1995,7 @@ U32 PassiveTelemetryComponentBase :: U32 PassiveTelemetryComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -2006,7 +2006,7 @@ U32 PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -2017,7 +2017,7 @@ void PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2044,7 +2044,7 @@ void PassiveTelemetryComponentBase :: F32 PassiveTelemetryComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2071,7 +2071,7 @@ F32 PassiveTelemetryComponentBase :: F32 PassiveTelemetryComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2098,7 +2098,7 @@ F32 PassiveTelemetryComponentBase :: void PassiveTelemetryComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTelemetryComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTelemetryComponentAc.ref.hpp index 52bc1654a..6c6dc664a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTelemetryComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTelemetryComponentAc.ref.hpp @@ -113,7 +113,7 @@ class PassiveTelemetryComponentBase : //! Initialize PassiveTelemetryComponentBase object void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -126,7 +126,7 @@ class PassiveTelemetryComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -139,56 +139,56 @@ class PassiveTelemetryComponentBase : //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -199,31 +199,31 @@ class PassiveTelemetryComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); @@ -231,7 +231,7 @@ class PassiveTelemetryComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -239,13 +239,13 @@ class PassiveTelemetryComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -257,25 +257,25 @@ class PassiveTelemetryComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -289,25 +289,25 @@ class PassiveTelemetryComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -315,7 +315,7 @@ class PassiveTelemetryComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -323,13 +323,13 @@ class PassiveTelemetryComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -345,13 +345,13 @@ class PassiveTelemetryComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -380,7 +380,7 @@ class PassiveTelemetryComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; PROTECTED: @@ -391,42 +391,42 @@ class PassiveTelemetryComponentBase : //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -437,46 +437,46 @@ class PassiveTelemetryComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -487,22 +487,22 @@ class PassiveTelemetryComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -514,35 +514,35 @@ class PassiveTelemetryComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -551,7 +551,7 @@ class PassiveTelemetryComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -560,14 +560,14 @@ class PassiveTelemetryComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -580,28 +580,28 @@ class PassiveTelemetryComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -612,27 +612,27 @@ class PassiveTelemetryComponentBase : //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -644,7 +644,7 @@ class PassiveTelemetryComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -656,7 +656,7 @@ class PassiveTelemetryComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -668,7 +668,7 @@ class PassiveTelemetryComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -688,27 +688,27 @@ class PassiveTelemetryComponentBase : //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -720,7 +720,7 @@ class PassiveTelemetryComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -732,7 +732,7 @@ class PassiveTelemetryComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -744,7 +744,7 @@ class PassiveTelemetryComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -762,17 +762,17 @@ class PassiveTelemetryComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -784,7 +784,7 @@ class PassiveTelemetryComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -923,7 +923,7 @@ class PassiveTelemetryComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -938,31 +938,31 @@ class PassiveTelemetryComponentBase : //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -975,7 +975,7 @@ class PassiveTelemetryComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -988,7 +988,7 @@ class PassiveTelemetryComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1001,7 +1001,7 @@ class PassiveTelemetryComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp index 15d180464..855b2736e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp @@ -171,15 +171,15 @@ Fw::SerializeStatus PassiveTestComponentBase::DpContainer :: // ---------------------------------------------------------------------- void PassiveTestComponentBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -202,8 +202,8 @@ void PassiveTestComponentBase :: // Connect input port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRecvIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRecvIn_InputPorts()); port++ ) { this->m_productRecvIn_InputPort[port].init(); @@ -226,8 +226,8 @@ void PassiveTestComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -250,8 +250,8 @@ void PassiveTestComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -274,8 +274,8 @@ void PassiveTestComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -298,8 +298,8 @@ void PassiveTestComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -322,8 +322,8 @@ void PassiveTestComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -346,8 +346,8 @@ void PassiveTestComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -370,8 +370,8 @@ void PassiveTestComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -394,8 +394,8 @@ void PassiveTestComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -418,8 +418,8 @@ void PassiveTestComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -437,8 +437,8 @@ void PassiveTestComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -456,8 +456,8 @@ void PassiveTestComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -475,8 +475,8 @@ void PassiveTestComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -494,8 +494,8 @@ void PassiveTestComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -513,8 +513,8 @@ void PassiveTestComponentBase :: // Connect output port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRequestOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRequestOut_OutputPorts()); port++ ) { this->m_productRequestOut_OutputPort[port].init(); @@ -532,8 +532,8 @@ void PassiveTestComponentBase :: // Connect output port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productSendOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productSendOut_OutputPorts()); port++ ) { this->m_productSendOut_OutputPort[port].init(); @@ -552,8 +552,8 @@ void PassiveTestComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -572,8 +572,8 @@ void PassiveTestComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -591,8 +591,8 @@ void PassiveTestComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -610,8 +610,8 @@ void PassiveTestComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -629,8 +629,8 @@ void PassiveTestComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -648,8 +648,8 @@ void PassiveTestComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -667,8 +667,8 @@ void PassiveTestComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -690,7 +690,7 @@ void PassiveTestComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* PassiveTestComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -701,7 +701,7 @@ Fw::InputCmdPort* PassiveTestComponentBase :: } Fw::InputDpResponsePort* PassiveTestComponentBase :: - get_productRecvIn_InputPort(NATIVE_INT_TYPE portNum) + get_productRecvIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRecvIn_InputPorts(), @@ -716,7 +716,7 @@ Fw::InputDpResponsePort* PassiveTestComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* PassiveTestComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -727,7 +727,7 @@ Ports::InputNoArgsPort* PassiveTestComponentBase :: } Ports::InputNoArgsReturnPort* PassiveTestComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -738,7 +738,7 @@ Ports::InputNoArgsReturnPort* PassiveTestComponentBase :: } Ports::InputNoArgsReturnPort* PassiveTestComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -749,7 +749,7 @@ Ports::InputNoArgsReturnPort* PassiveTestComponentBase :: } Ports::InputNoArgsPort* PassiveTestComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -760,7 +760,7 @@ Ports::InputNoArgsPort* PassiveTestComponentBase :: } Ports::InputTypedPort* PassiveTestComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -771,7 +771,7 @@ Ports::InputTypedPort* PassiveTestComponentBase :: } Ports::InputTypedReturnPort* PassiveTestComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -782,7 +782,7 @@ Ports::InputTypedReturnPort* PassiveTestComponentBase :: } Ports::InputTypedReturnPort* PassiveTestComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -793,7 +793,7 @@ Ports::InputTypedReturnPort* PassiveTestComponentBase :: } Ports::InputTypedPort* PassiveTestComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -809,7 +809,7 @@ Ports::InputTypedPort* PassiveTestComponentBase :: void PassiveTestComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -823,7 +823,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -837,7 +837,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -851,7 +851,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -865,7 +865,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -879,7 +879,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpRequestPort* port ) { @@ -893,7 +893,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpSendPort* port ) { @@ -909,7 +909,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -925,7 +925,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -939,7 +939,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -957,7 +957,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -971,7 +971,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -985,7 +985,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -999,7 +999,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -1019,7 +1019,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1033,7 +1033,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1047,7 +1047,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1061,7 +1061,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1075,7 +1075,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1089,7 +1089,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1105,7 +1105,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1121,7 +1121,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1135,7 +1135,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1157,7 +1157,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1171,7 +1171,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1503,164 +1503,164 @@ PassiveTestComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_productRecvIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_productRequestOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); } -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_productSendOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE PassiveTestComponentBase :: +FwIndexType PassiveTestComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1668,7 +1668,7 @@ NATIVE_INT_TYPE PassiveTestComponentBase :: // ---------------------------------------------------------------------- bool PassiveTestComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1679,7 +1679,7 @@ bool PassiveTestComponentBase :: } bool PassiveTestComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1690,7 +1690,7 @@ bool PassiveTestComponentBase :: } bool PassiveTestComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1701,7 +1701,7 @@ bool PassiveTestComponentBase :: } bool PassiveTestComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1712,7 +1712,7 @@ bool PassiveTestComponentBase :: } bool PassiveTestComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1723,7 +1723,7 @@ bool PassiveTestComponentBase :: } bool PassiveTestComponentBase :: - isConnected_productRequestOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productRequestOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRequestOut_OutputPorts(), @@ -1734,7 +1734,7 @@ bool PassiveTestComponentBase :: } bool PassiveTestComponentBase :: - isConnected_productSendOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productSendOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productSendOut_OutputPorts(), @@ -1747,7 +1747,7 @@ bool PassiveTestComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool PassiveTestComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1760,7 +1760,7 @@ bool PassiveTestComponentBase :: #endif bool PassiveTestComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1771,7 +1771,7 @@ bool PassiveTestComponentBase :: } bool PassiveTestComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1786,7 +1786,7 @@ bool PassiveTestComponentBase :: // ---------------------------------------------------------------------- bool PassiveTestComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1797,7 +1797,7 @@ bool PassiveTestComponentBase :: } bool PassiveTestComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1808,7 +1808,7 @@ bool PassiveTestComponentBase :: } bool PassiveTestComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1819,7 +1819,7 @@ bool PassiveTestComponentBase :: } bool PassiveTestComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1837,7 +1837,7 @@ bool PassiveTestComponentBase :: void PassiveTestComponentBase :: productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -1865,7 +1865,7 @@ void PassiveTestComponentBase :: // ---------------------------------------------------------------------- void PassiveTestComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1884,7 +1884,7 @@ void PassiveTestComponentBase :: } U32 PassiveTestComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1907,7 +1907,7 @@ U32 PassiveTestComponentBase :: } U32 PassiveTestComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1924,7 +1924,7 @@ U32 PassiveTestComponentBase :: } void PassiveTestComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1938,7 +1938,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1975,7 +1975,7 @@ void PassiveTestComponentBase :: F32 PassiveTestComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2016,7 +2016,7 @@ F32 PassiveTestComponentBase :: F32 PassiveTestComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2051,7 +2051,7 @@ F32 PassiveTestComponentBase :: void PassiveTestComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2090,7 +2090,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -2105,7 +2105,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: productRequestOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -2122,7 +2122,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: productSendOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -2142,7 +2142,7 @@ void PassiveTestComponentBase :: // ---------------------------------------------------------------------- void PassiveTestComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -2152,7 +2152,7 @@ void PassiveTestComponentBase :: } U32 PassiveTestComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -2163,7 +2163,7 @@ U32 PassiveTestComponentBase :: void PassiveTestComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2190,7 +2190,7 @@ void PassiveTestComponentBase :: F32 PassiveTestComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4115,7 +4115,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -4362,7 +4362,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -4385,7 +4385,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -4396,7 +4396,7 @@ void PassiveTestComponentBase :: U32 PassiveTestComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -4407,7 +4407,7 @@ U32 PassiveTestComponentBase :: U32 PassiveTestComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -4418,7 +4418,7 @@ U32 PassiveTestComponentBase :: void PassiveTestComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -4429,7 +4429,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4456,7 +4456,7 @@ void PassiveTestComponentBase :: F32 PassiveTestComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4483,7 +4483,7 @@ F32 PassiveTestComponentBase :: F32 PassiveTestComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4510,7 +4510,7 @@ F32 PassiveTestComponentBase :: void PassiveTestComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4853,7 +4853,7 @@ void PassiveTestComponentBase :: void PassiveTestComponentBase :: productRecvIn_handler( - const NATIVE_INT_TYPE portNum, + const FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp index afdebf884..4ff515b1b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp @@ -283,7 +283,7 @@ class PassiveTestComponentBase : //! Initialize PassiveTestComponentBase object void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -296,14 +296,14 @@ class PassiveTestComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get special input port at index //! //! \return productRecvIn[portNum] Fw::InputDpResponsePort* get_productRecvIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -316,56 +316,56 @@ class PassiveTestComponentBase : //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -376,43 +376,43 @@ class PassiveTestComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpRequestPort* port //!< The input port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpSendPort* port //!< The input port ); @@ -420,7 +420,7 @@ class PassiveTestComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -428,13 +428,13 @@ class PassiveTestComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -446,25 +446,25 @@ class PassiveTestComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -478,37 +478,37 @@ class PassiveTestComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -516,7 +516,7 @@ class PassiveTestComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -524,13 +524,13 @@ class PassiveTestComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -546,13 +546,13 @@ class PassiveTestComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -603,12 +603,12 @@ class PassiveTestComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; //! Get the number of productRecvIn input ports //! //! \return The number of productRecvIn input ports - NATIVE_INT_TYPE getNum_productRecvIn_InputPorts() const; + FwIndexType getNum_productRecvIn_InputPorts() const; PROTECTED: @@ -619,42 +619,42 @@ class PassiveTestComponentBase : //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -665,56 +665,56 @@ class PassiveTestComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; //! Get the number of productRequestOut output ports //! //! \return The number of productRequestOut output ports - NATIVE_INT_TYPE getNum_productRequestOut_OutputPorts() const; + FwIndexType getNum_productRequestOut_OutputPorts() const; //! Get the number of productSendOut output ports //! //! \return The number of productSendOut output ports - NATIVE_INT_TYPE getNum_productSendOut_OutputPorts() const; + FwIndexType getNum_productSendOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -725,22 +725,22 @@ class PassiveTestComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -752,49 +752,49 @@ class PassiveTestComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productRequestOut is connected //! //! \return Whether port productRequestOut is connected bool isConnected_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productSendOut is connected //! //! \return Whether port productSendOut is connected bool isConnected_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -803,7 +803,7 @@ class PassiveTestComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -812,14 +812,14 @@ class PassiveTestComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -832,28 +832,28 @@ class PassiveTestComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -866,7 +866,7 @@ class PassiveTestComponentBase : //! Handler base-class function for input port productRecvIn void productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -880,27 +880,27 @@ class PassiveTestComponentBase : //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -912,7 +912,7 @@ class PassiveTestComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -924,7 +924,7 @@ class PassiveTestComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -936,7 +936,7 @@ class PassiveTestComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -956,27 +956,27 @@ class PassiveTestComponentBase : //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -988,7 +988,7 @@ class PassiveTestComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1000,7 +1000,7 @@ class PassiveTestComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1012,7 +1012,7 @@ class PassiveTestComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1034,7 +1034,7 @@ class PassiveTestComponentBase : //! Pre-message hook for async input port productRecvIn virtual void productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -1048,14 +1048,14 @@ class PassiveTestComponentBase : //! Invoke output port productRequestOut void productRequestOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); //! Invoke output port productSendOut void productSendOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -1068,17 +1068,17 @@ class PassiveTestComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1090,7 +1090,7 @@ class PassiveTestComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1711,7 +1711,7 @@ class PassiveTestComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -1720,7 +1720,7 @@ class PassiveTestComponentBase : //! Callback for port productRecvIn static void m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -1735,31 +1735,31 @@ class PassiveTestComponentBase : //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1772,7 +1772,7 @@ class PassiveTestComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1785,7 +1785,7 @@ class PassiveTestComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1798,7 +1798,7 @@ class PassiveTestComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1906,7 +1906,7 @@ class PassiveTestComponentBase : //! Handler implementation for productRecvIn void productRecvIn_handler( - const NATIVE_INT_TYPE portNum, //!< The port number + const FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container id const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The buffer status @@ -2019,13 +2019,13 @@ class PassiveTestComponentBase : // ---------------------------------------------------------------------- //! Throttle for EventActivityLowThrottled - NATIVE_UINT_TYPE m_EventActivityLowThrottledThrottle; + FwIndexType m_EventActivityLowThrottledThrottle; //! Throttle for EventFatalThrottled - NATIVE_UINT_TYPE m_EventFatalThrottledThrottle; + FwIndexType m_EventFatalThrottledThrottle; //! Throttle for EventWarningLowThrottled - NATIVE_UINT_TYPE m_EventWarningLowThrottledThrottle; + FwIndexType m_EventWarningLowThrottledThrottle; PRIVATE: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductPortsOnlyComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductPortsOnlyComponentAc.ref.cpp index 947625d7b..b09b3d5f0 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductPortsOnlyComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductPortsOnlyComponentAc.ref.cpp @@ -36,11 +36,11 @@ namespace { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = sizeof(BuffUnion) + - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -65,8 +65,8 @@ namespace { void QueuedAsyncProductPortsOnlyComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwEnumStoreType instance ) { // Initialize base class @@ -74,8 +74,8 @@ void QueuedAsyncProductPortsOnlyComponentBase :: // Connect input port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRecvIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRecvIn_InputPorts()); port++ ) { this->m_productRecvIn_InputPort[port].init(); @@ -98,8 +98,8 @@ void QueuedAsyncProductPortsOnlyComponentBase :: // Connect output port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRequestOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRequestOut_OutputPorts()); port++ ) { this->m_productRequestOut_OutputPort[port].init(); @@ -117,8 +117,8 @@ void QueuedAsyncProductPortsOnlyComponentBase :: // Connect output port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productSendOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productSendOut_OutputPorts()); port++ ) { this->m_productSendOut_OutputPort[port].init(); @@ -149,7 +149,7 @@ void QueuedAsyncProductPortsOnlyComponentBase :: // ---------------------------------------------------------------------- Fw::InputDpResponsePort* QueuedAsyncProductPortsOnlyComponentBase :: - get_productRecvIn_InputPort(NATIVE_INT_TYPE portNum) + get_productRecvIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRecvIn_InputPorts(), @@ -165,7 +165,7 @@ Fw::InputDpResponsePort* QueuedAsyncProductPortsOnlyComponentBase :: void QueuedAsyncProductPortsOnlyComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpRequestPort* port ) { @@ -179,7 +179,7 @@ void QueuedAsyncProductPortsOnlyComponentBase :: void QueuedAsyncProductPortsOnlyComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpSendPort* port ) { @@ -199,7 +199,7 @@ void QueuedAsyncProductPortsOnlyComponentBase :: void QueuedAsyncProductPortsOnlyComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -213,7 +213,7 @@ void QueuedAsyncProductPortsOnlyComponentBase :: void QueuedAsyncProductPortsOnlyComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -248,26 +248,26 @@ QueuedAsyncProductPortsOnlyComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedAsyncProductPortsOnlyComponentBase :: +FwIndexType QueuedAsyncProductPortsOnlyComponentBase :: getNum_productRecvIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedAsyncProductPortsOnlyComponentBase :: +FwIndexType QueuedAsyncProductPortsOnlyComponentBase :: getNum_productRequestOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductPortsOnlyComponentBase :: +FwIndexType QueuedAsyncProductPortsOnlyComponentBase :: getNum_productSendOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -275,7 +275,7 @@ NATIVE_INT_TYPE QueuedAsyncProductPortsOnlyComponentBase :: // ---------------------------------------------------------------------- bool QueuedAsyncProductPortsOnlyComponentBase :: - isConnected_productRequestOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productRequestOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRequestOut_OutputPorts(), @@ -286,7 +286,7 @@ bool QueuedAsyncProductPortsOnlyComponentBase :: } bool QueuedAsyncProductPortsOnlyComponentBase :: - isConnected_productSendOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productSendOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productSendOut_OutputPorts(), @@ -304,7 +304,7 @@ bool QueuedAsyncProductPortsOnlyComponentBase :: void QueuedAsyncProductPortsOnlyComponentBase :: productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -328,7 +328,7 @@ void QueuedAsyncProductPortsOnlyComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(PRODUCTRECVIN_DPRESPONSE) + static_cast(PRODUCTRECVIN_DPRESPONSE) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -383,7 +383,7 @@ void QueuedAsyncProductPortsOnlyComponentBase :: void QueuedAsyncProductPortsOnlyComponentBase :: productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -398,7 +398,7 @@ void QueuedAsyncProductPortsOnlyComponentBase :: void QueuedAsyncProductPortsOnlyComponentBase :: productRequestOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -415,7 +415,7 @@ void QueuedAsyncProductPortsOnlyComponentBase :: void QueuedAsyncProductPortsOnlyComponentBase :: productSendOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -438,7 +438,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedAsyncProductPortsOnlyComponentB doDispatch() { ComponentIpcSerializableBuffer msg; - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -458,7 +458,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedAsyncProductPortsOnlyComponentB // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -471,7 +471,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedAsyncProductPortsOnlyComponentB return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -529,7 +529,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedAsyncProductPortsOnlyComponentB void QueuedAsyncProductPortsOnlyComponentBase :: m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -551,7 +551,7 @@ void QueuedAsyncProductPortsOnlyComponentBase :: void QueuedAsyncProductPortsOnlyComponentBase :: productRecvIn_handler( - const NATIVE_INT_TYPE portNum, + const FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductPortsOnlyComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductPortsOnlyComponentAc.ref.hpp index 9bfb054c0..32facb995 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductPortsOnlyComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductPortsOnlyComponentAc.ref.hpp @@ -55,8 +55,8 @@ class QueuedAsyncProductPortsOnlyComponentBase : //! Initialize QueuedAsyncProductPortsOnlyComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -69,7 +69,7 @@ class QueuedAsyncProductPortsOnlyComponentBase : //! //! \return productRecvIn[portNum] Fw::InputDpResponsePort* get_productRecvIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -80,13 +80,13 @@ class QueuedAsyncProductPortsOnlyComponentBase : //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpRequestPort* port //!< The input port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpSendPort* port //!< The input port ); @@ -100,13 +100,13 @@ class QueuedAsyncProductPortsOnlyComponentBase : //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -135,7 +135,7 @@ class QueuedAsyncProductPortsOnlyComponentBase : //! Get the number of productRecvIn input ports //! //! \return The number of productRecvIn input ports - NATIVE_INT_TYPE getNum_productRecvIn_InputPorts() const; + FwIndexType getNum_productRecvIn_InputPorts() const; PROTECTED: @@ -146,12 +146,12 @@ class QueuedAsyncProductPortsOnlyComponentBase : //! Get the number of productRequestOut output ports //! //! \return The number of productRequestOut output ports - NATIVE_INT_TYPE getNum_productRequestOut_OutputPorts() const; + FwIndexType getNum_productRequestOut_OutputPorts() const; //! Get the number of productSendOut output ports //! //! \return The number of productSendOut output ports - NATIVE_INT_TYPE getNum_productSendOut_OutputPorts() const; + FwIndexType getNum_productSendOut_OutputPorts() const; PROTECTED: @@ -163,14 +163,14 @@ class QueuedAsyncProductPortsOnlyComponentBase : //! //! \return Whether port productRequestOut is connected bool isConnected_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productSendOut is connected //! //! \return Whether port productSendOut is connected bool isConnected_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -183,7 +183,7 @@ class QueuedAsyncProductPortsOnlyComponentBase : //! Handler base-class function for input port productRecvIn void productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -201,7 +201,7 @@ class QueuedAsyncProductPortsOnlyComponentBase : //! Pre-message hook for async input port productRecvIn virtual void productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -215,14 +215,14 @@ class QueuedAsyncProductPortsOnlyComponentBase : //! Invoke output port productRequestOut void productRequestOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); //! Invoke output port productSendOut void productSendOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -245,7 +245,7 @@ class QueuedAsyncProductPortsOnlyComponentBase : //! Callback for port productRecvIn static void m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -259,7 +259,7 @@ class QueuedAsyncProductPortsOnlyComponentBase : //! Handler implementation for productRecvIn void productRecvIn_handler( - const NATIVE_INT_TYPE portNum, //!< The port number + const FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container id const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The buffer status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.cpp index 9b7a366b1..0d44e09c2 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.cpp @@ -46,11 +46,11 @@ namespace { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = sizeof(BuffUnion) + - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -229,8 +229,8 @@ Fw::SerializeStatus QueuedAsyncProductsComponentBase::DpContainer :: void QueuedAsyncProductsComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwEnumStoreType instance ) { // Initialize base class @@ -238,8 +238,8 @@ void QueuedAsyncProductsComponentBase :: // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -262,8 +262,8 @@ void QueuedAsyncProductsComponentBase :: // Connect input port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRecvIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRecvIn_InputPorts()); port++ ) { this->m_productRecvIn_InputPort[port].init(); @@ -286,8 +286,8 @@ void QueuedAsyncProductsComponentBase :: // Connect input port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsAsync_InputPorts()); port++ ) { this->m_noArgsAsync_InputPort[port].init(); @@ -310,8 +310,8 @@ void QueuedAsyncProductsComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -334,8 +334,8 @@ void QueuedAsyncProductsComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -358,8 +358,8 @@ void QueuedAsyncProductsComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -382,8 +382,8 @@ void QueuedAsyncProductsComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -406,8 +406,8 @@ void QueuedAsyncProductsComponentBase :: // Connect input port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsync_InputPorts()); port++ ) { this->m_typedAsync_InputPort[port].init(); @@ -430,8 +430,8 @@ void QueuedAsyncProductsComponentBase :: // Connect input port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); port++ ) { this->m_typedAsyncAssert_InputPort[port].init(); @@ -454,8 +454,8 @@ void QueuedAsyncProductsComponentBase :: // Connect input port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); port++ ) { this->m_typedAsyncBlockPriority_InputPort[port].init(); @@ -478,8 +478,8 @@ void QueuedAsyncProductsComponentBase :: // Connect input port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); port++ ) { this->m_typedAsyncDropPriority_InputPort[port].init(); @@ -502,8 +502,8 @@ void QueuedAsyncProductsComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -526,8 +526,8 @@ void QueuedAsyncProductsComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -550,8 +550,8 @@ void QueuedAsyncProductsComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -574,8 +574,8 @@ void QueuedAsyncProductsComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -598,8 +598,8 @@ void QueuedAsyncProductsComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -617,8 +617,8 @@ void QueuedAsyncProductsComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -636,8 +636,8 @@ void QueuedAsyncProductsComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -655,8 +655,8 @@ void QueuedAsyncProductsComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -674,8 +674,8 @@ void QueuedAsyncProductsComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -693,8 +693,8 @@ void QueuedAsyncProductsComponentBase :: // Connect output port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRequestOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRequestOut_OutputPorts()); port++ ) { this->m_productRequestOut_OutputPort[port].init(); @@ -712,8 +712,8 @@ void QueuedAsyncProductsComponentBase :: // Connect output port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productSendOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productSendOut_OutputPorts()); port++ ) { this->m_productSendOut_OutputPort[port].init(); @@ -732,8 +732,8 @@ void QueuedAsyncProductsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -752,8 +752,8 @@ void QueuedAsyncProductsComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -771,8 +771,8 @@ void QueuedAsyncProductsComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -790,8 +790,8 @@ void QueuedAsyncProductsComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -809,8 +809,8 @@ void QueuedAsyncProductsComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -828,8 +828,8 @@ void QueuedAsyncProductsComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -847,8 +847,8 @@ void QueuedAsyncProductsComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -879,7 +879,7 @@ void QueuedAsyncProductsComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* QueuedAsyncProductsComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -890,7 +890,7 @@ Fw::InputCmdPort* QueuedAsyncProductsComponentBase :: } Fw::InputDpResponsePort* QueuedAsyncProductsComponentBase :: - get_productRecvIn_InputPort(NATIVE_INT_TYPE portNum) + get_productRecvIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRecvIn_InputPorts(), @@ -905,7 +905,7 @@ Fw::InputDpResponsePort* QueuedAsyncProductsComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* QueuedAsyncProductsComponentBase :: - get_noArgsAsync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsAsync_InputPorts(), @@ -916,7 +916,7 @@ Ports::InputNoArgsPort* QueuedAsyncProductsComponentBase :: } Ports::InputNoArgsPort* QueuedAsyncProductsComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -927,7 +927,7 @@ Ports::InputNoArgsPort* QueuedAsyncProductsComponentBase :: } Ports::InputNoArgsReturnPort* QueuedAsyncProductsComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -938,7 +938,7 @@ Ports::InputNoArgsReturnPort* QueuedAsyncProductsComponentBase :: } Ports::InputNoArgsReturnPort* QueuedAsyncProductsComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -949,7 +949,7 @@ Ports::InputNoArgsReturnPort* QueuedAsyncProductsComponentBase :: } Ports::InputNoArgsPort* QueuedAsyncProductsComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -960,7 +960,7 @@ Ports::InputNoArgsPort* QueuedAsyncProductsComponentBase :: } Ports::InputTypedPort* QueuedAsyncProductsComponentBase :: - get_typedAsync_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsync_InputPorts(), @@ -971,7 +971,7 @@ Ports::InputTypedPort* QueuedAsyncProductsComponentBase :: } Ports::InputTypedPort* QueuedAsyncProductsComponentBase :: - get_typedAsyncAssert_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncAssert_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncAssert_InputPorts(), @@ -982,7 +982,7 @@ Ports::InputTypedPort* QueuedAsyncProductsComponentBase :: } Ports::InputTypedPort* QueuedAsyncProductsComponentBase :: - get_typedAsyncBlockPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncBlockPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncBlockPriority_InputPorts(), @@ -993,7 +993,7 @@ Ports::InputTypedPort* QueuedAsyncProductsComponentBase :: } Ports::InputTypedPort* QueuedAsyncProductsComponentBase :: - get_typedAsyncDropPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncDropPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncDropPriority_InputPorts(), @@ -1004,7 +1004,7 @@ Ports::InputTypedPort* QueuedAsyncProductsComponentBase :: } Ports::InputTypedPort* QueuedAsyncProductsComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -1015,7 +1015,7 @@ Ports::InputTypedPort* QueuedAsyncProductsComponentBase :: } Ports::InputTypedReturnPort* QueuedAsyncProductsComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -1026,7 +1026,7 @@ Ports::InputTypedReturnPort* QueuedAsyncProductsComponentBase :: } Ports::InputTypedReturnPort* QueuedAsyncProductsComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -1037,7 +1037,7 @@ Ports::InputTypedReturnPort* QueuedAsyncProductsComponentBase :: } Ports::InputTypedPort* QueuedAsyncProductsComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -1053,7 +1053,7 @@ Ports::InputTypedPort* QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -1067,7 +1067,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -1081,7 +1081,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -1095,7 +1095,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -1109,7 +1109,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -1123,7 +1123,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpRequestPort* port ) { @@ -1137,7 +1137,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpSendPort* port ) { @@ -1153,7 +1153,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -1169,7 +1169,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -1183,7 +1183,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -1201,7 +1201,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -1215,7 +1215,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -1229,7 +1229,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -1243,7 +1243,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -1263,7 +1263,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1277,7 +1277,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1291,7 +1291,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1305,7 +1305,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1319,7 +1319,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1333,7 +1333,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1349,7 +1349,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1365,7 +1365,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1379,7 +1379,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1401,7 +1401,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1415,7 +1415,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1450,194 +1450,194 @@ QueuedAsyncProductsComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_productRecvIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_noArgsAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_typedAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_typedAsyncAssert_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_typedAsyncBlockPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_typedAsyncDropPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_productRequestOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_productSendOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: +FwIndexType QueuedAsyncProductsComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1645,7 +1645,7 @@ NATIVE_INT_TYPE QueuedAsyncProductsComponentBase :: // ---------------------------------------------------------------------- bool QueuedAsyncProductsComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1656,7 +1656,7 @@ bool QueuedAsyncProductsComponentBase :: } bool QueuedAsyncProductsComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1667,7 +1667,7 @@ bool QueuedAsyncProductsComponentBase :: } bool QueuedAsyncProductsComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1678,7 +1678,7 @@ bool QueuedAsyncProductsComponentBase :: } bool QueuedAsyncProductsComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1689,7 +1689,7 @@ bool QueuedAsyncProductsComponentBase :: } bool QueuedAsyncProductsComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1700,7 +1700,7 @@ bool QueuedAsyncProductsComponentBase :: } bool QueuedAsyncProductsComponentBase :: - isConnected_productRequestOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productRequestOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRequestOut_OutputPorts(), @@ -1711,7 +1711,7 @@ bool QueuedAsyncProductsComponentBase :: } bool QueuedAsyncProductsComponentBase :: - isConnected_productSendOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productSendOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productSendOut_OutputPorts(), @@ -1724,7 +1724,7 @@ bool QueuedAsyncProductsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool QueuedAsyncProductsComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1737,7 +1737,7 @@ bool QueuedAsyncProductsComponentBase :: #endif bool QueuedAsyncProductsComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1748,7 +1748,7 @@ bool QueuedAsyncProductsComponentBase :: } bool QueuedAsyncProductsComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1763,7 +1763,7 @@ bool QueuedAsyncProductsComponentBase :: // ---------------------------------------------------------------------- bool QueuedAsyncProductsComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1774,7 +1774,7 @@ bool QueuedAsyncProductsComponentBase :: } bool QueuedAsyncProductsComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1785,7 +1785,7 @@ bool QueuedAsyncProductsComponentBase :: } bool QueuedAsyncProductsComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1796,7 +1796,7 @@ bool QueuedAsyncProductsComponentBase :: } bool QueuedAsyncProductsComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1814,7 +1814,7 @@ bool QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -1838,7 +1838,7 @@ void QueuedAsyncProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(PRODUCTRECVIN_DPRESPONSE) + static_cast(PRODUCTRECVIN_DPRESPONSE) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1890,7 +1890,7 @@ void QueuedAsyncProductsComponentBase :: // ---------------------------------------------------------------------- void QueuedAsyncProductsComponentBase :: - noArgsAsync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsAsync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1905,7 +1905,7 @@ void QueuedAsyncProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(NOARGSASYNC_NOARGS) + static_cast(NOARGSASYNC_NOARGS) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1930,7 +1930,7 @@ void QueuedAsyncProductsComponentBase :: } void QueuedAsyncProductsComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1949,7 +1949,7 @@ void QueuedAsyncProductsComponentBase :: } U32 QueuedAsyncProductsComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1972,7 +1972,7 @@ U32 QueuedAsyncProductsComponentBase :: } U32 QueuedAsyncProductsComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1989,7 +1989,7 @@ U32 QueuedAsyncProductsComponentBase :: } void QueuedAsyncProductsComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -2003,7 +2003,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2035,7 +2035,7 @@ void QueuedAsyncProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNC_TYPED) + static_cast(TYPEDASYNC_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2110,7 +2110,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2142,7 +2142,7 @@ void QueuedAsyncProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCASSERT_TYPED) + static_cast(TYPEDASYNCASSERT_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2217,7 +2217,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2249,7 +2249,7 @@ void QueuedAsyncProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) + static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2324,7 +2324,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2356,7 +2356,7 @@ void QueuedAsyncProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCDROPPRIORITY_TYPED) + static_cast(TYPEDASYNCDROPPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2436,7 +2436,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2473,7 +2473,7 @@ void QueuedAsyncProductsComponentBase :: F32 QueuedAsyncProductsComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2514,7 +2514,7 @@ F32 QueuedAsyncProductsComponentBase :: F32 QueuedAsyncProductsComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2549,7 +2549,7 @@ F32 QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2588,7 +2588,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -2606,14 +2606,14 @@ void QueuedAsyncProductsComponentBase :: // ---------------------------------------------------------------------- void QueuedAsyncProductsComponentBase :: - noArgsAsync_preMsgHook(NATIVE_INT_TYPE portNum) + noArgsAsync_preMsgHook(FwIndexType portNum) { // Default: no-op } void QueuedAsyncProductsComponentBase :: typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2628,7 +2628,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2643,7 +2643,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2658,7 +2658,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2677,7 +2677,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: productRequestOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -2694,7 +2694,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: productSendOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -2714,7 +2714,7 @@ void QueuedAsyncProductsComponentBase :: // ---------------------------------------------------------------------- void QueuedAsyncProductsComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -2724,7 +2724,7 @@ void QueuedAsyncProductsComponentBase :: } U32 QueuedAsyncProductsComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -2735,7 +2735,7 @@ U32 QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2762,7 +2762,7 @@ void QueuedAsyncProductsComponentBase :: F32 QueuedAsyncProductsComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2861,7 +2861,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedAsyncProductsComponentBase :: doDispatch() { ComponentIpcSerializableBuffer msg; - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -2876,7 +2876,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedAsyncProductsComponentBase :: // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -2889,7 +2889,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedAsyncProductsComponentBase :: return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -3243,7 +3243,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -3258,7 +3258,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -3281,7 +3281,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3292,7 +3292,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3303,7 +3303,7 @@ void QueuedAsyncProductsComponentBase :: U32 QueuedAsyncProductsComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3314,7 +3314,7 @@ U32 QueuedAsyncProductsComponentBase :: U32 QueuedAsyncProductsComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3325,7 +3325,7 @@ U32 QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3336,7 +3336,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3363,7 +3363,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3390,7 +3390,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3417,7 +3417,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3444,7 +3444,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3471,7 +3471,7 @@ void QueuedAsyncProductsComponentBase :: F32 QueuedAsyncProductsComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3498,7 +3498,7 @@ F32 QueuedAsyncProductsComponentBase :: F32 QueuedAsyncProductsComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3525,7 +3525,7 @@ F32 QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3566,7 +3566,7 @@ void QueuedAsyncProductsComponentBase :: void QueuedAsyncProductsComponentBase :: productRecvIn_handler( - const NATIVE_INT_TYPE portNum, + const FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.hpp index 0eb80747b..a93b02b6c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.hpp @@ -209,8 +209,8 @@ class QueuedAsyncProductsComponentBase : //! Initialize QueuedAsyncProductsComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -223,14 +223,14 @@ class QueuedAsyncProductsComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get special input port at index //! //! \return productRecvIn[portNum] Fw::InputDpResponsePort* get_productRecvIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -243,91 +243,91 @@ class QueuedAsyncProductsComponentBase : //! //! \return noArgsAsync[portNum] Ports::InputNoArgsPort* get_noArgsAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsync[portNum] Ports::InputTypedPort* get_typedAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncAssert[portNum] Ports::InputTypedPort* get_typedAsyncAssert_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncBlockPriority[portNum] Ports::InputTypedPort* get_typedAsyncBlockPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncDropPriority[portNum] Ports::InputTypedPort* get_typedAsyncDropPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -338,43 +338,43 @@ class QueuedAsyncProductsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpRequestPort* port //!< The input port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpSendPort* port //!< The input port ); @@ -382,7 +382,7 @@ class QueuedAsyncProductsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -390,13 +390,13 @@ class QueuedAsyncProductsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -408,25 +408,25 @@ class QueuedAsyncProductsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -440,37 +440,37 @@ class QueuedAsyncProductsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -478,7 +478,7 @@ class QueuedAsyncProductsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -486,13 +486,13 @@ class QueuedAsyncProductsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -508,13 +508,13 @@ class QueuedAsyncProductsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -543,12 +543,12 @@ class QueuedAsyncProductsComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; //! Get the number of productRecvIn input ports //! //! \return The number of productRecvIn input ports - NATIVE_INT_TYPE getNum_productRecvIn_InputPorts() const; + FwIndexType getNum_productRecvIn_InputPorts() const; PROTECTED: @@ -559,67 +559,67 @@ class QueuedAsyncProductsComponentBase : //! Get the number of noArgsAsync input ports //! //! \return The number of noArgsAsync input ports - NATIVE_INT_TYPE getNum_noArgsAsync_InputPorts() const; + FwIndexType getNum_noArgsAsync_InputPorts() const; //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedAsync input ports //! //! \return The number of typedAsync input ports - NATIVE_INT_TYPE getNum_typedAsync_InputPorts() const; + FwIndexType getNum_typedAsync_InputPorts() const; //! Get the number of typedAsyncAssert input ports //! //! \return The number of typedAsyncAssert input ports - NATIVE_INT_TYPE getNum_typedAsyncAssert_InputPorts() const; + FwIndexType getNum_typedAsyncAssert_InputPorts() const; //! Get the number of typedAsyncBlockPriority input ports //! //! \return The number of typedAsyncBlockPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncBlockPriority_InputPorts() const; + FwIndexType getNum_typedAsyncBlockPriority_InputPorts() const; //! Get the number of typedAsyncDropPriority input ports //! //! \return The number of typedAsyncDropPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncDropPriority_InputPorts() const; + FwIndexType getNum_typedAsyncDropPriority_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -630,56 +630,56 @@ class QueuedAsyncProductsComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; //! Get the number of productRequestOut output ports //! //! \return The number of productRequestOut output ports - NATIVE_INT_TYPE getNum_productRequestOut_OutputPorts() const; + FwIndexType getNum_productRequestOut_OutputPorts() const; //! Get the number of productSendOut output ports //! //! \return The number of productSendOut output ports - NATIVE_INT_TYPE getNum_productSendOut_OutputPorts() const; + FwIndexType getNum_productSendOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -690,22 +690,22 @@ class QueuedAsyncProductsComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -717,49 +717,49 @@ class QueuedAsyncProductsComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productRequestOut is connected //! //! \return Whether port productRequestOut is connected bool isConnected_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productSendOut is connected //! //! \return Whether port productSendOut is connected bool isConnected_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -768,7 +768,7 @@ class QueuedAsyncProductsComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -777,14 +777,14 @@ class QueuedAsyncProductsComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -797,28 +797,28 @@ class QueuedAsyncProductsComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -831,7 +831,7 @@ class QueuedAsyncProductsComponentBase : //! Handler base-class function for input port productRecvIn void productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -845,32 +845,32 @@ class QueuedAsyncProductsComponentBase : //! Handler for input port noArgsAsync virtual void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedAsync virtual void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -882,7 +882,7 @@ class QueuedAsyncProductsComponentBase : //! Handler for input port typedAsyncAssert virtual void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -894,7 +894,7 @@ class QueuedAsyncProductsComponentBase : //! Handler for input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -906,7 +906,7 @@ class QueuedAsyncProductsComponentBase : //! Handler for input port typedAsyncDropPriority virtual void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -918,7 +918,7 @@ class QueuedAsyncProductsComponentBase : //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -930,7 +930,7 @@ class QueuedAsyncProductsComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -942,7 +942,7 @@ class QueuedAsyncProductsComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -954,7 +954,7 @@ class QueuedAsyncProductsComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -974,32 +974,32 @@ class QueuedAsyncProductsComponentBase : //! Handler base-class function for input port noArgsAsync void noArgsAsync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedAsync void typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1011,7 +1011,7 @@ class QueuedAsyncProductsComponentBase : //! Handler base-class function for input port typedAsyncAssert void typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1023,7 +1023,7 @@ class QueuedAsyncProductsComponentBase : //! Handler base-class function for input port typedAsyncBlockPriority void typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1035,7 +1035,7 @@ class QueuedAsyncProductsComponentBase : //! Handler base-class function for input port typedAsyncDropPriority void typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1047,7 +1047,7 @@ class QueuedAsyncProductsComponentBase : //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1059,7 +1059,7 @@ class QueuedAsyncProductsComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1071,7 +1071,7 @@ class QueuedAsyncProductsComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1083,7 +1083,7 @@ class QueuedAsyncProductsComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1105,7 +1105,7 @@ class QueuedAsyncProductsComponentBase : //! Pre-message hook for async input port productRecvIn virtual void productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -1123,12 +1123,12 @@ class QueuedAsyncProductsComponentBase : //! Pre-message hook for async input port noArgsAsync virtual void noArgsAsync_preMsgHook( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Pre-message hook for async input port typedAsync virtual void typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1140,7 +1140,7 @@ class QueuedAsyncProductsComponentBase : //! Pre-message hook for async input port typedAsyncAssert virtual void typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1152,7 +1152,7 @@ class QueuedAsyncProductsComponentBase : //! Pre-message hook for async input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1164,7 +1164,7 @@ class QueuedAsyncProductsComponentBase : //! Pre-message hook for async input port typedAsyncDropPriority virtual void typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1182,14 +1182,14 @@ class QueuedAsyncProductsComponentBase : //! Invoke output port productRequestOut void productRequestOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); //! Invoke output port productSendOut void productSendOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -1202,17 +1202,17 @@ class QueuedAsyncProductsComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1224,7 +1224,7 @@ class QueuedAsyncProductsComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1361,7 +1361,7 @@ class QueuedAsyncProductsComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -1370,7 +1370,7 @@ class QueuedAsyncProductsComponentBase : //! Callback for port productRecvIn static void m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -1385,37 +1385,37 @@ class QueuedAsyncProductsComponentBase : //! Callback for port noArgsAsync static void m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedAsync static void m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1428,7 +1428,7 @@ class QueuedAsyncProductsComponentBase : //! Callback for port typedAsyncAssert static void m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1441,7 +1441,7 @@ class QueuedAsyncProductsComponentBase : //! Callback for port typedAsyncBlockPriority static void m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1454,7 +1454,7 @@ class QueuedAsyncProductsComponentBase : //! Callback for port typedAsyncDropPriority static void m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1467,7 +1467,7 @@ class QueuedAsyncProductsComponentBase : //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1480,7 +1480,7 @@ class QueuedAsyncProductsComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1493,7 +1493,7 @@ class QueuedAsyncProductsComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1506,7 +1506,7 @@ class QueuedAsyncProductsComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1530,7 +1530,7 @@ class QueuedAsyncProductsComponentBase : //! Handler implementation for productRecvIn void productRecvIn_handler( - const NATIVE_INT_TYPE portNum, //!< The port number + const FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container id const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The buffer status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedCommandsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedCommandsComponentAc.ref.cpp index 11a8ef140..0d7156171 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedCommandsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedCommandsComponentAc.ref.cpp @@ -49,11 +49,11 @@ namespace { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = sizeof(BuffUnion) + - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -78,8 +78,8 @@ namespace { void QueuedCommandsComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwEnumStoreType instance ) { // Initialize base class @@ -87,8 +87,8 @@ void QueuedCommandsComponentBase :: // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -111,8 +111,8 @@ void QueuedCommandsComponentBase :: // Connect input port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsAsync_InputPorts()); port++ ) { this->m_noArgsAsync_InputPort[port].init(); @@ -135,8 +135,8 @@ void QueuedCommandsComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -159,8 +159,8 @@ void QueuedCommandsComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -183,8 +183,8 @@ void QueuedCommandsComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -207,8 +207,8 @@ void QueuedCommandsComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -231,8 +231,8 @@ void QueuedCommandsComponentBase :: // Connect input port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsync_InputPorts()); port++ ) { this->m_typedAsync_InputPort[port].init(); @@ -255,8 +255,8 @@ void QueuedCommandsComponentBase :: // Connect input port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); port++ ) { this->m_typedAsyncAssert_InputPort[port].init(); @@ -279,8 +279,8 @@ void QueuedCommandsComponentBase :: // Connect input port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); port++ ) { this->m_typedAsyncBlockPriority_InputPort[port].init(); @@ -303,8 +303,8 @@ void QueuedCommandsComponentBase :: // Connect input port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); port++ ) { this->m_typedAsyncDropPriority_InputPort[port].init(); @@ -327,8 +327,8 @@ void QueuedCommandsComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -351,8 +351,8 @@ void QueuedCommandsComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -375,8 +375,8 @@ void QueuedCommandsComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -399,8 +399,8 @@ void QueuedCommandsComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -423,8 +423,8 @@ void QueuedCommandsComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -442,8 +442,8 @@ void QueuedCommandsComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -461,8 +461,8 @@ void QueuedCommandsComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -480,8 +480,8 @@ void QueuedCommandsComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -499,8 +499,8 @@ void QueuedCommandsComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -519,8 +519,8 @@ void QueuedCommandsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -539,8 +539,8 @@ void QueuedCommandsComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -558,8 +558,8 @@ void QueuedCommandsComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -577,8 +577,8 @@ void QueuedCommandsComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -596,8 +596,8 @@ void QueuedCommandsComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -615,8 +615,8 @@ void QueuedCommandsComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -634,8 +634,8 @@ void QueuedCommandsComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -666,7 +666,7 @@ void QueuedCommandsComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* QueuedCommandsComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -681,7 +681,7 @@ Fw::InputCmdPort* QueuedCommandsComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* QueuedCommandsComponentBase :: - get_noArgsAsync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsAsync_InputPorts(), @@ -692,7 +692,7 @@ Ports::InputNoArgsPort* QueuedCommandsComponentBase :: } Ports::InputNoArgsPort* QueuedCommandsComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -703,7 +703,7 @@ Ports::InputNoArgsPort* QueuedCommandsComponentBase :: } Ports::InputNoArgsReturnPort* QueuedCommandsComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -714,7 +714,7 @@ Ports::InputNoArgsReturnPort* QueuedCommandsComponentBase :: } Ports::InputNoArgsReturnPort* QueuedCommandsComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -725,7 +725,7 @@ Ports::InputNoArgsReturnPort* QueuedCommandsComponentBase :: } Ports::InputNoArgsPort* QueuedCommandsComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -736,7 +736,7 @@ Ports::InputNoArgsPort* QueuedCommandsComponentBase :: } Ports::InputTypedPort* QueuedCommandsComponentBase :: - get_typedAsync_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsync_InputPorts(), @@ -747,7 +747,7 @@ Ports::InputTypedPort* QueuedCommandsComponentBase :: } Ports::InputTypedPort* QueuedCommandsComponentBase :: - get_typedAsyncAssert_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncAssert_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncAssert_InputPorts(), @@ -758,7 +758,7 @@ Ports::InputTypedPort* QueuedCommandsComponentBase :: } Ports::InputTypedPort* QueuedCommandsComponentBase :: - get_typedAsyncBlockPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncBlockPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncBlockPriority_InputPorts(), @@ -769,7 +769,7 @@ Ports::InputTypedPort* QueuedCommandsComponentBase :: } Ports::InputTypedPort* QueuedCommandsComponentBase :: - get_typedAsyncDropPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncDropPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncDropPriority_InputPorts(), @@ -780,7 +780,7 @@ Ports::InputTypedPort* QueuedCommandsComponentBase :: } Ports::InputTypedPort* QueuedCommandsComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -791,7 +791,7 @@ Ports::InputTypedPort* QueuedCommandsComponentBase :: } Ports::InputTypedReturnPort* QueuedCommandsComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -802,7 +802,7 @@ Ports::InputTypedReturnPort* QueuedCommandsComponentBase :: } Ports::InputTypedReturnPort* QueuedCommandsComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -813,7 +813,7 @@ Ports::InputTypedReturnPort* QueuedCommandsComponentBase :: } Ports::InputTypedPort* QueuedCommandsComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -829,7 +829,7 @@ Ports::InputTypedPort* QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -843,7 +843,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -857,7 +857,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -871,7 +871,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -885,7 +885,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -901,7 +901,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -917,7 +917,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -931,7 +931,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -949,7 +949,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -963,7 +963,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -977,7 +977,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -991,7 +991,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -1011,7 +1011,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1025,7 +1025,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1039,7 +1039,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1053,7 +1053,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1069,7 +1069,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1085,7 +1085,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1099,7 +1099,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1121,7 +1121,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1135,7 +1135,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1248,176 +1248,176 @@ QueuedCommandsComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_noArgsAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); } -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_typedAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); } -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_typedAsyncAssert_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); } -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_typedAsyncBlockPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); } -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_typedAsyncDropPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); } -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE QueuedCommandsComponentBase :: +FwIndexType QueuedCommandsComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1425,7 +1425,7 @@ NATIVE_INT_TYPE QueuedCommandsComponentBase :: // ---------------------------------------------------------------------- bool QueuedCommandsComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1436,7 +1436,7 @@ bool QueuedCommandsComponentBase :: } bool QueuedCommandsComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1447,7 +1447,7 @@ bool QueuedCommandsComponentBase :: } bool QueuedCommandsComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1458,7 +1458,7 @@ bool QueuedCommandsComponentBase :: } bool QueuedCommandsComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1469,7 +1469,7 @@ bool QueuedCommandsComponentBase :: } bool QueuedCommandsComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1482,7 +1482,7 @@ bool QueuedCommandsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool QueuedCommandsComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1495,7 +1495,7 @@ bool QueuedCommandsComponentBase :: #endif bool QueuedCommandsComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1506,7 +1506,7 @@ bool QueuedCommandsComponentBase :: } bool QueuedCommandsComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1521,7 +1521,7 @@ bool QueuedCommandsComponentBase :: // ---------------------------------------------------------------------- bool QueuedCommandsComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1532,7 +1532,7 @@ bool QueuedCommandsComponentBase :: } bool QueuedCommandsComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1543,7 +1543,7 @@ bool QueuedCommandsComponentBase :: } bool QueuedCommandsComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1554,7 +1554,7 @@ bool QueuedCommandsComponentBase :: } bool QueuedCommandsComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1571,7 +1571,7 @@ bool QueuedCommandsComponentBase :: // ---------------------------------------------------------------------- void QueuedCommandsComponentBase :: - noArgsAsync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsAsync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1586,7 +1586,7 @@ void QueuedCommandsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(NOARGSASYNC_NOARGS) + static_cast(NOARGSASYNC_NOARGS) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1611,7 +1611,7 @@ void QueuedCommandsComponentBase :: } void QueuedCommandsComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1630,7 +1630,7 @@ void QueuedCommandsComponentBase :: } U32 QueuedCommandsComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1653,7 +1653,7 @@ U32 QueuedCommandsComponentBase :: } U32 QueuedCommandsComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1670,7 +1670,7 @@ U32 QueuedCommandsComponentBase :: } void QueuedCommandsComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1684,7 +1684,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1716,7 +1716,7 @@ void QueuedCommandsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNC_TYPED) + static_cast(TYPEDASYNC_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1791,7 +1791,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1823,7 +1823,7 @@ void QueuedCommandsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCASSERT_TYPED) + static_cast(TYPEDASYNCASSERT_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1898,7 +1898,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1930,7 +1930,7 @@ void QueuedCommandsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) + static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2005,7 +2005,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2037,7 +2037,7 @@ void QueuedCommandsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCDROPPRIORITY_TYPED) + static_cast(TYPEDASYNCDROPPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2117,7 +2117,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2154,7 +2154,7 @@ void QueuedCommandsComponentBase :: F32 QueuedCommandsComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2195,7 +2195,7 @@ F32 QueuedCommandsComponentBase :: F32 QueuedCommandsComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2230,7 +2230,7 @@ F32 QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2268,14 +2268,14 @@ void QueuedCommandsComponentBase :: // ---------------------------------------------------------------------- void QueuedCommandsComponentBase :: - noArgsAsync_preMsgHook(NATIVE_INT_TYPE portNum) + noArgsAsync_preMsgHook(FwIndexType portNum) { // Default: no-op } void QueuedCommandsComponentBase :: typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2290,7 +2290,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2305,7 +2305,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2320,7 +2320,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2338,7 +2338,7 @@ void QueuedCommandsComponentBase :: // ---------------------------------------------------------------------- void QueuedCommandsComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -2348,7 +2348,7 @@ void QueuedCommandsComponentBase :: } U32 QueuedCommandsComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -2359,7 +2359,7 @@ U32 QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2386,7 +2386,7 @@ void QueuedCommandsComponentBase :: F32 QueuedCommandsComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3076,14 +3076,14 @@ void QueuedCommandsComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_ASYNC)); + _status = msg.serialize(static_cast(CMD_CMD_ASYNC)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -3135,14 +3135,14 @@ void QueuedCommandsComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_PRIORITY)); + _status = msg.serialize(static_cast(CMD_CMD_PRIORITY)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -3194,14 +3194,14 @@ void QueuedCommandsComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY)); + _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -3253,14 +3253,14 @@ void QueuedCommandsComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_DROP)); + _status = msg.serialize(static_cast(CMD_CMD_DROP)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -3317,14 +3317,14 @@ void QueuedCommandsComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY_DROP)); + _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY_DROP)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -3472,7 +3472,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedCommandsComponentBase :: doDispatch() { ComponentIpcSerializableBuffer msg; - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -3492,7 +3492,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedCommandsComponentBase :: // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -3505,7 +3505,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedCommandsComponentBase :: return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -4094,7 +4094,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -4270,7 +4270,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -4281,7 +4281,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -4292,7 +4292,7 @@ void QueuedCommandsComponentBase :: U32 QueuedCommandsComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -4303,7 +4303,7 @@ U32 QueuedCommandsComponentBase :: U32 QueuedCommandsComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -4314,7 +4314,7 @@ U32 QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -4325,7 +4325,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4352,7 +4352,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4379,7 +4379,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4406,7 +4406,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4433,7 +4433,7 @@ void QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4460,7 +4460,7 @@ void QueuedCommandsComponentBase :: F32 QueuedCommandsComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4487,7 +4487,7 @@ F32 QueuedCommandsComponentBase :: F32 QueuedCommandsComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4514,7 +4514,7 @@ F32 QueuedCommandsComponentBase :: void QueuedCommandsComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedCommandsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedCommandsComponentAc.ref.hpp index 1096b2838..725193b9c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedCommandsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedCommandsComponentAc.ref.hpp @@ -124,8 +124,8 @@ class QueuedCommandsComponentBase : //! Initialize QueuedCommandsComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -138,7 +138,7 @@ class QueuedCommandsComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -151,91 +151,91 @@ class QueuedCommandsComponentBase : //! //! \return noArgsAsync[portNum] Ports::InputNoArgsPort* get_noArgsAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsync[portNum] Ports::InputTypedPort* get_typedAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncAssert[portNum] Ports::InputTypedPort* get_typedAsyncAssert_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncBlockPriority[portNum] Ports::InputTypedPort* get_typedAsyncBlockPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncDropPriority[portNum] Ports::InputTypedPort* get_typedAsyncDropPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -246,31 +246,31 @@ class QueuedCommandsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); @@ -278,7 +278,7 @@ class QueuedCommandsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -286,13 +286,13 @@ class QueuedCommandsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -304,25 +304,25 @@ class QueuedCommandsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -336,25 +336,25 @@ class QueuedCommandsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -362,7 +362,7 @@ class QueuedCommandsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -370,13 +370,13 @@ class QueuedCommandsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -392,13 +392,13 @@ class QueuedCommandsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -438,7 +438,7 @@ class QueuedCommandsComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; PROTECTED: @@ -449,67 +449,67 @@ class QueuedCommandsComponentBase : //! Get the number of noArgsAsync input ports //! //! \return The number of noArgsAsync input ports - NATIVE_INT_TYPE getNum_noArgsAsync_InputPorts() const; + FwIndexType getNum_noArgsAsync_InputPorts() const; //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedAsync input ports //! //! \return The number of typedAsync input ports - NATIVE_INT_TYPE getNum_typedAsync_InputPorts() const; + FwIndexType getNum_typedAsync_InputPorts() const; //! Get the number of typedAsyncAssert input ports //! //! \return The number of typedAsyncAssert input ports - NATIVE_INT_TYPE getNum_typedAsyncAssert_InputPorts() const; + FwIndexType getNum_typedAsyncAssert_InputPorts() const; //! Get the number of typedAsyncBlockPriority input ports //! //! \return The number of typedAsyncBlockPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncBlockPriority_InputPorts() const; + FwIndexType getNum_typedAsyncBlockPriority_InputPorts() const; //! Get the number of typedAsyncDropPriority input ports //! //! \return The number of typedAsyncDropPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncDropPriority_InputPorts() const; + FwIndexType getNum_typedAsyncDropPriority_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -520,46 +520,46 @@ class QueuedCommandsComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -570,22 +570,22 @@ class QueuedCommandsComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -597,35 +597,35 @@ class QueuedCommandsComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -634,7 +634,7 @@ class QueuedCommandsComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -643,14 +643,14 @@ class QueuedCommandsComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -663,28 +663,28 @@ class QueuedCommandsComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -695,32 +695,32 @@ class QueuedCommandsComponentBase : //! Handler for input port noArgsAsync virtual void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedAsync virtual void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -732,7 +732,7 @@ class QueuedCommandsComponentBase : //! Handler for input port typedAsyncAssert virtual void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -744,7 +744,7 @@ class QueuedCommandsComponentBase : //! Handler for input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -756,7 +756,7 @@ class QueuedCommandsComponentBase : //! Handler for input port typedAsyncDropPriority virtual void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -768,7 +768,7 @@ class QueuedCommandsComponentBase : //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -780,7 +780,7 @@ class QueuedCommandsComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -792,7 +792,7 @@ class QueuedCommandsComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -804,7 +804,7 @@ class QueuedCommandsComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -824,32 +824,32 @@ class QueuedCommandsComponentBase : //! Handler base-class function for input port noArgsAsync void noArgsAsync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedAsync void typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -861,7 +861,7 @@ class QueuedCommandsComponentBase : //! Handler base-class function for input port typedAsyncAssert void typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -873,7 +873,7 @@ class QueuedCommandsComponentBase : //! Handler base-class function for input port typedAsyncBlockPriority void typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -885,7 +885,7 @@ class QueuedCommandsComponentBase : //! Handler base-class function for input port typedAsyncDropPriority void typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -897,7 +897,7 @@ class QueuedCommandsComponentBase : //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -909,7 +909,7 @@ class QueuedCommandsComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -921,7 +921,7 @@ class QueuedCommandsComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -933,7 +933,7 @@ class QueuedCommandsComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -955,12 +955,12 @@ class QueuedCommandsComponentBase : //! Pre-message hook for async input port noArgsAsync virtual void noArgsAsync_preMsgHook( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Pre-message hook for async input port typedAsync virtual void typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -972,7 +972,7 @@ class QueuedCommandsComponentBase : //! Pre-message hook for async input port typedAsyncAssert virtual void typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -984,7 +984,7 @@ class QueuedCommandsComponentBase : //! Pre-message hook for async input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -996,7 +996,7 @@ class QueuedCommandsComponentBase : //! Pre-message hook for async input port typedAsyncDropPriority virtual void typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1014,17 +1014,17 @@ class QueuedCommandsComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1036,7 +1036,7 @@ class QueuedCommandsComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1464,7 +1464,7 @@ class QueuedCommandsComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -1479,37 +1479,37 @@ class QueuedCommandsComponentBase : //! Callback for port noArgsAsync static void m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedAsync static void m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1522,7 +1522,7 @@ class QueuedCommandsComponentBase : //! Callback for port typedAsyncAssert static void m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1535,7 +1535,7 @@ class QueuedCommandsComponentBase : //! Callback for port typedAsyncBlockPriority static void m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1548,7 +1548,7 @@ class QueuedCommandsComponentBase : //! Callback for port typedAsyncDropPriority static void m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1561,7 +1561,7 @@ class QueuedCommandsComponentBase : //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1574,7 +1574,7 @@ class QueuedCommandsComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1587,7 +1587,7 @@ class QueuedCommandsComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1600,7 +1600,7 @@ class QueuedCommandsComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedEventsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedEventsComponentAc.ref.cpp index d3bf44ee6..405156177 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedEventsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedEventsComponentAc.ref.cpp @@ -44,11 +44,11 @@ namespace { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = sizeof(BuffUnion) + - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -73,8 +73,8 @@ namespace { void QueuedEventsComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwEnumStoreType instance ) { // Initialize base class @@ -82,8 +82,8 @@ void QueuedEventsComponentBase :: // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -106,8 +106,8 @@ void QueuedEventsComponentBase :: // Connect input port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsAsync_InputPorts()); port++ ) { this->m_noArgsAsync_InputPort[port].init(); @@ -130,8 +130,8 @@ void QueuedEventsComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -154,8 +154,8 @@ void QueuedEventsComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -178,8 +178,8 @@ void QueuedEventsComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -202,8 +202,8 @@ void QueuedEventsComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -226,8 +226,8 @@ void QueuedEventsComponentBase :: // Connect input port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsync_InputPorts()); port++ ) { this->m_typedAsync_InputPort[port].init(); @@ -250,8 +250,8 @@ void QueuedEventsComponentBase :: // Connect input port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); port++ ) { this->m_typedAsyncAssert_InputPort[port].init(); @@ -274,8 +274,8 @@ void QueuedEventsComponentBase :: // Connect input port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); port++ ) { this->m_typedAsyncBlockPriority_InputPort[port].init(); @@ -298,8 +298,8 @@ void QueuedEventsComponentBase :: // Connect input port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); port++ ) { this->m_typedAsyncDropPriority_InputPort[port].init(); @@ -322,8 +322,8 @@ void QueuedEventsComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -346,8 +346,8 @@ void QueuedEventsComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -370,8 +370,8 @@ void QueuedEventsComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -394,8 +394,8 @@ void QueuedEventsComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -418,8 +418,8 @@ void QueuedEventsComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -437,8 +437,8 @@ void QueuedEventsComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -456,8 +456,8 @@ void QueuedEventsComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -475,8 +475,8 @@ void QueuedEventsComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -494,8 +494,8 @@ void QueuedEventsComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -514,8 +514,8 @@ void QueuedEventsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -534,8 +534,8 @@ void QueuedEventsComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -553,8 +553,8 @@ void QueuedEventsComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -572,8 +572,8 @@ void QueuedEventsComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -591,8 +591,8 @@ void QueuedEventsComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -610,8 +610,8 @@ void QueuedEventsComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -629,8 +629,8 @@ void QueuedEventsComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -661,7 +661,7 @@ void QueuedEventsComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* QueuedEventsComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -676,7 +676,7 @@ Fw::InputCmdPort* QueuedEventsComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* QueuedEventsComponentBase :: - get_noArgsAsync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsAsync_InputPorts(), @@ -687,7 +687,7 @@ Ports::InputNoArgsPort* QueuedEventsComponentBase :: } Ports::InputNoArgsPort* QueuedEventsComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -698,7 +698,7 @@ Ports::InputNoArgsPort* QueuedEventsComponentBase :: } Ports::InputNoArgsReturnPort* QueuedEventsComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -709,7 +709,7 @@ Ports::InputNoArgsReturnPort* QueuedEventsComponentBase :: } Ports::InputNoArgsReturnPort* QueuedEventsComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -720,7 +720,7 @@ Ports::InputNoArgsReturnPort* QueuedEventsComponentBase :: } Ports::InputNoArgsPort* QueuedEventsComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -731,7 +731,7 @@ Ports::InputNoArgsPort* QueuedEventsComponentBase :: } Ports::InputTypedPort* QueuedEventsComponentBase :: - get_typedAsync_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsync_InputPorts(), @@ -742,7 +742,7 @@ Ports::InputTypedPort* QueuedEventsComponentBase :: } Ports::InputTypedPort* QueuedEventsComponentBase :: - get_typedAsyncAssert_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncAssert_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncAssert_InputPorts(), @@ -753,7 +753,7 @@ Ports::InputTypedPort* QueuedEventsComponentBase :: } Ports::InputTypedPort* QueuedEventsComponentBase :: - get_typedAsyncBlockPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncBlockPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncBlockPriority_InputPorts(), @@ -764,7 +764,7 @@ Ports::InputTypedPort* QueuedEventsComponentBase :: } Ports::InputTypedPort* QueuedEventsComponentBase :: - get_typedAsyncDropPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncDropPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncDropPriority_InputPorts(), @@ -775,7 +775,7 @@ Ports::InputTypedPort* QueuedEventsComponentBase :: } Ports::InputTypedPort* QueuedEventsComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -786,7 +786,7 @@ Ports::InputTypedPort* QueuedEventsComponentBase :: } Ports::InputTypedReturnPort* QueuedEventsComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -797,7 +797,7 @@ Ports::InputTypedReturnPort* QueuedEventsComponentBase :: } Ports::InputTypedReturnPort* QueuedEventsComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -808,7 +808,7 @@ Ports::InputTypedReturnPort* QueuedEventsComponentBase :: } Ports::InputTypedPort* QueuedEventsComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -824,7 +824,7 @@ Ports::InputTypedPort* QueuedEventsComponentBase :: void QueuedEventsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -838,7 +838,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -852,7 +852,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -866,7 +866,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -880,7 +880,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -896,7 +896,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -912,7 +912,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -926,7 +926,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -944,7 +944,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -958,7 +958,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -972,7 +972,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -986,7 +986,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -1006,7 +1006,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1020,7 +1020,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1034,7 +1034,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1048,7 +1048,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1064,7 +1064,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1080,7 +1080,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1094,7 +1094,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1116,7 +1116,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1130,7 +1130,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1167,176 +1167,176 @@ QueuedEventsComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_noArgsAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); } -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_typedAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); } -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_typedAsyncAssert_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); } -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_typedAsyncBlockPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); } -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_typedAsyncDropPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); } -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE QueuedEventsComponentBase :: +FwIndexType QueuedEventsComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1344,7 +1344,7 @@ NATIVE_INT_TYPE QueuedEventsComponentBase :: // ---------------------------------------------------------------------- bool QueuedEventsComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1355,7 +1355,7 @@ bool QueuedEventsComponentBase :: } bool QueuedEventsComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1366,7 +1366,7 @@ bool QueuedEventsComponentBase :: } bool QueuedEventsComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1377,7 +1377,7 @@ bool QueuedEventsComponentBase :: } bool QueuedEventsComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1388,7 +1388,7 @@ bool QueuedEventsComponentBase :: } bool QueuedEventsComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1401,7 +1401,7 @@ bool QueuedEventsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool QueuedEventsComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1414,7 +1414,7 @@ bool QueuedEventsComponentBase :: #endif bool QueuedEventsComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1425,7 +1425,7 @@ bool QueuedEventsComponentBase :: } bool QueuedEventsComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1440,7 +1440,7 @@ bool QueuedEventsComponentBase :: // ---------------------------------------------------------------------- bool QueuedEventsComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1451,7 +1451,7 @@ bool QueuedEventsComponentBase :: } bool QueuedEventsComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1462,7 +1462,7 @@ bool QueuedEventsComponentBase :: } bool QueuedEventsComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1473,7 +1473,7 @@ bool QueuedEventsComponentBase :: } bool QueuedEventsComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1490,7 +1490,7 @@ bool QueuedEventsComponentBase :: // ---------------------------------------------------------------------- void QueuedEventsComponentBase :: - noArgsAsync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsAsync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1505,7 +1505,7 @@ void QueuedEventsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(NOARGSASYNC_NOARGS) + static_cast(NOARGSASYNC_NOARGS) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1530,7 +1530,7 @@ void QueuedEventsComponentBase :: } void QueuedEventsComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1549,7 +1549,7 @@ void QueuedEventsComponentBase :: } U32 QueuedEventsComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1572,7 +1572,7 @@ U32 QueuedEventsComponentBase :: } U32 QueuedEventsComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1589,7 +1589,7 @@ U32 QueuedEventsComponentBase :: } void QueuedEventsComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1603,7 +1603,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1635,7 +1635,7 @@ void QueuedEventsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNC_TYPED) + static_cast(TYPEDASYNC_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1710,7 +1710,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1742,7 +1742,7 @@ void QueuedEventsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCASSERT_TYPED) + static_cast(TYPEDASYNCASSERT_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1817,7 +1817,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1849,7 +1849,7 @@ void QueuedEventsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) + static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1924,7 +1924,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1956,7 +1956,7 @@ void QueuedEventsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCDROPPRIORITY_TYPED) + static_cast(TYPEDASYNCDROPPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2036,7 +2036,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2073,7 +2073,7 @@ void QueuedEventsComponentBase :: F32 QueuedEventsComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2114,7 +2114,7 @@ F32 QueuedEventsComponentBase :: F32 QueuedEventsComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2149,7 +2149,7 @@ F32 QueuedEventsComponentBase :: void QueuedEventsComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2187,14 +2187,14 @@ void QueuedEventsComponentBase :: // ---------------------------------------------------------------------- void QueuedEventsComponentBase :: - noArgsAsync_preMsgHook(NATIVE_INT_TYPE portNum) + noArgsAsync_preMsgHook(FwIndexType portNum) { // Default: no-op } void QueuedEventsComponentBase :: typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2209,7 +2209,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2224,7 +2224,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2239,7 +2239,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2257,7 +2257,7 @@ void QueuedEventsComponentBase :: // ---------------------------------------------------------------------- void QueuedEventsComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -2267,7 +2267,7 @@ void QueuedEventsComponentBase :: } U32 QueuedEventsComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -2278,7 +2278,7 @@ U32 QueuedEventsComponentBase :: void QueuedEventsComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2305,7 +2305,7 @@ void QueuedEventsComponentBase :: F32 QueuedEventsComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3069,7 +3069,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedEventsComponentBase :: doDispatch() { ComponentIpcSerializableBuffer msg; - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -3089,7 +3089,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedEventsComponentBase :: // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -3102,7 +3102,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedEventsComponentBase :: return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -3420,7 +3420,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedEventsComponentBase :: void QueuedEventsComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -3439,7 +3439,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3450,7 +3450,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3461,7 +3461,7 @@ void QueuedEventsComponentBase :: U32 QueuedEventsComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3472,7 +3472,7 @@ U32 QueuedEventsComponentBase :: U32 QueuedEventsComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3483,7 +3483,7 @@ U32 QueuedEventsComponentBase :: void QueuedEventsComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3494,7 +3494,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3521,7 +3521,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3548,7 +3548,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3575,7 +3575,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3602,7 +3602,7 @@ void QueuedEventsComponentBase :: void QueuedEventsComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3629,7 +3629,7 @@ void QueuedEventsComponentBase :: F32 QueuedEventsComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3656,7 +3656,7 @@ F32 QueuedEventsComponentBase :: F32 QueuedEventsComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3683,7 +3683,7 @@ F32 QueuedEventsComponentBase :: void QueuedEventsComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedEventsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedEventsComponentAc.ref.hpp index c52ff4732..3e39450be 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedEventsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedEventsComponentAc.ref.hpp @@ -121,8 +121,8 @@ class QueuedEventsComponentBase : //! Initialize QueuedEventsComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -135,7 +135,7 @@ class QueuedEventsComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -148,91 +148,91 @@ class QueuedEventsComponentBase : //! //! \return noArgsAsync[portNum] Ports::InputNoArgsPort* get_noArgsAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsync[portNum] Ports::InputTypedPort* get_typedAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncAssert[portNum] Ports::InputTypedPort* get_typedAsyncAssert_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncBlockPriority[portNum] Ports::InputTypedPort* get_typedAsyncBlockPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncDropPriority[portNum] Ports::InputTypedPort* get_typedAsyncDropPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -243,31 +243,31 @@ class QueuedEventsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); @@ -275,7 +275,7 @@ class QueuedEventsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -283,13 +283,13 @@ class QueuedEventsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -301,25 +301,25 @@ class QueuedEventsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -333,25 +333,25 @@ class QueuedEventsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -359,7 +359,7 @@ class QueuedEventsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -367,13 +367,13 @@ class QueuedEventsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -389,13 +389,13 @@ class QueuedEventsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -424,7 +424,7 @@ class QueuedEventsComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; PROTECTED: @@ -435,67 +435,67 @@ class QueuedEventsComponentBase : //! Get the number of noArgsAsync input ports //! //! \return The number of noArgsAsync input ports - NATIVE_INT_TYPE getNum_noArgsAsync_InputPorts() const; + FwIndexType getNum_noArgsAsync_InputPorts() const; //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedAsync input ports //! //! \return The number of typedAsync input ports - NATIVE_INT_TYPE getNum_typedAsync_InputPorts() const; + FwIndexType getNum_typedAsync_InputPorts() const; //! Get the number of typedAsyncAssert input ports //! //! \return The number of typedAsyncAssert input ports - NATIVE_INT_TYPE getNum_typedAsyncAssert_InputPorts() const; + FwIndexType getNum_typedAsyncAssert_InputPorts() const; //! Get the number of typedAsyncBlockPriority input ports //! //! \return The number of typedAsyncBlockPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncBlockPriority_InputPorts() const; + FwIndexType getNum_typedAsyncBlockPriority_InputPorts() const; //! Get the number of typedAsyncDropPriority input ports //! //! \return The number of typedAsyncDropPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncDropPriority_InputPorts() const; + FwIndexType getNum_typedAsyncDropPriority_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -506,46 +506,46 @@ class QueuedEventsComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -556,22 +556,22 @@ class QueuedEventsComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -583,35 +583,35 @@ class QueuedEventsComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -620,7 +620,7 @@ class QueuedEventsComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -629,14 +629,14 @@ class QueuedEventsComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -649,28 +649,28 @@ class QueuedEventsComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -681,32 +681,32 @@ class QueuedEventsComponentBase : //! Handler for input port noArgsAsync virtual void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedAsync virtual void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -718,7 +718,7 @@ class QueuedEventsComponentBase : //! Handler for input port typedAsyncAssert virtual void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -730,7 +730,7 @@ class QueuedEventsComponentBase : //! Handler for input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -742,7 +742,7 @@ class QueuedEventsComponentBase : //! Handler for input port typedAsyncDropPriority virtual void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -754,7 +754,7 @@ class QueuedEventsComponentBase : //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -766,7 +766,7 @@ class QueuedEventsComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -778,7 +778,7 @@ class QueuedEventsComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -790,7 +790,7 @@ class QueuedEventsComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -810,32 +810,32 @@ class QueuedEventsComponentBase : //! Handler base-class function for input port noArgsAsync void noArgsAsync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedAsync void typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -847,7 +847,7 @@ class QueuedEventsComponentBase : //! Handler base-class function for input port typedAsyncAssert void typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -859,7 +859,7 @@ class QueuedEventsComponentBase : //! Handler base-class function for input port typedAsyncBlockPriority void typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -871,7 +871,7 @@ class QueuedEventsComponentBase : //! Handler base-class function for input port typedAsyncDropPriority void typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -883,7 +883,7 @@ class QueuedEventsComponentBase : //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -895,7 +895,7 @@ class QueuedEventsComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -907,7 +907,7 @@ class QueuedEventsComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -919,7 +919,7 @@ class QueuedEventsComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -941,12 +941,12 @@ class QueuedEventsComponentBase : //! Pre-message hook for async input port noArgsAsync virtual void noArgsAsync_preMsgHook( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Pre-message hook for async input port typedAsync virtual void typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -958,7 +958,7 @@ class QueuedEventsComponentBase : //! Pre-message hook for async input port typedAsyncAssert virtual void typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -970,7 +970,7 @@ class QueuedEventsComponentBase : //! Pre-message hook for async input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -982,7 +982,7 @@ class QueuedEventsComponentBase : //! Pre-message hook for async input port typedAsyncDropPriority virtual void typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1000,17 +1000,17 @@ class QueuedEventsComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1022,7 +1022,7 @@ class QueuedEventsComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1145,7 +1145,7 @@ class QueuedEventsComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -1160,37 +1160,37 @@ class QueuedEventsComponentBase : //! Callback for port noArgsAsync static void m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedAsync static void m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1203,7 +1203,7 @@ class QueuedEventsComponentBase : //! Callback for port typedAsyncAssert static void m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1216,7 +1216,7 @@ class QueuedEventsComponentBase : //! Callback for port typedAsyncBlockPriority static void m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1229,7 +1229,7 @@ class QueuedEventsComponentBase : //! Callback for port typedAsyncDropPriority static void m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1242,7 +1242,7 @@ class QueuedEventsComponentBase : //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1255,7 +1255,7 @@ class QueuedEventsComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1268,7 +1268,7 @@ class QueuedEventsComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1281,7 +1281,7 @@ class QueuedEventsComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1404,13 +1404,13 @@ class QueuedEventsComponentBase : // ---------------------------------------------------------------------- //! Throttle for EventActivityLowThrottled - NATIVE_UINT_TYPE m_EventActivityLowThrottledThrottle; + FwIndexType m_EventActivityLowThrottledThrottle; //! Throttle for EventFatalThrottled - NATIVE_UINT_TYPE m_EventFatalThrottledThrottle; + FwIndexType m_EventFatalThrottledThrottle; //! Throttle for EventWarningLowThrottled - NATIVE_UINT_TYPE m_EventWarningLowThrottledThrottle; + FwIndexType m_EventWarningLowThrottledThrottle; PRIVATE: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.cpp index 36732e409..c45058bc9 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.cpp @@ -44,11 +44,11 @@ namespace { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = sizeof(BuffUnion) + - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -227,8 +227,8 @@ Fw::SerializeStatus QueuedGetProductsComponentBase::DpContainer :: void QueuedGetProductsComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwEnumStoreType instance ) { // Initialize base class @@ -236,8 +236,8 @@ void QueuedGetProductsComponentBase :: // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -260,8 +260,8 @@ void QueuedGetProductsComponentBase :: // Connect input port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsAsync_InputPorts()); port++ ) { this->m_noArgsAsync_InputPort[port].init(); @@ -284,8 +284,8 @@ void QueuedGetProductsComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -308,8 +308,8 @@ void QueuedGetProductsComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -332,8 +332,8 @@ void QueuedGetProductsComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -356,8 +356,8 @@ void QueuedGetProductsComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -380,8 +380,8 @@ void QueuedGetProductsComponentBase :: // Connect input port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsync_InputPorts()); port++ ) { this->m_typedAsync_InputPort[port].init(); @@ -404,8 +404,8 @@ void QueuedGetProductsComponentBase :: // Connect input port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); port++ ) { this->m_typedAsyncAssert_InputPort[port].init(); @@ -428,8 +428,8 @@ void QueuedGetProductsComponentBase :: // Connect input port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); port++ ) { this->m_typedAsyncBlockPriority_InputPort[port].init(); @@ -452,8 +452,8 @@ void QueuedGetProductsComponentBase :: // Connect input port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); port++ ) { this->m_typedAsyncDropPriority_InputPort[port].init(); @@ -476,8 +476,8 @@ void QueuedGetProductsComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -500,8 +500,8 @@ void QueuedGetProductsComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -524,8 +524,8 @@ void QueuedGetProductsComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -548,8 +548,8 @@ void QueuedGetProductsComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -572,8 +572,8 @@ void QueuedGetProductsComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -591,8 +591,8 @@ void QueuedGetProductsComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -610,8 +610,8 @@ void QueuedGetProductsComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -629,8 +629,8 @@ void QueuedGetProductsComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -648,8 +648,8 @@ void QueuedGetProductsComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -667,8 +667,8 @@ void QueuedGetProductsComponentBase :: // Connect output port productGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productGetOut_OutputPorts()); port++ ) { this->m_productGetOut_OutputPort[port].init(); @@ -686,8 +686,8 @@ void QueuedGetProductsComponentBase :: // Connect output port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productSendOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productSendOut_OutputPorts()); port++ ) { this->m_productSendOut_OutputPort[port].init(); @@ -706,8 +706,8 @@ void QueuedGetProductsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -726,8 +726,8 @@ void QueuedGetProductsComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -745,8 +745,8 @@ void QueuedGetProductsComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -764,8 +764,8 @@ void QueuedGetProductsComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -783,8 +783,8 @@ void QueuedGetProductsComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -802,8 +802,8 @@ void QueuedGetProductsComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -821,8 +821,8 @@ void QueuedGetProductsComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -853,7 +853,7 @@ void QueuedGetProductsComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* QueuedGetProductsComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -868,7 +868,7 @@ Fw::InputCmdPort* QueuedGetProductsComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* QueuedGetProductsComponentBase :: - get_noArgsAsync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsAsync_InputPorts(), @@ -879,7 +879,7 @@ Ports::InputNoArgsPort* QueuedGetProductsComponentBase :: } Ports::InputNoArgsPort* QueuedGetProductsComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -890,7 +890,7 @@ Ports::InputNoArgsPort* QueuedGetProductsComponentBase :: } Ports::InputNoArgsReturnPort* QueuedGetProductsComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -901,7 +901,7 @@ Ports::InputNoArgsReturnPort* QueuedGetProductsComponentBase :: } Ports::InputNoArgsReturnPort* QueuedGetProductsComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -912,7 +912,7 @@ Ports::InputNoArgsReturnPort* QueuedGetProductsComponentBase :: } Ports::InputNoArgsPort* QueuedGetProductsComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -923,7 +923,7 @@ Ports::InputNoArgsPort* QueuedGetProductsComponentBase :: } Ports::InputTypedPort* QueuedGetProductsComponentBase :: - get_typedAsync_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsync_InputPorts(), @@ -934,7 +934,7 @@ Ports::InputTypedPort* QueuedGetProductsComponentBase :: } Ports::InputTypedPort* QueuedGetProductsComponentBase :: - get_typedAsyncAssert_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncAssert_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncAssert_InputPorts(), @@ -945,7 +945,7 @@ Ports::InputTypedPort* QueuedGetProductsComponentBase :: } Ports::InputTypedPort* QueuedGetProductsComponentBase :: - get_typedAsyncBlockPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncBlockPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncBlockPriority_InputPorts(), @@ -956,7 +956,7 @@ Ports::InputTypedPort* QueuedGetProductsComponentBase :: } Ports::InputTypedPort* QueuedGetProductsComponentBase :: - get_typedAsyncDropPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncDropPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncDropPriority_InputPorts(), @@ -967,7 +967,7 @@ Ports::InputTypedPort* QueuedGetProductsComponentBase :: } Ports::InputTypedPort* QueuedGetProductsComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -978,7 +978,7 @@ Ports::InputTypedPort* QueuedGetProductsComponentBase :: } Ports::InputTypedReturnPort* QueuedGetProductsComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -989,7 +989,7 @@ Ports::InputTypedReturnPort* QueuedGetProductsComponentBase :: } Ports::InputTypedReturnPort* QueuedGetProductsComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -1000,7 +1000,7 @@ Ports::InputTypedReturnPort* QueuedGetProductsComponentBase :: } Ports::InputTypedPort* QueuedGetProductsComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -1016,7 +1016,7 @@ Ports::InputTypedPort* QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -1030,7 +1030,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -1044,7 +1044,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -1058,7 +1058,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -1072,7 +1072,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -1086,7 +1086,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_productGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpGetPort* port ) { @@ -1100,7 +1100,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpSendPort* port ) { @@ -1116,7 +1116,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -1132,7 +1132,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -1146,7 +1146,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -1164,7 +1164,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -1178,7 +1178,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -1192,7 +1192,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -1206,7 +1206,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -1226,7 +1226,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1240,7 +1240,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1254,7 +1254,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1268,7 +1268,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1282,7 +1282,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1298,7 +1298,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1314,7 +1314,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1328,7 +1328,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1350,7 +1350,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1364,7 +1364,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1399,188 +1399,188 @@ QueuedGetProductsComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_noArgsAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); } -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_typedAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); } -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_typedAsyncAssert_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); } -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_typedAsyncBlockPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); } -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_typedAsyncDropPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); } -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_productGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productGetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_productSendOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE QueuedGetProductsComponentBase :: +FwIndexType QueuedGetProductsComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1588,7 +1588,7 @@ NATIVE_INT_TYPE QueuedGetProductsComponentBase :: // ---------------------------------------------------------------------- bool QueuedGetProductsComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1599,7 +1599,7 @@ bool QueuedGetProductsComponentBase :: } bool QueuedGetProductsComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1610,7 +1610,7 @@ bool QueuedGetProductsComponentBase :: } bool QueuedGetProductsComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1621,7 +1621,7 @@ bool QueuedGetProductsComponentBase :: } bool QueuedGetProductsComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1632,7 +1632,7 @@ bool QueuedGetProductsComponentBase :: } bool QueuedGetProductsComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1643,7 +1643,7 @@ bool QueuedGetProductsComponentBase :: } bool QueuedGetProductsComponentBase :: - isConnected_productGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productGetOut_OutputPorts(), @@ -1654,7 +1654,7 @@ bool QueuedGetProductsComponentBase :: } bool QueuedGetProductsComponentBase :: - isConnected_productSendOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productSendOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productSendOut_OutputPorts(), @@ -1667,7 +1667,7 @@ bool QueuedGetProductsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool QueuedGetProductsComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1680,7 +1680,7 @@ bool QueuedGetProductsComponentBase :: #endif bool QueuedGetProductsComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1691,7 +1691,7 @@ bool QueuedGetProductsComponentBase :: } bool QueuedGetProductsComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1706,7 +1706,7 @@ bool QueuedGetProductsComponentBase :: // ---------------------------------------------------------------------- bool QueuedGetProductsComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1717,7 +1717,7 @@ bool QueuedGetProductsComponentBase :: } bool QueuedGetProductsComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1728,7 +1728,7 @@ bool QueuedGetProductsComponentBase :: } bool QueuedGetProductsComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1739,7 +1739,7 @@ bool QueuedGetProductsComponentBase :: } bool QueuedGetProductsComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1756,7 +1756,7 @@ bool QueuedGetProductsComponentBase :: // ---------------------------------------------------------------------- void QueuedGetProductsComponentBase :: - noArgsAsync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsAsync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1771,7 +1771,7 @@ void QueuedGetProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(NOARGSASYNC_NOARGS) + static_cast(NOARGSASYNC_NOARGS) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1796,7 +1796,7 @@ void QueuedGetProductsComponentBase :: } void QueuedGetProductsComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1815,7 +1815,7 @@ void QueuedGetProductsComponentBase :: } U32 QueuedGetProductsComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1838,7 +1838,7 @@ U32 QueuedGetProductsComponentBase :: } U32 QueuedGetProductsComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1855,7 +1855,7 @@ U32 QueuedGetProductsComponentBase :: } void QueuedGetProductsComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1869,7 +1869,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1901,7 +1901,7 @@ void QueuedGetProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNC_TYPED) + static_cast(TYPEDASYNC_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1976,7 +1976,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2008,7 +2008,7 @@ void QueuedGetProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCASSERT_TYPED) + static_cast(TYPEDASYNCASSERT_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2083,7 +2083,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2115,7 +2115,7 @@ void QueuedGetProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) + static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2190,7 +2190,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2222,7 +2222,7 @@ void QueuedGetProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCDROPPRIORITY_TYPED) + static_cast(TYPEDASYNCDROPPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2302,7 +2302,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2339,7 +2339,7 @@ void QueuedGetProductsComponentBase :: F32 QueuedGetProductsComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2380,7 +2380,7 @@ F32 QueuedGetProductsComponentBase :: F32 QueuedGetProductsComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2415,7 +2415,7 @@ F32 QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2453,14 +2453,14 @@ void QueuedGetProductsComponentBase :: // ---------------------------------------------------------------------- void QueuedGetProductsComponentBase :: - noArgsAsync_preMsgHook(NATIVE_INT_TYPE portNum) + noArgsAsync_preMsgHook(FwIndexType portNum) { // Default: no-op } void QueuedGetProductsComponentBase :: typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2475,7 +2475,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2490,7 +2490,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2505,7 +2505,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2524,7 +2524,7 @@ void QueuedGetProductsComponentBase :: Fw::Success QueuedGetProductsComponentBase :: productGetOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize, Fw::Buffer& buffer @@ -2543,7 +2543,7 @@ Fw::Success QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: productSendOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -2563,7 +2563,7 @@ void QueuedGetProductsComponentBase :: // ---------------------------------------------------------------------- void QueuedGetProductsComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -2573,7 +2573,7 @@ void QueuedGetProductsComponentBase :: } U32 QueuedGetProductsComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -2584,7 +2584,7 @@ U32 QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2611,7 +2611,7 @@ void QueuedGetProductsComponentBase :: F32 QueuedGetProductsComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2710,7 +2710,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedGetProductsComponentBase :: doDispatch() { ComponentIpcSerializableBuffer msg; - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -2725,7 +2725,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedGetProductsComponentBase :: // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -2738,7 +2738,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedGetProductsComponentBase :: return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -3056,7 +3056,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -3075,7 +3075,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3086,7 +3086,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3097,7 +3097,7 @@ void QueuedGetProductsComponentBase :: U32 QueuedGetProductsComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3108,7 +3108,7 @@ U32 QueuedGetProductsComponentBase :: U32 QueuedGetProductsComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3119,7 +3119,7 @@ U32 QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3130,7 +3130,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3157,7 +3157,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3184,7 +3184,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3211,7 +3211,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3238,7 +3238,7 @@ void QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3265,7 +3265,7 @@ void QueuedGetProductsComponentBase :: F32 QueuedGetProductsComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3292,7 +3292,7 @@ F32 QueuedGetProductsComponentBase :: F32 QueuedGetProductsComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3319,7 +3319,7 @@ F32 QueuedGetProductsComponentBase :: void QueuedGetProductsComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.hpp index 24efdd711..98938547d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.hpp @@ -207,8 +207,8 @@ class QueuedGetProductsComponentBase : //! Initialize QueuedGetProductsComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -221,7 +221,7 @@ class QueuedGetProductsComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -234,91 +234,91 @@ class QueuedGetProductsComponentBase : //! //! \return noArgsAsync[portNum] Ports::InputNoArgsPort* get_noArgsAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsync[portNum] Ports::InputTypedPort* get_typedAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncAssert[portNum] Ports::InputTypedPort* get_typedAsyncAssert_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncBlockPriority[portNum] Ports::InputTypedPort* get_typedAsyncBlockPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncDropPriority[portNum] Ports::InputTypedPort* get_typedAsyncDropPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -329,43 +329,43 @@ class QueuedGetProductsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); //! Connect port to productGetOut[portNum] void set_productGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpGetPort* port //!< The input port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpSendPort* port //!< The input port ); @@ -373,7 +373,7 @@ class QueuedGetProductsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -381,13 +381,13 @@ class QueuedGetProductsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -399,25 +399,25 @@ class QueuedGetProductsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -431,31 +431,31 @@ class QueuedGetProductsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -463,7 +463,7 @@ class QueuedGetProductsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -471,13 +471,13 @@ class QueuedGetProductsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -493,13 +493,13 @@ class QueuedGetProductsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -528,7 +528,7 @@ class QueuedGetProductsComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; PROTECTED: @@ -539,67 +539,67 @@ class QueuedGetProductsComponentBase : //! Get the number of noArgsAsync input ports //! //! \return The number of noArgsAsync input ports - NATIVE_INT_TYPE getNum_noArgsAsync_InputPorts() const; + FwIndexType getNum_noArgsAsync_InputPorts() const; //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedAsync input ports //! //! \return The number of typedAsync input ports - NATIVE_INT_TYPE getNum_typedAsync_InputPorts() const; + FwIndexType getNum_typedAsync_InputPorts() const; //! Get the number of typedAsyncAssert input ports //! //! \return The number of typedAsyncAssert input ports - NATIVE_INT_TYPE getNum_typedAsyncAssert_InputPorts() const; + FwIndexType getNum_typedAsyncAssert_InputPorts() const; //! Get the number of typedAsyncBlockPriority input ports //! //! \return The number of typedAsyncBlockPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncBlockPriority_InputPorts() const; + FwIndexType getNum_typedAsyncBlockPriority_InputPorts() const; //! Get the number of typedAsyncDropPriority input ports //! //! \return The number of typedAsyncDropPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncDropPriority_InputPorts() const; + FwIndexType getNum_typedAsyncDropPriority_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -610,56 +610,56 @@ class QueuedGetProductsComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; //! Get the number of productGetOut output ports //! //! \return The number of productGetOut output ports - NATIVE_INT_TYPE getNum_productGetOut_OutputPorts() const; + FwIndexType getNum_productGetOut_OutputPorts() const; //! Get the number of productSendOut output ports //! //! \return The number of productSendOut output ports - NATIVE_INT_TYPE getNum_productSendOut_OutputPorts() const; + FwIndexType getNum_productSendOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -670,22 +670,22 @@ class QueuedGetProductsComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -697,49 +697,49 @@ class QueuedGetProductsComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productGetOut is connected //! //! \return Whether port productGetOut is connected bool isConnected_productGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productSendOut is connected //! //! \return Whether port productSendOut is connected bool isConnected_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -748,7 +748,7 @@ class QueuedGetProductsComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -757,14 +757,14 @@ class QueuedGetProductsComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -777,28 +777,28 @@ class QueuedGetProductsComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -809,32 +809,32 @@ class QueuedGetProductsComponentBase : //! Handler for input port noArgsAsync virtual void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedAsync virtual void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -846,7 +846,7 @@ class QueuedGetProductsComponentBase : //! Handler for input port typedAsyncAssert virtual void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -858,7 +858,7 @@ class QueuedGetProductsComponentBase : //! Handler for input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -870,7 +870,7 @@ class QueuedGetProductsComponentBase : //! Handler for input port typedAsyncDropPriority virtual void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -882,7 +882,7 @@ class QueuedGetProductsComponentBase : //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -894,7 +894,7 @@ class QueuedGetProductsComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -906,7 +906,7 @@ class QueuedGetProductsComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -918,7 +918,7 @@ class QueuedGetProductsComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -938,32 +938,32 @@ class QueuedGetProductsComponentBase : //! Handler base-class function for input port noArgsAsync void noArgsAsync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedAsync void typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -975,7 +975,7 @@ class QueuedGetProductsComponentBase : //! Handler base-class function for input port typedAsyncAssert void typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -987,7 +987,7 @@ class QueuedGetProductsComponentBase : //! Handler base-class function for input port typedAsyncBlockPriority void typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -999,7 +999,7 @@ class QueuedGetProductsComponentBase : //! Handler base-class function for input port typedAsyncDropPriority void typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1011,7 +1011,7 @@ class QueuedGetProductsComponentBase : //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1023,7 +1023,7 @@ class QueuedGetProductsComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1035,7 +1035,7 @@ class QueuedGetProductsComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1047,7 +1047,7 @@ class QueuedGetProductsComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1069,12 +1069,12 @@ class QueuedGetProductsComponentBase : //! Pre-message hook for async input port noArgsAsync virtual void noArgsAsync_preMsgHook( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Pre-message hook for async input port typedAsync virtual void typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1086,7 +1086,7 @@ class QueuedGetProductsComponentBase : //! Pre-message hook for async input port typedAsyncAssert virtual void typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1098,7 +1098,7 @@ class QueuedGetProductsComponentBase : //! Pre-message hook for async input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1110,7 +1110,7 @@ class QueuedGetProductsComponentBase : //! Pre-message hook for async input port typedAsyncDropPriority virtual void typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1128,7 +1128,7 @@ class QueuedGetProductsComponentBase : //! Invoke output port productGetOut Fw::Success productGetOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID (input) FwSizeType dataSize, //!< The data size of the requested buffer (input) Fw::Buffer& buffer //!< The buffer (output) @@ -1136,7 +1136,7 @@ class QueuedGetProductsComponentBase : //! Invoke output port productSendOut void productSendOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -1149,17 +1149,17 @@ class QueuedGetProductsComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1171,7 +1171,7 @@ class QueuedGetProductsComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1318,7 +1318,7 @@ class QueuedGetProductsComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -1333,37 +1333,37 @@ class QueuedGetProductsComponentBase : //! Callback for port noArgsAsync static void m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedAsync static void m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1376,7 +1376,7 @@ class QueuedGetProductsComponentBase : //! Callback for port typedAsyncAssert static void m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1389,7 +1389,7 @@ class QueuedGetProductsComponentBase : //! Callback for port typedAsyncBlockPriority static void m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1402,7 +1402,7 @@ class QueuedGetProductsComponentBase : //! Callback for port typedAsyncDropPriority static void m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1415,7 +1415,7 @@ class QueuedGetProductsComponentBase : //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1428,7 +1428,7 @@ class QueuedGetProductsComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1441,7 +1441,7 @@ class QueuedGetProductsComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1454,7 +1454,7 @@ class QueuedGetProductsComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.cpp index 190ea22c2..90c07629e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.cpp @@ -44,11 +44,11 @@ namespace { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = sizeof(BuffUnion) + - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -227,8 +227,8 @@ Fw::SerializeStatus QueuedGuardedProductsComponentBase::DpContainer :: void QueuedGuardedProductsComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwEnumStoreType instance ) { // Initialize base class @@ -236,8 +236,8 @@ void QueuedGuardedProductsComponentBase :: // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -260,8 +260,8 @@ void QueuedGuardedProductsComponentBase :: // Connect input port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRecvIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRecvIn_InputPorts()); port++ ) { this->m_productRecvIn_InputPort[port].init(); @@ -284,8 +284,8 @@ void QueuedGuardedProductsComponentBase :: // Connect input port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsAsync_InputPorts()); port++ ) { this->m_noArgsAsync_InputPort[port].init(); @@ -308,8 +308,8 @@ void QueuedGuardedProductsComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -332,8 +332,8 @@ void QueuedGuardedProductsComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -356,8 +356,8 @@ void QueuedGuardedProductsComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -380,8 +380,8 @@ void QueuedGuardedProductsComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -404,8 +404,8 @@ void QueuedGuardedProductsComponentBase :: // Connect input port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsync_InputPorts()); port++ ) { this->m_typedAsync_InputPort[port].init(); @@ -428,8 +428,8 @@ void QueuedGuardedProductsComponentBase :: // Connect input port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); port++ ) { this->m_typedAsyncAssert_InputPort[port].init(); @@ -452,8 +452,8 @@ void QueuedGuardedProductsComponentBase :: // Connect input port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); port++ ) { this->m_typedAsyncBlockPriority_InputPort[port].init(); @@ -476,8 +476,8 @@ void QueuedGuardedProductsComponentBase :: // Connect input port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); port++ ) { this->m_typedAsyncDropPriority_InputPort[port].init(); @@ -500,8 +500,8 @@ void QueuedGuardedProductsComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -524,8 +524,8 @@ void QueuedGuardedProductsComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -548,8 +548,8 @@ void QueuedGuardedProductsComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -572,8 +572,8 @@ void QueuedGuardedProductsComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -596,8 +596,8 @@ void QueuedGuardedProductsComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -615,8 +615,8 @@ void QueuedGuardedProductsComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -634,8 +634,8 @@ void QueuedGuardedProductsComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -653,8 +653,8 @@ void QueuedGuardedProductsComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -672,8 +672,8 @@ void QueuedGuardedProductsComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -691,8 +691,8 @@ void QueuedGuardedProductsComponentBase :: // Connect output port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRequestOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRequestOut_OutputPorts()); port++ ) { this->m_productRequestOut_OutputPort[port].init(); @@ -710,8 +710,8 @@ void QueuedGuardedProductsComponentBase :: // Connect output port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productSendOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productSendOut_OutputPorts()); port++ ) { this->m_productSendOut_OutputPort[port].init(); @@ -730,8 +730,8 @@ void QueuedGuardedProductsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -750,8 +750,8 @@ void QueuedGuardedProductsComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -769,8 +769,8 @@ void QueuedGuardedProductsComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -788,8 +788,8 @@ void QueuedGuardedProductsComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -807,8 +807,8 @@ void QueuedGuardedProductsComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -826,8 +826,8 @@ void QueuedGuardedProductsComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -845,8 +845,8 @@ void QueuedGuardedProductsComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -877,7 +877,7 @@ void QueuedGuardedProductsComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* QueuedGuardedProductsComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -888,7 +888,7 @@ Fw::InputCmdPort* QueuedGuardedProductsComponentBase :: } Fw::InputDpResponsePort* QueuedGuardedProductsComponentBase :: - get_productRecvIn_InputPort(NATIVE_INT_TYPE portNum) + get_productRecvIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRecvIn_InputPorts(), @@ -903,7 +903,7 @@ Fw::InputDpResponsePort* QueuedGuardedProductsComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* QueuedGuardedProductsComponentBase :: - get_noArgsAsync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsAsync_InputPorts(), @@ -914,7 +914,7 @@ Ports::InputNoArgsPort* QueuedGuardedProductsComponentBase :: } Ports::InputNoArgsPort* QueuedGuardedProductsComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -925,7 +925,7 @@ Ports::InputNoArgsPort* QueuedGuardedProductsComponentBase :: } Ports::InputNoArgsReturnPort* QueuedGuardedProductsComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -936,7 +936,7 @@ Ports::InputNoArgsReturnPort* QueuedGuardedProductsComponentBase :: } Ports::InputNoArgsReturnPort* QueuedGuardedProductsComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -947,7 +947,7 @@ Ports::InputNoArgsReturnPort* QueuedGuardedProductsComponentBase :: } Ports::InputNoArgsPort* QueuedGuardedProductsComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -958,7 +958,7 @@ Ports::InputNoArgsPort* QueuedGuardedProductsComponentBase :: } Ports::InputTypedPort* QueuedGuardedProductsComponentBase :: - get_typedAsync_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsync_InputPorts(), @@ -969,7 +969,7 @@ Ports::InputTypedPort* QueuedGuardedProductsComponentBase :: } Ports::InputTypedPort* QueuedGuardedProductsComponentBase :: - get_typedAsyncAssert_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncAssert_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncAssert_InputPorts(), @@ -980,7 +980,7 @@ Ports::InputTypedPort* QueuedGuardedProductsComponentBase :: } Ports::InputTypedPort* QueuedGuardedProductsComponentBase :: - get_typedAsyncBlockPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncBlockPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncBlockPriority_InputPorts(), @@ -991,7 +991,7 @@ Ports::InputTypedPort* QueuedGuardedProductsComponentBase :: } Ports::InputTypedPort* QueuedGuardedProductsComponentBase :: - get_typedAsyncDropPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncDropPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncDropPriority_InputPorts(), @@ -1002,7 +1002,7 @@ Ports::InputTypedPort* QueuedGuardedProductsComponentBase :: } Ports::InputTypedPort* QueuedGuardedProductsComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -1013,7 +1013,7 @@ Ports::InputTypedPort* QueuedGuardedProductsComponentBase :: } Ports::InputTypedReturnPort* QueuedGuardedProductsComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -1024,7 +1024,7 @@ Ports::InputTypedReturnPort* QueuedGuardedProductsComponentBase :: } Ports::InputTypedReturnPort* QueuedGuardedProductsComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -1035,7 +1035,7 @@ Ports::InputTypedReturnPort* QueuedGuardedProductsComponentBase :: } Ports::InputTypedPort* QueuedGuardedProductsComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -1051,7 +1051,7 @@ Ports::InputTypedPort* QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -1065,7 +1065,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -1079,7 +1079,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -1093,7 +1093,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -1107,7 +1107,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -1121,7 +1121,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpRequestPort* port ) { @@ -1135,7 +1135,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpSendPort* port ) { @@ -1151,7 +1151,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -1167,7 +1167,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -1181,7 +1181,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -1199,7 +1199,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -1213,7 +1213,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -1227,7 +1227,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -1241,7 +1241,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -1261,7 +1261,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1275,7 +1275,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1289,7 +1289,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1303,7 +1303,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1317,7 +1317,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1331,7 +1331,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1347,7 +1347,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1363,7 +1363,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1377,7 +1377,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1399,7 +1399,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1413,7 +1413,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1448,194 +1448,194 @@ QueuedGuardedProductsComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_productRecvIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_noArgsAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); } -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_typedAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); } -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_typedAsyncAssert_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); } -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_typedAsyncBlockPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); } -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_typedAsyncDropPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); } -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_productRequestOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); } -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_productSendOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: +FwIndexType QueuedGuardedProductsComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1643,7 +1643,7 @@ NATIVE_INT_TYPE QueuedGuardedProductsComponentBase :: // ---------------------------------------------------------------------- bool QueuedGuardedProductsComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1654,7 +1654,7 @@ bool QueuedGuardedProductsComponentBase :: } bool QueuedGuardedProductsComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1665,7 +1665,7 @@ bool QueuedGuardedProductsComponentBase :: } bool QueuedGuardedProductsComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1676,7 +1676,7 @@ bool QueuedGuardedProductsComponentBase :: } bool QueuedGuardedProductsComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1687,7 +1687,7 @@ bool QueuedGuardedProductsComponentBase :: } bool QueuedGuardedProductsComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1698,7 +1698,7 @@ bool QueuedGuardedProductsComponentBase :: } bool QueuedGuardedProductsComponentBase :: - isConnected_productRequestOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productRequestOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRequestOut_OutputPorts(), @@ -1709,7 +1709,7 @@ bool QueuedGuardedProductsComponentBase :: } bool QueuedGuardedProductsComponentBase :: - isConnected_productSendOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productSendOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productSendOut_OutputPorts(), @@ -1722,7 +1722,7 @@ bool QueuedGuardedProductsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool QueuedGuardedProductsComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1735,7 +1735,7 @@ bool QueuedGuardedProductsComponentBase :: #endif bool QueuedGuardedProductsComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1746,7 +1746,7 @@ bool QueuedGuardedProductsComponentBase :: } bool QueuedGuardedProductsComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1761,7 +1761,7 @@ bool QueuedGuardedProductsComponentBase :: // ---------------------------------------------------------------------- bool QueuedGuardedProductsComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1772,7 +1772,7 @@ bool QueuedGuardedProductsComponentBase :: } bool QueuedGuardedProductsComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1783,7 +1783,7 @@ bool QueuedGuardedProductsComponentBase :: } bool QueuedGuardedProductsComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1794,7 +1794,7 @@ bool QueuedGuardedProductsComponentBase :: } bool QueuedGuardedProductsComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1812,7 +1812,7 @@ bool QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -1846,7 +1846,7 @@ void QueuedGuardedProductsComponentBase :: // ---------------------------------------------------------------------- void QueuedGuardedProductsComponentBase :: - noArgsAsync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsAsync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1861,7 +1861,7 @@ void QueuedGuardedProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(NOARGSASYNC_NOARGS) + static_cast(NOARGSASYNC_NOARGS) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1886,7 +1886,7 @@ void QueuedGuardedProductsComponentBase :: } void QueuedGuardedProductsComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1905,7 +1905,7 @@ void QueuedGuardedProductsComponentBase :: } U32 QueuedGuardedProductsComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1928,7 +1928,7 @@ U32 QueuedGuardedProductsComponentBase :: } U32 QueuedGuardedProductsComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1945,7 +1945,7 @@ U32 QueuedGuardedProductsComponentBase :: } void QueuedGuardedProductsComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1959,7 +1959,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1991,7 +1991,7 @@ void QueuedGuardedProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNC_TYPED) + static_cast(TYPEDASYNC_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2066,7 +2066,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2098,7 +2098,7 @@ void QueuedGuardedProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCASSERT_TYPED) + static_cast(TYPEDASYNCASSERT_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2173,7 +2173,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2205,7 +2205,7 @@ void QueuedGuardedProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) + static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2280,7 +2280,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2312,7 +2312,7 @@ void QueuedGuardedProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCDROPPRIORITY_TYPED) + static_cast(TYPEDASYNCDROPPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2392,7 +2392,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2429,7 +2429,7 @@ void QueuedGuardedProductsComponentBase :: F32 QueuedGuardedProductsComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2470,7 +2470,7 @@ F32 QueuedGuardedProductsComponentBase :: F32 QueuedGuardedProductsComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2505,7 +2505,7 @@ F32 QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2544,7 +2544,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -2562,14 +2562,14 @@ void QueuedGuardedProductsComponentBase :: // ---------------------------------------------------------------------- void QueuedGuardedProductsComponentBase :: - noArgsAsync_preMsgHook(NATIVE_INT_TYPE portNum) + noArgsAsync_preMsgHook(FwIndexType portNum) { // Default: no-op } void QueuedGuardedProductsComponentBase :: typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2584,7 +2584,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2599,7 +2599,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2614,7 +2614,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2633,7 +2633,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: productRequestOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -2650,7 +2650,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: productSendOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -2670,7 +2670,7 @@ void QueuedGuardedProductsComponentBase :: // ---------------------------------------------------------------------- void QueuedGuardedProductsComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -2680,7 +2680,7 @@ void QueuedGuardedProductsComponentBase :: } U32 QueuedGuardedProductsComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -2691,7 +2691,7 @@ U32 QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2718,7 +2718,7 @@ void QueuedGuardedProductsComponentBase :: F32 QueuedGuardedProductsComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2817,7 +2817,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedGuardedProductsComponentBase :: doDispatch() { ComponentIpcSerializableBuffer msg; - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -2832,7 +2832,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedGuardedProductsComponentBase :: // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -2845,7 +2845,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedGuardedProductsComponentBase :: return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -3163,7 +3163,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -3178,7 +3178,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -3201,7 +3201,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3212,7 +3212,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3223,7 +3223,7 @@ void QueuedGuardedProductsComponentBase :: U32 QueuedGuardedProductsComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3234,7 +3234,7 @@ U32 QueuedGuardedProductsComponentBase :: U32 QueuedGuardedProductsComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3245,7 +3245,7 @@ U32 QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3256,7 +3256,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3283,7 +3283,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3310,7 +3310,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3337,7 +3337,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3364,7 +3364,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3391,7 +3391,7 @@ void QueuedGuardedProductsComponentBase :: F32 QueuedGuardedProductsComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3418,7 +3418,7 @@ F32 QueuedGuardedProductsComponentBase :: F32 QueuedGuardedProductsComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3445,7 +3445,7 @@ F32 QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3486,7 +3486,7 @@ void QueuedGuardedProductsComponentBase :: void QueuedGuardedProductsComponentBase :: productRecvIn_handler( - const NATIVE_INT_TYPE portNum, + const FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp index 14e153f1d..3a414c7e7 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp @@ -209,8 +209,8 @@ class QueuedGuardedProductsComponentBase : //! Initialize QueuedGuardedProductsComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -223,14 +223,14 @@ class QueuedGuardedProductsComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get special input port at index //! //! \return productRecvIn[portNum] Fw::InputDpResponsePort* get_productRecvIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -243,91 +243,91 @@ class QueuedGuardedProductsComponentBase : //! //! \return noArgsAsync[portNum] Ports::InputNoArgsPort* get_noArgsAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsync[portNum] Ports::InputTypedPort* get_typedAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncAssert[portNum] Ports::InputTypedPort* get_typedAsyncAssert_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncBlockPriority[portNum] Ports::InputTypedPort* get_typedAsyncBlockPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncDropPriority[portNum] Ports::InputTypedPort* get_typedAsyncDropPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -338,43 +338,43 @@ class QueuedGuardedProductsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpRequestPort* port //!< The input port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpSendPort* port //!< The input port ); @@ -382,7 +382,7 @@ class QueuedGuardedProductsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -390,13 +390,13 @@ class QueuedGuardedProductsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -408,25 +408,25 @@ class QueuedGuardedProductsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -440,37 +440,37 @@ class QueuedGuardedProductsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -478,7 +478,7 @@ class QueuedGuardedProductsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -486,13 +486,13 @@ class QueuedGuardedProductsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -508,13 +508,13 @@ class QueuedGuardedProductsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -543,12 +543,12 @@ class QueuedGuardedProductsComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; //! Get the number of productRecvIn input ports //! //! \return The number of productRecvIn input ports - NATIVE_INT_TYPE getNum_productRecvIn_InputPorts() const; + FwIndexType getNum_productRecvIn_InputPorts() const; PROTECTED: @@ -559,67 +559,67 @@ class QueuedGuardedProductsComponentBase : //! Get the number of noArgsAsync input ports //! //! \return The number of noArgsAsync input ports - NATIVE_INT_TYPE getNum_noArgsAsync_InputPorts() const; + FwIndexType getNum_noArgsAsync_InputPorts() const; //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedAsync input ports //! //! \return The number of typedAsync input ports - NATIVE_INT_TYPE getNum_typedAsync_InputPorts() const; + FwIndexType getNum_typedAsync_InputPorts() const; //! Get the number of typedAsyncAssert input ports //! //! \return The number of typedAsyncAssert input ports - NATIVE_INT_TYPE getNum_typedAsyncAssert_InputPorts() const; + FwIndexType getNum_typedAsyncAssert_InputPorts() const; //! Get the number of typedAsyncBlockPriority input ports //! //! \return The number of typedAsyncBlockPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncBlockPriority_InputPorts() const; + FwIndexType getNum_typedAsyncBlockPriority_InputPorts() const; //! Get the number of typedAsyncDropPriority input ports //! //! \return The number of typedAsyncDropPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncDropPriority_InputPorts() const; + FwIndexType getNum_typedAsyncDropPriority_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -630,56 +630,56 @@ class QueuedGuardedProductsComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; //! Get the number of productRequestOut output ports //! //! \return The number of productRequestOut output ports - NATIVE_INT_TYPE getNum_productRequestOut_OutputPorts() const; + FwIndexType getNum_productRequestOut_OutputPorts() const; //! Get the number of productSendOut output ports //! //! \return The number of productSendOut output ports - NATIVE_INT_TYPE getNum_productSendOut_OutputPorts() const; + FwIndexType getNum_productSendOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -690,22 +690,22 @@ class QueuedGuardedProductsComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -717,49 +717,49 @@ class QueuedGuardedProductsComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productRequestOut is connected //! //! \return Whether port productRequestOut is connected bool isConnected_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productSendOut is connected //! //! \return Whether port productSendOut is connected bool isConnected_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -768,7 +768,7 @@ class QueuedGuardedProductsComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -777,14 +777,14 @@ class QueuedGuardedProductsComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -797,28 +797,28 @@ class QueuedGuardedProductsComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -831,7 +831,7 @@ class QueuedGuardedProductsComponentBase : //! Handler base-class function for input port productRecvIn void productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -845,32 +845,32 @@ class QueuedGuardedProductsComponentBase : //! Handler for input port noArgsAsync virtual void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedAsync virtual void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -882,7 +882,7 @@ class QueuedGuardedProductsComponentBase : //! Handler for input port typedAsyncAssert virtual void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -894,7 +894,7 @@ class QueuedGuardedProductsComponentBase : //! Handler for input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -906,7 +906,7 @@ class QueuedGuardedProductsComponentBase : //! Handler for input port typedAsyncDropPriority virtual void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -918,7 +918,7 @@ class QueuedGuardedProductsComponentBase : //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -930,7 +930,7 @@ class QueuedGuardedProductsComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -942,7 +942,7 @@ class QueuedGuardedProductsComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -954,7 +954,7 @@ class QueuedGuardedProductsComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -974,32 +974,32 @@ class QueuedGuardedProductsComponentBase : //! Handler base-class function for input port noArgsAsync void noArgsAsync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedAsync void typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1011,7 +1011,7 @@ class QueuedGuardedProductsComponentBase : //! Handler base-class function for input port typedAsyncAssert void typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1023,7 +1023,7 @@ class QueuedGuardedProductsComponentBase : //! Handler base-class function for input port typedAsyncBlockPriority void typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1035,7 +1035,7 @@ class QueuedGuardedProductsComponentBase : //! Handler base-class function for input port typedAsyncDropPriority void typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1047,7 +1047,7 @@ class QueuedGuardedProductsComponentBase : //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1059,7 +1059,7 @@ class QueuedGuardedProductsComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1071,7 +1071,7 @@ class QueuedGuardedProductsComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1083,7 +1083,7 @@ class QueuedGuardedProductsComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1105,7 +1105,7 @@ class QueuedGuardedProductsComponentBase : //! Pre-message hook for async input port productRecvIn virtual void productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -1123,12 +1123,12 @@ class QueuedGuardedProductsComponentBase : //! Pre-message hook for async input port noArgsAsync virtual void noArgsAsync_preMsgHook( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Pre-message hook for async input port typedAsync virtual void typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1140,7 +1140,7 @@ class QueuedGuardedProductsComponentBase : //! Pre-message hook for async input port typedAsyncAssert virtual void typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1152,7 +1152,7 @@ class QueuedGuardedProductsComponentBase : //! Pre-message hook for async input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1164,7 +1164,7 @@ class QueuedGuardedProductsComponentBase : //! Pre-message hook for async input port typedAsyncDropPriority virtual void typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1182,14 +1182,14 @@ class QueuedGuardedProductsComponentBase : //! Invoke output port productRequestOut void productRequestOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); //! Invoke output port productSendOut void productSendOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -1202,17 +1202,17 @@ class QueuedGuardedProductsComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1224,7 +1224,7 @@ class QueuedGuardedProductsComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1361,7 +1361,7 @@ class QueuedGuardedProductsComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -1370,7 +1370,7 @@ class QueuedGuardedProductsComponentBase : //! Callback for port productRecvIn static void m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -1385,37 +1385,37 @@ class QueuedGuardedProductsComponentBase : //! Callback for port noArgsAsync static void m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedAsync static void m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1428,7 +1428,7 @@ class QueuedGuardedProductsComponentBase : //! Callback for port typedAsyncAssert static void m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1441,7 +1441,7 @@ class QueuedGuardedProductsComponentBase : //! Callback for port typedAsyncBlockPriority static void m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1454,7 +1454,7 @@ class QueuedGuardedProductsComponentBase : //! Callback for port typedAsyncDropPriority static void m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1467,7 +1467,7 @@ class QueuedGuardedProductsComponentBase : //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1480,7 +1480,7 @@ class QueuedGuardedProductsComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1493,7 +1493,7 @@ class QueuedGuardedProductsComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1506,7 +1506,7 @@ class QueuedGuardedProductsComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1530,7 +1530,7 @@ class QueuedGuardedProductsComponentBase : //! Handler implementation for productRecvIn void productRecvIn_handler( - const NATIVE_INT_TYPE portNum, //!< The port number + const FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container id const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The buffer status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedNoArgsPortsOnlyComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedNoArgsPortsOnlyComponentAc.ref.cpp index 6e7cdf846..19296baf8 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedNoArgsPortsOnlyComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedNoArgsPortsOnlyComponentAc.ref.cpp @@ -29,11 +29,11 @@ namespace { enum { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -58,8 +58,8 @@ namespace { void QueuedNoArgsPortsOnlyComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwEnumStoreType instance ) { // Initialize base class @@ -67,8 +67,8 @@ void QueuedNoArgsPortsOnlyComponentBase :: // Connect input port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsAsync_InputPorts()); port++ ) { this->m_noArgsAsync_InputPort[port].init(); @@ -91,8 +91,8 @@ void QueuedNoArgsPortsOnlyComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -115,8 +115,8 @@ void QueuedNoArgsPortsOnlyComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -139,8 +139,8 @@ void QueuedNoArgsPortsOnlyComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -163,8 +163,8 @@ void QueuedNoArgsPortsOnlyComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -182,8 +182,8 @@ void QueuedNoArgsPortsOnlyComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -214,7 +214,7 @@ void QueuedNoArgsPortsOnlyComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* QueuedNoArgsPortsOnlyComponentBase :: - get_noArgsAsync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsAsync_InputPorts(), @@ -225,7 +225,7 @@ Ports::InputNoArgsPort* QueuedNoArgsPortsOnlyComponentBase :: } Ports::InputNoArgsPort* QueuedNoArgsPortsOnlyComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -236,7 +236,7 @@ Ports::InputNoArgsPort* QueuedNoArgsPortsOnlyComponentBase :: } Ports::InputNoArgsReturnPort* QueuedNoArgsPortsOnlyComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -247,7 +247,7 @@ Ports::InputNoArgsReturnPort* QueuedNoArgsPortsOnlyComponentBase :: } Ports::InputNoArgsReturnPort* QueuedNoArgsPortsOnlyComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -263,7 +263,7 @@ Ports::InputNoArgsReturnPort* QueuedNoArgsPortsOnlyComponentBase :: void QueuedNoArgsPortsOnlyComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -277,7 +277,7 @@ void QueuedNoArgsPortsOnlyComponentBase :: void QueuedNoArgsPortsOnlyComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -297,7 +297,7 @@ void QueuedNoArgsPortsOnlyComponentBase :: void QueuedNoArgsPortsOnlyComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -332,44 +332,44 @@ QueuedNoArgsPortsOnlyComponentBase :: // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedNoArgsPortsOnlyComponentBase :: +FwIndexType QueuedNoArgsPortsOnlyComponentBase :: getNum_noArgsAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); } -NATIVE_INT_TYPE QueuedNoArgsPortsOnlyComponentBase :: +FwIndexType QueuedNoArgsPortsOnlyComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedNoArgsPortsOnlyComponentBase :: +FwIndexType QueuedNoArgsPortsOnlyComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedNoArgsPortsOnlyComponentBase :: +FwIndexType QueuedNoArgsPortsOnlyComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedNoArgsPortsOnlyComponentBase :: +FwIndexType QueuedNoArgsPortsOnlyComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE QueuedNoArgsPortsOnlyComponentBase :: +FwIndexType QueuedNoArgsPortsOnlyComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -377,7 +377,7 @@ NATIVE_INT_TYPE QueuedNoArgsPortsOnlyComponentBase :: // ---------------------------------------------------------------------- bool QueuedNoArgsPortsOnlyComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -388,7 +388,7 @@ bool QueuedNoArgsPortsOnlyComponentBase :: } bool QueuedNoArgsPortsOnlyComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -405,7 +405,7 @@ bool QueuedNoArgsPortsOnlyComponentBase :: // ---------------------------------------------------------------------- void QueuedNoArgsPortsOnlyComponentBase :: - noArgsAsync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsAsync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -420,7 +420,7 @@ void QueuedNoArgsPortsOnlyComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(NOARGSASYNC_NOARGS) + static_cast(NOARGSASYNC_NOARGS) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -445,7 +445,7 @@ void QueuedNoArgsPortsOnlyComponentBase :: } void QueuedNoArgsPortsOnlyComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -464,7 +464,7 @@ void QueuedNoArgsPortsOnlyComponentBase :: } U32 QueuedNoArgsPortsOnlyComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -487,7 +487,7 @@ U32 QueuedNoArgsPortsOnlyComponentBase :: } U32 QueuedNoArgsPortsOnlyComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -512,7 +512,7 @@ U32 QueuedNoArgsPortsOnlyComponentBase :: // ---------------------------------------------------------------------- void QueuedNoArgsPortsOnlyComponentBase :: - noArgsAsync_preMsgHook(NATIVE_INT_TYPE portNum) + noArgsAsync_preMsgHook(FwIndexType portNum) { // Default: no-op } @@ -522,7 +522,7 @@ void QueuedNoArgsPortsOnlyComponentBase :: // ---------------------------------------------------------------------- void QueuedNoArgsPortsOnlyComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -532,7 +532,7 @@ void QueuedNoArgsPortsOnlyComponentBase :: } U32 QueuedNoArgsPortsOnlyComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -568,7 +568,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedNoArgsPortsOnlyComponentBase :: doDispatch() { ComponentIpcSerializableBuffer msg; - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -588,7 +588,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedNoArgsPortsOnlyComponentBase :: // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -601,7 +601,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedNoArgsPortsOnlyComponentBase :: return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -631,7 +631,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedNoArgsPortsOnlyComponentBase :: void QueuedNoArgsPortsOnlyComponentBase :: m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -642,7 +642,7 @@ void QueuedNoArgsPortsOnlyComponentBase :: void QueuedNoArgsPortsOnlyComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -653,7 +653,7 @@ void QueuedNoArgsPortsOnlyComponentBase :: U32 QueuedNoArgsPortsOnlyComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -664,7 +664,7 @@ U32 QueuedNoArgsPortsOnlyComponentBase :: U32 QueuedNoArgsPortsOnlyComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedNoArgsPortsOnlyComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedNoArgsPortsOnlyComponentAc.ref.hpp index ff380bc20..31990940f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedNoArgsPortsOnlyComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedNoArgsPortsOnlyComponentAc.ref.hpp @@ -58,8 +58,8 @@ class QueuedNoArgsPortsOnlyComponentBase : //! Initialize QueuedNoArgsPortsOnlyComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -72,28 +72,28 @@ class QueuedNoArgsPortsOnlyComponentBase : //! //! \return noArgsAsync[portNum] Ports::InputNoArgsPort* get_noArgsAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -104,13 +104,13 @@ class QueuedNoArgsPortsOnlyComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); @@ -124,7 +124,7 @@ class QueuedNoArgsPortsOnlyComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -153,22 +153,22 @@ class QueuedNoArgsPortsOnlyComponentBase : //! Get the number of noArgsAsync input ports //! //! \return The number of noArgsAsync input ports - NATIVE_INT_TYPE getNum_noArgsAsync_InputPorts() const; + FwIndexType getNum_noArgsAsync_InputPorts() const; //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; PROTECTED: @@ -179,12 +179,12 @@ class QueuedNoArgsPortsOnlyComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; PROTECTED: @@ -196,14 +196,14 @@ class QueuedNoArgsPortsOnlyComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -214,22 +214,22 @@ class QueuedNoArgsPortsOnlyComponentBase : //! Handler for input port noArgsAsync virtual void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; PROTECTED: @@ -242,22 +242,22 @@ class QueuedNoArgsPortsOnlyComponentBase : //! Handler base-class function for input port noArgsAsync void noArgsAsync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -272,7 +272,7 @@ class QueuedNoArgsPortsOnlyComponentBase : //! Pre-message hook for async input port noArgsAsync virtual void noArgsAsync_preMsgHook( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -283,12 +283,12 @@ class QueuedNoArgsPortsOnlyComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -324,25 +324,25 @@ class QueuedNoArgsPortsOnlyComponentBase : //! Callback for port noArgsAsync static void m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PRIVATE: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp index 315420973..b19870427 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp @@ -44,11 +44,11 @@ namespace { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = sizeof(BuffUnion) + - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -73,8 +73,8 @@ namespace { void QueuedParamsComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwEnumStoreType instance ) { // Initialize base class @@ -82,8 +82,8 @@ void QueuedParamsComponentBase :: // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -106,8 +106,8 @@ void QueuedParamsComponentBase :: // Connect input port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsAsync_InputPorts()); port++ ) { this->m_noArgsAsync_InputPort[port].init(); @@ -130,8 +130,8 @@ void QueuedParamsComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -154,8 +154,8 @@ void QueuedParamsComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -178,8 +178,8 @@ void QueuedParamsComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -202,8 +202,8 @@ void QueuedParamsComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -226,8 +226,8 @@ void QueuedParamsComponentBase :: // Connect input port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsync_InputPorts()); port++ ) { this->m_typedAsync_InputPort[port].init(); @@ -250,8 +250,8 @@ void QueuedParamsComponentBase :: // Connect input port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); port++ ) { this->m_typedAsyncAssert_InputPort[port].init(); @@ -274,8 +274,8 @@ void QueuedParamsComponentBase :: // Connect input port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); port++ ) { this->m_typedAsyncBlockPriority_InputPort[port].init(); @@ -298,8 +298,8 @@ void QueuedParamsComponentBase :: // Connect input port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); port++ ) { this->m_typedAsyncDropPriority_InputPort[port].init(); @@ -322,8 +322,8 @@ void QueuedParamsComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -346,8 +346,8 @@ void QueuedParamsComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -370,8 +370,8 @@ void QueuedParamsComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -394,8 +394,8 @@ void QueuedParamsComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -418,8 +418,8 @@ void QueuedParamsComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -437,8 +437,8 @@ void QueuedParamsComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -456,8 +456,8 @@ void QueuedParamsComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -475,8 +475,8 @@ void QueuedParamsComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -494,8 +494,8 @@ void QueuedParamsComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -514,8 +514,8 @@ void QueuedParamsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -534,8 +534,8 @@ void QueuedParamsComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -553,8 +553,8 @@ void QueuedParamsComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -572,8 +572,8 @@ void QueuedParamsComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -591,8 +591,8 @@ void QueuedParamsComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -610,8 +610,8 @@ void QueuedParamsComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -629,8 +629,8 @@ void QueuedParamsComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -661,7 +661,7 @@ void QueuedParamsComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* QueuedParamsComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -676,7 +676,7 @@ Fw::InputCmdPort* QueuedParamsComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* QueuedParamsComponentBase :: - get_noArgsAsync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsAsync_InputPorts(), @@ -687,7 +687,7 @@ Ports::InputNoArgsPort* QueuedParamsComponentBase :: } Ports::InputNoArgsPort* QueuedParamsComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -698,7 +698,7 @@ Ports::InputNoArgsPort* QueuedParamsComponentBase :: } Ports::InputNoArgsReturnPort* QueuedParamsComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -709,7 +709,7 @@ Ports::InputNoArgsReturnPort* QueuedParamsComponentBase :: } Ports::InputNoArgsReturnPort* QueuedParamsComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -720,7 +720,7 @@ Ports::InputNoArgsReturnPort* QueuedParamsComponentBase :: } Ports::InputNoArgsPort* QueuedParamsComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -731,7 +731,7 @@ Ports::InputNoArgsPort* QueuedParamsComponentBase :: } Ports::InputTypedPort* QueuedParamsComponentBase :: - get_typedAsync_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsync_InputPorts(), @@ -742,7 +742,7 @@ Ports::InputTypedPort* QueuedParamsComponentBase :: } Ports::InputTypedPort* QueuedParamsComponentBase :: - get_typedAsyncAssert_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncAssert_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncAssert_InputPorts(), @@ -753,7 +753,7 @@ Ports::InputTypedPort* QueuedParamsComponentBase :: } Ports::InputTypedPort* QueuedParamsComponentBase :: - get_typedAsyncBlockPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncBlockPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncBlockPriority_InputPorts(), @@ -764,7 +764,7 @@ Ports::InputTypedPort* QueuedParamsComponentBase :: } Ports::InputTypedPort* QueuedParamsComponentBase :: - get_typedAsyncDropPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncDropPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncDropPriority_InputPorts(), @@ -775,7 +775,7 @@ Ports::InputTypedPort* QueuedParamsComponentBase :: } Ports::InputTypedPort* QueuedParamsComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -786,7 +786,7 @@ Ports::InputTypedPort* QueuedParamsComponentBase :: } Ports::InputTypedReturnPort* QueuedParamsComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -797,7 +797,7 @@ Ports::InputTypedReturnPort* QueuedParamsComponentBase :: } Ports::InputTypedReturnPort* QueuedParamsComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -808,7 +808,7 @@ Ports::InputTypedReturnPort* QueuedParamsComponentBase :: } Ports::InputTypedPort* QueuedParamsComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -824,7 +824,7 @@ Ports::InputTypedPort* QueuedParamsComponentBase :: void QueuedParamsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -838,7 +838,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -852,7 +852,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -866,7 +866,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -880,7 +880,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -896,7 +896,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -912,7 +912,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -926,7 +926,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -944,7 +944,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -958,7 +958,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -972,7 +972,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -986,7 +986,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -1006,7 +1006,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1020,7 +1020,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1034,7 +1034,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1048,7 +1048,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1064,7 +1064,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1080,7 +1080,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1094,7 +1094,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1116,7 +1116,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1130,7 +1130,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1403,176 +1403,176 @@ QueuedParamsComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_noArgsAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); } -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_typedAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); } -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_typedAsyncAssert_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); } -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_typedAsyncBlockPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); } -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_typedAsyncDropPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); } -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE QueuedParamsComponentBase :: +FwIndexType QueuedParamsComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1580,7 +1580,7 @@ NATIVE_INT_TYPE QueuedParamsComponentBase :: // ---------------------------------------------------------------------- bool QueuedParamsComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1591,7 +1591,7 @@ bool QueuedParamsComponentBase :: } bool QueuedParamsComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1602,7 +1602,7 @@ bool QueuedParamsComponentBase :: } bool QueuedParamsComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1613,7 +1613,7 @@ bool QueuedParamsComponentBase :: } bool QueuedParamsComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1624,7 +1624,7 @@ bool QueuedParamsComponentBase :: } bool QueuedParamsComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1637,7 +1637,7 @@ bool QueuedParamsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool QueuedParamsComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1650,7 +1650,7 @@ bool QueuedParamsComponentBase :: #endif bool QueuedParamsComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1661,7 +1661,7 @@ bool QueuedParamsComponentBase :: } bool QueuedParamsComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1676,7 +1676,7 @@ bool QueuedParamsComponentBase :: // ---------------------------------------------------------------------- bool QueuedParamsComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1687,7 +1687,7 @@ bool QueuedParamsComponentBase :: } bool QueuedParamsComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1698,7 +1698,7 @@ bool QueuedParamsComponentBase :: } bool QueuedParamsComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1709,7 +1709,7 @@ bool QueuedParamsComponentBase :: } bool QueuedParamsComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1726,7 +1726,7 @@ bool QueuedParamsComponentBase :: // ---------------------------------------------------------------------- void QueuedParamsComponentBase :: - noArgsAsync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsAsync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1741,7 +1741,7 @@ void QueuedParamsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(NOARGSASYNC_NOARGS) + static_cast(NOARGSASYNC_NOARGS) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1766,7 +1766,7 @@ void QueuedParamsComponentBase :: } void QueuedParamsComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1785,7 +1785,7 @@ void QueuedParamsComponentBase :: } U32 QueuedParamsComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1808,7 +1808,7 @@ U32 QueuedParamsComponentBase :: } U32 QueuedParamsComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1825,7 +1825,7 @@ U32 QueuedParamsComponentBase :: } void QueuedParamsComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1839,7 +1839,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1871,7 +1871,7 @@ void QueuedParamsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNC_TYPED) + static_cast(TYPEDASYNC_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1946,7 +1946,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1978,7 +1978,7 @@ void QueuedParamsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCASSERT_TYPED) + static_cast(TYPEDASYNCASSERT_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2053,7 +2053,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2085,7 +2085,7 @@ void QueuedParamsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) + static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2160,7 +2160,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2192,7 +2192,7 @@ void QueuedParamsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCDROPPRIORITY_TYPED) + static_cast(TYPEDASYNCDROPPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2272,7 +2272,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2309,7 +2309,7 @@ void QueuedParamsComponentBase :: F32 QueuedParamsComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2350,7 +2350,7 @@ F32 QueuedParamsComponentBase :: F32 QueuedParamsComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2385,7 +2385,7 @@ F32 QueuedParamsComponentBase :: void QueuedParamsComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2423,14 +2423,14 @@ void QueuedParamsComponentBase :: // ---------------------------------------------------------------------- void QueuedParamsComponentBase :: - noArgsAsync_preMsgHook(NATIVE_INT_TYPE portNum) + noArgsAsync_preMsgHook(FwIndexType portNum) { // Default: no-op } void QueuedParamsComponentBase :: typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2445,7 +2445,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2460,7 +2460,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2475,7 +2475,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2493,7 +2493,7 @@ void QueuedParamsComponentBase :: // ---------------------------------------------------------------------- void QueuedParamsComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -2503,7 +2503,7 @@ void QueuedParamsComponentBase :: } U32 QueuedParamsComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -2514,7 +2514,7 @@ U32 QueuedParamsComponentBase :: void QueuedParamsComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2541,7 +2541,7 @@ void QueuedParamsComponentBase :: F32 QueuedParamsComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2711,7 +2711,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedParamsComponentBase :: doDispatch() { ComponentIpcSerializableBuffer msg; - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -2731,7 +2731,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedParamsComponentBase :: // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -2744,7 +2744,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedParamsComponentBase :: return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -3062,7 +3062,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedParamsComponentBase :: void QueuedParamsComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -3205,7 +3205,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3216,7 +3216,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3227,7 +3227,7 @@ void QueuedParamsComponentBase :: U32 QueuedParamsComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3238,7 +3238,7 @@ U32 QueuedParamsComponentBase :: U32 QueuedParamsComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3249,7 +3249,7 @@ U32 QueuedParamsComponentBase :: void QueuedParamsComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3260,7 +3260,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3287,7 +3287,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3314,7 +3314,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3341,7 +3341,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3368,7 +3368,7 @@ void QueuedParamsComponentBase :: void QueuedParamsComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3395,7 +3395,7 @@ void QueuedParamsComponentBase :: F32 QueuedParamsComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3422,7 +3422,7 @@ F32 QueuedParamsComponentBase :: F32 QueuedParamsComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3449,7 +3449,7 @@ F32 QueuedParamsComponentBase :: void QueuedParamsComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp index e31811c73..3776d21bd 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp @@ -131,8 +131,8 @@ class QueuedParamsComponentBase : //! Initialize QueuedParamsComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -145,7 +145,7 @@ class QueuedParamsComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -158,91 +158,91 @@ class QueuedParamsComponentBase : //! //! \return noArgsAsync[portNum] Ports::InputNoArgsPort* get_noArgsAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsync[portNum] Ports::InputTypedPort* get_typedAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncAssert[portNum] Ports::InputTypedPort* get_typedAsyncAssert_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncBlockPriority[portNum] Ports::InputTypedPort* get_typedAsyncBlockPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncDropPriority[portNum] Ports::InputTypedPort* get_typedAsyncDropPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -253,31 +253,31 @@ class QueuedParamsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); @@ -285,7 +285,7 @@ class QueuedParamsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -293,13 +293,13 @@ class QueuedParamsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -311,25 +311,25 @@ class QueuedParamsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -343,25 +343,25 @@ class QueuedParamsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -369,7 +369,7 @@ class QueuedParamsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -377,13 +377,13 @@ class QueuedParamsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -399,13 +399,13 @@ class QueuedParamsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -456,7 +456,7 @@ class QueuedParamsComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; PROTECTED: @@ -467,67 +467,67 @@ class QueuedParamsComponentBase : //! Get the number of noArgsAsync input ports //! //! \return The number of noArgsAsync input ports - NATIVE_INT_TYPE getNum_noArgsAsync_InputPorts() const; + FwIndexType getNum_noArgsAsync_InputPorts() const; //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedAsync input ports //! //! \return The number of typedAsync input ports - NATIVE_INT_TYPE getNum_typedAsync_InputPorts() const; + FwIndexType getNum_typedAsync_InputPorts() const; //! Get the number of typedAsyncAssert input ports //! //! \return The number of typedAsyncAssert input ports - NATIVE_INT_TYPE getNum_typedAsyncAssert_InputPorts() const; + FwIndexType getNum_typedAsyncAssert_InputPorts() const; //! Get the number of typedAsyncBlockPriority input ports //! //! \return The number of typedAsyncBlockPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncBlockPriority_InputPorts() const; + FwIndexType getNum_typedAsyncBlockPriority_InputPorts() const; //! Get the number of typedAsyncDropPriority input ports //! //! \return The number of typedAsyncDropPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncDropPriority_InputPorts() const; + FwIndexType getNum_typedAsyncDropPriority_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -538,46 +538,46 @@ class QueuedParamsComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -588,22 +588,22 @@ class QueuedParamsComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -615,35 +615,35 @@ class QueuedParamsComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -652,7 +652,7 @@ class QueuedParamsComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -661,14 +661,14 @@ class QueuedParamsComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -681,28 +681,28 @@ class QueuedParamsComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -713,32 +713,32 @@ class QueuedParamsComponentBase : //! Handler for input port noArgsAsync virtual void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedAsync virtual void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -750,7 +750,7 @@ class QueuedParamsComponentBase : //! Handler for input port typedAsyncAssert virtual void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -762,7 +762,7 @@ class QueuedParamsComponentBase : //! Handler for input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -774,7 +774,7 @@ class QueuedParamsComponentBase : //! Handler for input port typedAsyncDropPriority virtual void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -786,7 +786,7 @@ class QueuedParamsComponentBase : //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -798,7 +798,7 @@ class QueuedParamsComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -810,7 +810,7 @@ class QueuedParamsComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -822,7 +822,7 @@ class QueuedParamsComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -842,32 +842,32 @@ class QueuedParamsComponentBase : //! Handler base-class function for input port noArgsAsync void noArgsAsync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedAsync void typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -879,7 +879,7 @@ class QueuedParamsComponentBase : //! Handler base-class function for input port typedAsyncAssert void typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -891,7 +891,7 @@ class QueuedParamsComponentBase : //! Handler base-class function for input port typedAsyncBlockPriority void typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -903,7 +903,7 @@ class QueuedParamsComponentBase : //! Handler base-class function for input port typedAsyncDropPriority void typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -915,7 +915,7 @@ class QueuedParamsComponentBase : //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -927,7 +927,7 @@ class QueuedParamsComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -939,7 +939,7 @@ class QueuedParamsComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -951,7 +951,7 @@ class QueuedParamsComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -973,12 +973,12 @@ class QueuedParamsComponentBase : //! Pre-message hook for async input port noArgsAsync virtual void noArgsAsync_preMsgHook( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Pre-message hook for async input port typedAsync virtual void typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -990,7 +990,7 @@ class QueuedParamsComponentBase : //! Pre-message hook for async input port typedAsyncAssert virtual void typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1002,7 +1002,7 @@ class QueuedParamsComponentBase : //! Pre-message hook for async input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1014,7 +1014,7 @@ class QueuedParamsComponentBase : //! Pre-message hook for async input port typedAsyncDropPriority virtual void typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1032,17 +1032,17 @@ class QueuedParamsComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1054,7 +1054,7 @@ class QueuedParamsComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1204,7 +1204,7 @@ class QueuedParamsComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -1219,37 +1219,37 @@ class QueuedParamsComponentBase : //! Callback for port noArgsAsync static void m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedAsync static void m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1262,7 +1262,7 @@ class QueuedParamsComponentBase : //! Callback for port typedAsyncAssert static void m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1275,7 +1275,7 @@ class QueuedParamsComponentBase : //! Callback for port typedAsyncBlockPriority static void m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1288,7 +1288,7 @@ class QueuedParamsComponentBase : //! Callback for port typedAsyncDropPriority static void m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1301,7 +1301,7 @@ class QueuedParamsComponentBase : //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1314,7 +1314,7 @@ class QueuedParamsComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1327,7 +1327,7 @@ class QueuedParamsComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1340,7 +1340,7 @@ class QueuedParamsComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index e8c5f9f41..08fa4a935 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -82,11 +82,11 @@ namespace { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = sizeof(BuffUnion) + - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -111,9 +111,9 @@ namespace { void QueuedSerialComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE msgSize, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwSizeType msgSize, + FwEnumStoreType instance ) { // Initialize base class @@ -121,8 +121,8 @@ void QueuedSerialComponentBase :: // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -145,8 +145,8 @@ void QueuedSerialComponentBase :: // Connect input port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsAsync_InputPorts()); port++ ) { this->m_noArgsAsync_InputPort[port].init(); @@ -169,8 +169,8 @@ void QueuedSerialComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -193,8 +193,8 @@ void QueuedSerialComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -217,8 +217,8 @@ void QueuedSerialComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -241,8 +241,8 @@ void QueuedSerialComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -265,8 +265,8 @@ void QueuedSerialComponentBase :: // Connect input port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsync_InputPorts()); port++ ) { this->m_typedAsync_InputPort[port].init(); @@ -289,8 +289,8 @@ void QueuedSerialComponentBase :: // Connect input port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); port++ ) { this->m_typedAsyncAssert_InputPort[port].init(); @@ -313,8 +313,8 @@ void QueuedSerialComponentBase :: // Connect input port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); port++ ) { this->m_typedAsyncBlockPriority_InputPort[port].init(); @@ -337,8 +337,8 @@ void QueuedSerialComponentBase :: // Connect input port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); port++ ) { this->m_typedAsyncDropPriority_InputPort[port].init(); @@ -361,8 +361,8 @@ void QueuedSerialComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -385,8 +385,8 @@ void QueuedSerialComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -409,8 +409,8 @@ void QueuedSerialComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -433,8 +433,8 @@ void QueuedSerialComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -457,8 +457,8 @@ void QueuedSerialComponentBase :: // Connect input port serialAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_serialAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_serialAsync_InputPorts()); port++ ) { this->m_serialAsync_InputPort[port].init(); @@ -481,8 +481,8 @@ void QueuedSerialComponentBase :: // Connect input port serialAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_serialAsyncAssert_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_serialAsyncAssert_InputPorts()); port++ ) { this->m_serialAsyncAssert_InputPort[port].init(); @@ -505,8 +505,8 @@ void QueuedSerialComponentBase :: // Connect input port serialAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_serialAsyncBlockPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_serialAsyncBlockPriority_InputPorts()); port++ ) { this->m_serialAsyncBlockPriority_InputPort[port].init(); @@ -529,8 +529,8 @@ void QueuedSerialComponentBase :: // Connect input port serialAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_serialAsyncDropPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_serialAsyncDropPriority_InputPorts()); port++ ) { this->m_serialAsyncDropPriority_InputPort[port].init(); @@ -553,8 +553,8 @@ void QueuedSerialComponentBase :: // Connect input port serialGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_serialGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_serialGuarded_InputPorts()); port++ ) { this->m_serialGuarded_InputPort[port].init(); @@ -577,8 +577,8 @@ void QueuedSerialComponentBase :: // Connect input port serialSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_serialSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_serialSync_InputPorts()); port++ ) { this->m_serialSync_InputPort[port].init(); @@ -601,8 +601,8 @@ void QueuedSerialComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -620,8 +620,8 @@ void QueuedSerialComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -639,8 +639,8 @@ void QueuedSerialComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -658,8 +658,8 @@ void QueuedSerialComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -677,8 +677,8 @@ void QueuedSerialComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -697,8 +697,8 @@ void QueuedSerialComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -717,8 +717,8 @@ void QueuedSerialComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -736,8 +736,8 @@ void QueuedSerialComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -755,8 +755,8 @@ void QueuedSerialComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -774,8 +774,8 @@ void QueuedSerialComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -793,8 +793,8 @@ void QueuedSerialComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -812,8 +812,8 @@ void QueuedSerialComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -831,8 +831,8 @@ void QueuedSerialComponentBase :: // Connect output port serialOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_serialOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_serialOut_OutputPorts()); port++ ) { this->m_serialOut_OutputPort[port].init(); @@ -849,12 +849,11 @@ void QueuedSerialComponentBase :: } // Passed-in size added to port number and message type enumeration sizes. - // NATIVE_INT_TYPE cast because of compiler warning. this->m_msgSize = FW_MAX( msgSize + - static_cast(sizeof(NATIVE_INT_TYPE)) + - static_cast(sizeof(I32)), - static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) + static_cast(sizeof(FwIndexType)) + + static_cast(sizeof(FwEnumStoreType)), + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); Os::Queue::QueueStatus qStat = this->createQueue(queueDepth, this->m_msgSize); @@ -869,7 +868,7 @@ void QueuedSerialComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* QueuedSerialComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -884,7 +883,7 @@ Fw::InputCmdPort* QueuedSerialComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* QueuedSerialComponentBase :: - get_noArgsAsync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsAsync_InputPorts(), @@ -895,7 +894,7 @@ Ports::InputNoArgsPort* QueuedSerialComponentBase :: } Ports::InputNoArgsPort* QueuedSerialComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -906,7 +905,7 @@ Ports::InputNoArgsPort* QueuedSerialComponentBase :: } Ports::InputNoArgsReturnPort* QueuedSerialComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -917,7 +916,7 @@ Ports::InputNoArgsReturnPort* QueuedSerialComponentBase :: } Ports::InputNoArgsReturnPort* QueuedSerialComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -928,7 +927,7 @@ Ports::InputNoArgsReturnPort* QueuedSerialComponentBase :: } Ports::InputNoArgsPort* QueuedSerialComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -939,7 +938,7 @@ Ports::InputNoArgsPort* QueuedSerialComponentBase :: } Ports::InputTypedPort* QueuedSerialComponentBase :: - get_typedAsync_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsync_InputPorts(), @@ -950,7 +949,7 @@ Ports::InputTypedPort* QueuedSerialComponentBase :: } Ports::InputTypedPort* QueuedSerialComponentBase :: - get_typedAsyncAssert_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncAssert_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncAssert_InputPorts(), @@ -961,7 +960,7 @@ Ports::InputTypedPort* QueuedSerialComponentBase :: } Ports::InputTypedPort* QueuedSerialComponentBase :: - get_typedAsyncBlockPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncBlockPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncBlockPriority_InputPorts(), @@ -972,7 +971,7 @@ Ports::InputTypedPort* QueuedSerialComponentBase :: } Ports::InputTypedPort* QueuedSerialComponentBase :: - get_typedAsyncDropPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncDropPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncDropPriority_InputPorts(), @@ -983,7 +982,7 @@ Ports::InputTypedPort* QueuedSerialComponentBase :: } Ports::InputTypedPort* QueuedSerialComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -994,7 +993,7 @@ Ports::InputTypedPort* QueuedSerialComponentBase :: } Ports::InputTypedReturnPort* QueuedSerialComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -1005,7 +1004,7 @@ Ports::InputTypedReturnPort* QueuedSerialComponentBase :: } Ports::InputTypedReturnPort* QueuedSerialComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -1016,7 +1015,7 @@ Ports::InputTypedReturnPort* QueuedSerialComponentBase :: } Ports::InputTypedPort* QueuedSerialComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -1031,7 +1030,7 @@ Ports::InputTypedPort* QueuedSerialComponentBase :: // ---------------------------------------------------------------------- Fw::InputSerializePort* QueuedSerialComponentBase :: - get_serialAsync_InputPort(NATIVE_INT_TYPE portNum) + get_serialAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_serialAsync_InputPorts(), @@ -1042,7 +1041,7 @@ Fw::InputSerializePort* QueuedSerialComponentBase :: } Fw::InputSerializePort* QueuedSerialComponentBase :: - get_serialAsyncAssert_InputPort(NATIVE_INT_TYPE portNum) + get_serialAsyncAssert_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_serialAsyncAssert_InputPorts(), @@ -1053,7 +1052,7 @@ Fw::InputSerializePort* QueuedSerialComponentBase :: } Fw::InputSerializePort* QueuedSerialComponentBase :: - get_serialAsyncBlockPriority_InputPort(NATIVE_INT_TYPE portNum) + get_serialAsyncBlockPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_serialAsyncBlockPriority_InputPorts(), @@ -1064,7 +1063,7 @@ Fw::InputSerializePort* QueuedSerialComponentBase :: } Fw::InputSerializePort* QueuedSerialComponentBase :: - get_serialAsyncDropPriority_InputPort(NATIVE_INT_TYPE portNum) + get_serialAsyncDropPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_serialAsyncDropPriority_InputPorts(), @@ -1075,7 +1074,7 @@ Fw::InputSerializePort* QueuedSerialComponentBase :: } Fw::InputSerializePort* QueuedSerialComponentBase :: - get_serialGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_serialGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_serialGuarded_InputPorts(), @@ -1086,7 +1085,7 @@ Fw::InputSerializePort* QueuedSerialComponentBase :: } Fw::InputSerializePort* QueuedSerialComponentBase :: - get_serialSync_InputPort(NATIVE_INT_TYPE portNum) + get_serialSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_serialSync_InputPorts(), @@ -1102,7 +1101,7 @@ Fw::InputSerializePort* QueuedSerialComponentBase :: void QueuedSerialComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -1116,7 +1115,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -1130,7 +1129,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -1144,7 +1143,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -1158,7 +1157,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -1174,7 +1173,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -1190,7 +1189,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -1204,7 +1203,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -1222,7 +1221,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -1236,7 +1235,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -1250,7 +1249,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -1264,7 +1263,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -1284,7 +1283,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1298,7 +1297,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1312,7 +1311,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1326,7 +1325,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1342,7 +1341,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1358,7 +1357,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1372,7 +1371,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1394,7 +1393,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1408,7 +1407,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1430,7 +1429,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: set_serialOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPortBase* port ) { @@ -1782,226 +1781,226 @@ QueuedSerialComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_noArgsAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_typedAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_typedAsyncAssert_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_typedAsyncBlockPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_typedAsyncDropPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of serial input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_serialAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialAsync_InputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_serialAsyncAssert_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialAsyncAssert_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialAsyncAssert_InputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_serialAsyncBlockPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialAsyncBlockPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialAsyncBlockPriority_InputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_serialAsyncDropPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialAsyncDropPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialAsyncDropPriority_InputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_serialGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_serialSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of serial output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedSerialComponentBase :: +FwIndexType QueuedSerialComponentBase :: getNum_serialOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_serialOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -2009,7 +2008,7 @@ NATIVE_INT_TYPE QueuedSerialComponentBase :: // ---------------------------------------------------------------------- bool QueuedSerialComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -2020,7 +2019,7 @@ bool QueuedSerialComponentBase :: } bool QueuedSerialComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -2031,7 +2030,7 @@ bool QueuedSerialComponentBase :: } bool QueuedSerialComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -2042,7 +2041,7 @@ bool QueuedSerialComponentBase :: } bool QueuedSerialComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -2053,7 +2052,7 @@ bool QueuedSerialComponentBase :: } bool QueuedSerialComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -2066,7 +2065,7 @@ bool QueuedSerialComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool QueuedSerialComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -2079,7 +2078,7 @@ bool QueuedSerialComponentBase :: #endif bool QueuedSerialComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -2090,7 +2089,7 @@ bool QueuedSerialComponentBase :: } bool QueuedSerialComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -2105,7 +2104,7 @@ bool QueuedSerialComponentBase :: // ---------------------------------------------------------------------- bool QueuedSerialComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -2116,7 +2115,7 @@ bool QueuedSerialComponentBase :: } bool QueuedSerialComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -2127,7 +2126,7 @@ bool QueuedSerialComponentBase :: } bool QueuedSerialComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -2138,7 +2137,7 @@ bool QueuedSerialComponentBase :: } bool QueuedSerialComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -2153,7 +2152,7 @@ bool QueuedSerialComponentBase :: // ---------------------------------------------------------------------- bool QueuedSerialComponentBase :: - isConnected_serialOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_serialOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_serialOut_OutputPorts(), @@ -2170,7 +2169,7 @@ bool QueuedSerialComponentBase :: // ---------------------------------------------------------------------- void QueuedSerialComponentBase :: - noArgsAsync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsAsync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -2185,7 +2184,7 @@ void QueuedSerialComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(NOARGSASYNC_NOARGS) + static_cast(NOARGSASYNC_NOARGS) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2210,7 +2209,7 @@ void QueuedSerialComponentBase :: } void QueuedSerialComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -2229,7 +2228,7 @@ void QueuedSerialComponentBase :: } U32 QueuedSerialComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -2252,7 +2251,7 @@ U32 QueuedSerialComponentBase :: } U32 QueuedSerialComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -2269,7 +2268,7 @@ U32 QueuedSerialComponentBase :: } void QueuedSerialComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -2283,7 +2282,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2315,7 +2314,7 @@ void QueuedSerialComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNC_TYPED) + static_cast(TYPEDASYNC_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2390,7 +2389,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2422,7 +2421,7 @@ void QueuedSerialComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCASSERT_TYPED) + static_cast(TYPEDASYNCASSERT_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2497,7 +2496,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2529,7 +2528,7 @@ void QueuedSerialComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) + static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2604,7 +2603,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2636,7 +2635,7 @@ void QueuedSerialComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCDROPPRIORITY_TYPED) + static_cast(TYPEDASYNCDROPPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2716,7 +2715,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2753,7 +2752,7 @@ void QueuedSerialComponentBase :: F32 QueuedSerialComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2794,7 +2793,7 @@ F32 QueuedSerialComponentBase :: F32 QueuedSerialComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2829,7 +2828,7 @@ F32 QueuedSerialComponentBase :: void QueuedSerialComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2866,7 +2865,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: serialAsync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -2883,7 +2882,7 @@ void QueuedSerialComponentBase :: // Serialize message ID _status = msgSerBuff.serialize( - static_cast(SERIALASYNC_SERIAL) + static_cast(SERIALASYNC_SERIAL) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2916,7 +2915,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: serialAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -2933,7 +2932,7 @@ void QueuedSerialComponentBase :: // Serialize message ID _status = msgSerBuff.serialize( - static_cast(SERIALASYNCASSERT_SERIAL) + static_cast(SERIALASYNCASSERT_SERIAL) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2966,7 +2965,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: serialAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -2983,7 +2982,7 @@ void QueuedSerialComponentBase :: // Serialize message ID _status = msgSerBuff.serialize( - static_cast(SERIALASYNCBLOCKPRIORITY_SERIAL) + static_cast(SERIALASYNCBLOCKPRIORITY_SERIAL) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -3016,7 +3015,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: serialAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -3033,7 +3032,7 @@ void QueuedSerialComponentBase :: // Serialize message ID _status = msgSerBuff.serialize( - static_cast(SERIALASYNCDROPPRIORITY_SERIAL) + static_cast(SERIALASYNCDROPPRIORITY_SERIAL) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -3071,7 +3070,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: serialGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -3096,7 +3095,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: serialSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -3122,14 +3121,14 @@ void QueuedSerialComponentBase :: // ---------------------------------------------------------------------- void QueuedSerialComponentBase :: - noArgsAsync_preMsgHook(NATIVE_INT_TYPE portNum) + noArgsAsync_preMsgHook(FwIndexType portNum) { // Default: no-op } void QueuedSerialComponentBase :: typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3144,7 +3143,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3159,7 +3158,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3174,7 +3173,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3197,7 +3196,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: serialAsync_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -3206,7 +3205,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: serialAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -3215,7 +3214,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: serialAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -3224,7 +3223,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: serialAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -3236,7 +3235,7 @@ void QueuedSerialComponentBase :: // ---------------------------------------------------------------------- void QueuedSerialComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -3246,7 +3245,7 @@ void QueuedSerialComponentBase :: } U32 QueuedSerialComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -3257,7 +3256,7 @@ U32 QueuedSerialComponentBase :: void QueuedSerialComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3284,7 +3283,7 @@ void QueuedSerialComponentBase :: F32 QueuedSerialComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3315,7 +3314,7 @@ F32 QueuedSerialComponentBase :: Fw::SerializeStatus QueuedSerialComponentBase :: serialOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -3339,14 +3338,14 @@ void QueuedSerialComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALARRAY)); + _status = msg.serialize(static_cast(INT_IF_INTERNALARRAY)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3375,14 +3374,14 @@ void QueuedSerialComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALENUM)); + _status = msg.serialize(static_cast(INT_IF_INTERNALENUM)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3415,14 +3414,14 @@ void QueuedSerialComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALPRIMITIVE)); + _status = msg.serialize(static_cast(INT_IF_INTERNALPRIMITIVE)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3463,14 +3462,14 @@ void QueuedSerialComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALPRIORITYDROP)); + _status = msg.serialize(static_cast(INT_IF_INTERNALPRIORITYDROP)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3501,14 +3500,14 @@ void QueuedSerialComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALSTRING)); + _status = msg.serialize(static_cast(INT_IF_INTERNALSTRING)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3543,14 +3542,14 @@ void QueuedSerialComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALSTRUCT)); + _status = msg.serialize(static_cast(INT_IF_INTERNALSTRUCT)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -4242,14 +4241,14 @@ void QueuedSerialComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_ASYNC)); + _status = msg.serialize(static_cast(CMD_CMD_ASYNC)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -4301,14 +4300,14 @@ void QueuedSerialComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_PRIORITY)); + _status = msg.serialize(static_cast(CMD_CMD_PRIORITY)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -4360,14 +4359,14 @@ void QueuedSerialComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY)); + _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -4419,14 +4418,14 @@ void QueuedSerialComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_DROP)); + _status = msg.serialize(static_cast(CMD_CMD_DROP)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -4483,14 +4482,14 @@ void QueuedSerialComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY_DROP)); + _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY_DROP)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -5817,7 +5816,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedSerialComponentBase :: { U8 msgBuff[this->m_msgSize]; Fw::ExternalSerializeBuffer msg(msgBuff,this->m_msgSize); - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -5837,7 +5836,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedSerialComponentBase :: // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -5850,7 +5849,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedSerialComponentBase :: return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -6674,7 +6673,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedSerialComponentBase :: void QueuedSerialComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -6970,7 +6969,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -6981,7 +6980,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -6992,7 +6991,7 @@ void QueuedSerialComponentBase :: U32 QueuedSerialComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -7003,7 +7002,7 @@ U32 QueuedSerialComponentBase :: U32 QueuedSerialComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -7014,7 +7013,7 @@ U32 QueuedSerialComponentBase :: void QueuedSerialComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -7025,7 +7024,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -7052,7 +7051,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -7079,7 +7078,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -7106,7 +7105,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -7133,7 +7132,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -7160,7 +7159,7 @@ void QueuedSerialComponentBase :: F32 QueuedSerialComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -7187,7 +7186,7 @@ F32 QueuedSerialComponentBase :: F32 QueuedSerialComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -7214,7 +7213,7 @@ F32 QueuedSerialComponentBase :: void QueuedSerialComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -7247,7 +7246,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: m_p_serialAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -7262,7 +7261,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: m_p_serialAsyncAssert_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -7277,7 +7276,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: m_p_serialAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -7292,7 +7291,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: m_p_serialAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -7307,7 +7306,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: m_p_serialGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -7322,7 +7321,7 @@ void QueuedSerialComponentBase :: void QueuedSerialComponentBase :: m_p_serialSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp index 3625816c8..5b8a4dd52 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp @@ -204,9 +204,9 @@ class QueuedSerialComponentBase : //! Initialize QueuedSerialComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE msgSize, //!< The message size - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType msgSize, //!< The message size + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -219,7 +219,7 @@ class QueuedSerialComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -232,91 +232,91 @@ class QueuedSerialComponentBase : //! //! \return noArgsAsync[portNum] Ports::InputNoArgsPort* get_noArgsAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsync[portNum] Ports::InputTypedPort* get_typedAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncAssert[portNum] Ports::InputTypedPort* get_typedAsyncAssert_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncBlockPriority[portNum] Ports::InputTypedPort* get_typedAsyncBlockPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncDropPriority[portNum] Ports::InputTypedPort* get_typedAsyncDropPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -329,42 +329,42 @@ class QueuedSerialComponentBase : //! //! \return serialAsync[portNum] Fw::InputSerializePort* get_serialAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get serial input port at index //! //! \return serialAsyncAssert[portNum] Fw::InputSerializePort* get_serialAsyncAssert_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get serial input port at index //! //! \return serialAsyncBlockPriority[portNum] Fw::InputSerializePort* get_serialAsyncBlockPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get serial input port at index //! //! \return serialAsyncDropPriority[portNum] Fw::InputSerializePort* get_serialAsyncDropPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get serial input port at index //! //! \return serialGuarded[portNum] Fw::InputSerializePort* get_serialGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get serial input port at index //! //! \return serialSync[portNum] Fw::InputSerializePort* get_serialSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -375,31 +375,31 @@ class QueuedSerialComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); @@ -407,7 +407,7 @@ class QueuedSerialComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -415,13 +415,13 @@ class QueuedSerialComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -433,25 +433,25 @@ class QueuedSerialComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -465,25 +465,25 @@ class QueuedSerialComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -491,7 +491,7 @@ class QueuedSerialComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -499,13 +499,13 @@ class QueuedSerialComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -521,13 +521,13 @@ class QueuedSerialComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -543,7 +543,7 @@ class QueuedSerialComponentBase : //! Connect port to serialOut[portNum] void set_serialOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPortBase* port //!< The port ); @@ -594,7 +594,7 @@ class QueuedSerialComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; PROTECTED: @@ -605,67 +605,67 @@ class QueuedSerialComponentBase : //! Get the number of noArgsAsync input ports //! //! \return The number of noArgsAsync input ports - NATIVE_INT_TYPE getNum_noArgsAsync_InputPorts() const; + FwIndexType getNum_noArgsAsync_InputPorts() const; //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedAsync input ports //! //! \return The number of typedAsync input ports - NATIVE_INT_TYPE getNum_typedAsync_InputPorts() const; + FwIndexType getNum_typedAsync_InputPorts() const; //! Get the number of typedAsyncAssert input ports //! //! \return The number of typedAsyncAssert input ports - NATIVE_INT_TYPE getNum_typedAsyncAssert_InputPorts() const; + FwIndexType getNum_typedAsyncAssert_InputPorts() const; //! Get the number of typedAsyncBlockPriority input ports //! //! \return The number of typedAsyncBlockPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncBlockPriority_InputPorts() const; + FwIndexType getNum_typedAsyncBlockPriority_InputPorts() const; //! Get the number of typedAsyncDropPriority input ports //! //! \return The number of typedAsyncDropPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncDropPriority_InputPorts() const; + FwIndexType getNum_typedAsyncDropPriority_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -676,32 +676,32 @@ class QueuedSerialComponentBase : //! Get the number of serialAsync input ports //! //! \return The number of serialAsync input ports - NATIVE_INT_TYPE getNum_serialAsync_InputPorts() const; + FwIndexType getNum_serialAsync_InputPorts() const; //! Get the number of serialAsyncAssert input ports //! //! \return The number of serialAsyncAssert input ports - NATIVE_INT_TYPE getNum_serialAsyncAssert_InputPorts() const; + FwIndexType getNum_serialAsyncAssert_InputPorts() const; //! Get the number of serialAsyncBlockPriority input ports //! //! \return The number of serialAsyncBlockPriority input ports - NATIVE_INT_TYPE getNum_serialAsyncBlockPriority_InputPorts() const; + FwIndexType getNum_serialAsyncBlockPriority_InputPorts() const; //! Get the number of serialAsyncDropPriority input ports //! //! \return The number of serialAsyncDropPriority input ports - NATIVE_INT_TYPE getNum_serialAsyncDropPriority_InputPorts() const; + FwIndexType getNum_serialAsyncDropPriority_InputPorts() const; //! Get the number of serialGuarded input ports //! //! \return The number of serialGuarded input ports - NATIVE_INT_TYPE getNum_serialGuarded_InputPorts() const; + FwIndexType getNum_serialGuarded_InputPorts() const; //! Get the number of serialSync input ports //! //! \return The number of serialSync input ports - NATIVE_INT_TYPE getNum_serialSync_InputPorts() const; + FwIndexType getNum_serialSync_InputPorts() const; PROTECTED: @@ -712,46 +712,46 @@ class QueuedSerialComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -762,22 +762,22 @@ class QueuedSerialComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -788,7 +788,7 @@ class QueuedSerialComponentBase : //! Get the number of serialOut output ports //! //! \return The number of serialOut output ports - NATIVE_INT_TYPE getNum_serialOut_OutputPorts() const; + FwIndexType getNum_serialOut_OutputPorts() const; PROTECTED: @@ -800,35 +800,35 @@ class QueuedSerialComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -837,7 +837,7 @@ class QueuedSerialComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -846,14 +846,14 @@ class QueuedSerialComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -866,28 +866,28 @@ class QueuedSerialComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -900,7 +900,7 @@ class QueuedSerialComponentBase : //! //! \return Whether port serialOut is connected bool isConnected_serialOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -911,32 +911,32 @@ class QueuedSerialComponentBase : //! Handler for input port noArgsAsync virtual void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedAsync virtual void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -948,7 +948,7 @@ class QueuedSerialComponentBase : //! Handler for input port typedAsyncAssert virtual void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -960,7 +960,7 @@ class QueuedSerialComponentBase : //! Handler for input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -972,7 +972,7 @@ class QueuedSerialComponentBase : //! Handler for input port typedAsyncDropPriority virtual void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -984,7 +984,7 @@ class QueuedSerialComponentBase : //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -996,7 +996,7 @@ class QueuedSerialComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1008,7 +1008,7 @@ class QueuedSerialComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1020,7 +1020,7 @@ class QueuedSerialComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1040,32 +1040,32 @@ class QueuedSerialComponentBase : //! Handler base-class function for input port noArgsAsync void noArgsAsync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedAsync void typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1077,7 +1077,7 @@ class QueuedSerialComponentBase : //! Handler base-class function for input port typedAsyncAssert void typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1089,7 +1089,7 @@ class QueuedSerialComponentBase : //! Handler base-class function for input port typedAsyncBlockPriority void typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1101,7 +1101,7 @@ class QueuedSerialComponentBase : //! Handler base-class function for input port typedAsyncDropPriority void typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1113,7 +1113,7 @@ class QueuedSerialComponentBase : //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1125,7 +1125,7 @@ class QueuedSerialComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1137,7 +1137,7 @@ class QueuedSerialComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1149,7 +1149,7 @@ class QueuedSerialComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1167,37 +1167,37 @@ class QueuedSerialComponentBase : //! Handler for input port serialAsync virtual void serialAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) = 0; //! Handler for input port serialAsyncAssert virtual void serialAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) = 0; //! Handler for input port serialAsyncBlockPriority virtual void serialAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) = 0; //! Handler for input port serialAsyncDropPriority virtual void serialAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) = 0; //! Handler for input port serialGuarded virtual void serialGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) = 0; //! Handler for input port serialSync virtual void serialSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) = 0; @@ -1211,37 +1211,37 @@ class QueuedSerialComponentBase : //! Handler base-class function for input port serialAsync void serialAsync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Handler base-class function for input port serialAsyncAssert void serialAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Handler base-class function for input port serialAsyncBlockPriority void serialAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Handler base-class function for input port serialAsyncDropPriority void serialAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Handler base-class function for input port serialGuarded void serialGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Handler base-class function for input port serialSync void serialSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); @@ -1257,12 +1257,12 @@ class QueuedSerialComponentBase : //! Pre-message hook for async input port noArgsAsync virtual void noArgsAsync_preMsgHook( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Pre-message hook for async input port typedAsync virtual void typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1274,7 +1274,7 @@ class QueuedSerialComponentBase : //! Pre-message hook for async input port typedAsyncAssert virtual void typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1286,7 +1286,7 @@ class QueuedSerialComponentBase : //! Pre-message hook for async input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1298,7 +1298,7 @@ class QueuedSerialComponentBase : //! Pre-message hook for async input port typedAsyncDropPriority virtual void typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1320,25 +1320,25 @@ class QueuedSerialComponentBase : //! Pre-message hook for async input port serialAsync virtual void serialAsync_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Pre-message hook for async input port serialAsyncAssert virtual void serialAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Pre-message hook for async input port serialAsyncBlockPriority virtual void serialAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Pre-message hook for async input port serialAsyncDropPriority virtual void serialAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); @@ -1350,17 +1350,17 @@ class QueuedSerialComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1372,7 +1372,7 @@ class QueuedSerialComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1390,7 +1390,7 @@ class QueuedSerialComponentBase : //! Invoke output port serialOut Fw::SerializeStatus serialOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); @@ -2132,7 +2132,7 @@ class QueuedSerialComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -2147,37 +2147,37 @@ class QueuedSerialComponentBase : //! Callback for port noArgsAsync static void m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedAsync static void m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2190,7 +2190,7 @@ class QueuedSerialComponentBase : //! Callback for port typedAsyncAssert static void m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2203,7 +2203,7 @@ class QueuedSerialComponentBase : //! Callback for port typedAsyncBlockPriority static void m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2216,7 +2216,7 @@ class QueuedSerialComponentBase : //! Callback for port typedAsyncDropPriority static void m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2229,7 +2229,7 @@ class QueuedSerialComponentBase : //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2242,7 +2242,7 @@ class QueuedSerialComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2255,7 +2255,7 @@ class QueuedSerialComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2268,7 +2268,7 @@ class QueuedSerialComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2289,42 +2289,42 @@ class QueuedSerialComponentBase : //! Callback for port serialAsync static void m_p_serialAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Callback for port serialAsyncAssert static void m_p_serialAsyncAssert_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Callback for port serialAsyncBlockPriority static void m_p_serialAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Callback for port serialAsyncDropPriority static void m_p_serialAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Callback for port serialGuarded static void m_p_serialGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Callback for port serialSync static void m_p_serialSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); @@ -2560,13 +2560,13 @@ class QueuedSerialComponentBase : // ---------------------------------------------------------------------- //! Throttle for EventActivityLowThrottled - NATIVE_UINT_TYPE m_EventActivityLowThrottledThrottle; + FwIndexType m_EventActivityLowThrottledThrottle; //! Throttle for EventFatalThrottled - NATIVE_UINT_TYPE m_EventFatalThrottledThrottle; + FwIndexType m_EventFatalThrottledThrottle; //! Throttle for EventWarningLowThrottled - NATIVE_UINT_TYPE m_EventWarningLowThrottledThrottle; + FwIndexType m_EventWarningLowThrottledThrottle; PRIVATE: @@ -2656,7 +2656,7 @@ class QueuedSerialComponentBase : PRIVATE: //! Stores max message size - NATIVE_INT_TYPE m_msgSize; + FwSizeType m_msgSize; PRIVATE: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.cpp index d35f65e83..7255982a0 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.cpp @@ -44,11 +44,11 @@ namespace { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = sizeof(BuffUnion) + - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -227,8 +227,8 @@ Fw::SerializeStatus QueuedSyncProductsComponentBase::DpContainer :: void QueuedSyncProductsComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwEnumStoreType instance ) { // Initialize base class @@ -236,8 +236,8 @@ void QueuedSyncProductsComponentBase :: // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -260,8 +260,8 @@ void QueuedSyncProductsComponentBase :: // Connect input port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRecvIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRecvIn_InputPorts()); port++ ) { this->m_productRecvIn_InputPort[port].init(); @@ -284,8 +284,8 @@ void QueuedSyncProductsComponentBase :: // Connect input port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsAsync_InputPorts()); port++ ) { this->m_noArgsAsync_InputPort[port].init(); @@ -308,8 +308,8 @@ void QueuedSyncProductsComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -332,8 +332,8 @@ void QueuedSyncProductsComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -356,8 +356,8 @@ void QueuedSyncProductsComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -380,8 +380,8 @@ void QueuedSyncProductsComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -404,8 +404,8 @@ void QueuedSyncProductsComponentBase :: // Connect input port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsync_InputPorts()); port++ ) { this->m_typedAsync_InputPort[port].init(); @@ -428,8 +428,8 @@ void QueuedSyncProductsComponentBase :: // Connect input port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); port++ ) { this->m_typedAsyncAssert_InputPort[port].init(); @@ -452,8 +452,8 @@ void QueuedSyncProductsComponentBase :: // Connect input port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); port++ ) { this->m_typedAsyncBlockPriority_InputPort[port].init(); @@ -476,8 +476,8 @@ void QueuedSyncProductsComponentBase :: // Connect input port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); port++ ) { this->m_typedAsyncDropPriority_InputPort[port].init(); @@ -500,8 +500,8 @@ void QueuedSyncProductsComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -524,8 +524,8 @@ void QueuedSyncProductsComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -548,8 +548,8 @@ void QueuedSyncProductsComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -572,8 +572,8 @@ void QueuedSyncProductsComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -596,8 +596,8 @@ void QueuedSyncProductsComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -615,8 +615,8 @@ void QueuedSyncProductsComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -634,8 +634,8 @@ void QueuedSyncProductsComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -653,8 +653,8 @@ void QueuedSyncProductsComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -672,8 +672,8 @@ void QueuedSyncProductsComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -691,8 +691,8 @@ void QueuedSyncProductsComponentBase :: // Connect output port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRequestOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRequestOut_OutputPorts()); port++ ) { this->m_productRequestOut_OutputPort[port].init(); @@ -710,8 +710,8 @@ void QueuedSyncProductsComponentBase :: // Connect output port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productSendOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productSendOut_OutputPorts()); port++ ) { this->m_productSendOut_OutputPort[port].init(); @@ -730,8 +730,8 @@ void QueuedSyncProductsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -750,8 +750,8 @@ void QueuedSyncProductsComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -769,8 +769,8 @@ void QueuedSyncProductsComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -788,8 +788,8 @@ void QueuedSyncProductsComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -807,8 +807,8 @@ void QueuedSyncProductsComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -826,8 +826,8 @@ void QueuedSyncProductsComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -845,8 +845,8 @@ void QueuedSyncProductsComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -877,7 +877,7 @@ void QueuedSyncProductsComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* QueuedSyncProductsComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -888,7 +888,7 @@ Fw::InputCmdPort* QueuedSyncProductsComponentBase :: } Fw::InputDpResponsePort* QueuedSyncProductsComponentBase :: - get_productRecvIn_InputPort(NATIVE_INT_TYPE portNum) + get_productRecvIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRecvIn_InputPorts(), @@ -903,7 +903,7 @@ Fw::InputDpResponsePort* QueuedSyncProductsComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* QueuedSyncProductsComponentBase :: - get_noArgsAsync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsAsync_InputPorts(), @@ -914,7 +914,7 @@ Ports::InputNoArgsPort* QueuedSyncProductsComponentBase :: } Ports::InputNoArgsPort* QueuedSyncProductsComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -925,7 +925,7 @@ Ports::InputNoArgsPort* QueuedSyncProductsComponentBase :: } Ports::InputNoArgsReturnPort* QueuedSyncProductsComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -936,7 +936,7 @@ Ports::InputNoArgsReturnPort* QueuedSyncProductsComponentBase :: } Ports::InputNoArgsReturnPort* QueuedSyncProductsComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -947,7 +947,7 @@ Ports::InputNoArgsReturnPort* QueuedSyncProductsComponentBase :: } Ports::InputNoArgsPort* QueuedSyncProductsComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -958,7 +958,7 @@ Ports::InputNoArgsPort* QueuedSyncProductsComponentBase :: } Ports::InputTypedPort* QueuedSyncProductsComponentBase :: - get_typedAsync_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsync_InputPorts(), @@ -969,7 +969,7 @@ Ports::InputTypedPort* QueuedSyncProductsComponentBase :: } Ports::InputTypedPort* QueuedSyncProductsComponentBase :: - get_typedAsyncAssert_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncAssert_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncAssert_InputPorts(), @@ -980,7 +980,7 @@ Ports::InputTypedPort* QueuedSyncProductsComponentBase :: } Ports::InputTypedPort* QueuedSyncProductsComponentBase :: - get_typedAsyncBlockPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncBlockPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncBlockPriority_InputPorts(), @@ -991,7 +991,7 @@ Ports::InputTypedPort* QueuedSyncProductsComponentBase :: } Ports::InputTypedPort* QueuedSyncProductsComponentBase :: - get_typedAsyncDropPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncDropPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncDropPriority_InputPorts(), @@ -1002,7 +1002,7 @@ Ports::InputTypedPort* QueuedSyncProductsComponentBase :: } Ports::InputTypedPort* QueuedSyncProductsComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -1013,7 +1013,7 @@ Ports::InputTypedPort* QueuedSyncProductsComponentBase :: } Ports::InputTypedReturnPort* QueuedSyncProductsComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -1024,7 +1024,7 @@ Ports::InputTypedReturnPort* QueuedSyncProductsComponentBase :: } Ports::InputTypedReturnPort* QueuedSyncProductsComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -1035,7 +1035,7 @@ Ports::InputTypedReturnPort* QueuedSyncProductsComponentBase :: } Ports::InputTypedPort* QueuedSyncProductsComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -1051,7 +1051,7 @@ Ports::InputTypedPort* QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -1065,7 +1065,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -1079,7 +1079,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -1093,7 +1093,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -1107,7 +1107,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -1121,7 +1121,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpRequestPort* port ) { @@ -1135,7 +1135,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpSendPort* port ) { @@ -1151,7 +1151,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -1167,7 +1167,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -1181,7 +1181,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -1199,7 +1199,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -1213,7 +1213,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -1227,7 +1227,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -1241,7 +1241,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -1261,7 +1261,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1275,7 +1275,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1289,7 +1289,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1303,7 +1303,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1317,7 +1317,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1331,7 +1331,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1347,7 +1347,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1363,7 +1363,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1377,7 +1377,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1399,7 +1399,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1413,7 +1413,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1448,194 +1448,194 @@ QueuedSyncProductsComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_productRecvIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_noArgsAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); } -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_typedAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); } -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_typedAsyncAssert_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); } -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_typedAsyncBlockPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); } -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_typedAsyncDropPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); } -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_productRequestOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); } -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_productSendOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: +FwIndexType QueuedSyncProductsComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1643,7 +1643,7 @@ NATIVE_INT_TYPE QueuedSyncProductsComponentBase :: // ---------------------------------------------------------------------- bool QueuedSyncProductsComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1654,7 +1654,7 @@ bool QueuedSyncProductsComponentBase :: } bool QueuedSyncProductsComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1665,7 +1665,7 @@ bool QueuedSyncProductsComponentBase :: } bool QueuedSyncProductsComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1676,7 +1676,7 @@ bool QueuedSyncProductsComponentBase :: } bool QueuedSyncProductsComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1687,7 +1687,7 @@ bool QueuedSyncProductsComponentBase :: } bool QueuedSyncProductsComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1698,7 +1698,7 @@ bool QueuedSyncProductsComponentBase :: } bool QueuedSyncProductsComponentBase :: - isConnected_productRequestOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productRequestOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRequestOut_OutputPorts(), @@ -1709,7 +1709,7 @@ bool QueuedSyncProductsComponentBase :: } bool QueuedSyncProductsComponentBase :: - isConnected_productSendOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productSendOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productSendOut_OutputPorts(), @@ -1722,7 +1722,7 @@ bool QueuedSyncProductsComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool QueuedSyncProductsComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1735,7 +1735,7 @@ bool QueuedSyncProductsComponentBase :: #endif bool QueuedSyncProductsComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1746,7 +1746,7 @@ bool QueuedSyncProductsComponentBase :: } bool QueuedSyncProductsComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1761,7 +1761,7 @@ bool QueuedSyncProductsComponentBase :: // ---------------------------------------------------------------------- bool QueuedSyncProductsComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1772,7 +1772,7 @@ bool QueuedSyncProductsComponentBase :: } bool QueuedSyncProductsComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1783,7 +1783,7 @@ bool QueuedSyncProductsComponentBase :: } bool QueuedSyncProductsComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1794,7 +1794,7 @@ bool QueuedSyncProductsComponentBase :: } bool QueuedSyncProductsComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1812,7 +1812,7 @@ bool QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -1840,7 +1840,7 @@ void QueuedSyncProductsComponentBase :: // ---------------------------------------------------------------------- void QueuedSyncProductsComponentBase :: - noArgsAsync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsAsync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1855,7 +1855,7 @@ void QueuedSyncProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(NOARGSASYNC_NOARGS) + static_cast(NOARGSASYNC_NOARGS) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1880,7 +1880,7 @@ void QueuedSyncProductsComponentBase :: } void QueuedSyncProductsComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1899,7 +1899,7 @@ void QueuedSyncProductsComponentBase :: } U32 QueuedSyncProductsComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1922,7 +1922,7 @@ U32 QueuedSyncProductsComponentBase :: } U32 QueuedSyncProductsComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1939,7 +1939,7 @@ U32 QueuedSyncProductsComponentBase :: } void QueuedSyncProductsComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1953,7 +1953,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1985,7 +1985,7 @@ void QueuedSyncProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNC_TYPED) + static_cast(TYPEDASYNC_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2060,7 +2060,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2092,7 +2092,7 @@ void QueuedSyncProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCASSERT_TYPED) + static_cast(TYPEDASYNCASSERT_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2167,7 +2167,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2199,7 +2199,7 @@ void QueuedSyncProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) + static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2274,7 +2274,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2306,7 +2306,7 @@ void QueuedSyncProductsComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCDROPPRIORITY_TYPED) + static_cast(TYPEDASYNCDROPPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2386,7 +2386,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2423,7 +2423,7 @@ void QueuedSyncProductsComponentBase :: F32 QueuedSyncProductsComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2464,7 +2464,7 @@ F32 QueuedSyncProductsComponentBase :: F32 QueuedSyncProductsComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2499,7 +2499,7 @@ F32 QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2538,7 +2538,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -2556,14 +2556,14 @@ void QueuedSyncProductsComponentBase :: // ---------------------------------------------------------------------- void QueuedSyncProductsComponentBase :: - noArgsAsync_preMsgHook(NATIVE_INT_TYPE portNum) + noArgsAsync_preMsgHook(FwIndexType portNum) { // Default: no-op } void QueuedSyncProductsComponentBase :: typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2578,7 +2578,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2593,7 +2593,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2608,7 +2608,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2627,7 +2627,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: productRequestOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -2644,7 +2644,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: productSendOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -2664,7 +2664,7 @@ void QueuedSyncProductsComponentBase :: // ---------------------------------------------------------------------- void QueuedSyncProductsComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -2674,7 +2674,7 @@ void QueuedSyncProductsComponentBase :: } U32 QueuedSyncProductsComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -2685,7 +2685,7 @@ U32 QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2712,7 +2712,7 @@ void QueuedSyncProductsComponentBase :: F32 QueuedSyncProductsComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2811,7 +2811,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedSyncProductsComponentBase :: doDispatch() { ComponentIpcSerializableBuffer msg; - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -2826,7 +2826,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedSyncProductsComponentBase :: // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -2839,7 +2839,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedSyncProductsComponentBase :: return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -3157,7 +3157,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -3172,7 +3172,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -3195,7 +3195,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3206,7 +3206,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3217,7 +3217,7 @@ void QueuedSyncProductsComponentBase :: U32 QueuedSyncProductsComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3228,7 +3228,7 @@ U32 QueuedSyncProductsComponentBase :: U32 QueuedSyncProductsComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3239,7 +3239,7 @@ U32 QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3250,7 +3250,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3277,7 +3277,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3304,7 +3304,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3331,7 +3331,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3358,7 +3358,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3385,7 +3385,7 @@ void QueuedSyncProductsComponentBase :: F32 QueuedSyncProductsComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3412,7 +3412,7 @@ F32 QueuedSyncProductsComponentBase :: F32 QueuedSyncProductsComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3439,7 +3439,7 @@ F32 QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3480,7 +3480,7 @@ void QueuedSyncProductsComponentBase :: void QueuedSyncProductsComponentBase :: productRecvIn_handler( - const NATIVE_INT_TYPE portNum, + const FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp index 9df2783f1..0f8e4353a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp @@ -209,8 +209,8 @@ class QueuedSyncProductsComponentBase : //! Initialize QueuedSyncProductsComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -223,14 +223,14 @@ class QueuedSyncProductsComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get special input port at index //! //! \return productRecvIn[portNum] Fw::InputDpResponsePort* get_productRecvIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -243,91 +243,91 @@ class QueuedSyncProductsComponentBase : //! //! \return noArgsAsync[portNum] Ports::InputNoArgsPort* get_noArgsAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsync[portNum] Ports::InputTypedPort* get_typedAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncAssert[portNum] Ports::InputTypedPort* get_typedAsyncAssert_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncBlockPriority[portNum] Ports::InputTypedPort* get_typedAsyncBlockPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncDropPriority[portNum] Ports::InputTypedPort* get_typedAsyncDropPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -338,43 +338,43 @@ class QueuedSyncProductsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpRequestPort* port //!< The input port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpSendPort* port //!< The input port ); @@ -382,7 +382,7 @@ class QueuedSyncProductsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -390,13 +390,13 @@ class QueuedSyncProductsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -408,25 +408,25 @@ class QueuedSyncProductsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -440,37 +440,37 @@ class QueuedSyncProductsComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -478,7 +478,7 @@ class QueuedSyncProductsComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -486,13 +486,13 @@ class QueuedSyncProductsComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -508,13 +508,13 @@ class QueuedSyncProductsComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -543,12 +543,12 @@ class QueuedSyncProductsComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; //! Get the number of productRecvIn input ports //! //! \return The number of productRecvIn input ports - NATIVE_INT_TYPE getNum_productRecvIn_InputPorts() const; + FwIndexType getNum_productRecvIn_InputPorts() const; PROTECTED: @@ -559,67 +559,67 @@ class QueuedSyncProductsComponentBase : //! Get the number of noArgsAsync input ports //! //! \return The number of noArgsAsync input ports - NATIVE_INT_TYPE getNum_noArgsAsync_InputPorts() const; + FwIndexType getNum_noArgsAsync_InputPorts() const; //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedAsync input ports //! //! \return The number of typedAsync input ports - NATIVE_INT_TYPE getNum_typedAsync_InputPorts() const; + FwIndexType getNum_typedAsync_InputPorts() const; //! Get the number of typedAsyncAssert input ports //! //! \return The number of typedAsyncAssert input ports - NATIVE_INT_TYPE getNum_typedAsyncAssert_InputPorts() const; + FwIndexType getNum_typedAsyncAssert_InputPorts() const; //! Get the number of typedAsyncBlockPriority input ports //! //! \return The number of typedAsyncBlockPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncBlockPriority_InputPorts() const; + FwIndexType getNum_typedAsyncBlockPriority_InputPorts() const; //! Get the number of typedAsyncDropPriority input ports //! //! \return The number of typedAsyncDropPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncDropPriority_InputPorts() const; + FwIndexType getNum_typedAsyncDropPriority_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -630,56 +630,56 @@ class QueuedSyncProductsComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; //! Get the number of productRequestOut output ports //! //! \return The number of productRequestOut output ports - NATIVE_INT_TYPE getNum_productRequestOut_OutputPorts() const; + FwIndexType getNum_productRequestOut_OutputPorts() const; //! Get the number of productSendOut output ports //! //! \return The number of productSendOut output ports - NATIVE_INT_TYPE getNum_productSendOut_OutputPorts() const; + FwIndexType getNum_productSendOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -690,22 +690,22 @@ class QueuedSyncProductsComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -717,49 +717,49 @@ class QueuedSyncProductsComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productRequestOut is connected //! //! \return Whether port productRequestOut is connected bool isConnected_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productSendOut is connected //! //! \return Whether port productSendOut is connected bool isConnected_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -768,7 +768,7 @@ class QueuedSyncProductsComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -777,14 +777,14 @@ class QueuedSyncProductsComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -797,28 +797,28 @@ class QueuedSyncProductsComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -831,7 +831,7 @@ class QueuedSyncProductsComponentBase : //! Handler base-class function for input port productRecvIn void productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -845,32 +845,32 @@ class QueuedSyncProductsComponentBase : //! Handler for input port noArgsAsync virtual void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedAsync virtual void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -882,7 +882,7 @@ class QueuedSyncProductsComponentBase : //! Handler for input port typedAsyncAssert virtual void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -894,7 +894,7 @@ class QueuedSyncProductsComponentBase : //! Handler for input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -906,7 +906,7 @@ class QueuedSyncProductsComponentBase : //! Handler for input port typedAsyncDropPriority virtual void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -918,7 +918,7 @@ class QueuedSyncProductsComponentBase : //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -930,7 +930,7 @@ class QueuedSyncProductsComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -942,7 +942,7 @@ class QueuedSyncProductsComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -954,7 +954,7 @@ class QueuedSyncProductsComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -974,32 +974,32 @@ class QueuedSyncProductsComponentBase : //! Handler base-class function for input port noArgsAsync void noArgsAsync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedAsync void typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1011,7 +1011,7 @@ class QueuedSyncProductsComponentBase : //! Handler base-class function for input port typedAsyncAssert void typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1023,7 +1023,7 @@ class QueuedSyncProductsComponentBase : //! Handler base-class function for input port typedAsyncBlockPriority void typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1035,7 +1035,7 @@ class QueuedSyncProductsComponentBase : //! Handler base-class function for input port typedAsyncDropPriority void typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1047,7 +1047,7 @@ class QueuedSyncProductsComponentBase : //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1059,7 +1059,7 @@ class QueuedSyncProductsComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1071,7 +1071,7 @@ class QueuedSyncProductsComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1083,7 +1083,7 @@ class QueuedSyncProductsComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1105,7 +1105,7 @@ class QueuedSyncProductsComponentBase : //! Pre-message hook for async input port productRecvIn virtual void productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -1123,12 +1123,12 @@ class QueuedSyncProductsComponentBase : //! Pre-message hook for async input port noArgsAsync virtual void noArgsAsync_preMsgHook( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Pre-message hook for async input port typedAsync virtual void typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1140,7 +1140,7 @@ class QueuedSyncProductsComponentBase : //! Pre-message hook for async input port typedAsyncAssert virtual void typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1152,7 +1152,7 @@ class QueuedSyncProductsComponentBase : //! Pre-message hook for async input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1164,7 +1164,7 @@ class QueuedSyncProductsComponentBase : //! Pre-message hook for async input port typedAsyncDropPriority virtual void typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1182,14 +1182,14 @@ class QueuedSyncProductsComponentBase : //! Invoke output port productRequestOut void productRequestOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); //! Invoke output port productSendOut void productSendOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -1202,17 +1202,17 @@ class QueuedSyncProductsComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1224,7 +1224,7 @@ class QueuedSyncProductsComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1361,7 +1361,7 @@ class QueuedSyncProductsComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -1370,7 +1370,7 @@ class QueuedSyncProductsComponentBase : //! Callback for port productRecvIn static void m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -1385,37 +1385,37 @@ class QueuedSyncProductsComponentBase : //! Callback for port noArgsAsync static void m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedAsync static void m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1428,7 +1428,7 @@ class QueuedSyncProductsComponentBase : //! Callback for port typedAsyncAssert static void m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1441,7 +1441,7 @@ class QueuedSyncProductsComponentBase : //! Callback for port typedAsyncBlockPriority static void m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1454,7 +1454,7 @@ class QueuedSyncProductsComponentBase : //! Callback for port typedAsyncDropPriority static void m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1467,7 +1467,7 @@ class QueuedSyncProductsComponentBase : //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1480,7 +1480,7 @@ class QueuedSyncProductsComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1493,7 +1493,7 @@ class QueuedSyncProductsComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1506,7 +1506,7 @@ class QueuedSyncProductsComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1530,7 +1530,7 @@ class QueuedSyncProductsComponentBase : //! Handler implementation for productRecvIn void productRecvIn_handler( - const NATIVE_INT_TYPE portNum, //!< The port number + const FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container id const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The buffer status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTelemetryComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTelemetryComponentAc.ref.cpp index caa8c23e0..5c10833cf 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTelemetryComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTelemetryComponentAc.ref.cpp @@ -44,11 +44,11 @@ namespace { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = sizeof(BuffUnion) + - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -73,8 +73,8 @@ namespace { void QueuedTelemetryComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwEnumStoreType instance ) { // Initialize base class @@ -82,8 +82,8 @@ void QueuedTelemetryComponentBase :: // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -106,8 +106,8 @@ void QueuedTelemetryComponentBase :: // Connect input port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsAsync_InputPorts()); port++ ) { this->m_noArgsAsync_InputPort[port].init(); @@ -130,8 +130,8 @@ void QueuedTelemetryComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -154,8 +154,8 @@ void QueuedTelemetryComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -178,8 +178,8 @@ void QueuedTelemetryComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -202,8 +202,8 @@ void QueuedTelemetryComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -226,8 +226,8 @@ void QueuedTelemetryComponentBase :: // Connect input port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsync_InputPorts()); port++ ) { this->m_typedAsync_InputPort[port].init(); @@ -250,8 +250,8 @@ void QueuedTelemetryComponentBase :: // Connect input port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); port++ ) { this->m_typedAsyncAssert_InputPort[port].init(); @@ -274,8 +274,8 @@ void QueuedTelemetryComponentBase :: // Connect input port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); port++ ) { this->m_typedAsyncBlockPriority_InputPort[port].init(); @@ -298,8 +298,8 @@ void QueuedTelemetryComponentBase :: // Connect input port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); port++ ) { this->m_typedAsyncDropPriority_InputPort[port].init(); @@ -322,8 +322,8 @@ void QueuedTelemetryComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -346,8 +346,8 @@ void QueuedTelemetryComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -370,8 +370,8 @@ void QueuedTelemetryComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -394,8 +394,8 @@ void QueuedTelemetryComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -418,8 +418,8 @@ void QueuedTelemetryComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -437,8 +437,8 @@ void QueuedTelemetryComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -456,8 +456,8 @@ void QueuedTelemetryComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -475,8 +475,8 @@ void QueuedTelemetryComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -494,8 +494,8 @@ void QueuedTelemetryComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -514,8 +514,8 @@ void QueuedTelemetryComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -534,8 +534,8 @@ void QueuedTelemetryComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -553,8 +553,8 @@ void QueuedTelemetryComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -572,8 +572,8 @@ void QueuedTelemetryComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -591,8 +591,8 @@ void QueuedTelemetryComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -610,8 +610,8 @@ void QueuedTelemetryComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -629,8 +629,8 @@ void QueuedTelemetryComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -661,7 +661,7 @@ void QueuedTelemetryComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* QueuedTelemetryComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -676,7 +676,7 @@ Fw::InputCmdPort* QueuedTelemetryComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* QueuedTelemetryComponentBase :: - get_noArgsAsync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsAsync_InputPorts(), @@ -687,7 +687,7 @@ Ports::InputNoArgsPort* QueuedTelemetryComponentBase :: } Ports::InputNoArgsPort* QueuedTelemetryComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -698,7 +698,7 @@ Ports::InputNoArgsPort* QueuedTelemetryComponentBase :: } Ports::InputNoArgsReturnPort* QueuedTelemetryComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -709,7 +709,7 @@ Ports::InputNoArgsReturnPort* QueuedTelemetryComponentBase :: } Ports::InputNoArgsReturnPort* QueuedTelemetryComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -720,7 +720,7 @@ Ports::InputNoArgsReturnPort* QueuedTelemetryComponentBase :: } Ports::InputNoArgsPort* QueuedTelemetryComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -731,7 +731,7 @@ Ports::InputNoArgsPort* QueuedTelemetryComponentBase :: } Ports::InputTypedPort* QueuedTelemetryComponentBase :: - get_typedAsync_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsync_InputPorts(), @@ -742,7 +742,7 @@ Ports::InputTypedPort* QueuedTelemetryComponentBase :: } Ports::InputTypedPort* QueuedTelemetryComponentBase :: - get_typedAsyncAssert_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncAssert_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncAssert_InputPorts(), @@ -753,7 +753,7 @@ Ports::InputTypedPort* QueuedTelemetryComponentBase :: } Ports::InputTypedPort* QueuedTelemetryComponentBase :: - get_typedAsyncBlockPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncBlockPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncBlockPriority_InputPorts(), @@ -764,7 +764,7 @@ Ports::InputTypedPort* QueuedTelemetryComponentBase :: } Ports::InputTypedPort* QueuedTelemetryComponentBase :: - get_typedAsyncDropPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncDropPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncDropPriority_InputPorts(), @@ -775,7 +775,7 @@ Ports::InputTypedPort* QueuedTelemetryComponentBase :: } Ports::InputTypedPort* QueuedTelemetryComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -786,7 +786,7 @@ Ports::InputTypedPort* QueuedTelemetryComponentBase :: } Ports::InputTypedReturnPort* QueuedTelemetryComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -797,7 +797,7 @@ Ports::InputTypedReturnPort* QueuedTelemetryComponentBase :: } Ports::InputTypedReturnPort* QueuedTelemetryComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -808,7 +808,7 @@ Ports::InputTypedReturnPort* QueuedTelemetryComponentBase :: } Ports::InputTypedPort* QueuedTelemetryComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -824,7 +824,7 @@ Ports::InputTypedPort* QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -838,7 +838,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -852,7 +852,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -866,7 +866,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -880,7 +880,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -896,7 +896,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -912,7 +912,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -926,7 +926,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -944,7 +944,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -958,7 +958,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -972,7 +972,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -986,7 +986,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -1006,7 +1006,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1020,7 +1020,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1034,7 +1034,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1048,7 +1048,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1064,7 +1064,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1080,7 +1080,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1094,7 +1094,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1116,7 +1116,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1130,7 +1130,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1170,176 +1170,176 @@ QueuedTelemetryComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_noArgsAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); } -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_typedAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); } -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_typedAsyncAssert_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); } -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_typedAsyncBlockPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); } -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_typedAsyncDropPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); } -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE QueuedTelemetryComponentBase :: +FwIndexType QueuedTelemetryComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1347,7 +1347,7 @@ NATIVE_INT_TYPE QueuedTelemetryComponentBase :: // ---------------------------------------------------------------------- bool QueuedTelemetryComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -1358,7 +1358,7 @@ bool QueuedTelemetryComponentBase :: } bool QueuedTelemetryComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -1369,7 +1369,7 @@ bool QueuedTelemetryComponentBase :: } bool QueuedTelemetryComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -1380,7 +1380,7 @@ bool QueuedTelemetryComponentBase :: } bool QueuedTelemetryComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -1391,7 +1391,7 @@ bool QueuedTelemetryComponentBase :: } bool QueuedTelemetryComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -1404,7 +1404,7 @@ bool QueuedTelemetryComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool QueuedTelemetryComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -1417,7 +1417,7 @@ bool QueuedTelemetryComponentBase :: #endif bool QueuedTelemetryComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -1428,7 +1428,7 @@ bool QueuedTelemetryComponentBase :: } bool QueuedTelemetryComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -1443,7 +1443,7 @@ bool QueuedTelemetryComponentBase :: // ---------------------------------------------------------------------- bool QueuedTelemetryComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -1454,7 +1454,7 @@ bool QueuedTelemetryComponentBase :: } bool QueuedTelemetryComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -1465,7 +1465,7 @@ bool QueuedTelemetryComponentBase :: } bool QueuedTelemetryComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -1476,7 +1476,7 @@ bool QueuedTelemetryComponentBase :: } bool QueuedTelemetryComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -1493,7 +1493,7 @@ bool QueuedTelemetryComponentBase :: // ---------------------------------------------------------------------- void QueuedTelemetryComponentBase :: - noArgsAsync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsAsync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1508,7 +1508,7 @@ void QueuedTelemetryComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(NOARGSASYNC_NOARGS) + static_cast(NOARGSASYNC_NOARGS) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1533,7 +1533,7 @@ void QueuedTelemetryComponentBase :: } void QueuedTelemetryComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1552,7 +1552,7 @@ void QueuedTelemetryComponentBase :: } U32 QueuedTelemetryComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1575,7 +1575,7 @@ U32 QueuedTelemetryComponentBase :: } U32 QueuedTelemetryComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1592,7 +1592,7 @@ U32 QueuedTelemetryComponentBase :: } void QueuedTelemetryComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1606,7 +1606,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1638,7 +1638,7 @@ void QueuedTelemetryComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNC_TYPED) + static_cast(TYPEDASYNC_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1713,7 +1713,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1745,7 +1745,7 @@ void QueuedTelemetryComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCASSERT_TYPED) + static_cast(TYPEDASYNCASSERT_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1820,7 +1820,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1852,7 +1852,7 @@ void QueuedTelemetryComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) + static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -1927,7 +1927,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1959,7 +1959,7 @@ void QueuedTelemetryComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCDROPPRIORITY_TYPED) + static_cast(TYPEDASYNCDROPPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2039,7 +2039,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2076,7 +2076,7 @@ void QueuedTelemetryComponentBase :: F32 QueuedTelemetryComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2117,7 +2117,7 @@ F32 QueuedTelemetryComponentBase :: F32 QueuedTelemetryComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2152,7 +2152,7 @@ F32 QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2190,14 +2190,14 @@ void QueuedTelemetryComponentBase :: // ---------------------------------------------------------------------- void QueuedTelemetryComponentBase :: - noArgsAsync_preMsgHook(NATIVE_INT_TYPE portNum) + noArgsAsync_preMsgHook(FwIndexType portNum) { // Default: no-op } void QueuedTelemetryComponentBase :: typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2212,7 +2212,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2227,7 +2227,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2242,7 +2242,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2260,7 +2260,7 @@ void QueuedTelemetryComponentBase :: // ---------------------------------------------------------------------- void QueuedTelemetryComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -2270,7 +2270,7 @@ void QueuedTelemetryComponentBase :: } U32 QueuedTelemetryComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -2281,7 +2281,7 @@ U32 QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2308,7 +2308,7 @@ void QueuedTelemetryComponentBase :: F32 QueuedTelemetryComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2774,7 +2774,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedTelemetryComponentBase :: doDispatch() { ComponentIpcSerializableBuffer msg; - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -2794,7 +2794,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedTelemetryComponentBase :: // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -2807,7 +2807,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedTelemetryComponentBase :: return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -3125,7 +3125,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -3144,7 +3144,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3155,7 +3155,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3166,7 +3166,7 @@ void QueuedTelemetryComponentBase :: U32 QueuedTelemetryComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3177,7 +3177,7 @@ U32 QueuedTelemetryComponentBase :: U32 QueuedTelemetryComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3188,7 +3188,7 @@ U32 QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -3199,7 +3199,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3226,7 +3226,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3253,7 +3253,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3280,7 +3280,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3307,7 +3307,7 @@ void QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3334,7 +3334,7 @@ void QueuedTelemetryComponentBase :: F32 QueuedTelemetryComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3361,7 +3361,7 @@ F32 QueuedTelemetryComponentBase :: F32 QueuedTelemetryComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3388,7 +3388,7 @@ F32 QueuedTelemetryComponentBase :: void QueuedTelemetryComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTelemetryComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTelemetryComponentAc.ref.hpp index 01d36b81f..e5c09ed17 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTelemetryComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTelemetryComponentAc.ref.hpp @@ -118,8 +118,8 @@ class QueuedTelemetryComponentBase : //! Initialize QueuedTelemetryComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -132,7 +132,7 @@ class QueuedTelemetryComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -145,91 +145,91 @@ class QueuedTelemetryComponentBase : //! //! \return noArgsAsync[portNum] Ports::InputNoArgsPort* get_noArgsAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsync[portNum] Ports::InputTypedPort* get_typedAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncAssert[portNum] Ports::InputTypedPort* get_typedAsyncAssert_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncBlockPriority[portNum] Ports::InputTypedPort* get_typedAsyncBlockPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncDropPriority[portNum] Ports::InputTypedPort* get_typedAsyncDropPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -240,31 +240,31 @@ class QueuedTelemetryComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); @@ -272,7 +272,7 @@ class QueuedTelemetryComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -280,13 +280,13 @@ class QueuedTelemetryComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -298,25 +298,25 @@ class QueuedTelemetryComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -330,25 +330,25 @@ class QueuedTelemetryComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -356,7 +356,7 @@ class QueuedTelemetryComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -364,13 +364,13 @@ class QueuedTelemetryComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -386,13 +386,13 @@ class QueuedTelemetryComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -421,7 +421,7 @@ class QueuedTelemetryComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; PROTECTED: @@ -432,67 +432,67 @@ class QueuedTelemetryComponentBase : //! Get the number of noArgsAsync input ports //! //! \return The number of noArgsAsync input ports - NATIVE_INT_TYPE getNum_noArgsAsync_InputPorts() const; + FwIndexType getNum_noArgsAsync_InputPorts() const; //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedAsync input ports //! //! \return The number of typedAsync input ports - NATIVE_INT_TYPE getNum_typedAsync_InputPorts() const; + FwIndexType getNum_typedAsync_InputPorts() const; //! Get the number of typedAsyncAssert input ports //! //! \return The number of typedAsyncAssert input ports - NATIVE_INT_TYPE getNum_typedAsyncAssert_InputPorts() const; + FwIndexType getNum_typedAsyncAssert_InputPorts() const; //! Get the number of typedAsyncBlockPriority input ports //! //! \return The number of typedAsyncBlockPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncBlockPriority_InputPorts() const; + FwIndexType getNum_typedAsyncBlockPriority_InputPorts() const; //! Get the number of typedAsyncDropPriority input ports //! //! \return The number of typedAsyncDropPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncDropPriority_InputPorts() const; + FwIndexType getNum_typedAsyncDropPriority_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -503,46 +503,46 @@ class QueuedTelemetryComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -553,22 +553,22 @@ class QueuedTelemetryComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -580,35 +580,35 @@ class QueuedTelemetryComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -617,7 +617,7 @@ class QueuedTelemetryComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -626,14 +626,14 @@ class QueuedTelemetryComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -646,28 +646,28 @@ class QueuedTelemetryComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -678,32 +678,32 @@ class QueuedTelemetryComponentBase : //! Handler for input port noArgsAsync virtual void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedAsync virtual void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -715,7 +715,7 @@ class QueuedTelemetryComponentBase : //! Handler for input port typedAsyncAssert virtual void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -727,7 +727,7 @@ class QueuedTelemetryComponentBase : //! Handler for input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -739,7 +739,7 @@ class QueuedTelemetryComponentBase : //! Handler for input port typedAsyncDropPriority virtual void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -751,7 +751,7 @@ class QueuedTelemetryComponentBase : //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -763,7 +763,7 @@ class QueuedTelemetryComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -775,7 +775,7 @@ class QueuedTelemetryComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -787,7 +787,7 @@ class QueuedTelemetryComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -807,32 +807,32 @@ class QueuedTelemetryComponentBase : //! Handler base-class function for input port noArgsAsync void noArgsAsync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedAsync void typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -844,7 +844,7 @@ class QueuedTelemetryComponentBase : //! Handler base-class function for input port typedAsyncAssert void typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -856,7 +856,7 @@ class QueuedTelemetryComponentBase : //! Handler base-class function for input port typedAsyncBlockPriority void typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -868,7 +868,7 @@ class QueuedTelemetryComponentBase : //! Handler base-class function for input port typedAsyncDropPriority void typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -880,7 +880,7 @@ class QueuedTelemetryComponentBase : //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -892,7 +892,7 @@ class QueuedTelemetryComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -904,7 +904,7 @@ class QueuedTelemetryComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -916,7 +916,7 @@ class QueuedTelemetryComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -938,12 +938,12 @@ class QueuedTelemetryComponentBase : //! Pre-message hook for async input port noArgsAsync virtual void noArgsAsync_preMsgHook( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Pre-message hook for async input port typedAsync virtual void typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -955,7 +955,7 @@ class QueuedTelemetryComponentBase : //! Pre-message hook for async input port typedAsyncAssert virtual void typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -967,7 +967,7 @@ class QueuedTelemetryComponentBase : //! Pre-message hook for async input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -979,7 +979,7 @@ class QueuedTelemetryComponentBase : //! Pre-message hook for async input port typedAsyncDropPriority virtual void typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -997,17 +997,17 @@ class QueuedTelemetryComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1019,7 +1019,7 @@ class QueuedTelemetryComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1167,7 +1167,7 @@ class QueuedTelemetryComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -1182,37 +1182,37 @@ class QueuedTelemetryComponentBase : //! Callback for port noArgsAsync static void m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedAsync static void m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1225,7 +1225,7 @@ class QueuedTelemetryComponentBase : //! Callback for port typedAsyncAssert static void m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1238,7 +1238,7 @@ class QueuedTelemetryComponentBase : //! Callback for port typedAsyncBlockPriority static void m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1251,7 +1251,7 @@ class QueuedTelemetryComponentBase : //! Callback for port typedAsyncDropPriority static void m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1264,7 +1264,7 @@ class QueuedTelemetryComponentBase : //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1277,7 +1277,7 @@ class QueuedTelemetryComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1290,7 +1290,7 @@ class QueuedTelemetryComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1303,7 +1303,7 @@ class QueuedTelemetryComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index 5389aca8c..a610bdd89 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -80,11 +80,11 @@ namespace { // Max. message size = size of data + message id + port SERIALIZATION_SIZE = sizeof(BuffUnion) + - sizeof(NATIVE_INT_TYPE) + - sizeof(NATIVE_INT_TYPE) + sizeof(FwEnumStoreType) + + sizeof(FwIndexType) }; - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return sizeof(m_buff); } @@ -263,8 +263,8 @@ Fw::SerializeStatus QueuedTestComponentBase::DpContainer :: void QueuedTestComponentBase :: init( - NATIVE_INT_TYPE queueDepth, - NATIVE_INT_TYPE instance + FwQueueSizeType queueDepth, + FwEnumStoreType instance ) { // Initialize base class @@ -272,8 +272,8 @@ void QueuedTestComponentBase :: // Connect input port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdIn_InputPorts()); port++ ) { this->m_cmdIn_InputPort[port].init(); @@ -296,8 +296,8 @@ void QueuedTestComponentBase :: // Connect input port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRecvIn_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRecvIn_InputPorts()); port++ ) { this->m_productRecvIn_InputPort[port].init(); @@ -320,8 +320,8 @@ void QueuedTestComponentBase :: // Connect input port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsAsync_InputPorts()); port++ ) { this->m_noArgsAsync_InputPort[port].init(); @@ -344,8 +344,8 @@ void QueuedTestComponentBase :: // Connect input port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsGuarded_InputPorts()); port++ ) { this->m_noArgsGuarded_InputPort[port].init(); @@ -368,8 +368,8 @@ void QueuedTestComponentBase :: // Connect input port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnGuarded_InputPorts()); port++ ) { this->m_noArgsReturnGuarded_InputPort[port].init(); @@ -392,8 +392,8 @@ void QueuedTestComponentBase :: // Connect input port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnSync_InputPorts()); port++ ) { this->m_noArgsReturnSync_InputPort[port].init(); @@ -416,8 +416,8 @@ void QueuedTestComponentBase :: // Connect input port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsSync_InputPorts()); port++ ) { this->m_noArgsSync_InputPort[port].init(); @@ -440,8 +440,8 @@ void QueuedTestComponentBase :: // Connect input port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsync_InputPorts()); port++ ) { this->m_typedAsync_InputPort[port].init(); @@ -464,8 +464,8 @@ void QueuedTestComponentBase :: // Connect input port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncAssert_InputPorts()); port++ ) { this->m_typedAsyncAssert_InputPort[port].init(); @@ -488,8 +488,8 @@ void QueuedTestComponentBase :: // Connect input port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncBlockPriority_InputPorts()); port++ ) { this->m_typedAsyncBlockPriority_InputPort[port].init(); @@ -512,8 +512,8 @@ void QueuedTestComponentBase :: // Connect input port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedAsyncDropPriority_InputPorts()); port++ ) { this->m_typedAsyncDropPriority_InputPort[port].init(); @@ -536,8 +536,8 @@ void QueuedTestComponentBase :: // Connect input port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedGuarded_InputPorts()); port++ ) { this->m_typedGuarded_InputPort[port].init(); @@ -560,8 +560,8 @@ void QueuedTestComponentBase :: // Connect input port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnGuarded_InputPorts()); port++ ) { this->m_typedReturnGuarded_InputPort[port].init(); @@ -584,8 +584,8 @@ void QueuedTestComponentBase :: // Connect input port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnSync_InputPorts()); port++ ) { this->m_typedReturnSync_InputPort[port].init(); @@ -608,8 +608,8 @@ void QueuedTestComponentBase :: // Connect input port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedSync_InputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedSync_InputPorts()); port++ ) { this->m_typedSync_InputPort[port].init(); @@ -632,8 +632,8 @@ void QueuedTestComponentBase :: // Connect output port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdRegOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdRegOut_OutputPorts()); port++ ) { this->m_cmdRegOut_OutputPort[port].init(); @@ -651,8 +651,8 @@ void QueuedTestComponentBase :: // Connect output port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_cmdResponseOut_OutputPorts()); port++ ) { this->m_cmdResponseOut_OutputPort[port].init(); @@ -670,8 +670,8 @@ void QueuedTestComponentBase :: // Connect output port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_eventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_eventOut_OutputPorts()); port++ ) { this->m_eventOut_OutputPort[port].init(); @@ -689,8 +689,8 @@ void QueuedTestComponentBase :: // Connect output port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmGetOut_OutputPorts()); port++ ) { this->m_prmGetOut_OutputPort[port].init(); @@ -708,8 +708,8 @@ void QueuedTestComponentBase :: // Connect output port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_prmSetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_prmSetOut_OutputPorts()); port++ ) { this->m_prmSetOut_OutputPort[port].init(); @@ -727,8 +727,8 @@ void QueuedTestComponentBase :: // Connect output port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productRequestOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productRequestOut_OutputPorts()); port++ ) { this->m_productRequestOut_OutputPort[port].init(); @@ -746,8 +746,8 @@ void QueuedTestComponentBase :: // Connect output port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_productSendOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_productSendOut_OutputPorts()); port++ ) { this->m_productSendOut_OutputPort[port].init(); @@ -766,8 +766,8 @@ void QueuedTestComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect output port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_textEventOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_textEventOut_OutputPorts()); port++ ) { this->m_textEventOut_OutputPort[port].init(); @@ -786,8 +786,8 @@ void QueuedTestComponentBase :: // Connect output port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_timeGetOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_timeGetOut_OutputPorts()); port++ ) { this->m_timeGetOut_OutputPort[port].init(); @@ -805,8 +805,8 @@ void QueuedTestComponentBase :: // Connect output port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_tlmOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_tlmOut_OutputPorts()); port++ ) { this->m_tlmOut_OutputPort[port].init(); @@ -824,8 +824,8 @@ void QueuedTestComponentBase :: // Connect output port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsOut_OutputPorts()); port++ ) { this->m_noArgsOut_OutputPort[port].init(); @@ -843,8 +843,8 @@ void QueuedTestComponentBase :: // Connect output port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_noArgsReturnOut_OutputPorts()); port++ ) { this->m_noArgsReturnOut_OutputPort[port].init(); @@ -862,8 +862,8 @@ void QueuedTestComponentBase :: // Connect output port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedOut_OutputPorts()); port++ ) { this->m_typedOut_OutputPort[port].init(); @@ -881,8 +881,8 @@ void QueuedTestComponentBase :: // Connect output port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_typedReturnOut_OutputPorts()); + FwIndexType port = 0; + port < static_cast(this->getNum_typedReturnOut_OutputPorts()); port++ ) { this->m_typedReturnOut_OutputPort[port].init(); @@ -913,7 +913,7 @@ void QueuedTestComponentBase :: // ---------------------------------------------------------------------- Fw::InputCmdPort* QueuedTestComponentBase :: - get_cmdIn_InputPort(NATIVE_INT_TYPE portNum) + get_cmdIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdIn_InputPorts(), @@ -924,7 +924,7 @@ Fw::InputCmdPort* QueuedTestComponentBase :: } Fw::InputDpResponsePort* QueuedTestComponentBase :: - get_productRecvIn_InputPort(NATIVE_INT_TYPE portNum) + get_productRecvIn_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRecvIn_InputPorts(), @@ -939,7 +939,7 @@ Fw::InputDpResponsePort* QueuedTestComponentBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* QueuedTestComponentBase :: - get_noArgsAsync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsAsync_InputPorts(), @@ -950,7 +950,7 @@ Ports::InputNoArgsPort* QueuedTestComponentBase :: } Ports::InputNoArgsPort* QueuedTestComponentBase :: - get_noArgsGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsGuarded_InputPorts(), @@ -961,7 +961,7 @@ Ports::InputNoArgsPort* QueuedTestComponentBase :: } Ports::InputNoArgsReturnPort* QueuedTestComponentBase :: - get_noArgsReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnGuarded_InputPorts(), @@ -972,7 +972,7 @@ Ports::InputNoArgsReturnPort* QueuedTestComponentBase :: } Ports::InputNoArgsReturnPort* QueuedTestComponentBase :: - get_noArgsReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnSync_InputPorts(), @@ -983,7 +983,7 @@ Ports::InputNoArgsReturnPort* QueuedTestComponentBase :: } Ports::InputNoArgsPort* QueuedTestComponentBase :: - get_noArgsSync_InputPort(NATIVE_INT_TYPE portNum) + get_noArgsSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsSync_InputPorts(), @@ -994,7 +994,7 @@ Ports::InputNoArgsPort* QueuedTestComponentBase :: } Ports::InputTypedPort* QueuedTestComponentBase :: - get_typedAsync_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsync_InputPorts(), @@ -1005,7 +1005,7 @@ Ports::InputTypedPort* QueuedTestComponentBase :: } Ports::InputTypedPort* QueuedTestComponentBase :: - get_typedAsyncAssert_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncAssert_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncAssert_InputPorts(), @@ -1016,7 +1016,7 @@ Ports::InputTypedPort* QueuedTestComponentBase :: } Ports::InputTypedPort* QueuedTestComponentBase :: - get_typedAsyncBlockPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncBlockPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncBlockPriority_InputPorts(), @@ -1027,7 +1027,7 @@ Ports::InputTypedPort* QueuedTestComponentBase :: } Ports::InputTypedPort* QueuedTestComponentBase :: - get_typedAsyncDropPriority_InputPort(NATIVE_INT_TYPE portNum) + get_typedAsyncDropPriority_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedAsyncDropPriority_InputPorts(), @@ -1038,7 +1038,7 @@ Ports::InputTypedPort* QueuedTestComponentBase :: } Ports::InputTypedPort* QueuedTestComponentBase :: - get_typedGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedGuarded_InputPorts(), @@ -1049,7 +1049,7 @@ Ports::InputTypedPort* QueuedTestComponentBase :: } Ports::InputTypedReturnPort* QueuedTestComponentBase :: - get_typedReturnGuarded_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnGuarded_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnGuarded_InputPorts(), @@ -1060,7 +1060,7 @@ Ports::InputTypedReturnPort* QueuedTestComponentBase :: } Ports::InputTypedReturnPort* QueuedTestComponentBase :: - get_typedReturnSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedReturnSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnSync_InputPorts(), @@ -1071,7 +1071,7 @@ Ports::InputTypedReturnPort* QueuedTestComponentBase :: } Ports::InputTypedPort* QueuedTestComponentBase :: - get_typedSync_InputPort(NATIVE_INT_TYPE portNum) + get_typedSync_InputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedSync_InputPorts(), @@ -1087,7 +1087,7 @@ Ports::InputTypedPort* QueuedTestComponentBase :: void QueuedTestComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdRegPort* port ) { @@ -1101,7 +1101,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdResponsePort* port ) { @@ -1115,7 +1115,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogPort* port ) { @@ -1129,7 +1129,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmGetPort* port ) { @@ -1143,7 +1143,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputPrmSetPort* port ) { @@ -1157,7 +1157,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpRequestPort* port ) { @@ -1171,7 +1171,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpSendPort* port ) { @@ -1187,7 +1187,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputLogTextPort* port ) { @@ -1203,7 +1203,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTimePort* port ) { @@ -1217,7 +1217,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputTlmPort* port ) { @@ -1235,7 +1235,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -1249,7 +1249,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -1263,7 +1263,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -1277,7 +1277,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -1297,7 +1297,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1311,7 +1311,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1325,7 +1325,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1339,7 +1339,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1353,7 +1353,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1367,7 +1367,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1383,7 +1383,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1399,7 +1399,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1413,7 +1413,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1435,7 +1435,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1449,7 +1449,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1801,194 +1801,194 @@ QueuedTestComponentBase :: // Getters for numbers of special input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_cmdIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdIn_InputPort)); } -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_productRecvIn_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRecvIn_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed input ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_noArgsAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsAsync_InputPort)); } -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_noArgsGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_noArgsReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_noArgsReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnSync_InputPort)); } -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_noArgsSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsSync_InputPort)); } -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_typedAsync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsync_InputPort)); } -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_typedAsyncAssert_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncAssert_InputPort)); } -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_typedAsyncBlockPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncBlockPriority_InputPort)); } -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_typedAsyncDropPriority_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedAsyncDropPriority_InputPort)); } -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_typedGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_typedReturnGuarded_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnGuarded_InputPort)); } -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_typedReturnSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnSync_InputPort)); } -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_typedSync_InputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedSync_InputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of special output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_cmdRegOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdRegOut_OutputPort)); } -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_cmdResponseOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_cmdResponseOut_OutputPort)); } -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_eventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_eventOut_OutputPort)); } -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_prmGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmGetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_prmSetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_prmSetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_productRequestOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productRequestOut_OutputPort)); } -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_productSendOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_productSendOut_OutputPort)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_textEventOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_textEventOut_OutputPort)); } #endif -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_timeGetOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_timeGetOut_OutputPort)); } -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_tlmOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_tlmOut_OutputPort)); } // ---------------------------------------------------------------------- // Getters for numbers of typed output ports // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_noArgsOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsOut_OutputPort)); } -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_noArgsReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_noArgsReturnOut_OutputPort)); } -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_typedOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedOut_OutputPort)); } -NATIVE_INT_TYPE QueuedTestComponentBase :: +FwIndexType QueuedTestComponentBase :: getNum_typedReturnOut_OutputPorts() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_typedReturnOut_OutputPort)); } // ---------------------------------------------------------------------- @@ -1996,7 +1996,7 @@ NATIVE_INT_TYPE QueuedTestComponentBase :: // ---------------------------------------------------------------------- bool QueuedTestComponentBase :: - isConnected_cmdRegOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdRegOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdRegOut_OutputPorts(), @@ -2007,7 +2007,7 @@ bool QueuedTestComponentBase :: } bool QueuedTestComponentBase :: - isConnected_cmdResponseOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_cmdResponseOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_cmdResponseOut_OutputPorts(), @@ -2018,7 +2018,7 @@ bool QueuedTestComponentBase :: } bool QueuedTestComponentBase :: - isConnected_eventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_eventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_eventOut_OutputPorts(), @@ -2029,7 +2029,7 @@ bool QueuedTestComponentBase :: } bool QueuedTestComponentBase :: - isConnected_prmGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmGetOut_OutputPorts(), @@ -2040,7 +2040,7 @@ bool QueuedTestComponentBase :: } bool QueuedTestComponentBase :: - isConnected_prmSetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_prmSetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_prmSetOut_OutputPorts(), @@ -2051,7 +2051,7 @@ bool QueuedTestComponentBase :: } bool QueuedTestComponentBase :: - isConnected_productRequestOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productRequestOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productRequestOut_OutputPorts(), @@ -2062,7 +2062,7 @@ bool QueuedTestComponentBase :: } bool QueuedTestComponentBase :: - isConnected_productSendOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_productSendOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_productSendOut_OutputPorts(), @@ -2075,7 +2075,7 @@ bool QueuedTestComponentBase :: #if FW_ENABLE_TEXT_LOGGING == 1 bool QueuedTestComponentBase :: - isConnected_textEventOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_textEventOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_textEventOut_OutputPorts(), @@ -2088,7 +2088,7 @@ bool QueuedTestComponentBase :: #endif bool QueuedTestComponentBase :: - isConnected_timeGetOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_timeGetOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_timeGetOut_OutputPorts(), @@ -2099,7 +2099,7 @@ bool QueuedTestComponentBase :: } bool QueuedTestComponentBase :: - isConnected_tlmOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_tlmOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_tlmOut_OutputPorts(), @@ -2114,7 +2114,7 @@ bool QueuedTestComponentBase :: // ---------------------------------------------------------------------- bool QueuedTestComponentBase :: - isConnected_noArgsOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -2125,7 +2125,7 @@ bool QueuedTestComponentBase :: } bool QueuedTestComponentBase :: - isConnected_noArgsReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_noArgsReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -2136,7 +2136,7 @@ bool QueuedTestComponentBase :: } bool QueuedTestComponentBase :: - isConnected_typedOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedOut_OutputPorts(), @@ -2147,7 +2147,7 @@ bool QueuedTestComponentBase :: } bool QueuedTestComponentBase :: - isConnected_typedReturnOut_OutputPort(NATIVE_INT_TYPE portNum) + isConnected_typedReturnOut_OutputPort(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_typedReturnOut_OutputPorts(), @@ -2165,7 +2165,7 @@ bool QueuedTestComponentBase :: void QueuedTestComponentBase :: productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -2189,7 +2189,7 @@ void QueuedTestComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(PRODUCTRECVIN_DPRESPONSE) + static_cast(PRODUCTRECVIN_DPRESPONSE) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2241,7 +2241,7 @@ void QueuedTestComponentBase :: // ---------------------------------------------------------------------- void QueuedTestComponentBase :: - noArgsAsync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsAsync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -2256,7 +2256,7 @@ void QueuedTestComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(NOARGSASYNC_NOARGS) + static_cast(NOARGSASYNC_NOARGS) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2281,7 +2281,7 @@ void QueuedTestComponentBase :: } void QueuedTestComponentBase :: - noArgsGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -2300,7 +2300,7 @@ void QueuedTestComponentBase :: } U32 QueuedTestComponentBase :: - noArgsReturnGuarded_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -2323,7 +2323,7 @@ U32 QueuedTestComponentBase :: } U32 QueuedTestComponentBase :: - noArgsReturnSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -2340,7 +2340,7 @@ U32 QueuedTestComponentBase :: } void QueuedTestComponentBase :: - noArgsSync_handlerBase(NATIVE_INT_TYPE portNum) + noArgsSync_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -2354,7 +2354,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2386,7 +2386,7 @@ void QueuedTestComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNC_TYPED) + static_cast(TYPEDASYNC_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2461,7 +2461,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2493,7 +2493,7 @@ void QueuedTestComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCASSERT_TYPED) + static_cast(TYPEDASYNCASSERT_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2568,7 +2568,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2600,7 +2600,7 @@ void QueuedTestComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) + static_cast(TYPEDASYNCBLOCKPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2675,7 +2675,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2707,7 +2707,7 @@ void QueuedTestComponentBase :: // Serialize message ID _status = msg.serialize( - static_cast(TYPEDASYNCDROPPRIORITY_TYPED) + static_cast(TYPEDASYNCDROPPRIORITY_TYPED) ); FW_ASSERT( _status == Fw::FW_SERIALIZE_OK, @@ -2787,7 +2787,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2824,7 +2824,7 @@ void QueuedTestComponentBase :: F32 QueuedTestComponentBase :: typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2865,7 +2865,7 @@ F32 QueuedTestComponentBase :: F32 QueuedTestComponentBase :: typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2900,7 +2900,7 @@ F32 QueuedTestComponentBase :: void QueuedTestComponentBase :: typedSync_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2939,7 +2939,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -2957,14 +2957,14 @@ void QueuedTestComponentBase :: // ---------------------------------------------------------------------- void QueuedTestComponentBase :: - noArgsAsync_preMsgHook(NATIVE_INT_TYPE portNum) + noArgsAsync_preMsgHook(FwIndexType portNum) { // Default: no-op } void QueuedTestComponentBase :: typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2979,7 +2979,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2994,7 +2994,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3009,7 +3009,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3028,7 +3028,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: productRequestOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -3045,7 +3045,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: productSendOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -3065,7 +3065,7 @@ void QueuedTestComponentBase :: // ---------------------------------------------------------------------- void QueuedTestComponentBase :: - noArgsOut_out(NATIVE_INT_TYPE portNum) + noArgsOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsOut_OutputPorts(), @@ -3075,7 +3075,7 @@ void QueuedTestComponentBase :: } U32 QueuedTestComponentBase :: - noArgsReturnOut_out(NATIVE_INT_TYPE portNum) + noArgsReturnOut_out(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_noArgsReturnOut_OutputPorts(), @@ -3086,7 +3086,7 @@ U32 QueuedTestComponentBase :: void QueuedTestComponentBase :: typedOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3113,7 +3113,7 @@ void QueuedTestComponentBase :: F32 QueuedTestComponentBase :: typedReturnOut_out( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3149,14 +3149,14 @@ void QueuedTestComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALARRAY)); + _status = msg.serialize(static_cast(INT_IF_INTERNALARRAY)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3185,14 +3185,14 @@ void QueuedTestComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALENUM)); + _status = msg.serialize(static_cast(INT_IF_INTERNALENUM)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3225,14 +3225,14 @@ void QueuedTestComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALPRIMITIVE)); + _status = msg.serialize(static_cast(INT_IF_INTERNALPRIMITIVE)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3273,14 +3273,14 @@ void QueuedTestComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALPRIORITYDROP)); + _status = msg.serialize(static_cast(INT_IF_INTERNALPRIORITYDROP)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3311,14 +3311,14 @@ void QueuedTestComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALSTRING)); + _status = msg.serialize(static_cast(INT_IF_INTERNALSTRING)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -3353,14 +3353,14 @@ void QueuedTestComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize the message ID - _status = msg.serialize(static_cast(INT_IF_INTERNALSTRUCT)); + _status = msg.serialize(static_cast(INT_IF_INTERNALSTRUCT)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - _status = msg.serialize(static_cast(0)); + _status = msg.serialize(static_cast(0)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) @@ -4052,14 +4052,14 @@ void QueuedTestComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_ASYNC)); + _status = msg.serialize(static_cast(CMD_CMD_ASYNC)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -4111,14 +4111,14 @@ void QueuedTestComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_PRIORITY)); + _status = msg.serialize(static_cast(CMD_CMD_PRIORITY)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -4170,14 +4170,14 @@ void QueuedTestComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY)); + _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -4229,14 +4229,14 @@ void QueuedTestComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_DROP)); + _status = msg.serialize(static_cast(CMD_CMD_DROP)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -4293,14 +4293,14 @@ void QueuedTestComponentBase :: Fw::SerializeStatus _status = Fw::FW_SERIALIZE_OK; // Serialize for IPC - _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY_DROP)); + _status = msg.serialize(static_cast(CMD_CMD_PARAMS_PRIORITY_DROP)); FW_ASSERT ( _status == Fw::FW_SERIALIZE_OK, static_cast(_status) ); // Fake port number to make message dequeue work - NATIVE_INT_TYPE port = 0; + FwIndexType port = 0; _status = msg.serialize(port); FW_ASSERT ( @@ -5656,7 +5656,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedTestComponentBase :: doDispatch() { ComponentIpcSerializableBuffer msg; - NATIVE_INT_TYPE priority = 0; + FwQueuePriorityType priority = 0; Os::Queue::QueueStatus msgStatus = this->m_queue.receive( msg, @@ -5676,7 +5676,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedTestComponentBase :: // Reset to beginning of buffer msg.resetDeser(); - NATIVE_INT_TYPE desMsg = 0; + FwEnumStoreType desMsg = 0; Fw::SerializeStatus deserStatus = msg.deserialize(desMsg); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -5689,7 +5689,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedTestComponentBase :: return MSG_DISPATCH_EXIT; } - NATIVE_INT_TYPE portNum = 0; + FwIndexType portNum = 0; deserStatus = msg.deserialize(portNum); FW_ASSERT( deserStatus == Fw::FW_SERIALIZE_OK, @@ -6489,7 +6489,7 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedTestComponentBase :: void QueuedTestComponentBase :: m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, Fw::CmdArgBuffer& args @@ -6781,7 +6781,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status @@ -6804,7 +6804,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -6815,7 +6815,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -6826,7 +6826,7 @@ void QueuedTestComponentBase :: U32 QueuedTestComponentBase :: m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -6837,7 +6837,7 @@ U32 QueuedTestComponentBase :: U32 QueuedTestComponentBase :: m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -6848,7 +6848,7 @@ U32 QueuedTestComponentBase :: void QueuedTestComponentBase :: m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp); @@ -6859,7 +6859,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -6886,7 +6886,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -6913,7 +6913,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -6940,7 +6940,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -6967,7 +6967,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -6994,7 +6994,7 @@ void QueuedTestComponentBase :: F32 QueuedTestComponentBase :: m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -7021,7 +7021,7 @@ F32 QueuedTestComponentBase :: F32 QueuedTestComponentBase :: m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -7048,7 +7048,7 @@ F32 QueuedTestComponentBase :: void QueuedTestComponentBase :: m_p_typedSync_in( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -7391,7 +7391,7 @@ void QueuedTestComponentBase :: void QueuedTestComponentBase :: productRecvIn_handler( - const NATIVE_INT_TYPE portNum, + const FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer, const Fw::Success& status diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp index ef7686e69..d8f6dd3e4 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp @@ -294,8 +294,8 @@ class QueuedTestComponentBase : //! Initialize QueuedTestComponentBase object void init( - NATIVE_INT_TYPE queueDepth, //!< The queue depth - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwQueueSizeType queueDepth, //!< The queue depth + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -308,14 +308,14 @@ class QueuedTestComponentBase : //! //! \return cmdIn[portNum] Fw::InputCmdPort* get_cmdIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get special input port at index //! //! \return productRecvIn[portNum] Fw::InputDpResponsePort* get_productRecvIn_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -328,91 +328,91 @@ class QueuedTestComponentBase : //! //! \return noArgsAsync[portNum] Ports::InputNoArgsPort* get_noArgsAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsGuarded[portNum] Ports::InputNoArgsPort* get_noArgsGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnGuarded[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsReturnSync[portNum] Ports::InputNoArgsReturnPort* get_noArgsReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return noArgsSync[portNum] Ports::InputNoArgsPort* get_noArgsSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsync[portNum] Ports::InputTypedPort* get_typedAsync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncAssert[portNum] Ports::InputTypedPort* get_typedAsyncAssert_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncBlockPriority[portNum] Ports::InputTypedPort* get_typedAsyncBlockPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedAsyncDropPriority[portNum] Ports::InputTypedPort* get_typedAsyncDropPriority_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedGuarded[portNum] Ports::InputTypedPort* get_typedGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnGuarded[portNum] Ports::InputTypedReturnPort* get_typedReturnGuarded_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedReturnSync[portNum] Ports::InputTypedReturnPort* get_typedReturnSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get typed input port at index //! //! \return typedSync[portNum] Ports::InputTypedPort* get_typedSync_InputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); public: @@ -423,43 +423,43 @@ class QueuedTestComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdRegPort* port //!< The input port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdResponsePort* port //!< The input port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogPort* port //!< The input port ); //! Connect port to prmGetOut[portNum] void set_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmGetPort* port //!< The input port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputPrmSetPort* port //!< The input port ); //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpRequestPort* port //!< The input port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpSendPort* port //!< The input port ); @@ -467,7 +467,7 @@ class QueuedTestComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputLogTextPort* port //!< The input port ); @@ -475,13 +475,13 @@ class QueuedTestComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTimePort* port //!< The input port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputTlmPort* port //!< The input port ); @@ -493,25 +493,25 @@ class QueuedTestComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnOut[portNum] void set_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnOut[portNum] void set_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); @@ -525,37 +525,37 @@ class QueuedTestComponentBase : //! Connect port to cmdRegOut[portNum] void set_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to cmdResponseOut[portNum] void set_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to eventOut[portNum] void set_eventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to prmSetOut[portNum] void set_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productRequestOut[portNum] void set_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to productSendOut[portNum] void set_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -563,7 +563,7 @@ class QueuedTestComponentBase : //! Connect port to textEventOut[portNum] void set_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -571,13 +571,13 @@ class QueuedTestComponentBase : //! Connect port to timeGetOut[portNum] void set_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to tlmOut[portNum] void set_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -593,13 +593,13 @@ class QueuedTestComponentBase : //! Connect port to noArgsOut[portNum] void set_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); //! Connect port to typedOut[portNum] void set_typedOut_OutputPort( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The port ); @@ -650,12 +650,12 @@ class QueuedTestComponentBase : //! Get the number of cmdIn input ports //! //! \return The number of cmdIn input ports - NATIVE_INT_TYPE getNum_cmdIn_InputPorts() const; + FwIndexType getNum_cmdIn_InputPorts() const; //! Get the number of productRecvIn input ports //! //! \return The number of productRecvIn input ports - NATIVE_INT_TYPE getNum_productRecvIn_InputPorts() const; + FwIndexType getNum_productRecvIn_InputPorts() const; PROTECTED: @@ -666,67 +666,67 @@ class QueuedTestComponentBase : //! Get the number of noArgsAsync input ports //! //! \return The number of noArgsAsync input ports - NATIVE_INT_TYPE getNum_noArgsAsync_InputPorts() const; + FwIndexType getNum_noArgsAsync_InputPorts() const; //! Get the number of noArgsGuarded input ports //! //! \return The number of noArgsGuarded input ports - NATIVE_INT_TYPE getNum_noArgsGuarded_InputPorts() const; + FwIndexType getNum_noArgsGuarded_InputPorts() const; //! Get the number of noArgsReturnGuarded input ports //! //! \return The number of noArgsReturnGuarded input ports - NATIVE_INT_TYPE getNum_noArgsReturnGuarded_InputPorts() const; + FwIndexType getNum_noArgsReturnGuarded_InputPorts() const; //! Get the number of noArgsReturnSync input ports //! //! \return The number of noArgsReturnSync input ports - NATIVE_INT_TYPE getNum_noArgsReturnSync_InputPorts() const; + FwIndexType getNum_noArgsReturnSync_InputPorts() const; //! Get the number of noArgsSync input ports //! //! \return The number of noArgsSync input ports - NATIVE_INT_TYPE getNum_noArgsSync_InputPorts() const; + FwIndexType getNum_noArgsSync_InputPorts() const; //! Get the number of typedAsync input ports //! //! \return The number of typedAsync input ports - NATIVE_INT_TYPE getNum_typedAsync_InputPorts() const; + FwIndexType getNum_typedAsync_InputPorts() const; //! Get the number of typedAsyncAssert input ports //! //! \return The number of typedAsyncAssert input ports - NATIVE_INT_TYPE getNum_typedAsyncAssert_InputPorts() const; + FwIndexType getNum_typedAsyncAssert_InputPorts() const; //! Get the number of typedAsyncBlockPriority input ports //! //! \return The number of typedAsyncBlockPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncBlockPriority_InputPorts() const; + FwIndexType getNum_typedAsyncBlockPriority_InputPorts() const; //! Get the number of typedAsyncDropPriority input ports //! //! \return The number of typedAsyncDropPriority input ports - NATIVE_INT_TYPE getNum_typedAsyncDropPriority_InputPorts() const; + FwIndexType getNum_typedAsyncDropPriority_InputPorts() const; //! Get the number of typedGuarded input ports //! //! \return The number of typedGuarded input ports - NATIVE_INT_TYPE getNum_typedGuarded_InputPorts() const; + FwIndexType getNum_typedGuarded_InputPorts() const; //! Get the number of typedReturnGuarded input ports //! //! \return The number of typedReturnGuarded input ports - NATIVE_INT_TYPE getNum_typedReturnGuarded_InputPorts() const; + FwIndexType getNum_typedReturnGuarded_InputPorts() const; //! Get the number of typedReturnSync input ports //! //! \return The number of typedReturnSync input ports - NATIVE_INT_TYPE getNum_typedReturnSync_InputPorts() const; + FwIndexType getNum_typedReturnSync_InputPorts() const; //! Get the number of typedSync input ports //! //! \return The number of typedSync input ports - NATIVE_INT_TYPE getNum_typedSync_InputPorts() const; + FwIndexType getNum_typedSync_InputPorts() const; PROTECTED: @@ -737,56 +737,56 @@ class QueuedTestComponentBase : //! Get the number of cmdRegOut output ports //! //! \return The number of cmdRegOut output ports - NATIVE_INT_TYPE getNum_cmdRegOut_OutputPorts() const; + FwIndexType getNum_cmdRegOut_OutputPorts() const; //! Get the number of cmdResponseOut output ports //! //! \return The number of cmdResponseOut output ports - NATIVE_INT_TYPE getNum_cmdResponseOut_OutputPorts() const; + FwIndexType getNum_cmdResponseOut_OutputPorts() const; //! Get the number of eventOut output ports //! //! \return The number of eventOut output ports - NATIVE_INT_TYPE getNum_eventOut_OutputPorts() const; + FwIndexType getNum_eventOut_OutputPorts() const; //! Get the number of prmGetOut output ports //! //! \return The number of prmGetOut output ports - NATIVE_INT_TYPE getNum_prmGetOut_OutputPorts() const; + FwIndexType getNum_prmGetOut_OutputPorts() const; //! Get the number of prmSetOut output ports //! //! \return The number of prmSetOut output ports - NATIVE_INT_TYPE getNum_prmSetOut_OutputPorts() const; + FwIndexType getNum_prmSetOut_OutputPorts() const; //! Get the number of productRequestOut output ports //! //! \return The number of productRequestOut output ports - NATIVE_INT_TYPE getNum_productRequestOut_OutputPorts() const; + FwIndexType getNum_productRequestOut_OutputPorts() const; //! Get the number of productSendOut output ports //! //! \return The number of productSendOut output ports - NATIVE_INT_TYPE getNum_productSendOut_OutputPorts() const; + FwIndexType getNum_productSendOut_OutputPorts() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of textEventOut output ports //! //! \return The number of textEventOut output ports - NATIVE_INT_TYPE getNum_textEventOut_OutputPorts() const; + FwIndexType getNum_textEventOut_OutputPorts() const; #endif //! Get the number of timeGetOut output ports //! //! \return The number of timeGetOut output ports - NATIVE_INT_TYPE getNum_timeGetOut_OutputPorts() const; + FwIndexType getNum_timeGetOut_OutputPorts() const; //! Get the number of tlmOut output ports //! //! \return The number of tlmOut output ports - NATIVE_INT_TYPE getNum_tlmOut_OutputPorts() const; + FwIndexType getNum_tlmOut_OutputPorts() const; PROTECTED: @@ -797,22 +797,22 @@ class QueuedTestComponentBase : //! Get the number of noArgsOut output ports //! //! \return The number of noArgsOut output ports - NATIVE_INT_TYPE getNum_noArgsOut_OutputPorts() const; + FwIndexType getNum_noArgsOut_OutputPorts() const; //! Get the number of noArgsReturnOut output ports //! //! \return The number of noArgsReturnOut output ports - NATIVE_INT_TYPE getNum_noArgsReturnOut_OutputPorts() const; + FwIndexType getNum_noArgsReturnOut_OutputPorts() const; //! Get the number of typedOut output ports //! //! \return The number of typedOut output ports - NATIVE_INT_TYPE getNum_typedOut_OutputPorts() const; + FwIndexType getNum_typedOut_OutputPorts() const; //! Get the number of typedReturnOut output ports //! //! \return The number of typedReturnOut output ports - NATIVE_INT_TYPE getNum_typedReturnOut_OutputPorts() const; + FwIndexType getNum_typedReturnOut_OutputPorts() const; PROTECTED: @@ -824,49 +824,49 @@ class QueuedTestComponentBase : //! //! \return Whether port cmdRegOut is connected bool isConnected_cmdRegOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port cmdResponseOut is connected //! //! \return Whether port cmdResponseOut is connected bool isConnected_cmdResponseOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port eventOut is connected //! //! \return Whether port eventOut is connected bool isConnected_eventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmGetOut is connected //! //! \return Whether port prmGetOut is connected bool isConnected_prmGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port prmSetOut is connected //! //! \return Whether port prmSetOut is connected bool isConnected_prmSetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productRequestOut is connected //! //! \return Whether port productRequestOut is connected bool isConnected_productRequestOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port productSendOut is connected //! //! \return Whether port productSendOut is connected bool isConnected_productSendOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -875,7 +875,7 @@ class QueuedTestComponentBase : //! //! \return Whether port textEventOut is connected bool isConnected_textEventOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -884,14 +884,14 @@ class QueuedTestComponentBase : //! //! \return Whether port timeGetOut is connected bool isConnected_timeGetOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port tlmOut is connected //! //! \return Whether port tlmOut is connected bool isConnected_tlmOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -904,28 +904,28 @@ class QueuedTestComponentBase : //! //! \return Whether port noArgsOut is connected bool isConnected_noArgsOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port noArgsReturnOut is connected //! //! \return Whether port noArgsReturnOut is connected bool isConnected_noArgsReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedOut is connected //! //! \return Whether port typedOut is connected bool isConnected_typedOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port typedReturnOut is connected //! //! \return Whether port typedReturnOut is connected bool isConnected_typedReturnOut_OutputPort( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); PROTECTED: @@ -938,7 +938,7 @@ class QueuedTestComponentBase : //! Handler base-class function for input port productRecvIn void productRecvIn_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -952,32 +952,32 @@ class QueuedTestComponentBase : //! Handler for input port noArgsAsync virtual void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsGuarded virtual void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnGuarded virtual U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsReturnSync virtual U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port noArgsSync virtual void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port typedAsync virtual void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -989,7 +989,7 @@ class QueuedTestComponentBase : //! Handler for input port typedAsyncAssert virtual void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1001,7 +1001,7 @@ class QueuedTestComponentBase : //! Handler for input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1013,7 +1013,7 @@ class QueuedTestComponentBase : //! Handler for input port typedAsyncDropPriority virtual void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1025,7 +1025,7 @@ class QueuedTestComponentBase : //! Handler for input port typedGuarded virtual void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1037,7 +1037,7 @@ class QueuedTestComponentBase : //! Handler for input port typedReturnGuarded virtual F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1049,7 +1049,7 @@ class QueuedTestComponentBase : //! Handler for input port typedReturnSync virtual F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1061,7 +1061,7 @@ class QueuedTestComponentBase : //! Handler for input port typedSync virtual void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1081,32 +1081,32 @@ class QueuedTestComponentBase : //! Handler base-class function for input port noArgsAsync void noArgsAsync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsGuarded void noArgsGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnGuarded U32 noArgsReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsReturnSync U32 noArgsReturnSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port noArgsSync void noArgsSync_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for input port typedAsync void typedAsync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1118,7 +1118,7 @@ class QueuedTestComponentBase : //! Handler base-class function for input port typedAsyncAssert void typedAsyncAssert_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1130,7 +1130,7 @@ class QueuedTestComponentBase : //! Handler base-class function for input port typedAsyncBlockPriority void typedAsyncBlockPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1142,7 +1142,7 @@ class QueuedTestComponentBase : //! Handler base-class function for input port typedAsyncDropPriority void typedAsyncDropPriority_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1154,7 +1154,7 @@ class QueuedTestComponentBase : //! Handler base-class function for input port typedGuarded void typedGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1166,7 +1166,7 @@ class QueuedTestComponentBase : //! Handler base-class function for input port typedReturnGuarded F32 typedReturnGuarded_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1178,7 +1178,7 @@ class QueuedTestComponentBase : //! Handler base-class function for input port typedReturnSync F32 typedReturnSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1190,7 +1190,7 @@ class QueuedTestComponentBase : //! Handler base-class function for input port typedSync void typedSync_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1212,7 +1212,7 @@ class QueuedTestComponentBase : //! Pre-message hook for async input port productRecvIn virtual void productRecvIn_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -1230,12 +1230,12 @@ class QueuedTestComponentBase : //! Pre-message hook for async input port noArgsAsync virtual void noArgsAsync_preMsgHook( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Pre-message hook for async input port typedAsync virtual void typedAsync_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1247,7 +1247,7 @@ class QueuedTestComponentBase : //! Pre-message hook for async input port typedAsyncAssert virtual void typedAsyncAssert_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1259,7 +1259,7 @@ class QueuedTestComponentBase : //! Pre-message hook for async input port typedAsyncBlockPriority virtual void typedAsyncBlockPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1271,7 +1271,7 @@ class QueuedTestComponentBase : //! Pre-message hook for async input port typedAsyncDropPriority virtual void typedAsyncDropPriority_preMsgHook( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1289,14 +1289,14 @@ class QueuedTestComponentBase : //! Invoke output port productRequestOut void productRequestOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); //! Invoke output port productSendOut void productSendOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -1309,17 +1309,17 @@ class QueuedTestComponentBase : //! Invoke output port noArgsOut void noArgsOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port noArgsReturnOut U32 noArgsReturnOut_out( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke output port typedOut void typedOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1331,7 +1331,7 @@ class QueuedTestComponentBase : //! Invoke output port typedReturnOut F32 typedReturnOut_out( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2162,7 +2162,7 @@ class QueuedTestComponentBase : //! Callback for port cmdIn static void m_p_cmdIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence Fw::CmdArgBuffer& args //!< Buffer containing arguments @@ -2171,7 +2171,7 @@ class QueuedTestComponentBase : //! Callback for port productRecvIn static void m_p_productRecvIn_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The status @@ -2186,37 +2186,37 @@ class QueuedTestComponentBase : //! Callback for port noArgsAsync static void m_p_noArgsAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsGuarded static void m_p_noArgsGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnGuarded static U32 m_p_noArgsReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsReturnSync static U32 m_p_noArgsReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port noArgsSync static void m_p_noArgsSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Callback for port typedAsync static void m_p_typedAsync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2229,7 +2229,7 @@ class QueuedTestComponentBase : //! Callback for port typedAsyncAssert static void m_p_typedAsyncAssert_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2242,7 +2242,7 @@ class QueuedTestComponentBase : //! Callback for port typedAsyncBlockPriority static void m_p_typedAsyncBlockPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2255,7 +2255,7 @@ class QueuedTestComponentBase : //! Callback for port typedAsyncDropPriority static void m_p_typedAsyncDropPriority_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2268,7 +2268,7 @@ class QueuedTestComponentBase : //! Callback for port typedGuarded static void m_p_typedGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2281,7 +2281,7 @@ class QueuedTestComponentBase : //! Callback for port typedReturnGuarded static F32 m_p_typedReturnGuarded_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2294,7 +2294,7 @@ class QueuedTestComponentBase : //! Callback for port typedReturnSync static F32 m_p_typedReturnSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2307,7 +2307,7 @@ class QueuedTestComponentBase : //! Callback for port typedSync static void m_p_typedSync_in( Fw::PassiveComponentBase* callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -2415,7 +2415,7 @@ class QueuedTestComponentBase : //! Handler implementation for productRecvIn void productRecvIn_handler( - const NATIVE_INT_TYPE portNum, //!< The port number + const FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container id const Fw::Buffer& buffer, //!< The buffer const Fw::Success& status //!< The buffer status @@ -2543,13 +2543,13 @@ class QueuedTestComponentBase : // ---------------------------------------------------------------------- //! Throttle for EventActivityLowThrottled - NATIVE_UINT_TYPE m_EventActivityLowThrottledThrottle; + FwIndexType m_EventActivityLowThrottledThrottle; //! Throttle for EventFatalThrottled - NATIVE_UINT_TYPE m_EventFatalThrottledThrottle; + FwIndexType m_EventFatalThrottledThrottle; //! Throttle for EventWarningLowThrottled - NATIVE_UINT_TYPE m_EventWarningLowThrottledThrottle; + FwIndexType m_EventWarningLowThrottledThrottle; PRIVATE: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/SSerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/SSerializableAc.ref.cpp index 0af4fb47a..1d9b59c19 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/SSerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/SSerializableAc.ref.cpp @@ -84,7 +84,7 @@ const char* S::StringSize80 :: return this->m_buf; } -NATIVE_UINT_TYPE S::StringSize80 :: +Fw::StringBase::SizeType S::StringSize80 :: getCapacity() const { return sizeof(this->m_buf); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/SSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/SSerializableAc.ref.hpp index 28a57ae79..2990d76b0 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/SSerializableAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/SSerializableAc.ref.hpp @@ -60,7 +60,7 @@ class S : //! Retrieves char buffer of string const char* toChar() const; - NATIVE_UINT_TYPE getCapacity() const; + Fw::StringBase::SizeType getCapacity() const; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/base/TypedPortAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/TypedPortAc.ref.cpp index b905074d6..6c76ee0c9 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/TypedPortAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/TypedPortAc.ref.cpp @@ -85,7 +85,7 @@ namespace Ports { return this->m_buf; } - NATIVE_UINT_TYPE StringSize80 :: + Fw::StringBase::SizeType StringSize80 :: getCapacity() const { return sizeof(this->m_buf); @@ -103,7 +103,7 @@ namespace Ports { public: - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return InputTypedPort::SERIALIZED_SIZE; } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/TypedPortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/TypedPortAc.ref.hpp index 972b951fb..402ae8d73 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/TypedPortAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/TypedPortAc.ref.hpp @@ -66,7 +66,7 @@ namespace Ports { //! Retrieves char buffer of string const char* toChar() const; - NATIVE_UINT_TYPE getCapacity() const; + Fw::StringBase::SizeType getCapacity() const; private: @@ -115,7 +115,7 @@ namespace Ports { //! The port callback function type typedef void (*CompFuncPtr)( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/base/TypedReturnPortAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/TypedReturnPortAc.ref.cpp index f4e819be6..1971e7143 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/TypedReturnPortAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/TypedReturnPortAc.ref.cpp @@ -85,7 +85,7 @@ namespace Ports { return this->m_buf; } - NATIVE_UINT_TYPE StringSize80 :: + Fw::StringBase::SizeType StringSize80 :: getCapacity() const { return sizeof(this->m_buf); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/TypedReturnPortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/TypedReturnPortAc.ref.hpp index 1f72c943f..f9e400869 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/TypedReturnPortAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/TypedReturnPortAc.ref.hpp @@ -65,7 +65,7 @@ namespace Ports { //! Retrieves char buffer of string const char* toChar() const; - NATIVE_UINT_TYPE getCapacity() const; + Fw::StringBase::SizeType getCapacity() const; private: @@ -114,7 +114,7 @@ namespace Ports { //! The port callback function type typedef F32 (*CompFuncPtr)( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveAsyncProducts.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveAsyncProducts.template.ref.cpp index 8654a0350..b473ccc61 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveAsyncProducts.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveAsyncProducts.template.ref.cpp @@ -29,38 +29,38 @@ ActiveAsyncProducts :: // ---------------------------------------------------------------------- void ActiveAsyncProducts :: - noArgsAsync_handler(NATIVE_INT_TYPE portNum) + noArgsAsync_handler(FwIndexType portNum) { // TODO } void ActiveAsyncProducts :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 ActiveAsyncProducts :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 ActiveAsyncProducts :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void ActiveAsyncProducts :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void ActiveAsyncProducts :: typedAsync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -75,7 +75,7 @@ void ActiveAsyncProducts :: void ActiveAsyncProducts :: typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -90,7 +90,7 @@ void ActiveAsyncProducts :: void ActiveAsyncProducts :: typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -105,7 +105,7 @@ void ActiveAsyncProducts :: void ActiveAsyncProducts :: typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -120,7 +120,7 @@ void ActiveAsyncProducts :: void ActiveAsyncProducts :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -135,7 +135,7 @@ void ActiveAsyncProducts :: F32 ActiveAsyncProducts :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -150,7 +150,7 @@ F32 ActiveAsyncProducts :: F32 ActiveAsyncProducts :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -165,7 +165,7 @@ F32 ActiveAsyncProducts :: void ActiveAsyncProducts :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveAsyncProducts.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveAsyncProducts.template.ref.hpp index b6d69299c..9e1a27642 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveAsyncProducts.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveAsyncProducts.template.ref.hpp @@ -37,42 +37,42 @@ class ActiveAsyncProducts : //! //! A typed async input port void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsGuarded //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedAsync //! //! A typed async input port void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -86,7 +86,7 @@ class ActiveAsyncProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -100,7 +100,7 @@ class ActiveAsyncProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -114,7 +114,7 @@ class ActiveAsyncProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -128,7 +128,7 @@ class ActiveAsyncProducts : //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -142,7 +142,7 @@ class ActiveAsyncProducts : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -156,7 +156,7 @@ class ActiveAsyncProducts : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -170,7 +170,7 @@ class ActiveAsyncProducts : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveCommands.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveCommands.template.ref.cpp index 1a5f20ca6..b74564a7d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveCommands.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveCommands.template.ref.cpp @@ -29,38 +29,38 @@ ActiveCommands :: // ---------------------------------------------------------------------- void ActiveCommands :: - noArgsAsync_handler(NATIVE_INT_TYPE portNum) + noArgsAsync_handler(FwIndexType portNum) { // TODO } void ActiveCommands :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 ActiveCommands :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 ActiveCommands :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void ActiveCommands :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void ActiveCommands :: typedAsync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -75,7 +75,7 @@ void ActiveCommands :: void ActiveCommands :: typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -90,7 +90,7 @@ void ActiveCommands :: void ActiveCommands :: typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -105,7 +105,7 @@ void ActiveCommands :: void ActiveCommands :: typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -120,7 +120,7 @@ void ActiveCommands :: void ActiveCommands :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -135,7 +135,7 @@ void ActiveCommands :: F32 ActiveCommands :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -150,7 +150,7 @@ F32 ActiveCommands :: F32 ActiveCommands :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -165,7 +165,7 @@ F32 ActiveCommands :: void ActiveCommands :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveCommands.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveCommands.template.ref.hpp index 153e824b0..5a19a9aa4 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveCommands.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveCommands.template.ref.hpp @@ -37,42 +37,42 @@ class ActiveCommands : //! //! A typed async input port void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsGuarded //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedAsync //! //! A typed async input port void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -86,7 +86,7 @@ class ActiveCommands : //! //! A typed async input port with queue full behavior and priority void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -100,7 +100,7 @@ class ActiveCommands : //! //! A typed async input port with queue full behavior and priority void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -114,7 +114,7 @@ class ActiveCommands : //! //! A typed async input port with queue full behavior and priority void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -128,7 +128,7 @@ class ActiveCommands : //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -142,7 +142,7 @@ class ActiveCommands : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -156,7 +156,7 @@ class ActiveCommands : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -170,7 +170,7 @@ class ActiveCommands : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveEvents.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveEvents.template.ref.cpp index 1aefa2bea..9239221ee 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveEvents.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveEvents.template.ref.cpp @@ -29,38 +29,38 @@ ActiveEvents :: // ---------------------------------------------------------------------- void ActiveEvents :: - noArgsAsync_handler(NATIVE_INT_TYPE portNum) + noArgsAsync_handler(FwIndexType portNum) { // TODO } void ActiveEvents :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 ActiveEvents :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 ActiveEvents :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void ActiveEvents :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void ActiveEvents :: typedAsync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -75,7 +75,7 @@ void ActiveEvents :: void ActiveEvents :: typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -90,7 +90,7 @@ void ActiveEvents :: void ActiveEvents :: typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -105,7 +105,7 @@ void ActiveEvents :: void ActiveEvents :: typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -120,7 +120,7 @@ void ActiveEvents :: void ActiveEvents :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -135,7 +135,7 @@ void ActiveEvents :: F32 ActiveEvents :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -150,7 +150,7 @@ F32 ActiveEvents :: F32 ActiveEvents :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -165,7 +165,7 @@ F32 ActiveEvents :: void ActiveEvents :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveEvents.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveEvents.template.ref.hpp index 645001da0..791af13d2 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveEvents.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveEvents.template.ref.hpp @@ -37,42 +37,42 @@ class ActiveEvents : //! //! A typed async input port void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsGuarded //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedAsync //! //! A typed async input port void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -86,7 +86,7 @@ class ActiveEvents : //! //! A typed async input port with queue full behavior and priority void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -100,7 +100,7 @@ class ActiveEvents : //! //! A typed async input port with queue full behavior and priority void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -114,7 +114,7 @@ class ActiveEvents : //! //! A typed async input port with queue full behavior and priority void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -128,7 +128,7 @@ class ActiveEvents : //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -142,7 +142,7 @@ class ActiveEvents : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -156,7 +156,7 @@ class ActiveEvents : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -170,7 +170,7 @@ class ActiveEvents : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveGetProducts.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveGetProducts.template.ref.cpp index 3f2f7abf6..cd9e67b76 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveGetProducts.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveGetProducts.template.ref.cpp @@ -29,38 +29,38 @@ ActiveGetProducts :: // ---------------------------------------------------------------------- void ActiveGetProducts :: - noArgsAsync_handler(NATIVE_INT_TYPE portNum) + noArgsAsync_handler(FwIndexType portNum) { // TODO } void ActiveGetProducts :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 ActiveGetProducts :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 ActiveGetProducts :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void ActiveGetProducts :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void ActiveGetProducts :: typedAsync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -75,7 +75,7 @@ void ActiveGetProducts :: void ActiveGetProducts :: typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -90,7 +90,7 @@ void ActiveGetProducts :: void ActiveGetProducts :: typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -105,7 +105,7 @@ void ActiveGetProducts :: void ActiveGetProducts :: typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -120,7 +120,7 @@ void ActiveGetProducts :: void ActiveGetProducts :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -135,7 +135,7 @@ void ActiveGetProducts :: F32 ActiveGetProducts :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -150,7 +150,7 @@ F32 ActiveGetProducts :: F32 ActiveGetProducts :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -165,7 +165,7 @@ F32 ActiveGetProducts :: void ActiveGetProducts :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveGetProducts.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveGetProducts.template.ref.hpp index 5eeb88f82..ae66f472d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveGetProducts.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveGetProducts.template.ref.hpp @@ -37,42 +37,42 @@ class ActiveGetProducts : //! //! A typed async input port void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsGuarded //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedAsync //! //! A typed async input port void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -86,7 +86,7 @@ class ActiveGetProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -100,7 +100,7 @@ class ActiveGetProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -114,7 +114,7 @@ class ActiveGetProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -128,7 +128,7 @@ class ActiveGetProducts : //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -142,7 +142,7 @@ class ActiveGetProducts : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -156,7 +156,7 @@ class ActiveGetProducts : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -170,7 +170,7 @@ class ActiveGetProducts : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveGuardedProducts.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveGuardedProducts.template.ref.cpp index 6ddf3f6d7..ec4dff511 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveGuardedProducts.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveGuardedProducts.template.ref.cpp @@ -29,38 +29,38 @@ ActiveGuardedProducts :: // ---------------------------------------------------------------------- void ActiveGuardedProducts :: - noArgsAsync_handler(NATIVE_INT_TYPE portNum) + noArgsAsync_handler(FwIndexType portNum) { // TODO } void ActiveGuardedProducts :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 ActiveGuardedProducts :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 ActiveGuardedProducts :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void ActiveGuardedProducts :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void ActiveGuardedProducts :: typedAsync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -75,7 +75,7 @@ void ActiveGuardedProducts :: void ActiveGuardedProducts :: typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -90,7 +90,7 @@ void ActiveGuardedProducts :: void ActiveGuardedProducts :: typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -105,7 +105,7 @@ void ActiveGuardedProducts :: void ActiveGuardedProducts :: typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -120,7 +120,7 @@ void ActiveGuardedProducts :: void ActiveGuardedProducts :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -135,7 +135,7 @@ void ActiveGuardedProducts :: F32 ActiveGuardedProducts :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -150,7 +150,7 @@ F32 ActiveGuardedProducts :: F32 ActiveGuardedProducts :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -165,7 +165,7 @@ F32 ActiveGuardedProducts :: void ActiveGuardedProducts :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveGuardedProducts.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveGuardedProducts.template.ref.hpp index c2296896f..38545c290 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveGuardedProducts.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveGuardedProducts.template.ref.hpp @@ -37,42 +37,42 @@ class ActiveGuardedProducts : //! //! A typed async input port void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsGuarded //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedAsync //! //! A typed async input port void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -86,7 +86,7 @@ class ActiveGuardedProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -100,7 +100,7 @@ class ActiveGuardedProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -114,7 +114,7 @@ class ActiveGuardedProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -128,7 +128,7 @@ class ActiveGuardedProducts : //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -142,7 +142,7 @@ class ActiveGuardedProducts : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -156,7 +156,7 @@ class ActiveGuardedProducts : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -170,7 +170,7 @@ class ActiveGuardedProducts : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveNoArgsPortsOnly.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveNoArgsPortsOnly.template.ref.cpp index 06453966e..9fa10468d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveNoArgsPortsOnly.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveNoArgsPortsOnly.template.ref.cpp @@ -29,25 +29,25 @@ ActiveNoArgsPortsOnly :: // ---------------------------------------------------------------------- void ActiveNoArgsPortsOnly :: - noArgsAsync_handler(NATIVE_INT_TYPE portNum) + noArgsAsync_handler(FwIndexType portNum) { // TODO } void ActiveNoArgsPortsOnly :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 ActiveNoArgsPortsOnly :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 ActiveNoArgsPortsOnly :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveNoArgsPortsOnly.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveNoArgsPortsOnly.template.ref.hpp index 6cb4c616d..d6eecf8ab 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveNoArgsPortsOnly.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveNoArgsPortsOnly.template.ref.hpp @@ -37,28 +37,28 @@ class ActiveNoArgsPortsOnly : //! //! A typed async input port void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsGuarded //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; }; diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveParams.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveParams.template.ref.cpp index 4b7fa71f9..efdd13f74 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveParams.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveParams.template.ref.cpp @@ -29,38 +29,38 @@ ActiveParams :: // ---------------------------------------------------------------------- void ActiveParams :: - noArgsAsync_handler(NATIVE_INT_TYPE portNum) + noArgsAsync_handler(FwIndexType portNum) { // TODO } void ActiveParams :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 ActiveParams :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 ActiveParams :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void ActiveParams :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void ActiveParams :: typedAsync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -75,7 +75,7 @@ void ActiveParams :: void ActiveParams :: typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -90,7 +90,7 @@ void ActiveParams :: void ActiveParams :: typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -105,7 +105,7 @@ void ActiveParams :: void ActiveParams :: typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -120,7 +120,7 @@ void ActiveParams :: void ActiveParams :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -135,7 +135,7 @@ void ActiveParams :: F32 ActiveParams :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -150,7 +150,7 @@ F32 ActiveParams :: F32 ActiveParams :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -165,7 +165,7 @@ F32 ActiveParams :: void ActiveParams :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveParams.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveParams.template.ref.hpp index 506bfa120..4d2ac7f8d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveParams.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveParams.template.ref.hpp @@ -37,42 +37,42 @@ class ActiveParams : //! //! A typed async input port void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsGuarded //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedAsync //! //! A typed async input port void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -86,7 +86,7 @@ class ActiveParams : //! //! A typed async input port with queue full behavior and priority void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -100,7 +100,7 @@ class ActiveParams : //! //! A typed async input port with queue full behavior and priority void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -114,7 +114,7 @@ class ActiveParams : //! //! A typed async input port with queue full behavior and priority void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -128,7 +128,7 @@ class ActiveParams : //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -142,7 +142,7 @@ class ActiveParams : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -156,7 +156,7 @@ class ActiveParams : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -170,7 +170,7 @@ class ActiveParams : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveSerial.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveSerial.template.ref.cpp index 78be62660..0c6eff2ce 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveSerial.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveSerial.template.ref.cpp @@ -29,38 +29,38 @@ ActiveSerial :: // ---------------------------------------------------------------------- void ActiveSerial :: - noArgsAsync_handler(NATIVE_INT_TYPE portNum) + noArgsAsync_handler(FwIndexType portNum) { // TODO } void ActiveSerial :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 ActiveSerial :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 ActiveSerial :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void ActiveSerial :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void ActiveSerial :: typedAsync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -75,7 +75,7 @@ void ActiveSerial :: void ActiveSerial :: typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -90,7 +90,7 @@ void ActiveSerial :: void ActiveSerial :: typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -105,7 +105,7 @@ void ActiveSerial :: void ActiveSerial :: typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -120,7 +120,7 @@ void ActiveSerial :: void ActiveSerial :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -135,7 +135,7 @@ void ActiveSerial :: F32 ActiveSerial :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -150,7 +150,7 @@ F32 ActiveSerial :: F32 ActiveSerial :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -165,7 +165,7 @@ F32 ActiveSerial :: void ActiveSerial :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -184,7 +184,7 @@ void ActiveSerial :: void ActiveSerial :: serialAsync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -193,7 +193,7 @@ void ActiveSerial :: void ActiveSerial :: serialAsyncAssert_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -202,7 +202,7 @@ void ActiveSerial :: void ActiveSerial :: serialAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -211,7 +211,7 @@ void ActiveSerial :: void ActiveSerial :: serialAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -220,7 +220,7 @@ void ActiveSerial :: void ActiveSerial :: serialGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -229,7 +229,7 @@ void ActiveSerial :: void ActiveSerial :: serialSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveSerial.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveSerial.template.ref.hpp index 288c1b39a..81a1d364a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveSerial.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveSerial.template.ref.hpp @@ -37,42 +37,42 @@ class ActiveSerial : //! //! A typed async input port void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsGuarded //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedAsync //! //! A typed async input port void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -86,7 +86,7 @@ class ActiveSerial : //! //! A typed async input port with queue full behavior and priority void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -100,7 +100,7 @@ class ActiveSerial : //! //! A typed async input port with queue full behavior and priority void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -114,7 +114,7 @@ class ActiveSerial : //! //! A typed async input port with queue full behavior and priority void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -128,7 +128,7 @@ class ActiveSerial : //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -142,7 +142,7 @@ class ActiveSerial : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -156,7 +156,7 @@ class ActiveSerial : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -170,7 +170,7 @@ class ActiveSerial : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -190,7 +190,7 @@ class ActiveSerial : //! //! A serial async input port void serialAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) override; @@ -198,7 +198,7 @@ class ActiveSerial : //! //! A serial async input port with queue full behavior and priority void serialAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) override; @@ -206,7 +206,7 @@ class ActiveSerial : //! //! A serial async input port with queue full behavior and priority void serialAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) override; @@ -214,7 +214,7 @@ class ActiveSerial : //! //! A serial async input port with queue full behavior and priority void serialAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) override; @@ -222,7 +222,7 @@ class ActiveSerial : //! //! A serial guarded input void serialGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) override; @@ -230,7 +230,7 @@ class ActiveSerial : //! //! A serial sync input port void serialSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) override; diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveSyncProducts.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveSyncProducts.template.ref.cpp index d76718e0b..c279ff8cd 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveSyncProducts.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveSyncProducts.template.ref.cpp @@ -29,38 +29,38 @@ ActiveSyncProducts :: // ---------------------------------------------------------------------- void ActiveSyncProducts :: - noArgsAsync_handler(NATIVE_INT_TYPE portNum) + noArgsAsync_handler(FwIndexType portNum) { // TODO } void ActiveSyncProducts :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 ActiveSyncProducts :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 ActiveSyncProducts :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void ActiveSyncProducts :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void ActiveSyncProducts :: typedAsync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -75,7 +75,7 @@ void ActiveSyncProducts :: void ActiveSyncProducts :: typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -90,7 +90,7 @@ void ActiveSyncProducts :: void ActiveSyncProducts :: typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -105,7 +105,7 @@ void ActiveSyncProducts :: void ActiveSyncProducts :: typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -120,7 +120,7 @@ void ActiveSyncProducts :: void ActiveSyncProducts :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -135,7 +135,7 @@ void ActiveSyncProducts :: F32 ActiveSyncProducts :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -150,7 +150,7 @@ F32 ActiveSyncProducts :: F32 ActiveSyncProducts :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -165,7 +165,7 @@ F32 ActiveSyncProducts :: void ActiveSyncProducts :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveSyncProducts.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveSyncProducts.template.ref.hpp index e6d4206e4..5f9e3c4e6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveSyncProducts.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveSyncProducts.template.ref.hpp @@ -37,42 +37,42 @@ class ActiveSyncProducts : //! //! A typed async input port void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsGuarded //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedAsync //! //! A typed async input port void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -86,7 +86,7 @@ class ActiveSyncProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -100,7 +100,7 @@ class ActiveSyncProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -114,7 +114,7 @@ class ActiveSyncProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -128,7 +128,7 @@ class ActiveSyncProducts : //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -142,7 +142,7 @@ class ActiveSyncProducts : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -156,7 +156,7 @@ class ActiveSyncProducts : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -170,7 +170,7 @@ class ActiveSyncProducts : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveTelemetry.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveTelemetry.template.ref.cpp index 5e43f17ab..04e31dcaa 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveTelemetry.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveTelemetry.template.ref.cpp @@ -29,38 +29,38 @@ ActiveTelemetry :: // ---------------------------------------------------------------------- void ActiveTelemetry :: - noArgsAsync_handler(NATIVE_INT_TYPE portNum) + noArgsAsync_handler(FwIndexType portNum) { // TODO } void ActiveTelemetry :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 ActiveTelemetry :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 ActiveTelemetry :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void ActiveTelemetry :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void ActiveTelemetry :: typedAsync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -75,7 +75,7 @@ void ActiveTelemetry :: void ActiveTelemetry :: typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -90,7 +90,7 @@ void ActiveTelemetry :: void ActiveTelemetry :: typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -105,7 +105,7 @@ void ActiveTelemetry :: void ActiveTelemetry :: typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -120,7 +120,7 @@ void ActiveTelemetry :: void ActiveTelemetry :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -135,7 +135,7 @@ void ActiveTelemetry :: F32 ActiveTelemetry :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -150,7 +150,7 @@ F32 ActiveTelemetry :: F32 ActiveTelemetry :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -165,7 +165,7 @@ F32 ActiveTelemetry :: void ActiveTelemetry :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveTelemetry.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveTelemetry.template.ref.hpp index ce5a963fa..12b2dd3ba 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveTelemetry.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveTelemetry.template.ref.hpp @@ -37,42 +37,42 @@ class ActiveTelemetry : //! //! A typed async input port void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsGuarded //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedAsync //! //! A typed async input port void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -86,7 +86,7 @@ class ActiveTelemetry : //! //! A typed async input port with queue full behavior and priority void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -100,7 +100,7 @@ class ActiveTelemetry : //! //! A typed async input port with queue full behavior and priority void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -114,7 +114,7 @@ class ActiveTelemetry : //! //! A typed async input port with queue full behavior and priority void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -128,7 +128,7 @@ class ActiveTelemetry : //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -142,7 +142,7 @@ class ActiveTelemetry : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -156,7 +156,7 @@ class ActiveTelemetry : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -170,7 +170,7 @@ class ActiveTelemetry : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveTest.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveTest.template.ref.cpp index 9bc7b78b4..930e009c6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveTest.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveTest.template.ref.cpp @@ -31,38 +31,38 @@ namespace M { // ---------------------------------------------------------------------- void ActiveTest :: - noArgsAsync_handler(NATIVE_INT_TYPE portNum) + noArgsAsync_handler(FwIndexType portNum) { // TODO } void ActiveTest :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 ActiveTest :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 ActiveTest :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void ActiveTest :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void ActiveTest :: typedAsync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -77,7 +77,7 @@ namespace M { void ActiveTest :: typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -92,7 +92,7 @@ namespace M { void ActiveTest :: typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -107,7 +107,7 @@ namespace M { void ActiveTest :: typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -122,7 +122,7 @@ namespace M { void ActiveTest :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -137,7 +137,7 @@ namespace M { F32 ActiveTest :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -152,7 +152,7 @@ namespace M { F32 ActiveTest :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -167,7 +167,7 @@ namespace M { void ActiveTest :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveTest.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveTest.template.ref.hpp index 13659f3b8..81ae9632b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/ActiveTest.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/ActiveTest.template.ref.hpp @@ -39,42 +39,42 @@ namespace M { //! //! A typed async input port void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsGuarded //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedAsync //! //! A typed async input port void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -88,7 +88,7 @@ namespace M { //! //! A typed async input port with queue full behavior and priority void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -102,7 +102,7 @@ namespace M { //! //! A typed async input port with queue full behavior and priority void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -116,7 +116,7 @@ namespace M { //! //! A typed async input port with queue full behavior and priority void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -130,7 +130,7 @@ namespace M { //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -144,7 +144,7 @@ namespace M { //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -158,7 +158,7 @@ namespace M { //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -172,7 +172,7 @@ namespace M { //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveCommands.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveCommands.template.ref.cpp index 9318db314..48d5e903a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveCommands.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveCommands.template.ref.cpp @@ -29,32 +29,32 @@ PassiveCommands :: // ---------------------------------------------------------------------- void PassiveCommands :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 PassiveCommands :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 PassiveCommands :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void PassiveCommands :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void PassiveCommands :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -69,7 +69,7 @@ void PassiveCommands :: F32 PassiveCommands :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -84,7 +84,7 @@ F32 PassiveCommands :: F32 PassiveCommands :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -99,7 +99,7 @@ F32 PassiveCommands :: void PassiveCommands :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveCommands.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveCommands.template.ref.hpp index be1c5695b..1fe69546d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveCommands.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveCommands.template.ref.hpp @@ -37,35 +37,35 @@ class PassiveCommands : //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedGuarded //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -79,7 +79,7 @@ class PassiveCommands : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -93,7 +93,7 @@ class PassiveCommands : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -107,7 +107,7 @@ class PassiveCommands : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveEvents.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveEvents.template.ref.cpp index c2cd7a832..7574225d1 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveEvents.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveEvents.template.ref.cpp @@ -29,32 +29,32 @@ PassiveEvents :: // ---------------------------------------------------------------------- void PassiveEvents :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 PassiveEvents :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 PassiveEvents :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void PassiveEvents :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void PassiveEvents :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -69,7 +69,7 @@ void PassiveEvents :: F32 PassiveEvents :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -84,7 +84,7 @@ F32 PassiveEvents :: F32 PassiveEvents :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -99,7 +99,7 @@ F32 PassiveEvents :: void PassiveEvents :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveEvents.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveEvents.template.ref.hpp index 643185f47..21db235b3 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveEvents.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveEvents.template.ref.hpp @@ -37,35 +37,35 @@ class PassiveEvents : //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedGuarded //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -79,7 +79,7 @@ class PassiveEvents : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -93,7 +93,7 @@ class PassiveEvents : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -107,7 +107,7 @@ class PassiveEvents : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveGetProducts.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveGetProducts.template.ref.cpp index 8e14edd34..341b53a9d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveGetProducts.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveGetProducts.template.ref.cpp @@ -29,32 +29,32 @@ PassiveGetProducts :: // ---------------------------------------------------------------------- void PassiveGetProducts :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 PassiveGetProducts :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 PassiveGetProducts :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void PassiveGetProducts :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void PassiveGetProducts :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -69,7 +69,7 @@ void PassiveGetProducts :: F32 PassiveGetProducts :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -84,7 +84,7 @@ F32 PassiveGetProducts :: F32 PassiveGetProducts :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -99,7 +99,7 @@ F32 PassiveGetProducts :: void PassiveGetProducts :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveGetProducts.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveGetProducts.template.ref.hpp index 8072997b5..b382284d6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveGetProducts.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveGetProducts.template.ref.hpp @@ -37,35 +37,35 @@ class PassiveGetProducts : //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedGuarded //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -79,7 +79,7 @@ class PassiveGetProducts : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -93,7 +93,7 @@ class PassiveGetProducts : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -107,7 +107,7 @@ class PassiveGetProducts : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveGuardedProducts.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveGuardedProducts.template.ref.cpp index 58d083894..37fe655b7 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveGuardedProducts.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveGuardedProducts.template.ref.cpp @@ -29,32 +29,32 @@ PassiveGuardedProducts :: // ---------------------------------------------------------------------- void PassiveGuardedProducts :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 PassiveGuardedProducts :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 PassiveGuardedProducts :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void PassiveGuardedProducts :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void PassiveGuardedProducts :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -69,7 +69,7 @@ void PassiveGuardedProducts :: F32 PassiveGuardedProducts :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -84,7 +84,7 @@ F32 PassiveGuardedProducts :: F32 PassiveGuardedProducts :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -99,7 +99,7 @@ F32 PassiveGuardedProducts :: void PassiveGuardedProducts :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveGuardedProducts.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveGuardedProducts.template.ref.hpp index 4499e8cc6..39e2917aa 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveGuardedProducts.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveGuardedProducts.template.ref.hpp @@ -37,35 +37,35 @@ class PassiveGuardedProducts : //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedGuarded //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -79,7 +79,7 @@ class PassiveGuardedProducts : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -93,7 +93,7 @@ class PassiveGuardedProducts : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -107,7 +107,7 @@ class PassiveGuardedProducts : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveParams.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveParams.template.ref.cpp index 451cbda0c..552fca57c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveParams.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveParams.template.ref.cpp @@ -29,32 +29,32 @@ PassiveParams :: // ---------------------------------------------------------------------- void PassiveParams :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 PassiveParams :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 PassiveParams :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void PassiveParams :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void PassiveParams :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -69,7 +69,7 @@ void PassiveParams :: F32 PassiveParams :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -84,7 +84,7 @@ F32 PassiveParams :: F32 PassiveParams :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -99,7 +99,7 @@ F32 PassiveParams :: void PassiveParams :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveParams.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveParams.template.ref.hpp index 237d8a4f5..4a49c24e3 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveParams.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveParams.template.ref.hpp @@ -37,35 +37,35 @@ class PassiveParams : //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedGuarded //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -79,7 +79,7 @@ class PassiveParams : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -93,7 +93,7 @@ class PassiveParams : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -107,7 +107,7 @@ class PassiveParams : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveSerial.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveSerial.template.ref.cpp index 7456bd217..255e6671b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveSerial.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveSerial.template.ref.cpp @@ -29,32 +29,32 @@ PassiveSerial :: // ---------------------------------------------------------------------- void PassiveSerial :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 PassiveSerial :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 PassiveSerial :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void PassiveSerial :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void PassiveSerial :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -69,7 +69,7 @@ void PassiveSerial :: F32 PassiveSerial :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -84,7 +84,7 @@ F32 PassiveSerial :: F32 PassiveSerial :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -99,7 +99,7 @@ F32 PassiveSerial :: void PassiveSerial :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -118,7 +118,7 @@ void PassiveSerial :: void PassiveSerial :: serialGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -127,7 +127,7 @@ void PassiveSerial :: void PassiveSerial :: serialSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveSerial.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveSerial.template.ref.hpp index 2d03d14fe..ed5b76289 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveSerial.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveSerial.template.ref.hpp @@ -37,35 +37,35 @@ class PassiveSerial : //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedGuarded //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -79,7 +79,7 @@ class PassiveSerial : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -93,7 +93,7 @@ class PassiveSerial : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -107,7 +107,7 @@ class PassiveSerial : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -127,7 +127,7 @@ class PassiveSerial : //! //! A serial guarded input void serialGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) override; @@ -135,7 +135,7 @@ class PassiveSerial : //! //! A serial sync input port void serialSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) override; diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveSyncProducts.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveSyncProducts.template.ref.cpp index 4be24f224..64f1bbadd 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveSyncProducts.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveSyncProducts.template.ref.cpp @@ -29,32 +29,32 @@ PassiveSyncProducts :: // ---------------------------------------------------------------------- void PassiveSyncProducts :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 PassiveSyncProducts :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 PassiveSyncProducts :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void PassiveSyncProducts :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void PassiveSyncProducts :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -69,7 +69,7 @@ void PassiveSyncProducts :: F32 PassiveSyncProducts :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -84,7 +84,7 @@ F32 PassiveSyncProducts :: F32 PassiveSyncProducts :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -99,7 +99,7 @@ F32 PassiveSyncProducts :: void PassiveSyncProducts :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveSyncProducts.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveSyncProducts.template.ref.hpp index 5704fb313..701fdf7ac 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveSyncProducts.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveSyncProducts.template.ref.hpp @@ -37,35 +37,35 @@ class PassiveSyncProducts : //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedGuarded //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -79,7 +79,7 @@ class PassiveSyncProducts : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -93,7 +93,7 @@ class PassiveSyncProducts : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -107,7 +107,7 @@ class PassiveSyncProducts : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveTelemetry.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveTelemetry.template.ref.cpp index 7d2e7e48e..bd778beb2 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveTelemetry.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveTelemetry.template.ref.cpp @@ -29,32 +29,32 @@ PassiveTelemetry :: // ---------------------------------------------------------------------- void PassiveTelemetry :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 PassiveTelemetry :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 PassiveTelemetry :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void PassiveTelemetry :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void PassiveTelemetry :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -69,7 +69,7 @@ void PassiveTelemetry :: F32 PassiveTelemetry :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -84,7 +84,7 @@ F32 PassiveTelemetry :: F32 PassiveTelemetry :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -99,7 +99,7 @@ F32 PassiveTelemetry :: void PassiveTelemetry :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveTelemetry.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveTelemetry.template.ref.hpp index 701be7e7b..c68a89b6c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveTelemetry.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveTelemetry.template.ref.hpp @@ -37,35 +37,35 @@ class PassiveTelemetry : //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedGuarded //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -79,7 +79,7 @@ class PassiveTelemetry : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -93,7 +93,7 @@ class PassiveTelemetry : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -107,7 +107,7 @@ class PassiveTelemetry : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveTest.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveTest.template.ref.cpp index 4bbe88ac7..ffe989c8e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveTest.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveTest.template.ref.cpp @@ -29,32 +29,32 @@ PassiveTest :: // ---------------------------------------------------------------------- void PassiveTest :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 PassiveTest :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 PassiveTest :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void PassiveTest :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void PassiveTest :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -69,7 +69,7 @@ void PassiveTest :: F32 PassiveTest :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -84,7 +84,7 @@ F32 PassiveTest :: F32 PassiveTest :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -99,7 +99,7 @@ F32 PassiveTest :: void PassiveTest :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveTest.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveTest.template.ref.hpp index 2fd4cdd68..6916a4b54 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/PassiveTest.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/PassiveTest.template.ref.hpp @@ -37,35 +37,35 @@ class PassiveTest : //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedGuarded //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -79,7 +79,7 @@ class PassiveTest : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -93,7 +93,7 @@ class PassiveTest : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -107,7 +107,7 @@ class PassiveTest : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedAsyncProducts.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedAsyncProducts.template.ref.cpp index 0fcce31c7..2aae92883 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedAsyncProducts.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedAsyncProducts.template.ref.cpp @@ -29,38 +29,38 @@ QueuedAsyncProducts :: // ---------------------------------------------------------------------- void QueuedAsyncProducts :: - noArgsAsync_handler(NATIVE_INT_TYPE portNum) + noArgsAsync_handler(FwIndexType portNum) { // TODO } void QueuedAsyncProducts :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 QueuedAsyncProducts :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 QueuedAsyncProducts :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void QueuedAsyncProducts :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void QueuedAsyncProducts :: typedAsync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -75,7 +75,7 @@ void QueuedAsyncProducts :: void QueuedAsyncProducts :: typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -90,7 +90,7 @@ void QueuedAsyncProducts :: void QueuedAsyncProducts :: typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -105,7 +105,7 @@ void QueuedAsyncProducts :: void QueuedAsyncProducts :: typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -120,7 +120,7 @@ void QueuedAsyncProducts :: void QueuedAsyncProducts :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -135,7 +135,7 @@ void QueuedAsyncProducts :: F32 QueuedAsyncProducts :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -150,7 +150,7 @@ F32 QueuedAsyncProducts :: F32 QueuedAsyncProducts :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -165,7 +165,7 @@ F32 QueuedAsyncProducts :: void QueuedAsyncProducts :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedAsyncProducts.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedAsyncProducts.template.ref.hpp index a2b9bfe2b..7f156e3b0 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedAsyncProducts.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedAsyncProducts.template.ref.hpp @@ -37,42 +37,42 @@ class QueuedAsyncProducts : //! //! A typed async input port void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsGuarded //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedAsync //! //! A typed async input port void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -86,7 +86,7 @@ class QueuedAsyncProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -100,7 +100,7 @@ class QueuedAsyncProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -114,7 +114,7 @@ class QueuedAsyncProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -128,7 +128,7 @@ class QueuedAsyncProducts : //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -142,7 +142,7 @@ class QueuedAsyncProducts : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -156,7 +156,7 @@ class QueuedAsyncProducts : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -170,7 +170,7 @@ class QueuedAsyncProducts : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedCommands.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedCommands.template.ref.cpp index e304acfb8..54e7182ac 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedCommands.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedCommands.template.ref.cpp @@ -29,38 +29,38 @@ QueuedCommands :: // ---------------------------------------------------------------------- void QueuedCommands :: - noArgsAsync_handler(NATIVE_INT_TYPE portNum) + noArgsAsync_handler(FwIndexType portNum) { // TODO } void QueuedCommands :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 QueuedCommands :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 QueuedCommands :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void QueuedCommands :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void QueuedCommands :: typedAsync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -75,7 +75,7 @@ void QueuedCommands :: void QueuedCommands :: typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -90,7 +90,7 @@ void QueuedCommands :: void QueuedCommands :: typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -105,7 +105,7 @@ void QueuedCommands :: void QueuedCommands :: typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -120,7 +120,7 @@ void QueuedCommands :: void QueuedCommands :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -135,7 +135,7 @@ void QueuedCommands :: F32 QueuedCommands :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -150,7 +150,7 @@ F32 QueuedCommands :: F32 QueuedCommands :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -165,7 +165,7 @@ F32 QueuedCommands :: void QueuedCommands :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedCommands.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedCommands.template.ref.hpp index 3ede8d716..3fcfd3dc9 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedCommands.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedCommands.template.ref.hpp @@ -37,42 +37,42 @@ class QueuedCommands : //! //! A typed async input port void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsGuarded //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedAsync //! //! A typed async input port void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -86,7 +86,7 @@ class QueuedCommands : //! //! A typed async input port with queue full behavior and priority void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -100,7 +100,7 @@ class QueuedCommands : //! //! A typed async input port with queue full behavior and priority void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -114,7 +114,7 @@ class QueuedCommands : //! //! A typed async input port with queue full behavior and priority void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -128,7 +128,7 @@ class QueuedCommands : //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -142,7 +142,7 @@ class QueuedCommands : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -156,7 +156,7 @@ class QueuedCommands : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -170,7 +170,7 @@ class QueuedCommands : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedEvents.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedEvents.template.ref.cpp index 11442f9a9..49103fd58 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedEvents.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedEvents.template.ref.cpp @@ -29,38 +29,38 @@ QueuedEvents :: // ---------------------------------------------------------------------- void QueuedEvents :: - noArgsAsync_handler(NATIVE_INT_TYPE portNum) + noArgsAsync_handler(FwIndexType portNum) { // TODO } void QueuedEvents :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 QueuedEvents :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 QueuedEvents :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void QueuedEvents :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void QueuedEvents :: typedAsync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -75,7 +75,7 @@ void QueuedEvents :: void QueuedEvents :: typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -90,7 +90,7 @@ void QueuedEvents :: void QueuedEvents :: typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -105,7 +105,7 @@ void QueuedEvents :: void QueuedEvents :: typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -120,7 +120,7 @@ void QueuedEvents :: void QueuedEvents :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -135,7 +135,7 @@ void QueuedEvents :: F32 QueuedEvents :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -150,7 +150,7 @@ F32 QueuedEvents :: F32 QueuedEvents :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -165,7 +165,7 @@ F32 QueuedEvents :: void QueuedEvents :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedEvents.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedEvents.template.ref.hpp index 2df37054a..36d5d192f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedEvents.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedEvents.template.ref.hpp @@ -37,42 +37,42 @@ class QueuedEvents : //! //! A typed async input port void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsGuarded //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedAsync //! //! A typed async input port void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -86,7 +86,7 @@ class QueuedEvents : //! //! A typed async input port with queue full behavior and priority void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -100,7 +100,7 @@ class QueuedEvents : //! //! A typed async input port with queue full behavior and priority void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -114,7 +114,7 @@ class QueuedEvents : //! //! A typed async input port with queue full behavior and priority void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -128,7 +128,7 @@ class QueuedEvents : //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -142,7 +142,7 @@ class QueuedEvents : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -156,7 +156,7 @@ class QueuedEvents : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -170,7 +170,7 @@ class QueuedEvents : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedGetProducts.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedGetProducts.template.ref.cpp index 67c0cc8d0..a92559ab7 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedGetProducts.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedGetProducts.template.ref.cpp @@ -29,38 +29,38 @@ QueuedGetProducts :: // ---------------------------------------------------------------------- void QueuedGetProducts :: - noArgsAsync_handler(NATIVE_INT_TYPE portNum) + noArgsAsync_handler(FwIndexType portNum) { // TODO } void QueuedGetProducts :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 QueuedGetProducts :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 QueuedGetProducts :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void QueuedGetProducts :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void QueuedGetProducts :: typedAsync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -75,7 +75,7 @@ void QueuedGetProducts :: void QueuedGetProducts :: typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -90,7 +90,7 @@ void QueuedGetProducts :: void QueuedGetProducts :: typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -105,7 +105,7 @@ void QueuedGetProducts :: void QueuedGetProducts :: typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -120,7 +120,7 @@ void QueuedGetProducts :: void QueuedGetProducts :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -135,7 +135,7 @@ void QueuedGetProducts :: F32 QueuedGetProducts :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -150,7 +150,7 @@ F32 QueuedGetProducts :: F32 QueuedGetProducts :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -165,7 +165,7 @@ F32 QueuedGetProducts :: void QueuedGetProducts :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedGetProducts.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedGetProducts.template.ref.hpp index f5a04064e..78ee01673 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedGetProducts.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedGetProducts.template.ref.hpp @@ -37,42 +37,42 @@ class QueuedGetProducts : //! //! A typed async input port void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsGuarded //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedAsync //! //! A typed async input port void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -86,7 +86,7 @@ class QueuedGetProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -100,7 +100,7 @@ class QueuedGetProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -114,7 +114,7 @@ class QueuedGetProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -128,7 +128,7 @@ class QueuedGetProducts : //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -142,7 +142,7 @@ class QueuedGetProducts : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -156,7 +156,7 @@ class QueuedGetProducts : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -170,7 +170,7 @@ class QueuedGetProducts : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedGuardedProducts.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedGuardedProducts.template.ref.cpp index 94e18402c..d2e4df6f7 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedGuardedProducts.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedGuardedProducts.template.ref.cpp @@ -29,38 +29,38 @@ QueuedGuardedProducts :: // ---------------------------------------------------------------------- void QueuedGuardedProducts :: - noArgsAsync_handler(NATIVE_INT_TYPE portNum) + noArgsAsync_handler(FwIndexType portNum) { // TODO } void QueuedGuardedProducts :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 QueuedGuardedProducts :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 QueuedGuardedProducts :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void QueuedGuardedProducts :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void QueuedGuardedProducts :: typedAsync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -75,7 +75,7 @@ void QueuedGuardedProducts :: void QueuedGuardedProducts :: typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -90,7 +90,7 @@ void QueuedGuardedProducts :: void QueuedGuardedProducts :: typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -105,7 +105,7 @@ void QueuedGuardedProducts :: void QueuedGuardedProducts :: typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -120,7 +120,7 @@ void QueuedGuardedProducts :: void QueuedGuardedProducts :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -135,7 +135,7 @@ void QueuedGuardedProducts :: F32 QueuedGuardedProducts :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -150,7 +150,7 @@ F32 QueuedGuardedProducts :: F32 QueuedGuardedProducts :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -165,7 +165,7 @@ F32 QueuedGuardedProducts :: void QueuedGuardedProducts :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedGuardedProducts.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedGuardedProducts.template.ref.hpp index 641f5e6c7..2e47ba643 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedGuardedProducts.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedGuardedProducts.template.ref.hpp @@ -37,42 +37,42 @@ class QueuedGuardedProducts : //! //! A typed async input port void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsGuarded //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedAsync //! //! A typed async input port void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -86,7 +86,7 @@ class QueuedGuardedProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -100,7 +100,7 @@ class QueuedGuardedProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -114,7 +114,7 @@ class QueuedGuardedProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -128,7 +128,7 @@ class QueuedGuardedProducts : //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -142,7 +142,7 @@ class QueuedGuardedProducts : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -156,7 +156,7 @@ class QueuedGuardedProducts : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -170,7 +170,7 @@ class QueuedGuardedProducts : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedNoArgsPortsOnly.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedNoArgsPortsOnly.template.ref.cpp index 5c2ff1291..eb7d25b5c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedNoArgsPortsOnly.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedNoArgsPortsOnly.template.ref.cpp @@ -29,25 +29,25 @@ QueuedNoArgsPortsOnly :: // ---------------------------------------------------------------------- void QueuedNoArgsPortsOnly :: - noArgsAsync_handler(NATIVE_INT_TYPE portNum) + noArgsAsync_handler(FwIndexType portNum) { // TODO } void QueuedNoArgsPortsOnly :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 QueuedNoArgsPortsOnly :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 QueuedNoArgsPortsOnly :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedNoArgsPortsOnly.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedNoArgsPortsOnly.template.ref.hpp index 5ebefdde6..272487e75 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedNoArgsPortsOnly.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedNoArgsPortsOnly.template.ref.hpp @@ -37,28 +37,28 @@ class QueuedNoArgsPortsOnly : //! //! A typed async input port void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsGuarded //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; }; diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedParams.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedParams.template.ref.cpp index 7aec6b549..dc1776672 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedParams.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedParams.template.ref.cpp @@ -29,38 +29,38 @@ QueuedParams :: // ---------------------------------------------------------------------- void QueuedParams :: - noArgsAsync_handler(NATIVE_INT_TYPE portNum) + noArgsAsync_handler(FwIndexType portNum) { // TODO } void QueuedParams :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 QueuedParams :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 QueuedParams :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void QueuedParams :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void QueuedParams :: typedAsync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -75,7 +75,7 @@ void QueuedParams :: void QueuedParams :: typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -90,7 +90,7 @@ void QueuedParams :: void QueuedParams :: typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -105,7 +105,7 @@ void QueuedParams :: void QueuedParams :: typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -120,7 +120,7 @@ void QueuedParams :: void QueuedParams :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -135,7 +135,7 @@ void QueuedParams :: F32 QueuedParams :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -150,7 +150,7 @@ F32 QueuedParams :: F32 QueuedParams :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -165,7 +165,7 @@ F32 QueuedParams :: void QueuedParams :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedParams.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedParams.template.ref.hpp index 9156a9f89..9c7bcabf6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedParams.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedParams.template.ref.hpp @@ -37,42 +37,42 @@ class QueuedParams : //! //! A typed async input port void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsGuarded //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedAsync //! //! A typed async input port void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -86,7 +86,7 @@ class QueuedParams : //! //! A typed async input port with queue full behavior and priority void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -100,7 +100,7 @@ class QueuedParams : //! //! A typed async input port with queue full behavior and priority void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -114,7 +114,7 @@ class QueuedParams : //! //! A typed async input port with queue full behavior and priority void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -128,7 +128,7 @@ class QueuedParams : //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -142,7 +142,7 @@ class QueuedParams : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -156,7 +156,7 @@ class QueuedParams : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -170,7 +170,7 @@ class QueuedParams : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedSerial.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedSerial.template.ref.cpp index 60b0bc4ae..820b1ba8e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedSerial.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedSerial.template.ref.cpp @@ -29,38 +29,38 @@ QueuedSerial :: // ---------------------------------------------------------------------- void QueuedSerial :: - noArgsAsync_handler(NATIVE_INT_TYPE portNum) + noArgsAsync_handler(FwIndexType portNum) { // TODO } void QueuedSerial :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 QueuedSerial :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 QueuedSerial :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void QueuedSerial :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void QueuedSerial :: typedAsync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -75,7 +75,7 @@ void QueuedSerial :: void QueuedSerial :: typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -90,7 +90,7 @@ void QueuedSerial :: void QueuedSerial :: typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -105,7 +105,7 @@ void QueuedSerial :: void QueuedSerial :: typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -120,7 +120,7 @@ void QueuedSerial :: void QueuedSerial :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -135,7 +135,7 @@ void QueuedSerial :: F32 QueuedSerial :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -150,7 +150,7 @@ F32 QueuedSerial :: F32 QueuedSerial :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -165,7 +165,7 @@ F32 QueuedSerial :: void QueuedSerial :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -184,7 +184,7 @@ void QueuedSerial :: void QueuedSerial :: serialAsync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -193,7 +193,7 @@ void QueuedSerial :: void QueuedSerial :: serialAsyncAssert_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -202,7 +202,7 @@ void QueuedSerial :: void QueuedSerial :: serialAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -211,7 +211,7 @@ void QueuedSerial :: void QueuedSerial :: serialAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -220,7 +220,7 @@ void QueuedSerial :: void QueuedSerial :: serialGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -229,7 +229,7 @@ void QueuedSerial :: void QueuedSerial :: serialSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedSerial.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedSerial.template.ref.hpp index 800133fa8..fde4748da 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedSerial.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedSerial.template.ref.hpp @@ -37,42 +37,42 @@ class QueuedSerial : //! //! A typed async input port void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsGuarded //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedAsync //! //! A typed async input port void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -86,7 +86,7 @@ class QueuedSerial : //! //! A typed async input port with queue full behavior and priority void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -100,7 +100,7 @@ class QueuedSerial : //! //! A typed async input port with queue full behavior and priority void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -114,7 +114,7 @@ class QueuedSerial : //! //! A typed async input port with queue full behavior and priority void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -128,7 +128,7 @@ class QueuedSerial : //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -142,7 +142,7 @@ class QueuedSerial : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -156,7 +156,7 @@ class QueuedSerial : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -170,7 +170,7 @@ class QueuedSerial : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -190,7 +190,7 @@ class QueuedSerial : //! //! A serial async input port void serialAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) override; @@ -198,7 +198,7 @@ class QueuedSerial : //! //! A serial async input port with queue full behavior and priority void serialAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) override; @@ -206,7 +206,7 @@ class QueuedSerial : //! //! A serial async input port with queue full behavior and priority void serialAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) override; @@ -214,7 +214,7 @@ class QueuedSerial : //! //! A serial async input port with queue full behavior and priority void serialAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) override; @@ -222,7 +222,7 @@ class QueuedSerial : //! //! A serial guarded input void serialGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) override; @@ -230,7 +230,7 @@ class QueuedSerial : //! //! A serial sync input port void serialSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) override; diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedSyncProducts.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedSyncProducts.template.ref.cpp index c4070215b..759e2fedb 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedSyncProducts.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedSyncProducts.template.ref.cpp @@ -29,38 +29,38 @@ QueuedSyncProducts :: // ---------------------------------------------------------------------- void QueuedSyncProducts :: - noArgsAsync_handler(NATIVE_INT_TYPE portNum) + noArgsAsync_handler(FwIndexType portNum) { // TODO } void QueuedSyncProducts :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 QueuedSyncProducts :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 QueuedSyncProducts :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void QueuedSyncProducts :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void QueuedSyncProducts :: typedAsync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -75,7 +75,7 @@ void QueuedSyncProducts :: void QueuedSyncProducts :: typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -90,7 +90,7 @@ void QueuedSyncProducts :: void QueuedSyncProducts :: typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -105,7 +105,7 @@ void QueuedSyncProducts :: void QueuedSyncProducts :: typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -120,7 +120,7 @@ void QueuedSyncProducts :: void QueuedSyncProducts :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -135,7 +135,7 @@ void QueuedSyncProducts :: F32 QueuedSyncProducts :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -150,7 +150,7 @@ F32 QueuedSyncProducts :: F32 QueuedSyncProducts :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -165,7 +165,7 @@ F32 QueuedSyncProducts :: void QueuedSyncProducts :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedSyncProducts.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedSyncProducts.template.ref.hpp index 6e8c1a69f..89f67755a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedSyncProducts.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedSyncProducts.template.ref.hpp @@ -37,42 +37,42 @@ class QueuedSyncProducts : //! //! A typed async input port void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsGuarded //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedAsync //! //! A typed async input port void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -86,7 +86,7 @@ class QueuedSyncProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -100,7 +100,7 @@ class QueuedSyncProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -114,7 +114,7 @@ class QueuedSyncProducts : //! //! A typed async input port with queue full behavior and priority void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -128,7 +128,7 @@ class QueuedSyncProducts : //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -142,7 +142,7 @@ class QueuedSyncProducts : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -156,7 +156,7 @@ class QueuedSyncProducts : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -170,7 +170,7 @@ class QueuedSyncProducts : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedTelemetry.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedTelemetry.template.ref.cpp index 960f119a1..3e469eda7 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedTelemetry.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedTelemetry.template.ref.cpp @@ -29,38 +29,38 @@ QueuedTelemetry :: // ---------------------------------------------------------------------- void QueuedTelemetry :: - noArgsAsync_handler(NATIVE_INT_TYPE portNum) + noArgsAsync_handler(FwIndexType portNum) { // TODO } void QueuedTelemetry :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 QueuedTelemetry :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 QueuedTelemetry :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void QueuedTelemetry :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void QueuedTelemetry :: typedAsync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -75,7 +75,7 @@ void QueuedTelemetry :: void QueuedTelemetry :: typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -90,7 +90,7 @@ void QueuedTelemetry :: void QueuedTelemetry :: typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -105,7 +105,7 @@ void QueuedTelemetry :: void QueuedTelemetry :: typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -120,7 +120,7 @@ void QueuedTelemetry :: void QueuedTelemetry :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -135,7 +135,7 @@ void QueuedTelemetry :: F32 QueuedTelemetry :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -150,7 +150,7 @@ F32 QueuedTelemetry :: F32 QueuedTelemetry :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -165,7 +165,7 @@ F32 QueuedTelemetry :: void QueuedTelemetry :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedTelemetry.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedTelemetry.template.ref.hpp index 1dbad1316..691d82939 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedTelemetry.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedTelemetry.template.ref.hpp @@ -37,42 +37,42 @@ class QueuedTelemetry : //! //! A typed async input port void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsGuarded //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedAsync //! //! A typed async input port void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -86,7 +86,7 @@ class QueuedTelemetry : //! //! A typed async input port with queue full behavior and priority void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -100,7 +100,7 @@ class QueuedTelemetry : //! //! A typed async input port with queue full behavior and priority void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -114,7 +114,7 @@ class QueuedTelemetry : //! //! A typed async input port with queue full behavior and priority void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -128,7 +128,7 @@ class QueuedTelemetry : //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -142,7 +142,7 @@ class QueuedTelemetry : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -156,7 +156,7 @@ class QueuedTelemetry : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -170,7 +170,7 @@ class QueuedTelemetry : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedTest.template.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedTest.template.ref.cpp index 426e3c1d0..7b60cb530 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedTest.template.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedTest.template.ref.cpp @@ -29,38 +29,38 @@ QueuedTest :: // ---------------------------------------------------------------------- void QueuedTest :: - noArgsAsync_handler(NATIVE_INT_TYPE portNum) + noArgsAsync_handler(FwIndexType portNum) { // TODO } void QueuedTest :: - noArgsGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsGuarded_handler(FwIndexType portNum) { // TODO } U32 QueuedTest :: - noArgsReturnGuarded_handler(NATIVE_INT_TYPE portNum) + noArgsReturnGuarded_handler(FwIndexType portNum) { // TODO return } U32 QueuedTest :: - noArgsReturnSync_handler(NATIVE_INT_TYPE portNum) + noArgsReturnSync_handler(FwIndexType portNum) { // TODO return } void QueuedTest :: - noArgsSync_handler(NATIVE_INT_TYPE portNum) + noArgsSync_handler(FwIndexType portNum) { // TODO } void QueuedTest :: typedAsync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -75,7 +75,7 @@ void QueuedTest :: void QueuedTest :: typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -90,7 +90,7 @@ void QueuedTest :: void QueuedTest :: typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -105,7 +105,7 @@ void QueuedTest :: void QueuedTest :: typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -120,7 +120,7 @@ void QueuedTest :: void QueuedTest :: typedGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -135,7 +135,7 @@ void QueuedTest :: F32 QueuedTest :: typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -150,7 +150,7 @@ F32 QueuedTest :: F32 QueuedTest :: typedReturnSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -165,7 +165,7 @@ F32 QueuedTest :: void QueuedTest :: typedSync_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedTest.template.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedTest.template.ref.hpp index b8ed6da45..541c9c283 100644 --- a/compiler/tools/fpp-to-cpp/test/component/impl/QueuedTest.template.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/impl/QueuedTest.template.ref.hpp @@ -37,42 +37,42 @@ class QueuedTest : //! //! A typed async input port void noArgsAsync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsGuarded //! //! A typed guarded input void noArgsGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnGuarded //! //! A typed guarded input U32 noArgsReturnGuarded_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsReturnSync //! //! A typed sync input port U32 noArgsReturnSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for noArgsSync //! //! A typed sync input port void noArgsSync_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) override; //! Handler implementation for typedAsync //! //! A typed async input port void typedAsync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -86,7 +86,7 @@ class QueuedTest : //! //! A typed async input port with queue full behavior and priority void typedAsyncAssert_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -100,7 +100,7 @@ class QueuedTest : //! //! A typed async input port with queue full behavior and priority void typedAsyncBlockPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -114,7 +114,7 @@ class QueuedTest : //! //! A typed async input port with queue full behavior and priority void typedAsyncDropPriority_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -128,7 +128,7 @@ class QueuedTest : //! //! A typed guarded input void typedGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -142,7 +142,7 @@ class QueuedTest : //! //! A typed guarded input with a return type F32 typedReturnGuarded_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -156,7 +156,7 @@ class QueuedTest : //! //! A typed sync input port with a return type F32 typedReturnSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -170,7 +170,7 @@ class QueuedTest : //! //! A typed sync input port void typedSync_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductPortsOnlyTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductPortsOnlyTesterBase.ref.cpp index fe7254c6f..e07ef34f8 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductPortsOnlyTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductPortsOnlyTesterBase.ref.cpp @@ -14,7 +14,7 @@ // ---------------------------------------------------------------------- void ActiveAsyncProductPortsOnlyTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); @@ -26,7 +26,7 @@ void ActiveAsyncProductPortsOnlyTesterBase :: void ActiveAsyncProductPortsOnlyTesterBase :: connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpResponsePort* port ) { @@ -43,7 +43,7 @@ void ActiveAsyncProductPortsOnlyTesterBase :: // ---------------------------------------------------------------------- Fw::InputDpRequestPort* ActiveAsyncProductPortsOnlyTesterBase :: - get_from_productRequestOut(NATIVE_INT_TYPE portNum) + get_from_productRequestOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productRequestOut(), @@ -54,7 +54,7 @@ Fw::InputDpRequestPort* ActiveAsyncProductPortsOnlyTesterBase :: } Fw::InputDpSendPort* ActiveAsyncProductPortsOnlyTesterBase :: - get_from_productSendOut(NATIVE_INT_TYPE portNum) + get_from_productSendOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productSendOut(), @@ -88,22 +88,22 @@ ActiveAsyncProductPortsOnlyTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveAsyncProductPortsOnlyTesterBase :: +FwIndexType ActiveAsyncProductPortsOnlyTesterBase :: getNum_to_productRecvIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); } -NATIVE_INT_TYPE ActiveAsyncProductPortsOnlyTesterBase :: +FwIndexType ActiveAsyncProductPortsOnlyTesterBase :: getNum_from_productRequestOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); } -NATIVE_INT_TYPE ActiveAsyncProductPortsOnlyTesterBase :: +FwIndexType ActiveAsyncProductPortsOnlyTesterBase :: getNum_from_productSendOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); } // ---------------------------------------------------------------------- @@ -111,7 +111,7 @@ NATIVE_INT_TYPE ActiveAsyncProductPortsOnlyTesterBase :: // ---------------------------------------------------------------------- bool ActiveAsyncProductPortsOnlyTesterBase :: - isConnected_to_productRecvIn(NATIVE_INT_TYPE portNum) + isConnected_to_productRecvIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_productRecvIn(), diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductPortsOnlyTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductPortsOnlyTesterBase.ref.hpp index 9771df3c5..694b1816c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductPortsOnlyTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductPortsOnlyTesterBase.ref.hpp @@ -28,7 +28,7 @@ class ActiveAsyncProductPortsOnlyTesterBase : //! Initialize object ActiveAsyncProductPortsOnlyTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -39,7 +39,7 @@ class ActiveAsyncProductPortsOnlyTesterBase : //! Connect port to productRecvIn[portNum] void connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpResponsePort* port //!< The input port ); @@ -53,14 +53,14 @@ class ActiveAsyncProductPortsOnlyTesterBase : //! //! \return from_productRequestOut[portNum] Fw::InputDpRequestPort* get_from_productRequestOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productSendOut[portNum] Fw::InputDpSendPort* get_from_productSendOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -87,17 +87,17 @@ class ActiveAsyncProductPortsOnlyTesterBase : //! Get the number of to_productRecvIn ports //! //! \return The number of to_productRecvIn ports - NATIVE_INT_TYPE getNum_to_productRecvIn() const; + FwIndexType getNum_to_productRecvIn() const; //! Get the number of from_productRequestOut ports //! //! \return The number of from_productRequestOut ports - NATIVE_INT_TYPE getNum_from_productRequestOut() const; + FwIndexType getNum_from_productRequestOut() const; //! Get the number of from_productSendOut ports //! //! \return The number of from_productSendOut ports - NATIVE_INT_TYPE getNum_from_productSendOut() const; + FwIndexType getNum_from_productSendOut() const; protected: @@ -109,7 +109,7 @@ class ActiveAsyncProductPortsOnlyTesterBase : //! //! \return Whether port to_productRecvIn is connected bool isConnected_to_productRecvIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); private: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductsTesterBase.ref.cpp index ab67977bf..2c76086dc 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductsTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void ActiveAsyncProductsTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productRequestOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productRequestOut()); port++ ) { this->m_from_productRequestOut[port].init(); @@ -45,8 +45,8 @@ void ActiveAsyncProductsTesterBase :: // Connect input port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productSendOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productSendOut()); port++ ) { this->m_from_productSendOut[port].init(); @@ -69,8 +69,8 @@ void ActiveAsyncProductsTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -93,8 +93,8 @@ void ActiveAsyncProductsTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -117,8 +117,8 @@ void ActiveAsyncProductsTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -141,8 +141,8 @@ void ActiveAsyncProductsTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -165,8 +165,8 @@ void ActiveAsyncProductsTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -189,8 +189,8 @@ void ActiveAsyncProductsTesterBase :: // Connect output port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_productRecvIn()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_productRecvIn()); port++ ) { this->m_to_productRecvIn[port].init(); @@ -208,8 +208,8 @@ void ActiveAsyncProductsTesterBase :: // Connect output port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsAsync()); port++ ) { this->m_to_noArgsAsync[port].init(); @@ -227,8 +227,8 @@ void ActiveAsyncProductsTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -246,8 +246,8 @@ void ActiveAsyncProductsTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -265,8 +265,8 @@ void ActiveAsyncProductsTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -284,8 +284,8 @@ void ActiveAsyncProductsTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -303,8 +303,8 @@ void ActiveAsyncProductsTesterBase :: // Connect output port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsync()); port++ ) { this->m_to_typedAsync[port].init(); @@ -322,8 +322,8 @@ void ActiveAsyncProductsTesterBase :: // Connect output port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncAssert()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncAssert()); port++ ) { this->m_to_typedAsyncAssert[port].init(); @@ -341,8 +341,8 @@ void ActiveAsyncProductsTesterBase :: // Connect output port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncBlockPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncBlockPriority()); port++ ) { this->m_to_typedAsyncBlockPriority[port].init(); @@ -360,8 +360,8 @@ void ActiveAsyncProductsTesterBase :: // Connect output port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncDropPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncDropPriority()); port++ ) { this->m_to_typedAsyncDropPriority[port].init(); @@ -379,8 +379,8 @@ void ActiveAsyncProductsTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -398,8 +398,8 @@ void ActiveAsyncProductsTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -417,8 +417,8 @@ void ActiveAsyncProductsTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -436,8 +436,8 @@ void ActiveAsyncProductsTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -460,7 +460,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -474,7 +474,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpResponsePort* port ) { @@ -488,7 +488,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -502,7 +502,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -516,7 +516,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -530,7 +530,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -544,7 +544,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -558,7 +558,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: connect_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -572,7 +572,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -586,7 +586,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -600,7 +600,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -614,7 +614,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -628,7 +628,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -642,7 +642,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -656,7 +656,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -673,7 +673,7 @@ void ActiveAsyncProductsTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* ActiveAsyncProductsTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -684,7 +684,7 @@ Fw::InputCmdRegPort* ActiveAsyncProductsTesterBase :: } Fw::InputCmdResponsePort* ActiveAsyncProductsTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -695,7 +695,7 @@ Fw::InputCmdResponsePort* ActiveAsyncProductsTesterBase :: } Fw::InputLogPort* ActiveAsyncProductsTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -706,7 +706,7 @@ Fw::InputLogPort* ActiveAsyncProductsTesterBase :: } Fw::InputPrmGetPort* ActiveAsyncProductsTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -717,7 +717,7 @@ Fw::InputPrmGetPort* ActiveAsyncProductsTesterBase :: } Fw::InputPrmSetPort* ActiveAsyncProductsTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -728,7 +728,7 @@ Fw::InputPrmSetPort* ActiveAsyncProductsTesterBase :: } Fw::InputDpRequestPort* ActiveAsyncProductsTesterBase :: - get_from_productRequestOut(NATIVE_INT_TYPE portNum) + get_from_productRequestOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productRequestOut(), @@ -739,7 +739,7 @@ Fw::InputDpRequestPort* ActiveAsyncProductsTesterBase :: } Fw::InputDpSendPort* ActiveAsyncProductsTesterBase :: - get_from_productSendOut(NATIVE_INT_TYPE portNum) + get_from_productSendOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productSendOut(), @@ -752,7 +752,7 @@ Fw::InputDpSendPort* ActiveAsyncProductsTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* ActiveAsyncProductsTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -765,7 +765,7 @@ Fw::InputLogTextPort* ActiveAsyncProductsTesterBase :: #endif Fw::InputTimePort* ActiveAsyncProductsTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -776,7 +776,7 @@ Fw::InputTimePort* ActiveAsyncProductsTesterBase :: } Fw::InputTlmPort* ActiveAsyncProductsTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -787,7 +787,7 @@ Fw::InputTlmPort* ActiveAsyncProductsTesterBase :: } Ports::InputNoArgsPort* ActiveAsyncProductsTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -798,7 +798,7 @@ Ports::InputNoArgsPort* ActiveAsyncProductsTesterBase :: } Ports::InputNoArgsReturnPort* ActiveAsyncProductsTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -809,7 +809,7 @@ Ports::InputNoArgsReturnPort* ActiveAsyncProductsTesterBase :: } Ports::InputTypedPort* ActiveAsyncProductsTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -820,7 +820,7 @@ Ports::InputTypedPort* ActiveAsyncProductsTesterBase :: } Ports::InputTypedReturnPort* ActiveAsyncProductsTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -870,7 +870,7 @@ ActiveAsyncProductsTesterBase :: // ---------------------------------------------------------------------- void ActiveAsyncProductsTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -881,7 +881,7 @@ void ActiveAsyncProductsTesterBase :: } U32 ActiveAsyncProductsTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -893,7 +893,7 @@ U32 ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -922,7 +922,7 @@ void ActiveAsyncProductsTesterBase :: F32 ActiveAsyncProductsTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -954,7 +954,7 @@ F32 ActiveAsyncProductsTesterBase :: // ---------------------------------------------------------------------- void ActiveAsyncProductsTesterBase :: - invoke_to_noArgsAsync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsAsync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -965,7 +965,7 @@ void ActiveAsyncProductsTesterBase :: } void ActiveAsyncProductsTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -976,7 +976,7 @@ void ActiveAsyncProductsTesterBase :: } U32 ActiveAsyncProductsTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -987,7 +987,7 @@ U32 ActiveAsyncProductsTesterBase :: } U32 ActiveAsyncProductsTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -998,7 +998,7 @@ U32 ActiveAsyncProductsTesterBase :: } void ActiveAsyncProductsTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1010,7 +1010,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1038,7 +1038,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1066,7 +1066,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1094,7 +1094,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1122,7 +1122,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1150,7 +1150,7 @@ void ActiveAsyncProductsTesterBase :: F32 ActiveAsyncProductsTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1178,7 +1178,7 @@ F32 ActiveAsyncProductsTesterBase :: F32 ActiveAsyncProductsTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1206,7 +1206,7 @@ F32 ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1236,182 +1236,182 @@ void ActiveAsyncProductsTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_to_productRecvIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_to_noArgsAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_to_typedAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_to_typedAsyncAssert() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_to_typedAsyncBlockPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_to_typedAsyncDropPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_from_productRequestOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_from_productSendOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: +FwIndexType ActiveAsyncProductsTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1419,7 +1419,7 @@ NATIVE_INT_TYPE ActiveAsyncProductsTesterBase :: // ---------------------------------------------------------------------- bool ActiveAsyncProductsTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1430,7 +1430,7 @@ bool ActiveAsyncProductsTesterBase :: } bool ActiveAsyncProductsTesterBase :: - isConnected_to_productRecvIn(NATIVE_INT_TYPE portNum) + isConnected_to_productRecvIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_productRecvIn(), @@ -1441,7 +1441,7 @@ bool ActiveAsyncProductsTesterBase :: } bool ActiveAsyncProductsTesterBase :: - isConnected_to_noArgsAsync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsAsync(), @@ -1452,7 +1452,7 @@ bool ActiveAsyncProductsTesterBase :: } bool ActiveAsyncProductsTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1463,7 +1463,7 @@ bool ActiveAsyncProductsTesterBase :: } bool ActiveAsyncProductsTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1474,7 +1474,7 @@ bool ActiveAsyncProductsTesterBase :: } bool ActiveAsyncProductsTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1485,7 +1485,7 @@ bool ActiveAsyncProductsTesterBase :: } bool ActiveAsyncProductsTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1496,7 +1496,7 @@ bool ActiveAsyncProductsTesterBase :: } bool ActiveAsyncProductsTesterBase :: - isConnected_to_typedAsync(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsync(), @@ -1507,7 +1507,7 @@ bool ActiveAsyncProductsTesterBase :: } bool ActiveAsyncProductsTesterBase :: - isConnected_to_typedAsyncAssert(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncAssert(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncAssert(), @@ -1518,7 +1518,7 @@ bool ActiveAsyncProductsTesterBase :: } bool ActiveAsyncProductsTesterBase :: - isConnected_to_typedAsyncBlockPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncBlockPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncBlockPriority(), @@ -1529,7 +1529,7 @@ bool ActiveAsyncProductsTesterBase :: } bool ActiveAsyncProductsTesterBase :: - isConnected_to_typedAsyncDropPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncDropPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncDropPriority(), @@ -1540,7 +1540,7 @@ bool ActiveAsyncProductsTesterBase :: } bool ActiveAsyncProductsTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1551,7 +1551,7 @@ bool ActiveAsyncProductsTesterBase :: } bool ActiveAsyncProductsTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1562,7 +1562,7 @@ bool ActiveAsyncProductsTesterBase :: } bool ActiveAsyncProductsTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1573,7 +1573,7 @@ bool ActiveAsyncProductsTesterBase :: } bool ActiveAsyncProductsTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1738,7 +1738,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: from_productRequestOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -1750,7 +1750,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: from_productSendOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -1762,7 +1762,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -1773,7 +1773,7 @@ void ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1784,7 +1784,7 @@ void ActiveAsyncProductsTesterBase :: U32 ActiveAsyncProductsTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1795,7 +1795,7 @@ U32 ActiveAsyncProductsTesterBase :: void ActiveAsyncProductsTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1822,7 +1822,7 @@ void ActiveAsyncProductsTesterBase :: F32 ActiveAsyncProductsTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductsTesterBase.ref.hpp index 095ee522c..d2414105a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductsTesterBase.ref.hpp @@ -149,7 +149,7 @@ class ActiveAsyncProductsTesterBase : //! Initialize object ActiveAsyncProductsTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -160,91 +160,91 @@ class ActiveAsyncProductsTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to productRecvIn[portNum] void connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpResponsePort* port //!< The input port ); //! Connect port to noArgsAsync[portNum] void connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedAsync[portNum] void connect_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncAssert[portNum] void connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncBlockPriority[portNum] void connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncDropPriority[portNum] void connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -258,49 +258,49 @@ class ActiveAsyncProductsTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productRequestOut[portNum] Fw::InputDpRequestPort* get_from_productRequestOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productSendOut[portNum] Fw::InputDpSendPort* get_from_productSendOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -309,7 +309,7 @@ class ActiveAsyncProductsTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -318,42 +318,42 @@ class ActiveAsyncProductsTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -379,17 +379,17 @@ class ActiveAsyncProductsTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -401,7 +401,7 @@ class ActiveAsyncProductsTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -419,17 +419,17 @@ class ActiveAsyncProductsTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -441,7 +441,7 @@ class ActiveAsyncProductsTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -459,32 +459,32 @@ class ActiveAsyncProductsTesterBase : //! Invoke the to port connected to noArgsAsync void invoke_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedAsync void invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -496,7 +496,7 @@ class ActiveAsyncProductsTesterBase : //! Invoke the to port connected to typedAsyncAssert void invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -508,7 +508,7 @@ class ActiveAsyncProductsTesterBase : //! Invoke the to port connected to typedAsyncBlockPriority void invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -520,7 +520,7 @@ class ActiveAsyncProductsTesterBase : //! Invoke the to port connected to typedAsyncDropPriority void invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -532,7 +532,7 @@ class ActiveAsyncProductsTesterBase : //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -544,7 +544,7 @@ class ActiveAsyncProductsTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -556,7 +556,7 @@ class ActiveAsyncProductsTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -568,7 +568,7 @@ class ActiveAsyncProductsTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -587,151 +587,151 @@ class ActiveAsyncProductsTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_productRecvIn ports //! //! \return The number of to_productRecvIn ports - NATIVE_INT_TYPE getNum_to_productRecvIn() const; + FwIndexType getNum_to_productRecvIn() const; //! Get the number of to_noArgsAsync ports //! //! \return The number of to_noArgsAsync ports - NATIVE_INT_TYPE getNum_to_noArgsAsync() const; + FwIndexType getNum_to_noArgsAsync() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedAsync ports //! //! \return The number of to_typedAsync ports - NATIVE_INT_TYPE getNum_to_typedAsync() const; + FwIndexType getNum_to_typedAsync() const; //! Get the number of to_typedAsyncAssert ports //! //! \return The number of to_typedAsyncAssert ports - NATIVE_INT_TYPE getNum_to_typedAsyncAssert() const; + FwIndexType getNum_to_typedAsyncAssert() const; //! Get the number of to_typedAsyncBlockPriority ports //! //! \return The number of to_typedAsyncBlockPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncBlockPriority() const; + FwIndexType getNum_to_typedAsyncBlockPriority() const; //! Get the number of to_typedAsyncDropPriority ports //! //! \return The number of to_typedAsyncDropPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncDropPriority() const; + FwIndexType getNum_to_typedAsyncDropPriority() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; //! Get the number of from_productRequestOut ports //! //! \return The number of from_productRequestOut ports - NATIVE_INT_TYPE getNum_from_productRequestOut() const; + FwIndexType getNum_from_productRequestOut() const; //! Get the number of from_productSendOut ports //! //! \return The number of from_productSendOut ports - NATIVE_INT_TYPE getNum_from_productSendOut() const; + FwIndexType getNum_from_productSendOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -743,105 +743,105 @@ class ActiveAsyncProductsTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_productRecvIn is connected //! //! \return Whether port to_productRecvIn is connected bool isConnected_to_productRecvIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsAsync is connected //! //! \return Whether port to_noArgsAsync is connected bool isConnected_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsync is connected //! //! \return Whether port to_typedAsync is connected bool isConnected_to_typedAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncAssert is connected //! //! \return Whether port to_typedAsyncAssert is connected bool isConnected_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncBlockPriority is connected //! //! \return Whether port to_typedAsyncBlockPriority is connected bool isConnected_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncDropPriority is connected //! //! \return Whether port to_typedAsyncDropPriority is connected bool isConnected_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -947,7 +947,7 @@ class ActiveAsyncProductsTesterBase : //! Static function for port from_productRequestOut static void from_productRequestOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); @@ -955,7 +955,7 @@ class ActiveAsyncProductsTesterBase : //! Static function for port from_productSendOut static void from_productSendOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -963,26 +963,26 @@ class ActiveAsyncProductsTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -995,7 +995,7 @@ class ActiveAsyncProductsTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveCommandsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveCommandsTesterBase.ref.cpp index cb01fa1bf..97d9b9420 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveCommandsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveCommandsTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void ActiveCommandsTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdRegOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdRegOut()); port++ ) { this->m_from_cmdRegOut[port].init(); @@ -45,8 +45,8 @@ void ActiveCommandsTesterBase :: // Connect input port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdResponseOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdResponseOut()); port++ ) { this->m_from_cmdResponseOut[port].init(); @@ -69,8 +69,8 @@ void ActiveCommandsTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -93,8 +93,8 @@ void ActiveCommandsTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -117,8 +117,8 @@ void ActiveCommandsTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -141,8 +141,8 @@ void ActiveCommandsTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -165,8 +165,8 @@ void ActiveCommandsTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -189,8 +189,8 @@ void ActiveCommandsTesterBase :: // Connect output port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_cmdIn()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_cmdIn()); port++ ) { this->m_to_cmdIn[port].init(); @@ -208,8 +208,8 @@ void ActiveCommandsTesterBase :: // Connect output port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsAsync()); port++ ) { this->m_to_noArgsAsync[port].init(); @@ -227,8 +227,8 @@ void ActiveCommandsTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -246,8 +246,8 @@ void ActiveCommandsTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -265,8 +265,8 @@ void ActiveCommandsTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -284,8 +284,8 @@ void ActiveCommandsTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -303,8 +303,8 @@ void ActiveCommandsTesterBase :: // Connect output port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsync()); port++ ) { this->m_to_typedAsync[port].init(); @@ -322,8 +322,8 @@ void ActiveCommandsTesterBase :: // Connect output port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncAssert()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncAssert()); port++ ) { this->m_to_typedAsyncAssert[port].init(); @@ -341,8 +341,8 @@ void ActiveCommandsTesterBase :: // Connect output port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncBlockPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncBlockPriority()); port++ ) { this->m_to_typedAsyncBlockPriority[port].init(); @@ -360,8 +360,8 @@ void ActiveCommandsTesterBase :: // Connect output port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncDropPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncDropPriority()); port++ ) { this->m_to_typedAsyncDropPriority[port].init(); @@ -379,8 +379,8 @@ void ActiveCommandsTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -398,8 +398,8 @@ void ActiveCommandsTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -417,8 +417,8 @@ void ActiveCommandsTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -436,8 +436,8 @@ void ActiveCommandsTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -460,7 +460,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -474,7 +474,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -488,7 +488,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -502,7 +502,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -516,7 +516,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -530,7 +530,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -544,7 +544,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: connect_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -558,7 +558,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -572,7 +572,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -586,7 +586,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -600,7 +600,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -614,7 +614,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -628,7 +628,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -642,7 +642,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -659,7 +659,7 @@ void ActiveCommandsTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* ActiveCommandsTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -670,7 +670,7 @@ Fw::InputCmdRegPort* ActiveCommandsTesterBase :: } Fw::InputCmdResponsePort* ActiveCommandsTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -681,7 +681,7 @@ Fw::InputCmdResponsePort* ActiveCommandsTesterBase :: } Fw::InputLogPort* ActiveCommandsTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -692,7 +692,7 @@ Fw::InputLogPort* ActiveCommandsTesterBase :: } Fw::InputPrmGetPort* ActiveCommandsTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -703,7 +703,7 @@ Fw::InputPrmGetPort* ActiveCommandsTesterBase :: } Fw::InputPrmSetPort* ActiveCommandsTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -716,7 +716,7 @@ Fw::InputPrmSetPort* ActiveCommandsTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* ActiveCommandsTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -729,7 +729,7 @@ Fw::InputLogTextPort* ActiveCommandsTesterBase :: #endif Fw::InputTimePort* ActiveCommandsTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -740,7 +740,7 @@ Fw::InputTimePort* ActiveCommandsTesterBase :: } Fw::InputTlmPort* ActiveCommandsTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -751,7 +751,7 @@ Fw::InputTlmPort* ActiveCommandsTesterBase :: } Ports::InputNoArgsPort* ActiveCommandsTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -762,7 +762,7 @@ Ports::InputNoArgsPort* ActiveCommandsTesterBase :: } Ports::InputNoArgsReturnPort* ActiveCommandsTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -773,7 +773,7 @@ Ports::InputNoArgsReturnPort* ActiveCommandsTesterBase :: } Ports::InputTypedPort* ActiveCommandsTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -784,7 +784,7 @@ Ports::InputTypedPort* ActiveCommandsTesterBase :: } Ports::InputTypedReturnPort* ActiveCommandsTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -832,7 +832,7 @@ ActiveCommandsTesterBase :: // ---------------------------------------------------------------------- void ActiveCommandsTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -843,7 +843,7 @@ void ActiveCommandsTesterBase :: } U32 ActiveCommandsTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -855,7 +855,7 @@ U32 ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -884,7 +884,7 @@ void ActiveCommandsTesterBase :: F32 ActiveCommandsTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -916,7 +916,7 @@ F32 ActiveCommandsTesterBase :: // ---------------------------------------------------------------------- void ActiveCommandsTesterBase :: - invoke_to_noArgsAsync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsAsync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -927,7 +927,7 @@ void ActiveCommandsTesterBase :: } void ActiveCommandsTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -938,7 +938,7 @@ void ActiveCommandsTesterBase :: } U32 ActiveCommandsTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -949,7 +949,7 @@ U32 ActiveCommandsTesterBase :: } U32 ActiveCommandsTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -960,7 +960,7 @@ U32 ActiveCommandsTesterBase :: } void ActiveCommandsTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -972,7 +972,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1000,7 +1000,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1028,7 +1028,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1056,7 +1056,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1084,7 +1084,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1112,7 +1112,7 @@ void ActiveCommandsTesterBase :: F32 ActiveCommandsTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1140,7 +1140,7 @@ F32 ActiveCommandsTesterBase :: F32 ActiveCommandsTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1168,7 +1168,7 @@ F32 ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1198,164 +1198,164 @@ void ActiveCommandsTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_to_noArgsAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); } -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_to_typedAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); } -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_to_typedAsyncAssert() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); } -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_to_typedAsyncBlockPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); } -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_to_typedAsyncDropPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); } -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE ActiveCommandsTesterBase :: +FwIndexType ActiveCommandsTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1363,7 +1363,7 @@ NATIVE_INT_TYPE ActiveCommandsTesterBase :: // ---------------------------------------------------------------------- bool ActiveCommandsTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1374,7 +1374,7 @@ bool ActiveCommandsTesterBase :: } bool ActiveCommandsTesterBase :: - isConnected_to_noArgsAsync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsAsync(), @@ -1385,7 +1385,7 @@ bool ActiveCommandsTesterBase :: } bool ActiveCommandsTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1396,7 +1396,7 @@ bool ActiveCommandsTesterBase :: } bool ActiveCommandsTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1407,7 +1407,7 @@ bool ActiveCommandsTesterBase :: } bool ActiveCommandsTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1418,7 +1418,7 @@ bool ActiveCommandsTesterBase :: } bool ActiveCommandsTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1429,7 +1429,7 @@ bool ActiveCommandsTesterBase :: } bool ActiveCommandsTesterBase :: - isConnected_to_typedAsync(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsync(), @@ -1440,7 +1440,7 @@ bool ActiveCommandsTesterBase :: } bool ActiveCommandsTesterBase :: - isConnected_to_typedAsyncAssert(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncAssert(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncAssert(), @@ -1451,7 +1451,7 @@ bool ActiveCommandsTesterBase :: } bool ActiveCommandsTesterBase :: - isConnected_to_typedAsyncBlockPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncBlockPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncBlockPriority(), @@ -1462,7 +1462,7 @@ bool ActiveCommandsTesterBase :: } bool ActiveCommandsTesterBase :: - isConnected_to_typedAsyncDropPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncDropPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncDropPriority(), @@ -1473,7 +1473,7 @@ bool ActiveCommandsTesterBase :: } bool ActiveCommandsTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1484,7 +1484,7 @@ bool ActiveCommandsTesterBase :: } bool ActiveCommandsTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1495,7 +1495,7 @@ bool ActiveCommandsTesterBase :: } bool ActiveCommandsTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1506,7 +1506,7 @@ bool ActiveCommandsTesterBase :: } bool ActiveCommandsTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1554,7 +1554,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: sendCmd_CMD_SYNC( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -1579,7 +1579,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: sendCmd_CMD_SYNC_PRIMITIVE( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32, F32 f32, @@ -1627,7 +1627,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: sendCmd_CMD_SYNC_STRING( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, const Fw::CmdStringArg& str1, const Fw::CmdStringArg& str2 @@ -1668,7 +1668,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: sendCmd_CMD_SYNC_ENUM( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, E e ) @@ -1702,7 +1702,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: sendCmd_CMD_SYNC_ARRAY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, A a ) @@ -1736,7 +1736,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: sendCmd_CMD_SYNC_STRUCT( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, S s ) @@ -1770,7 +1770,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: sendCmd_CMD_GUARDED( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -1795,7 +1795,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: sendCmd_CMD_GUARDED_PRIMITIVE( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32, F32 f32, @@ -1843,7 +1843,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: sendCmd_CMD_GUARDED_STRING( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, const Fw::CmdStringArg& str1, const Fw::CmdStringArg& str2 @@ -1884,7 +1884,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: sendCmd_CMD_GUARDED_ENUM( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, E e ) @@ -1918,7 +1918,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: sendCmd_CMD_GUARDED_ARRAY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, A a ) @@ -1952,7 +1952,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: sendCmd_CMD_GUARDED_STRUCT( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, S s ) @@ -1986,7 +1986,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: sendCmd_CMD_ASYNC( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2011,7 +2011,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: sendCmd_CMD_PRIORITY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2036,7 +2036,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: sendCmd_CMD_PARAMS_PRIORITY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32 ) @@ -2070,7 +2070,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: sendCmd_CMD_DROP( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2095,7 +2095,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: sendCmd_CMD_PARAMS_PRIORITY_DROP( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32 ) @@ -2227,7 +2227,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode ) { @@ -2237,7 +2237,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, const Fw::CmdResponse& response @@ -2250,7 +2250,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -2261,7 +2261,7 @@ void ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -2272,7 +2272,7 @@ void ActiveCommandsTesterBase :: U32 ActiveCommandsTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -2283,7 +2283,7 @@ U32 ActiveCommandsTesterBase :: void ActiveCommandsTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2310,7 +2310,7 @@ void ActiveCommandsTesterBase :: F32 ActiveCommandsTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveCommandsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveCommandsTesterBase.ref.hpp index 4f7be8c33..c219ad40d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveCommandsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveCommandsTesterBase.ref.hpp @@ -143,7 +143,7 @@ class ActiveCommandsTesterBase : //! Initialize object ActiveCommandsTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -154,85 +154,85 @@ class ActiveCommandsTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to noArgsAsync[portNum] void connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedAsync[portNum] void connect_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncAssert[portNum] void connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncBlockPriority[portNum] void connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncDropPriority[portNum] void connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -246,35 +246,35 @@ class ActiveCommandsTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -283,7 +283,7 @@ class ActiveCommandsTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -292,42 +292,42 @@ class ActiveCommandsTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -353,17 +353,17 @@ class ActiveCommandsTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -375,7 +375,7 @@ class ActiveCommandsTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -393,17 +393,17 @@ class ActiveCommandsTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -415,7 +415,7 @@ class ActiveCommandsTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -433,32 +433,32 @@ class ActiveCommandsTesterBase : //! Invoke the to port connected to noArgsAsync void invoke_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedAsync void invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -470,7 +470,7 @@ class ActiveCommandsTesterBase : //! Invoke the to port connected to typedAsyncAssert void invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -482,7 +482,7 @@ class ActiveCommandsTesterBase : //! Invoke the to port connected to typedAsyncBlockPriority void invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -494,7 +494,7 @@ class ActiveCommandsTesterBase : //! Invoke the to port connected to typedAsyncDropPriority void invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -506,7 +506,7 @@ class ActiveCommandsTesterBase : //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -518,7 +518,7 @@ class ActiveCommandsTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -530,7 +530,7 @@ class ActiveCommandsTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -542,7 +542,7 @@ class ActiveCommandsTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -561,136 +561,136 @@ class ActiveCommandsTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_noArgsAsync ports //! //! \return The number of to_noArgsAsync ports - NATIVE_INT_TYPE getNum_to_noArgsAsync() const; + FwIndexType getNum_to_noArgsAsync() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedAsync ports //! //! \return The number of to_typedAsync ports - NATIVE_INT_TYPE getNum_to_typedAsync() const; + FwIndexType getNum_to_typedAsync() const; //! Get the number of to_typedAsyncAssert ports //! //! \return The number of to_typedAsyncAssert ports - NATIVE_INT_TYPE getNum_to_typedAsyncAssert() const; + FwIndexType getNum_to_typedAsyncAssert() const; //! Get the number of to_typedAsyncBlockPriority ports //! //! \return The number of to_typedAsyncBlockPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncBlockPriority() const; + FwIndexType getNum_to_typedAsyncBlockPriority() const; //! Get the number of to_typedAsyncDropPriority ports //! //! \return The number of to_typedAsyncDropPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncDropPriority() const; + FwIndexType getNum_to_typedAsyncDropPriority() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -702,98 +702,98 @@ class ActiveCommandsTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsAsync is connected //! //! \return Whether port to_noArgsAsync is connected bool isConnected_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsync is connected //! //! \return Whether port to_typedAsync is connected bool isConnected_to_typedAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncAssert is connected //! //! \return Whether port to_typedAsyncAssert is connected bool isConnected_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncBlockPriority is connected //! //! \return Whether port to_typedAsyncBlockPriority is connected bool isConnected_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncDropPriority is connected //! //! \return Whether port to_typedAsyncDropPriority is connected bool isConnected_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -818,13 +818,13 @@ class ActiveCommandsTesterBase : //! Send a CMD_SYNC command void sendCmd_CMD_SYNC( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_SYNC_PRIMITIVE command void sendCmd_CMD_SYNC_PRIMITIVE( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32, //!< A U32 F32 f32, //!< An F32 @@ -833,7 +833,7 @@ class ActiveCommandsTesterBase : //! Send a CMD_SYNC_STRING command void sendCmd_CMD_SYNC_STRING( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number const Fw::CmdStringArg& str1, //!< A string const Fw::CmdStringArg& str2 //!< Another string @@ -841,34 +841,34 @@ class ActiveCommandsTesterBase : //! Send a CMD_SYNC_ENUM command void sendCmd_CMD_SYNC_ENUM( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number E e //!< An enum ); //! Send a CMD_SYNC_ARRAY command void sendCmd_CMD_SYNC_ARRAY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number A a //!< An array ); //! Send a CMD_SYNC_STRUCT command void sendCmd_CMD_SYNC_STRUCT( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number S s //!< A struct ); //! Send a CMD_GUARDED command void sendCmd_CMD_GUARDED( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_GUARDED_PRIMITIVE command void sendCmd_CMD_GUARDED_PRIMITIVE( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32, //!< A U32 F32 f32, //!< An F32 @@ -877,7 +877,7 @@ class ActiveCommandsTesterBase : //! Send a CMD_GUARDED_STRING command void sendCmd_CMD_GUARDED_STRING( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number const Fw::CmdStringArg& str1, //!< A string const Fw::CmdStringArg& str2 //!< Another string @@ -885,53 +885,53 @@ class ActiveCommandsTesterBase : //! Send a CMD_GUARDED_ENUM command void sendCmd_CMD_GUARDED_ENUM( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number E e //!< An enum ); //! Send a CMD_GUARDED_ARRAY command void sendCmd_CMD_GUARDED_ARRAY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number A a //!< An array ); //! Send a CMD_GUARDED_STRUCT command void sendCmd_CMD_GUARDED_STRUCT( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number S s //!< A struct ); //! Send a CMD_ASYNC command void sendCmd_CMD_ASYNC( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_PRIORITY command void sendCmd_CMD_PRIORITY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_PARAMS_PRIORITY command void sendCmd_CMD_PARAMS_PRIORITY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32 ); //! Send a CMD_DROP command void sendCmd_CMD_DROP( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_PARAMS_PRIORITY_DROP command void sendCmd_CMD_PARAMS_PRIORITY_DROP( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32 ); @@ -996,14 +996,14 @@ class ActiveCommandsTesterBase : //! Static function for port from_cmdRegOut static void from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode //!< Command Op Code ); //! Static function for port from_cmdResponseOut static void from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence const Fw::CmdResponse& response //!< The command response argument @@ -1012,26 +1012,26 @@ class ActiveCommandsTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1044,7 +1044,7 @@ class ActiveCommandsTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveEventsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveEventsTesterBase.ref.cpp index f8084b07b..feaa7a9c0 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveEventsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveEventsTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void ActiveEventsTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_eventOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_eventOut()); port++ ) { this->m_from_eventOut[port].init(); @@ -46,8 +46,8 @@ void ActiveEventsTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect input port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_textEventOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_textEventOut()); port++ ) { this->m_from_textEventOut[port].init(); @@ -71,8 +71,8 @@ void ActiveEventsTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -95,8 +95,8 @@ void ActiveEventsTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -119,8 +119,8 @@ void ActiveEventsTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -143,8 +143,8 @@ void ActiveEventsTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -167,8 +167,8 @@ void ActiveEventsTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -191,8 +191,8 @@ void ActiveEventsTesterBase :: // Connect output port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsAsync()); port++ ) { this->m_to_noArgsAsync[port].init(); @@ -210,8 +210,8 @@ void ActiveEventsTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -229,8 +229,8 @@ void ActiveEventsTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -248,8 +248,8 @@ void ActiveEventsTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -267,8 +267,8 @@ void ActiveEventsTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -286,8 +286,8 @@ void ActiveEventsTesterBase :: // Connect output port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsync()); port++ ) { this->m_to_typedAsync[port].init(); @@ -305,8 +305,8 @@ void ActiveEventsTesterBase :: // Connect output port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncAssert()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncAssert()); port++ ) { this->m_to_typedAsyncAssert[port].init(); @@ -324,8 +324,8 @@ void ActiveEventsTesterBase :: // Connect output port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncBlockPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncBlockPriority()); port++ ) { this->m_to_typedAsyncBlockPriority[port].init(); @@ -343,8 +343,8 @@ void ActiveEventsTesterBase :: // Connect output port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncDropPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncDropPriority()); port++ ) { this->m_to_typedAsyncDropPriority[port].init(); @@ -362,8 +362,8 @@ void ActiveEventsTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -381,8 +381,8 @@ void ActiveEventsTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -400,8 +400,8 @@ void ActiveEventsTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -419,8 +419,8 @@ void ActiveEventsTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -443,7 +443,7 @@ void ActiveEventsTesterBase :: void ActiveEventsTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -457,7 +457,7 @@ void ActiveEventsTesterBase :: void ActiveEventsTesterBase :: connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -471,7 +471,7 @@ void ActiveEventsTesterBase :: void ActiveEventsTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -485,7 +485,7 @@ void ActiveEventsTesterBase :: void ActiveEventsTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -499,7 +499,7 @@ void ActiveEventsTesterBase :: void ActiveEventsTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -513,7 +513,7 @@ void ActiveEventsTesterBase :: void ActiveEventsTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -527,7 +527,7 @@ void ActiveEventsTesterBase :: void ActiveEventsTesterBase :: connect_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -541,7 +541,7 @@ void ActiveEventsTesterBase :: void ActiveEventsTesterBase :: connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -555,7 +555,7 @@ void ActiveEventsTesterBase :: void ActiveEventsTesterBase :: connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -569,7 +569,7 @@ void ActiveEventsTesterBase :: void ActiveEventsTesterBase :: connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -583,7 +583,7 @@ void ActiveEventsTesterBase :: void ActiveEventsTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -597,7 +597,7 @@ void ActiveEventsTesterBase :: void ActiveEventsTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -611,7 +611,7 @@ void ActiveEventsTesterBase :: void ActiveEventsTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -625,7 +625,7 @@ void ActiveEventsTesterBase :: void ActiveEventsTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -642,7 +642,7 @@ void ActiveEventsTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* ActiveEventsTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -653,7 +653,7 @@ Fw::InputCmdRegPort* ActiveEventsTesterBase :: } Fw::InputCmdResponsePort* ActiveEventsTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -664,7 +664,7 @@ Fw::InputCmdResponsePort* ActiveEventsTesterBase :: } Fw::InputLogPort* ActiveEventsTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -675,7 +675,7 @@ Fw::InputLogPort* ActiveEventsTesterBase :: } Fw::InputPrmGetPort* ActiveEventsTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -686,7 +686,7 @@ Fw::InputPrmGetPort* ActiveEventsTesterBase :: } Fw::InputPrmSetPort* ActiveEventsTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -699,7 +699,7 @@ Fw::InputPrmSetPort* ActiveEventsTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* ActiveEventsTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -712,7 +712,7 @@ Fw::InputLogTextPort* ActiveEventsTesterBase :: #endif Fw::InputTimePort* ActiveEventsTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -723,7 +723,7 @@ Fw::InputTimePort* ActiveEventsTesterBase :: } Fw::InputTlmPort* ActiveEventsTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -734,7 +734,7 @@ Fw::InputTlmPort* ActiveEventsTesterBase :: } Ports::InputNoArgsPort* ActiveEventsTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -745,7 +745,7 @@ Ports::InputNoArgsPort* ActiveEventsTesterBase :: } Ports::InputNoArgsReturnPort* ActiveEventsTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -756,7 +756,7 @@ Ports::InputNoArgsReturnPort* ActiveEventsTesterBase :: } Ports::InputTypedPort* ActiveEventsTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -767,7 +767,7 @@ Ports::InputTypedPort* ActiveEventsTesterBase :: } Ports::InputTypedReturnPort* ActiveEventsTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -829,7 +829,7 @@ ActiveEventsTesterBase :: // ---------------------------------------------------------------------- void ActiveEventsTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -840,7 +840,7 @@ void ActiveEventsTesterBase :: } U32 ActiveEventsTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -852,7 +852,7 @@ U32 ActiveEventsTesterBase :: void ActiveEventsTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -881,7 +881,7 @@ void ActiveEventsTesterBase :: F32 ActiveEventsTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -913,7 +913,7 @@ F32 ActiveEventsTesterBase :: // ---------------------------------------------------------------------- void ActiveEventsTesterBase :: - invoke_to_noArgsAsync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsAsync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -924,7 +924,7 @@ void ActiveEventsTesterBase :: } void ActiveEventsTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -935,7 +935,7 @@ void ActiveEventsTesterBase :: } U32 ActiveEventsTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -946,7 +946,7 @@ U32 ActiveEventsTesterBase :: } U32 ActiveEventsTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -957,7 +957,7 @@ U32 ActiveEventsTesterBase :: } void ActiveEventsTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -969,7 +969,7 @@ void ActiveEventsTesterBase :: void ActiveEventsTesterBase :: invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -997,7 +997,7 @@ void ActiveEventsTesterBase :: void ActiveEventsTesterBase :: invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1025,7 +1025,7 @@ void ActiveEventsTesterBase :: void ActiveEventsTesterBase :: invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1053,7 +1053,7 @@ void ActiveEventsTesterBase :: void ActiveEventsTesterBase :: invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1081,7 +1081,7 @@ void ActiveEventsTesterBase :: void ActiveEventsTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1109,7 +1109,7 @@ void ActiveEventsTesterBase :: F32 ActiveEventsTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1137,7 +1137,7 @@ F32 ActiveEventsTesterBase :: F32 ActiveEventsTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1165,7 +1165,7 @@ F32 ActiveEventsTesterBase :: void ActiveEventsTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1195,164 +1195,164 @@ void ActiveEventsTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_to_noArgsAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); } -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_to_typedAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); } -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_to_typedAsyncAssert() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); } -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_to_typedAsyncBlockPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); } -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_to_typedAsyncDropPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); } -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE ActiveEventsTesterBase :: +FwIndexType ActiveEventsTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1360,7 +1360,7 @@ NATIVE_INT_TYPE ActiveEventsTesterBase :: // ---------------------------------------------------------------------- bool ActiveEventsTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1371,7 +1371,7 @@ bool ActiveEventsTesterBase :: } bool ActiveEventsTesterBase :: - isConnected_to_noArgsAsync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsAsync(), @@ -1382,7 +1382,7 @@ bool ActiveEventsTesterBase :: } bool ActiveEventsTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1393,7 +1393,7 @@ bool ActiveEventsTesterBase :: } bool ActiveEventsTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1404,7 +1404,7 @@ bool ActiveEventsTesterBase :: } bool ActiveEventsTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1415,7 +1415,7 @@ bool ActiveEventsTesterBase :: } bool ActiveEventsTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1426,7 +1426,7 @@ bool ActiveEventsTesterBase :: } bool ActiveEventsTesterBase :: - isConnected_to_typedAsync(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsync(), @@ -1437,7 +1437,7 @@ bool ActiveEventsTesterBase :: } bool ActiveEventsTesterBase :: - isConnected_to_typedAsyncAssert(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncAssert(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncAssert(), @@ -1448,7 +1448,7 @@ bool ActiveEventsTesterBase :: } bool ActiveEventsTesterBase :: - isConnected_to_typedAsyncBlockPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncBlockPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncBlockPriority(), @@ -1459,7 +1459,7 @@ bool ActiveEventsTesterBase :: } bool ActiveEventsTesterBase :: - isConnected_to_typedAsyncDropPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncDropPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncDropPriority(), @@ -1470,7 +1470,7 @@ bool ActiveEventsTesterBase :: } bool ActiveEventsTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1481,7 +1481,7 @@ bool ActiveEventsTesterBase :: } bool ActiveEventsTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1492,7 +1492,7 @@ bool ActiveEventsTesterBase :: } bool ActiveEventsTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1503,7 +1503,7 @@ bool ActiveEventsTesterBase :: } bool ActiveEventsTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -2095,7 +2095,7 @@ void ActiveEventsTesterBase :: void ActiveEventsTesterBase :: from_eventOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwEventIdType id, Fw::Time& timeTag, const Fw::LogSeverity& severity, @@ -2111,7 +2111,7 @@ void ActiveEventsTesterBase :: void ActiveEventsTesterBase :: from_textEventOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwEventIdType id, Fw::Time& timeTag, const Fw::LogSeverity& severity, @@ -2127,7 +2127,7 @@ void ActiveEventsTesterBase :: void ActiveEventsTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -2138,7 +2138,7 @@ void ActiveEventsTesterBase :: void ActiveEventsTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -2149,7 +2149,7 @@ void ActiveEventsTesterBase :: U32 ActiveEventsTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -2160,7 +2160,7 @@ U32 ActiveEventsTesterBase :: void ActiveEventsTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2187,7 +2187,7 @@ void ActiveEventsTesterBase :: F32 ActiveEventsTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveEventsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveEventsTesterBase.ref.hpp index 5d54f2005..6c7e066e9 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveEventsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveEventsTesterBase.ref.hpp @@ -176,7 +176,7 @@ class ActiveEventsTesterBase : //! Initialize object ActiveEventsTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -187,85 +187,85 @@ class ActiveEventsTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to noArgsAsync[portNum] void connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedAsync[portNum] void connect_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncAssert[portNum] void connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncBlockPriority[portNum] void connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncDropPriority[portNum] void connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -279,35 +279,35 @@ class ActiveEventsTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -316,7 +316,7 @@ class ActiveEventsTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -325,42 +325,42 @@ class ActiveEventsTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -386,17 +386,17 @@ class ActiveEventsTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -408,7 +408,7 @@ class ActiveEventsTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -426,17 +426,17 @@ class ActiveEventsTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -448,7 +448,7 @@ class ActiveEventsTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -466,32 +466,32 @@ class ActiveEventsTesterBase : //! Invoke the to port connected to noArgsAsync void invoke_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedAsync void invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -503,7 +503,7 @@ class ActiveEventsTesterBase : //! Invoke the to port connected to typedAsyncAssert void invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -515,7 +515,7 @@ class ActiveEventsTesterBase : //! Invoke the to port connected to typedAsyncBlockPriority void invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -527,7 +527,7 @@ class ActiveEventsTesterBase : //! Invoke the to port connected to typedAsyncDropPriority void invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -539,7 +539,7 @@ class ActiveEventsTesterBase : //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -551,7 +551,7 @@ class ActiveEventsTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -563,7 +563,7 @@ class ActiveEventsTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -575,7 +575,7 @@ class ActiveEventsTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -594,136 +594,136 @@ class ActiveEventsTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_noArgsAsync ports //! //! \return The number of to_noArgsAsync ports - NATIVE_INT_TYPE getNum_to_noArgsAsync() const; + FwIndexType getNum_to_noArgsAsync() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedAsync ports //! //! \return The number of to_typedAsync ports - NATIVE_INT_TYPE getNum_to_typedAsync() const; + FwIndexType getNum_to_typedAsync() const; //! Get the number of to_typedAsyncAssert ports //! //! \return The number of to_typedAsyncAssert ports - NATIVE_INT_TYPE getNum_to_typedAsyncAssert() const; + FwIndexType getNum_to_typedAsyncAssert() const; //! Get the number of to_typedAsyncBlockPriority ports //! //! \return The number of to_typedAsyncBlockPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncBlockPriority() const; + FwIndexType getNum_to_typedAsyncBlockPriority() const; //! Get the number of to_typedAsyncDropPriority ports //! //! \return The number of to_typedAsyncDropPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncDropPriority() const; + FwIndexType getNum_to_typedAsyncDropPriority() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -735,98 +735,98 @@ class ActiveEventsTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsAsync is connected //! //! \return Whether port to_noArgsAsync is connected bool isConnected_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsync is connected //! //! \return Whether port to_typedAsync is connected bool isConnected_to_typedAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncAssert is connected //! //! \return Whether port to_typedAsyncAssert is connected bool isConnected_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncBlockPriority is connected //! //! \return Whether port to_typedAsyncBlockPriority is connected bool isConnected_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncDropPriority is connected //! //! \return Whether port to_typedAsyncDropPriority is connected bool isConnected_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -965,7 +965,7 @@ class ActiveEventsTesterBase : //! Static function for port from_eventOut static void from_eventOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwEventIdType id, //!< Log ID Fw::Time& timeTag, //!< Time Tag const Fw::LogSeverity& severity, //!< The severity argument @@ -977,7 +977,7 @@ class ActiveEventsTesterBase : //! Static function for port from_textEventOut static void from_textEventOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwEventIdType id, //!< Log ID Fw::Time& timeTag, //!< Time Tag const Fw::LogSeverity& severity, //!< The severity argument @@ -989,26 +989,26 @@ class ActiveEventsTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1021,7 +1021,7 @@ class ActiveEventsTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGetProductsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGetProductsTesterBase.ref.cpp index 1fea0756b..318691935 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGetProductsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGetProductsTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void ActiveGetProductsTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port productGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productGetOut()); port++ ) { this->m_from_productGetOut[port].init(); @@ -45,8 +45,8 @@ void ActiveGetProductsTesterBase :: // Connect input port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productSendOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productSendOut()); port++ ) { this->m_from_productSendOut[port].init(); @@ -69,8 +69,8 @@ void ActiveGetProductsTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -93,8 +93,8 @@ void ActiveGetProductsTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -117,8 +117,8 @@ void ActiveGetProductsTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -141,8 +141,8 @@ void ActiveGetProductsTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -165,8 +165,8 @@ void ActiveGetProductsTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -189,8 +189,8 @@ void ActiveGetProductsTesterBase :: // Connect output port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsAsync()); port++ ) { this->m_to_noArgsAsync[port].init(); @@ -208,8 +208,8 @@ void ActiveGetProductsTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -227,8 +227,8 @@ void ActiveGetProductsTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -246,8 +246,8 @@ void ActiveGetProductsTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -265,8 +265,8 @@ void ActiveGetProductsTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -284,8 +284,8 @@ void ActiveGetProductsTesterBase :: // Connect output port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsync()); port++ ) { this->m_to_typedAsync[port].init(); @@ -303,8 +303,8 @@ void ActiveGetProductsTesterBase :: // Connect output port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncAssert()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncAssert()); port++ ) { this->m_to_typedAsyncAssert[port].init(); @@ -322,8 +322,8 @@ void ActiveGetProductsTesterBase :: // Connect output port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncBlockPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncBlockPriority()); port++ ) { this->m_to_typedAsyncBlockPriority[port].init(); @@ -341,8 +341,8 @@ void ActiveGetProductsTesterBase :: // Connect output port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncDropPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncDropPriority()); port++ ) { this->m_to_typedAsyncDropPriority[port].init(); @@ -360,8 +360,8 @@ void ActiveGetProductsTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -379,8 +379,8 @@ void ActiveGetProductsTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -398,8 +398,8 @@ void ActiveGetProductsTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -417,8 +417,8 @@ void ActiveGetProductsTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -441,7 +441,7 @@ void ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -455,7 +455,7 @@ void ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -469,7 +469,7 @@ void ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -483,7 +483,7 @@ void ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -497,7 +497,7 @@ void ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -511,7 +511,7 @@ void ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -525,7 +525,7 @@ void ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: connect_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -539,7 +539,7 @@ void ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -553,7 +553,7 @@ void ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -567,7 +567,7 @@ void ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -581,7 +581,7 @@ void ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -595,7 +595,7 @@ void ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -609,7 +609,7 @@ void ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -623,7 +623,7 @@ void ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -640,7 +640,7 @@ void ActiveGetProductsTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* ActiveGetProductsTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -651,7 +651,7 @@ Fw::InputCmdRegPort* ActiveGetProductsTesterBase :: } Fw::InputCmdResponsePort* ActiveGetProductsTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -662,7 +662,7 @@ Fw::InputCmdResponsePort* ActiveGetProductsTesterBase :: } Fw::InputLogPort* ActiveGetProductsTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -673,7 +673,7 @@ Fw::InputLogPort* ActiveGetProductsTesterBase :: } Fw::InputPrmGetPort* ActiveGetProductsTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -684,7 +684,7 @@ Fw::InputPrmGetPort* ActiveGetProductsTesterBase :: } Fw::InputPrmSetPort* ActiveGetProductsTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -695,7 +695,7 @@ Fw::InputPrmSetPort* ActiveGetProductsTesterBase :: } Fw::InputDpGetPort* ActiveGetProductsTesterBase :: - get_from_productGetOut(NATIVE_INT_TYPE portNum) + get_from_productGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productGetOut(), @@ -706,7 +706,7 @@ Fw::InputDpGetPort* ActiveGetProductsTesterBase :: } Fw::InputDpSendPort* ActiveGetProductsTesterBase :: - get_from_productSendOut(NATIVE_INT_TYPE portNum) + get_from_productSendOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productSendOut(), @@ -719,7 +719,7 @@ Fw::InputDpSendPort* ActiveGetProductsTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* ActiveGetProductsTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -732,7 +732,7 @@ Fw::InputLogTextPort* ActiveGetProductsTesterBase :: #endif Fw::InputTimePort* ActiveGetProductsTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -743,7 +743,7 @@ Fw::InputTimePort* ActiveGetProductsTesterBase :: } Fw::InputTlmPort* ActiveGetProductsTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -754,7 +754,7 @@ Fw::InputTlmPort* ActiveGetProductsTesterBase :: } Ports::InputNoArgsPort* ActiveGetProductsTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -765,7 +765,7 @@ Ports::InputNoArgsPort* ActiveGetProductsTesterBase :: } Ports::InputNoArgsReturnPort* ActiveGetProductsTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -776,7 +776,7 @@ Ports::InputNoArgsReturnPort* ActiveGetProductsTesterBase :: } Ports::InputTypedPort* ActiveGetProductsTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -787,7 +787,7 @@ Ports::InputTypedPort* ActiveGetProductsTesterBase :: } Ports::InputTypedReturnPort* ActiveGetProductsTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -837,7 +837,7 @@ ActiveGetProductsTesterBase :: // ---------------------------------------------------------------------- void ActiveGetProductsTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -848,7 +848,7 @@ void ActiveGetProductsTesterBase :: } U32 ActiveGetProductsTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -860,7 +860,7 @@ U32 ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -889,7 +889,7 @@ void ActiveGetProductsTesterBase :: F32 ActiveGetProductsTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -921,7 +921,7 @@ F32 ActiveGetProductsTesterBase :: // ---------------------------------------------------------------------- void ActiveGetProductsTesterBase :: - invoke_to_noArgsAsync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsAsync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -932,7 +932,7 @@ void ActiveGetProductsTesterBase :: } void ActiveGetProductsTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -943,7 +943,7 @@ void ActiveGetProductsTesterBase :: } U32 ActiveGetProductsTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -954,7 +954,7 @@ U32 ActiveGetProductsTesterBase :: } U32 ActiveGetProductsTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -965,7 +965,7 @@ U32 ActiveGetProductsTesterBase :: } void ActiveGetProductsTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -977,7 +977,7 @@ void ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1005,7 +1005,7 @@ void ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1033,7 +1033,7 @@ void ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1061,7 +1061,7 @@ void ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1089,7 +1089,7 @@ void ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1117,7 +1117,7 @@ void ActiveGetProductsTesterBase :: F32 ActiveGetProductsTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1145,7 +1145,7 @@ F32 ActiveGetProductsTesterBase :: F32 ActiveGetProductsTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1173,7 +1173,7 @@ F32 ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1203,176 +1203,176 @@ void ActiveGetProductsTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_to_noArgsAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_to_typedAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_to_typedAsyncAssert() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_to_typedAsyncBlockPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_to_typedAsyncDropPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_from_productGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productGetOut)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_from_productSendOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE ActiveGetProductsTesterBase :: +FwIndexType ActiveGetProductsTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1380,7 +1380,7 @@ NATIVE_INT_TYPE ActiveGetProductsTesterBase :: // ---------------------------------------------------------------------- bool ActiveGetProductsTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1391,7 +1391,7 @@ bool ActiveGetProductsTesterBase :: } bool ActiveGetProductsTesterBase :: - isConnected_to_noArgsAsync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsAsync(), @@ -1402,7 +1402,7 @@ bool ActiveGetProductsTesterBase :: } bool ActiveGetProductsTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1413,7 +1413,7 @@ bool ActiveGetProductsTesterBase :: } bool ActiveGetProductsTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1424,7 +1424,7 @@ bool ActiveGetProductsTesterBase :: } bool ActiveGetProductsTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1435,7 +1435,7 @@ bool ActiveGetProductsTesterBase :: } bool ActiveGetProductsTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1446,7 +1446,7 @@ bool ActiveGetProductsTesterBase :: } bool ActiveGetProductsTesterBase :: - isConnected_to_typedAsync(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsync(), @@ -1457,7 +1457,7 @@ bool ActiveGetProductsTesterBase :: } bool ActiveGetProductsTesterBase :: - isConnected_to_typedAsyncAssert(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncAssert(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncAssert(), @@ -1468,7 +1468,7 @@ bool ActiveGetProductsTesterBase :: } bool ActiveGetProductsTesterBase :: - isConnected_to_typedAsyncBlockPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncBlockPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncBlockPriority(), @@ -1479,7 +1479,7 @@ bool ActiveGetProductsTesterBase :: } bool ActiveGetProductsTesterBase :: - isConnected_to_typedAsyncDropPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncDropPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncDropPriority(), @@ -1490,7 +1490,7 @@ bool ActiveGetProductsTesterBase :: } bool ActiveGetProductsTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1501,7 +1501,7 @@ bool ActiveGetProductsTesterBase :: } bool ActiveGetProductsTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1512,7 +1512,7 @@ bool ActiveGetProductsTesterBase :: } bool ActiveGetProductsTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1523,7 +1523,7 @@ bool ActiveGetProductsTesterBase :: } bool ActiveGetProductsTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1679,7 +1679,7 @@ void ActiveGetProductsTesterBase :: Fw::Success ActiveGetProductsTesterBase :: from_productGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize, Fw::Buffer& buffer @@ -1692,7 +1692,7 @@ Fw::Success ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: from_productSendOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -1704,7 +1704,7 @@ void ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -1715,7 +1715,7 @@ void ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1726,7 +1726,7 @@ void ActiveGetProductsTesterBase :: U32 ActiveGetProductsTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1737,7 +1737,7 @@ U32 ActiveGetProductsTesterBase :: void ActiveGetProductsTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1764,7 +1764,7 @@ void ActiveGetProductsTesterBase :: F32 ActiveGetProductsTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGetProductsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGetProductsTesterBase.ref.hpp index 97e6b70b2..f12771213 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGetProductsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGetProductsTesterBase.ref.hpp @@ -149,7 +149,7 @@ class ActiveGetProductsTesterBase : //! Initialize object ActiveGetProductsTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -160,85 +160,85 @@ class ActiveGetProductsTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to noArgsAsync[portNum] void connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedAsync[portNum] void connect_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncAssert[portNum] void connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncBlockPriority[portNum] void connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncDropPriority[portNum] void connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -252,49 +252,49 @@ class ActiveGetProductsTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productGetOut[portNum] Fw::InputDpGetPort* get_from_productGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productSendOut[portNum] Fw::InputDpSendPort* get_from_productSendOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -303,7 +303,7 @@ class ActiveGetProductsTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -312,42 +312,42 @@ class ActiveGetProductsTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -373,17 +373,17 @@ class ActiveGetProductsTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -395,7 +395,7 @@ class ActiveGetProductsTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -413,17 +413,17 @@ class ActiveGetProductsTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -435,7 +435,7 @@ class ActiveGetProductsTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -453,32 +453,32 @@ class ActiveGetProductsTesterBase : //! Invoke the to port connected to noArgsAsync void invoke_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedAsync void invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -490,7 +490,7 @@ class ActiveGetProductsTesterBase : //! Invoke the to port connected to typedAsyncAssert void invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -502,7 +502,7 @@ class ActiveGetProductsTesterBase : //! Invoke the to port connected to typedAsyncBlockPriority void invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -514,7 +514,7 @@ class ActiveGetProductsTesterBase : //! Invoke the to port connected to typedAsyncDropPriority void invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -526,7 +526,7 @@ class ActiveGetProductsTesterBase : //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -538,7 +538,7 @@ class ActiveGetProductsTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -550,7 +550,7 @@ class ActiveGetProductsTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -562,7 +562,7 @@ class ActiveGetProductsTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -581,146 +581,146 @@ class ActiveGetProductsTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_noArgsAsync ports //! //! \return The number of to_noArgsAsync ports - NATIVE_INT_TYPE getNum_to_noArgsAsync() const; + FwIndexType getNum_to_noArgsAsync() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedAsync ports //! //! \return The number of to_typedAsync ports - NATIVE_INT_TYPE getNum_to_typedAsync() const; + FwIndexType getNum_to_typedAsync() const; //! Get the number of to_typedAsyncAssert ports //! //! \return The number of to_typedAsyncAssert ports - NATIVE_INT_TYPE getNum_to_typedAsyncAssert() const; + FwIndexType getNum_to_typedAsyncAssert() const; //! Get the number of to_typedAsyncBlockPriority ports //! //! \return The number of to_typedAsyncBlockPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncBlockPriority() const; + FwIndexType getNum_to_typedAsyncBlockPriority() const; //! Get the number of to_typedAsyncDropPriority ports //! //! \return The number of to_typedAsyncDropPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncDropPriority() const; + FwIndexType getNum_to_typedAsyncDropPriority() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; //! Get the number of from_productGetOut ports //! //! \return The number of from_productGetOut ports - NATIVE_INT_TYPE getNum_from_productGetOut() const; + FwIndexType getNum_from_productGetOut() const; //! Get the number of from_productSendOut ports //! //! \return The number of from_productSendOut ports - NATIVE_INT_TYPE getNum_from_productSendOut() const; + FwIndexType getNum_from_productSendOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -732,98 +732,98 @@ class ActiveGetProductsTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsAsync is connected //! //! \return Whether port to_noArgsAsync is connected bool isConnected_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsync is connected //! //! \return Whether port to_typedAsync is connected bool isConnected_to_typedAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncAssert is connected //! //! \return Whether port to_typedAsyncAssert is connected bool isConnected_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncBlockPriority is connected //! //! \return Whether port to_typedAsyncBlockPriority is connected bool isConnected_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncDropPriority is connected //! //! \return Whether port to_typedAsyncDropPriority is connected bool isConnected_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -924,7 +924,7 @@ class ActiveGetProductsTesterBase : //! Static function for port from_productGetOut static Fw::Success from_productGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID (input) FwSizeType dataSize, //!< The data size of the requested buffer (input) Fw::Buffer& buffer //!< The buffer (output) @@ -933,7 +933,7 @@ class ActiveGetProductsTesterBase : //! Static function for port from_productSendOut static void from_productSendOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -941,26 +941,26 @@ class ActiveGetProductsTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -973,7 +973,7 @@ class ActiveGetProductsTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGuardedProductsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGuardedProductsTesterBase.ref.cpp index 71bdef31d..aa0ee8d39 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGuardedProductsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGuardedProductsTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void ActiveGuardedProductsTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productRequestOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productRequestOut()); port++ ) { this->m_from_productRequestOut[port].init(); @@ -45,8 +45,8 @@ void ActiveGuardedProductsTesterBase :: // Connect input port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productSendOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productSendOut()); port++ ) { this->m_from_productSendOut[port].init(); @@ -69,8 +69,8 @@ void ActiveGuardedProductsTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -93,8 +93,8 @@ void ActiveGuardedProductsTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -117,8 +117,8 @@ void ActiveGuardedProductsTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -141,8 +141,8 @@ void ActiveGuardedProductsTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -165,8 +165,8 @@ void ActiveGuardedProductsTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -189,8 +189,8 @@ void ActiveGuardedProductsTesterBase :: // Connect output port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_productRecvIn()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_productRecvIn()); port++ ) { this->m_to_productRecvIn[port].init(); @@ -208,8 +208,8 @@ void ActiveGuardedProductsTesterBase :: // Connect output port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsAsync()); port++ ) { this->m_to_noArgsAsync[port].init(); @@ -227,8 +227,8 @@ void ActiveGuardedProductsTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -246,8 +246,8 @@ void ActiveGuardedProductsTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -265,8 +265,8 @@ void ActiveGuardedProductsTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -284,8 +284,8 @@ void ActiveGuardedProductsTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -303,8 +303,8 @@ void ActiveGuardedProductsTesterBase :: // Connect output port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsync()); port++ ) { this->m_to_typedAsync[port].init(); @@ -322,8 +322,8 @@ void ActiveGuardedProductsTesterBase :: // Connect output port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncAssert()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncAssert()); port++ ) { this->m_to_typedAsyncAssert[port].init(); @@ -341,8 +341,8 @@ void ActiveGuardedProductsTesterBase :: // Connect output port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncBlockPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncBlockPriority()); port++ ) { this->m_to_typedAsyncBlockPriority[port].init(); @@ -360,8 +360,8 @@ void ActiveGuardedProductsTesterBase :: // Connect output port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncDropPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncDropPriority()); port++ ) { this->m_to_typedAsyncDropPriority[port].init(); @@ -379,8 +379,8 @@ void ActiveGuardedProductsTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -398,8 +398,8 @@ void ActiveGuardedProductsTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -417,8 +417,8 @@ void ActiveGuardedProductsTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -436,8 +436,8 @@ void ActiveGuardedProductsTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -460,7 +460,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -474,7 +474,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpResponsePort* port ) { @@ -488,7 +488,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -502,7 +502,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -516,7 +516,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -530,7 +530,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -544,7 +544,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -558,7 +558,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: connect_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -572,7 +572,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -586,7 +586,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -600,7 +600,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -614,7 +614,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -628,7 +628,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -642,7 +642,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -656,7 +656,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -673,7 +673,7 @@ void ActiveGuardedProductsTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* ActiveGuardedProductsTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -684,7 +684,7 @@ Fw::InputCmdRegPort* ActiveGuardedProductsTesterBase :: } Fw::InputCmdResponsePort* ActiveGuardedProductsTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -695,7 +695,7 @@ Fw::InputCmdResponsePort* ActiveGuardedProductsTesterBase :: } Fw::InputLogPort* ActiveGuardedProductsTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -706,7 +706,7 @@ Fw::InputLogPort* ActiveGuardedProductsTesterBase :: } Fw::InputPrmGetPort* ActiveGuardedProductsTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -717,7 +717,7 @@ Fw::InputPrmGetPort* ActiveGuardedProductsTesterBase :: } Fw::InputPrmSetPort* ActiveGuardedProductsTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -728,7 +728,7 @@ Fw::InputPrmSetPort* ActiveGuardedProductsTesterBase :: } Fw::InputDpRequestPort* ActiveGuardedProductsTesterBase :: - get_from_productRequestOut(NATIVE_INT_TYPE portNum) + get_from_productRequestOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productRequestOut(), @@ -739,7 +739,7 @@ Fw::InputDpRequestPort* ActiveGuardedProductsTesterBase :: } Fw::InputDpSendPort* ActiveGuardedProductsTesterBase :: - get_from_productSendOut(NATIVE_INT_TYPE portNum) + get_from_productSendOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productSendOut(), @@ -752,7 +752,7 @@ Fw::InputDpSendPort* ActiveGuardedProductsTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* ActiveGuardedProductsTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -765,7 +765,7 @@ Fw::InputLogTextPort* ActiveGuardedProductsTesterBase :: #endif Fw::InputTimePort* ActiveGuardedProductsTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -776,7 +776,7 @@ Fw::InputTimePort* ActiveGuardedProductsTesterBase :: } Fw::InputTlmPort* ActiveGuardedProductsTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -787,7 +787,7 @@ Fw::InputTlmPort* ActiveGuardedProductsTesterBase :: } Ports::InputNoArgsPort* ActiveGuardedProductsTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -798,7 +798,7 @@ Ports::InputNoArgsPort* ActiveGuardedProductsTesterBase :: } Ports::InputNoArgsReturnPort* ActiveGuardedProductsTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -809,7 +809,7 @@ Ports::InputNoArgsReturnPort* ActiveGuardedProductsTesterBase :: } Ports::InputTypedPort* ActiveGuardedProductsTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -820,7 +820,7 @@ Ports::InputTypedPort* ActiveGuardedProductsTesterBase :: } Ports::InputTypedReturnPort* ActiveGuardedProductsTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -870,7 +870,7 @@ ActiveGuardedProductsTesterBase :: // ---------------------------------------------------------------------- void ActiveGuardedProductsTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -881,7 +881,7 @@ void ActiveGuardedProductsTesterBase :: } U32 ActiveGuardedProductsTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -893,7 +893,7 @@ U32 ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -922,7 +922,7 @@ void ActiveGuardedProductsTesterBase :: F32 ActiveGuardedProductsTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -954,7 +954,7 @@ F32 ActiveGuardedProductsTesterBase :: // ---------------------------------------------------------------------- void ActiveGuardedProductsTesterBase :: - invoke_to_noArgsAsync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsAsync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -965,7 +965,7 @@ void ActiveGuardedProductsTesterBase :: } void ActiveGuardedProductsTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -976,7 +976,7 @@ void ActiveGuardedProductsTesterBase :: } U32 ActiveGuardedProductsTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -987,7 +987,7 @@ U32 ActiveGuardedProductsTesterBase :: } U32 ActiveGuardedProductsTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -998,7 +998,7 @@ U32 ActiveGuardedProductsTesterBase :: } void ActiveGuardedProductsTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1010,7 +1010,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1038,7 +1038,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1066,7 +1066,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1094,7 +1094,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1122,7 +1122,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1150,7 +1150,7 @@ void ActiveGuardedProductsTesterBase :: F32 ActiveGuardedProductsTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1178,7 +1178,7 @@ F32 ActiveGuardedProductsTesterBase :: F32 ActiveGuardedProductsTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1206,7 +1206,7 @@ F32 ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1236,182 +1236,182 @@ void ActiveGuardedProductsTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_to_productRecvIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_to_noArgsAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_to_typedAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_to_typedAsyncAssert() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_to_typedAsyncBlockPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_to_typedAsyncDropPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_from_productRequestOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_from_productSendOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: +FwIndexType ActiveGuardedProductsTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1419,7 +1419,7 @@ NATIVE_INT_TYPE ActiveGuardedProductsTesterBase :: // ---------------------------------------------------------------------- bool ActiveGuardedProductsTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1430,7 +1430,7 @@ bool ActiveGuardedProductsTesterBase :: } bool ActiveGuardedProductsTesterBase :: - isConnected_to_productRecvIn(NATIVE_INT_TYPE portNum) + isConnected_to_productRecvIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_productRecvIn(), @@ -1441,7 +1441,7 @@ bool ActiveGuardedProductsTesterBase :: } bool ActiveGuardedProductsTesterBase :: - isConnected_to_noArgsAsync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsAsync(), @@ -1452,7 +1452,7 @@ bool ActiveGuardedProductsTesterBase :: } bool ActiveGuardedProductsTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1463,7 +1463,7 @@ bool ActiveGuardedProductsTesterBase :: } bool ActiveGuardedProductsTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1474,7 +1474,7 @@ bool ActiveGuardedProductsTesterBase :: } bool ActiveGuardedProductsTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1485,7 +1485,7 @@ bool ActiveGuardedProductsTesterBase :: } bool ActiveGuardedProductsTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1496,7 +1496,7 @@ bool ActiveGuardedProductsTesterBase :: } bool ActiveGuardedProductsTesterBase :: - isConnected_to_typedAsync(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsync(), @@ -1507,7 +1507,7 @@ bool ActiveGuardedProductsTesterBase :: } bool ActiveGuardedProductsTesterBase :: - isConnected_to_typedAsyncAssert(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncAssert(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncAssert(), @@ -1518,7 +1518,7 @@ bool ActiveGuardedProductsTesterBase :: } bool ActiveGuardedProductsTesterBase :: - isConnected_to_typedAsyncBlockPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncBlockPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncBlockPriority(), @@ -1529,7 +1529,7 @@ bool ActiveGuardedProductsTesterBase :: } bool ActiveGuardedProductsTesterBase :: - isConnected_to_typedAsyncDropPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncDropPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncDropPriority(), @@ -1540,7 +1540,7 @@ bool ActiveGuardedProductsTesterBase :: } bool ActiveGuardedProductsTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1551,7 +1551,7 @@ bool ActiveGuardedProductsTesterBase :: } bool ActiveGuardedProductsTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1562,7 +1562,7 @@ bool ActiveGuardedProductsTesterBase :: } bool ActiveGuardedProductsTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1573,7 +1573,7 @@ bool ActiveGuardedProductsTesterBase :: } bool ActiveGuardedProductsTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1738,7 +1738,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: from_productRequestOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -1750,7 +1750,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: from_productSendOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -1762,7 +1762,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -1773,7 +1773,7 @@ void ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1784,7 +1784,7 @@ void ActiveGuardedProductsTesterBase :: U32 ActiveGuardedProductsTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1795,7 +1795,7 @@ U32 ActiveGuardedProductsTesterBase :: void ActiveGuardedProductsTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1822,7 +1822,7 @@ void ActiveGuardedProductsTesterBase :: F32 ActiveGuardedProductsTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGuardedProductsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGuardedProductsTesterBase.ref.hpp index 8de2331aa..432e2b162 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGuardedProductsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGuardedProductsTesterBase.ref.hpp @@ -149,7 +149,7 @@ class ActiveGuardedProductsTesterBase : //! Initialize object ActiveGuardedProductsTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -160,91 +160,91 @@ class ActiveGuardedProductsTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to productRecvIn[portNum] void connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpResponsePort* port //!< The input port ); //! Connect port to noArgsAsync[portNum] void connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedAsync[portNum] void connect_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncAssert[portNum] void connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncBlockPriority[portNum] void connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncDropPriority[portNum] void connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -258,49 +258,49 @@ class ActiveGuardedProductsTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productRequestOut[portNum] Fw::InputDpRequestPort* get_from_productRequestOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productSendOut[portNum] Fw::InputDpSendPort* get_from_productSendOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -309,7 +309,7 @@ class ActiveGuardedProductsTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -318,42 +318,42 @@ class ActiveGuardedProductsTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -379,17 +379,17 @@ class ActiveGuardedProductsTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -401,7 +401,7 @@ class ActiveGuardedProductsTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -419,17 +419,17 @@ class ActiveGuardedProductsTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -441,7 +441,7 @@ class ActiveGuardedProductsTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -459,32 +459,32 @@ class ActiveGuardedProductsTesterBase : //! Invoke the to port connected to noArgsAsync void invoke_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedAsync void invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -496,7 +496,7 @@ class ActiveGuardedProductsTesterBase : //! Invoke the to port connected to typedAsyncAssert void invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -508,7 +508,7 @@ class ActiveGuardedProductsTesterBase : //! Invoke the to port connected to typedAsyncBlockPriority void invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -520,7 +520,7 @@ class ActiveGuardedProductsTesterBase : //! Invoke the to port connected to typedAsyncDropPriority void invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -532,7 +532,7 @@ class ActiveGuardedProductsTesterBase : //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -544,7 +544,7 @@ class ActiveGuardedProductsTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -556,7 +556,7 @@ class ActiveGuardedProductsTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -568,7 +568,7 @@ class ActiveGuardedProductsTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -587,151 +587,151 @@ class ActiveGuardedProductsTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_productRecvIn ports //! //! \return The number of to_productRecvIn ports - NATIVE_INT_TYPE getNum_to_productRecvIn() const; + FwIndexType getNum_to_productRecvIn() const; //! Get the number of to_noArgsAsync ports //! //! \return The number of to_noArgsAsync ports - NATIVE_INT_TYPE getNum_to_noArgsAsync() const; + FwIndexType getNum_to_noArgsAsync() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedAsync ports //! //! \return The number of to_typedAsync ports - NATIVE_INT_TYPE getNum_to_typedAsync() const; + FwIndexType getNum_to_typedAsync() const; //! Get the number of to_typedAsyncAssert ports //! //! \return The number of to_typedAsyncAssert ports - NATIVE_INT_TYPE getNum_to_typedAsyncAssert() const; + FwIndexType getNum_to_typedAsyncAssert() const; //! Get the number of to_typedAsyncBlockPriority ports //! //! \return The number of to_typedAsyncBlockPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncBlockPriority() const; + FwIndexType getNum_to_typedAsyncBlockPriority() const; //! Get the number of to_typedAsyncDropPriority ports //! //! \return The number of to_typedAsyncDropPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncDropPriority() const; + FwIndexType getNum_to_typedAsyncDropPriority() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; //! Get the number of from_productRequestOut ports //! //! \return The number of from_productRequestOut ports - NATIVE_INT_TYPE getNum_from_productRequestOut() const; + FwIndexType getNum_from_productRequestOut() const; //! Get the number of from_productSendOut ports //! //! \return The number of from_productSendOut ports - NATIVE_INT_TYPE getNum_from_productSendOut() const; + FwIndexType getNum_from_productSendOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -743,105 +743,105 @@ class ActiveGuardedProductsTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_productRecvIn is connected //! //! \return Whether port to_productRecvIn is connected bool isConnected_to_productRecvIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsAsync is connected //! //! \return Whether port to_noArgsAsync is connected bool isConnected_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsync is connected //! //! \return Whether port to_typedAsync is connected bool isConnected_to_typedAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncAssert is connected //! //! \return Whether port to_typedAsyncAssert is connected bool isConnected_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncBlockPriority is connected //! //! \return Whether port to_typedAsyncBlockPriority is connected bool isConnected_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncDropPriority is connected //! //! \return Whether port to_typedAsyncDropPriority is connected bool isConnected_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -947,7 +947,7 @@ class ActiveGuardedProductsTesterBase : //! Static function for port from_productRequestOut static void from_productRequestOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); @@ -955,7 +955,7 @@ class ActiveGuardedProductsTesterBase : //! Static function for port from_productSendOut static void from_productSendOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -963,26 +963,26 @@ class ActiveGuardedProductsTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -995,7 +995,7 @@ class ActiveGuardedProductsTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveNoArgsPortsOnlyTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveNoArgsPortsOnlyTesterBase.ref.cpp index b41a26fea..98a304009 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveNoArgsPortsOnlyTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveNoArgsPortsOnlyTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void ActiveNoArgsPortsOnlyTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -45,8 +45,8 @@ void ActiveNoArgsPortsOnlyTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -69,8 +69,8 @@ void ActiveNoArgsPortsOnlyTesterBase :: // Connect output port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsAsync()); port++ ) { this->m_to_noArgsAsync[port].init(); @@ -88,8 +88,8 @@ void ActiveNoArgsPortsOnlyTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -107,8 +107,8 @@ void ActiveNoArgsPortsOnlyTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -126,8 +126,8 @@ void ActiveNoArgsPortsOnlyTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -150,7 +150,7 @@ void ActiveNoArgsPortsOnlyTesterBase :: void ActiveNoArgsPortsOnlyTesterBase :: connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -164,7 +164,7 @@ void ActiveNoArgsPortsOnlyTesterBase :: void ActiveNoArgsPortsOnlyTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -178,7 +178,7 @@ void ActiveNoArgsPortsOnlyTesterBase :: void ActiveNoArgsPortsOnlyTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -192,7 +192,7 @@ void ActiveNoArgsPortsOnlyTesterBase :: void ActiveNoArgsPortsOnlyTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -209,7 +209,7 @@ void ActiveNoArgsPortsOnlyTesterBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* ActiveNoArgsPortsOnlyTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -220,7 +220,7 @@ Ports::InputNoArgsPort* ActiveNoArgsPortsOnlyTesterBase :: } Ports::InputNoArgsReturnPort* ActiveNoArgsPortsOnlyTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -258,7 +258,7 @@ ActiveNoArgsPortsOnlyTesterBase :: // ---------------------------------------------------------------------- void ActiveNoArgsPortsOnlyTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -269,7 +269,7 @@ void ActiveNoArgsPortsOnlyTesterBase :: } U32 ActiveNoArgsPortsOnlyTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -284,7 +284,7 @@ U32 ActiveNoArgsPortsOnlyTesterBase :: // ---------------------------------------------------------------------- void ActiveNoArgsPortsOnlyTesterBase :: - invoke_to_noArgsAsync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsAsync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -295,7 +295,7 @@ void ActiveNoArgsPortsOnlyTesterBase :: } void ActiveNoArgsPortsOnlyTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -306,7 +306,7 @@ void ActiveNoArgsPortsOnlyTesterBase :: } U32 ActiveNoArgsPortsOnlyTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -317,7 +317,7 @@ U32 ActiveNoArgsPortsOnlyTesterBase :: } U32 ActiveNoArgsPortsOnlyTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -331,40 +331,40 @@ U32 ActiveNoArgsPortsOnlyTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveNoArgsPortsOnlyTesterBase :: +FwIndexType ActiveNoArgsPortsOnlyTesterBase :: getNum_to_noArgsAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); } -NATIVE_INT_TYPE ActiveNoArgsPortsOnlyTesterBase :: +FwIndexType ActiveNoArgsPortsOnlyTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE ActiveNoArgsPortsOnlyTesterBase :: +FwIndexType ActiveNoArgsPortsOnlyTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE ActiveNoArgsPortsOnlyTesterBase :: +FwIndexType ActiveNoArgsPortsOnlyTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE ActiveNoArgsPortsOnlyTesterBase :: +FwIndexType ActiveNoArgsPortsOnlyTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE ActiveNoArgsPortsOnlyTesterBase :: +FwIndexType ActiveNoArgsPortsOnlyTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } // ---------------------------------------------------------------------- @@ -372,7 +372,7 @@ NATIVE_INT_TYPE ActiveNoArgsPortsOnlyTesterBase :: // ---------------------------------------------------------------------- bool ActiveNoArgsPortsOnlyTesterBase :: - isConnected_to_noArgsAsync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsAsync(), @@ -383,7 +383,7 @@ bool ActiveNoArgsPortsOnlyTesterBase :: } bool ActiveNoArgsPortsOnlyTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -394,7 +394,7 @@ bool ActiveNoArgsPortsOnlyTesterBase :: } bool ActiveNoArgsPortsOnlyTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -405,7 +405,7 @@ bool ActiveNoArgsPortsOnlyTesterBase :: } bool ActiveNoArgsPortsOnlyTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -454,7 +454,7 @@ void ActiveNoArgsPortsOnlyTesterBase :: void ActiveNoArgsPortsOnlyTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -465,7 +465,7 @@ void ActiveNoArgsPortsOnlyTesterBase :: U32 ActiveNoArgsPortsOnlyTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveNoArgsPortsOnlyTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveNoArgsPortsOnlyTesterBase.ref.hpp index 6f16edba6..fca6b1026 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveNoArgsPortsOnlyTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveNoArgsPortsOnlyTesterBase.ref.hpp @@ -114,7 +114,7 @@ class ActiveNoArgsPortsOnlyTesterBase : //! Initialize object ActiveNoArgsPortsOnlyTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -125,25 +125,25 @@ class ActiveNoArgsPortsOnlyTesterBase : //! Connect port to noArgsAsync[portNum] void connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); @@ -157,14 +157,14 @@ class ActiveNoArgsPortsOnlyTesterBase : //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -190,12 +190,12 @@ class ActiveNoArgsPortsOnlyTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; protected: @@ -206,12 +206,12 @@ class ActiveNoArgsPortsOnlyTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -222,22 +222,22 @@ class ActiveNoArgsPortsOnlyTesterBase : //! Invoke the to port connected to noArgsAsync void invoke_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -249,32 +249,32 @@ class ActiveNoArgsPortsOnlyTesterBase : //! Get the number of to_noArgsAsync ports //! //! \return The number of to_noArgsAsync ports - NATIVE_INT_TYPE getNum_to_noArgsAsync() const; + FwIndexType getNum_to_noArgsAsync() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; protected: @@ -286,28 +286,28 @@ class ActiveNoArgsPortsOnlyTesterBase : //! //! \return Whether port to_noArgsAsync is connected bool isConnected_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -337,13 +337,13 @@ class ActiveNoArgsPortsOnlyTesterBase : //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.cpp index 30b1c4e4a..5d066a6d6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void ActiveParamsTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdRegOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdRegOut()); port++ ) { this->m_from_cmdRegOut[port].init(); @@ -45,8 +45,8 @@ void ActiveParamsTesterBase :: // Connect input port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdResponseOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdResponseOut()); port++ ) { this->m_from_cmdResponseOut[port].init(); @@ -69,8 +69,8 @@ void ActiveParamsTesterBase :: // Connect input port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_prmGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_prmGetOut()); port++ ) { this->m_from_prmGetOut[port].init(); @@ -93,8 +93,8 @@ void ActiveParamsTesterBase :: // Connect input port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_prmSetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_prmSetOut()); port++ ) { this->m_from_prmSetOut[port].init(); @@ -117,8 +117,8 @@ void ActiveParamsTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -141,8 +141,8 @@ void ActiveParamsTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -165,8 +165,8 @@ void ActiveParamsTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -189,8 +189,8 @@ void ActiveParamsTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -213,8 +213,8 @@ void ActiveParamsTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -237,8 +237,8 @@ void ActiveParamsTesterBase :: // Connect output port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_cmdIn()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_cmdIn()); port++ ) { this->m_to_cmdIn[port].init(); @@ -256,8 +256,8 @@ void ActiveParamsTesterBase :: // Connect output port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsAsync()); port++ ) { this->m_to_noArgsAsync[port].init(); @@ -275,8 +275,8 @@ void ActiveParamsTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -294,8 +294,8 @@ void ActiveParamsTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -313,8 +313,8 @@ void ActiveParamsTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -332,8 +332,8 @@ void ActiveParamsTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -351,8 +351,8 @@ void ActiveParamsTesterBase :: // Connect output port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsync()); port++ ) { this->m_to_typedAsync[port].init(); @@ -370,8 +370,8 @@ void ActiveParamsTesterBase :: // Connect output port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncAssert()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncAssert()); port++ ) { this->m_to_typedAsyncAssert[port].init(); @@ -389,8 +389,8 @@ void ActiveParamsTesterBase :: // Connect output port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncBlockPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncBlockPriority()); port++ ) { this->m_to_typedAsyncBlockPriority[port].init(); @@ -408,8 +408,8 @@ void ActiveParamsTesterBase :: // Connect output port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncDropPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncDropPriority()); port++ ) { this->m_to_typedAsyncDropPriority[port].init(); @@ -427,8 +427,8 @@ void ActiveParamsTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -446,8 +446,8 @@ void ActiveParamsTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -465,8 +465,8 @@ void ActiveParamsTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -484,8 +484,8 @@ void ActiveParamsTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -508,7 +508,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -522,7 +522,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -536,7 +536,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -550,7 +550,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -564,7 +564,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -578,7 +578,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -592,7 +592,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: connect_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -606,7 +606,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -620,7 +620,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -634,7 +634,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -648,7 +648,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -662,7 +662,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -676,7 +676,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -690,7 +690,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -707,7 +707,7 @@ void ActiveParamsTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* ActiveParamsTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -718,7 +718,7 @@ Fw::InputCmdRegPort* ActiveParamsTesterBase :: } Fw::InputCmdResponsePort* ActiveParamsTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -729,7 +729,7 @@ Fw::InputCmdResponsePort* ActiveParamsTesterBase :: } Fw::InputLogPort* ActiveParamsTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -740,7 +740,7 @@ Fw::InputLogPort* ActiveParamsTesterBase :: } Fw::InputPrmGetPort* ActiveParamsTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -751,7 +751,7 @@ Fw::InputPrmGetPort* ActiveParamsTesterBase :: } Fw::InputPrmSetPort* ActiveParamsTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -764,7 +764,7 @@ Fw::InputPrmSetPort* ActiveParamsTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* ActiveParamsTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -777,7 +777,7 @@ Fw::InputLogTextPort* ActiveParamsTesterBase :: #endif Fw::InputTimePort* ActiveParamsTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -788,7 +788,7 @@ Fw::InputTimePort* ActiveParamsTesterBase :: } Fw::InputTlmPort* ActiveParamsTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -799,7 +799,7 @@ Fw::InputTlmPort* ActiveParamsTesterBase :: } Ports::InputNoArgsPort* ActiveParamsTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -810,7 +810,7 @@ Ports::InputNoArgsPort* ActiveParamsTesterBase :: } Ports::InputNoArgsReturnPort* ActiveParamsTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -821,7 +821,7 @@ Ports::InputNoArgsReturnPort* ActiveParamsTesterBase :: } Ports::InputTypedPort* ActiveParamsTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -832,7 +832,7 @@ Ports::InputTypedPort* ActiveParamsTesterBase :: } Ports::InputTypedReturnPort* ActiveParamsTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -886,7 +886,7 @@ ActiveParamsTesterBase :: // ---------------------------------------------------------------------- void ActiveParamsTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -897,7 +897,7 @@ void ActiveParamsTesterBase :: } U32 ActiveParamsTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -909,7 +909,7 @@ U32 ActiveParamsTesterBase :: void ActiveParamsTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -938,7 +938,7 @@ void ActiveParamsTesterBase :: F32 ActiveParamsTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -970,7 +970,7 @@ F32 ActiveParamsTesterBase :: // ---------------------------------------------------------------------- void ActiveParamsTesterBase :: - invoke_to_noArgsAsync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsAsync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -981,7 +981,7 @@ void ActiveParamsTesterBase :: } void ActiveParamsTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -992,7 +992,7 @@ void ActiveParamsTesterBase :: } U32 ActiveParamsTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1003,7 +1003,7 @@ U32 ActiveParamsTesterBase :: } U32 ActiveParamsTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1014,7 +1014,7 @@ U32 ActiveParamsTesterBase :: } void ActiveParamsTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1026,7 +1026,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1054,7 +1054,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1082,7 +1082,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1110,7 +1110,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1138,7 +1138,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1166,7 +1166,7 @@ void ActiveParamsTesterBase :: F32 ActiveParamsTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1194,7 +1194,7 @@ F32 ActiveParamsTesterBase :: F32 ActiveParamsTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1222,7 +1222,7 @@ F32 ActiveParamsTesterBase :: void ActiveParamsTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1252,164 +1252,164 @@ void ActiveParamsTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_to_noArgsAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); } -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_to_typedAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); } -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_to_typedAsyncAssert() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); } -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_to_typedAsyncBlockPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); } -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_to_typedAsyncDropPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); } -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE ActiveParamsTesterBase :: +FwIndexType ActiveParamsTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1417,7 +1417,7 @@ NATIVE_INT_TYPE ActiveParamsTesterBase :: // ---------------------------------------------------------------------- bool ActiveParamsTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1428,7 +1428,7 @@ bool ActiveParamsTesterBase :: } bool ActiveParamsTesterBase :: - isConnected_to_noArgsAsync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsAsync(), @@ -1439,7 +1439,7 @@ bool ActiveParamsTesterBase :: } bool ActiveParamsTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1450,7 +1450,7 @@ bool ActiveParamsTesterBase :: } bool ActiveParamsTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1461,7 +1461,7 @@ bool ActiveParamsTesterBase :: } bool ActiveParamsTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1472,7 +1472,7 @@ bool ActiveParamsTesterBase :: } bool ActiveParamsTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1483,7 +1483,7 @@ bool ActiveParamsTesterBase :: } bool ActiveParamsTesterBase :: - isConnected_to_typedAsync(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsync(), @@ -1494,7 +1494,7 @@ bool ActiveParamsTesterBase :: } bool ActiveParamsTesterBase :: - isConnected_to_typedAsyncAssert(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncAssert(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncAssert(), @@ -1505,7 +1505,7 @@ bool ActiveParamsTesterBase :: } bool ActiveParamsTesterBase :: - isConnected_to_typedAsyncBlockPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncBlockPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncBlockPriority(), @@ -1516,7 +1516,7 @@ bool ActiveParamsTesterBase :: } bool ActiveParamsTesterBase :: - isConnected_to_typedAsyncDropPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncDropPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncDropPriority(), @@ -1527,7 +1527,7 @@ bool ActiveParamsTesterBase :: } bool ActiveParamsTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1538,7 +1538,7 @@ bool ActiveParamsTesterBase :: } bool ActiveParamsTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1549,7 +1549,7 @@ bool ActiveParamsTesterBase :: } bool ActiveParamsTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1560,7 +1560,7 @@ bool ActiveParamsTesterBase :: } bool ActiveParamsTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1622,7 +1622,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: paramSend_ParamU32( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1649,7 +1649,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: paramSave_ParamU32( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1681,7 +1681,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: paramSend_ParamF64( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1708,7 +1708,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: paramSave_ParamF64( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1740,7 +1740,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: paramSend_ParamString( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1767,7 +1767,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: paramSave_ParamString( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1799,7 +1799,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: paramSend_ParamEnum( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1826,7 +1826,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: paramSave_ParamEnum( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1858,7 +1858,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: paramSend_ParamArray( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1885,7 +1885,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: paramSave_ParamArray( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1917,7 +1917,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: paramSend_ParamStruct( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1944,7 +1944,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: paramSave_ParamStruct( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -2064,7 +2064,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode ) { @@ -2074,7 +2074,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, const Fw::CmdResponse& response @@ -2087,7 +2087,7 @@ void ActiveParamsTesterBase :: Fw::ParamValid ActiveParamsTesterBase :: from_prmGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwPrmIdType id, Fw::ParamBuffer& val ) @@ -2174,7 +2174,7 @@ Fw::ParamValid ActiveParamsTesterBase :: void ActiveParamsTesterBase :: from_prmSetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwPrmIdType id, Fw::ParamBuffer& val ) @@ -2280,7 +2280,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -2291,7 +2291,7 @@ void ActiveParamsTesterBase :: void ActiveParamsTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -2302,7 +2302,7 @@ void ActiveParamsTesterBase :: U32 ActiveParamsTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -2313,7 +2313,7 @@ U32 ActiveParamsTesterBase :: void ActiveParamsTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2340,7 +2340,7 @@ void ActiveParamsTesterBase :: F32 ActiveParamsTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.hpp index 651e24eb8..d108cc266 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveParamsTesterBase.ref.hpp @@ -143,7 +143,7 @@ class ActiveParamsTesterBase : //! Initialize object ActiveParamsTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -154,85 +154,85 @@ class ActiveParamsTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to noArgsAsync[portNum] void connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedAsync[portNum] void connect_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncAssert[portNum] void connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncBlockPriority[portNum] void connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncDropPriority[portNum] void connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -246,35 +246,35 @@ class ActiveParamsTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -283,7 +283,7 @@ class ActiveParamsTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -292,42 +292,42 @@ class ActiveParamsTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -353,17 +353,17 @@ class ActiveParamsTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -375,7 +375,7 @@ class ActiveParamsTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -393,17 +393,17 @@ class ActiveParamsTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -415,7 +415,7 @@ class ActiveParamsTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -433,32 +433,32 @@ class ActiveParamsTesterBase : //! Invoke the to port connected to noArgsAsync void invoke_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedAsync void invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -470,7 +470,7 @@ class ActiveParamsTesterBase : //! Invoke the to port connected to typedAsyncAssert void invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -482,7 +482,7 @@ class ActiveParamsTesterBase : //! Invoke the to port connected to typedAsyncBlockPriority void invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -494,7 +494,7 @@ class ActiveParamsTesterBase : //! Invoke the to port connected to typedAsyncDropPriority void invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -506,7 +506,7 @@ class ActiveParamsTesterBase : //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -518,7 +518,7 @@ class ActiveParamsTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -530,7 +530,7 @@ class ActiveParamsTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -542,7 +542,7 @@ class ActiveParamsTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -561,136 +561,136 @@ class ActiveParamsTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_noArgsAsync ports //! //! \return The number of to_noArgsAsync ports - NATIVE_INT_TYPE getNum_to_noArgsAsync() const; + FwIndexType getNum_to_noArgsAsync() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedAsync ports //! //! \return The number of to_typedAsync ports - NATIVE_INT_TYPE getNum_to_typedAsync() const; + FwIndexType getNum_to_typedAsync() const; //! Get the number of to_typedAsyncAssert ports //! //! \return The number of to_typedAsyncAssert ports - NATIVE_INT_TYPE getNum_to_typedAsyncAssert() const; + FwIndexType getNum_to_typedAsyncAssert() const; //! Get the number of to_typedAsyncBlockPriority ports //! //! \return The number of to_typedAsyncBlockPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncBlockPriority() const; + FwIndexType getNum_to_typedAsyncBlockPriority() const; //! Get the number of to_typedAsyncDropPriority ports //! //! \return The number of to_typedAsyncDropPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncDropPriority() const; + FwIndexType getNum_to_typedAsyncDropPriority() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -702,98 +702,98 @@ class ActiveParamsTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsAsync is connected //! //! \return Whether port to_noArgsAsync is connected bool isConnected_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsync is connected //! //! \return Whether port to_typedAsync is connected bool isConnected_to_typedAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncAssert is connected //! //! \return Whether port to_typedAsyncAssert is connected bool isConnected_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncBlockPriority is connected //! //! \return Whether port to_typedAsyncBlockPriority is connected bool isConnected_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncDropPriority is connected //! //! \return Whether port to_typedAsyncDropPriority is connected bool isConnected_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -830,13 +830,13 @@ class ActiveParamsTesterBase : //! Send parameter ParamU32 void paramSend_ParamU32( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamU32 void paramSave_ParamU32( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -848,13 +848,13 @@ class ActiveParamsTesterBase : //! Send parameter ParamF64 void paramSend_ParamF64( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamF64 void paramSave_ParamF64( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -866,13 +866,13 @@ class ActiveParamsTesterBase : //! Send parameter ParamString void paramSend_ParamString( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamString void paramSave_ParamString( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -884,13 +884,13 @@ class ActiveParamsTesterBase : //! Send parameter ParamEnum void paramSend_ParamEnum( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamEnum void paramSave_ParamEnum( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -902,13 +902,13 @@ class ActiveParamsTesterBase : //! Send parameter ParamArray void paramSend_ParamArray( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamArray void paramSave_ParamArray( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -920,13 +920,13 @@ class ActiveParamsTesterBase : //! Send parameter ParamStruct void paramSend_ParamStruct( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamStruct void paramSave_ParamStruct( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -990,14 +990,14 @@ class ActiveParamsTesterBase : //! Static function for port from_cmdRegOut static void from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode //!< Command Op Code ); //! Static function for port from_cmdResponseOut static void from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence const Fw::CmdResponse& response //!< The command response argument @@ -1006,7 +1006,7 @@ class ActiveParamsTesterBase : //! Static function for port from_prmGetOut static Fw::ParamValid from_prmGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwPrmIdType id, //!< Parameter ID Fw::ParamBuffer& val //!< Buffer containing serialized parameter value ); @@ -1014,7 +1014,7 @@ class ActiveParamsTesterBase : //! Static function for port from_prmSetOut static void from_prmSetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwPrmIdType id, //!< Parameter ID Fw::ParamBuffer& val //!< Buffer containing serialized parameter value ); @@ -1022,26 +1022,26 @@ class ActiveParamsTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1054,7 +1054,7 @@ class ActiveParamsTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.cpp index dcce59d2a..d68526be3 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void ActiveSerialTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdRegOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdRegOut()); port++ ) { this->m_from_cmdRegOut[port].init(); @@ -45,8 +45,8 @@ void ActiveSerialTesterBase :: // Connect input port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdResponseOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdResponseOut()); port++ ) { this->m_from_cmdResponseOut[port].init(); @@ -69,8 +69,8 @@ void ActiveSerialTesterBase :: // Connect input port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_eventOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_eventOut()); port++ ) { this->m_from_eventOut[port].init(); @@ -93,8 +93,8 @@ void ActiveSerialTesterBase :: // Connect input port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_prmGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_prmGetOut()); port++ ) { this->m_from_prmGetOut[port].init(); @@ -117,8 +117,8 @@ void ActiveSerialTesterBase :: // Connect input port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_prmSetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_prmSetOut()); port++ ) { this->m_from_prmSetOut[port].init(); @@ -142,8 +142,8 @@ void ActiveSerialTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect input port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_textEventOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_textEventOut()); port++ ) { this->m_from_textEventOut[port].init(); @@ -167,8 +167,8 @@ void ActiveSerialTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -191,8 +191,8 @@ void ActiveSerialTesterBase :: // Connect input port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_tlmOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_tlmOut()); port++ ) { this->m_from_tlmOut[port].init(); @@ -215,8 +215,8 @@ void ActiveSerialTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -239,8 +239,8 @@ void ActiveSerialTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -263,8 +263,8 @@ void ActiveSerialTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -287,8 +287,8 @@ void ActiveSerialTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -311,8 +311,8 @@ void ActiveSerialTesterBase :: // Connect input port serialOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_serialOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_serialOut()); port++ ) { this->m_from_serialOut[port].init(); @@ -335,8 +335,8 @@ void ActiveSerialTesterBase :: // Connect output port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_cmdIn()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_cmdIn()); port++ ) { this->m_to_cmdIn[port].init(); @@ -354,8 +354,8 @@ void ActiveSerialTesterBase :: // Connect output port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsAsync()); port++ ) { this->m_to_noArgsAsync[port].init(); @@ -373,8 +373,8 @@ void ActiveSerialTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -392,8 +392,8 @@ void ActiveSerialTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -411,8 +411,8 @@ void ActiveSerialTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -430,8 +430,8 @@ void ActiveSerialTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -449,8 +449,8 @@ void ActiveSerialTesterBase :: // Connect output port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsync()); port++ ) { this->m_to_typedAsync[port].init(); @@ -468,8 +468,8 @@ void ActiveSerialTesterBase :: // Connect output port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncAssert()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncAssert()); port++ ) { this->m_to_typedAsyncAssert[port].init(); @@ -487,8 +487,8 @@ void ActiveSerialTesterBase :: // Connect output port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncBlockPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncBlockPriority()); port++ ) { this->m_to_typedAsyncBlockPriority[port].init(); @@ -506,8 +506,8 @@ void ActiveSerialTesterBase :: // Connect output port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncDropPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncDropPriority()); port++ ) { this->m_to_typedAsyncDropPriority[port].init(); @@ -525,8 +525,8 @@ void ActiveSerialTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -544,8 +544,8 @@ void ActiveSerialTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -563,8 +563,8 @@ void ActiveSerialTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -582,8 +582,8 @@ void ActiveSerialTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -601,8 +601,8 @@ void ActiveSerialTesterBase :: // Connect output port serialAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_serialAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_serialAsync()); port++ ) { this->m_to_serialAsync[port].init(); @@ -620,8 +620,8 @@ void ActiveSerialTesterBase :: // Connect output port serialAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_serialAsyncAssert()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_serialAsyncAssert()); port++ ) { this->m_to_serialAsyncAssert[port].init(); @@ -639,8 +639,8 @@ void ActiveSerialTesterBase :: // Connect output port serialAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_serialAsyncBlockPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_serialAsyncBlockPriority()); port++ ) { this->m_to_serialAsyncBlockPriority[port].init(); @@ -658,8 +658,8 @@ void ActiveSerialTesterBase :: // Connect output port serialAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_serialAsyncDropPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_serialAsyncDropPriority()); port++ ) { this->m_to_serialAsyncDropPriority[port].init(); @@ -677,8 +677,8 @@ void ActiveSerialTesterBase :: // Connect output port serialGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_serialGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_serialGuarded()); port++ ) { this->m_to_serialGuarded[port].init(); @@ -696,8 +696,8 @@ void ActiveSerialTesterBase :: // Connect output port serialSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_serialSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_serialSync()); port++ ) { this->m_to_serialSync[port].init(); @@ -720,7 +720,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -734,7 +734,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -748,7 +748,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -762,7 +762,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -776,7 +776,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -790,7 +790,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -804,7 +804,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: connect_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -818,7 +818,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -832,7 +832,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -846,7 +846,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -860,7 +860,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -874,7 +874,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -888,7 +888,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -902,7 +902,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -916,7 +916,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: connect_to_serialAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -930,7 +930,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: connect_to_serialAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -944,7 +944,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: connect_to_serialAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -958,7 +958,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: connect_to_serialAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -972,7 +972,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: connect_to_serialGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -986,7 +986,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: connect_to_serialSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1003,7 +1003,7 @@ void ActiveSerialTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* ActiveSerialTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -1014,7 +1014,7 @@ Fw::InputCmdRegPort* ActiveSerialTesterBase :: } Fw::InputCmdResponsePort* ActiveSerialTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -1025,7 +1025,7 @@ Fw::InputCmdResponsePort* ActiveSerialTesterBase :: } Fw::InputLogPort* ActiveSerialTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -1036,7 +1036,7 @@ Fw::InputLogPort* ActiveSerialTesterBase :: } Fw::InputPrmGetPort* ActiveSerialTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -1047,7 +1047,7 @@ Fw::InputPrmGetPort* ActiveSerialTesterBase :: } Fw::InputPrmSetPort* ActiveSerialTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -1060,7 +1060,7 @@ Fw::InputPrmSetPort* ActiveSerialTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* ActiveSerialTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -1073,7 +1073,7 @@ Fw::InputLogTextPort* ActiveSerialTesterBase :: #endif Fw::InputTimePort* ActiveSerialTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -1084,7 +1084,7 @@ Fw::InputTimePort* ActiveSerialTesterBase :: } Fw::InputTlmPort* ActiveSerialTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -1095,7 +1095,7 @@ Fw::InputTlmPort* ActiveSerialTesterBase :: } Ports::InputNoArgsPort* ActiveSerialTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -1106,7 +1106,7 @@ Ports::InputNoArgsPort* ActiveSerialTesterBase :: } Ports::InputNoArgsReturnPort* ActiveSerialTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -1117,7 +1117,7 @@ Ports::InputNoArgsReturnPort* ActiveSerialTesterBase :: } Ports::InputTypedPort* ActiveSerialTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -1128,7 +1128,7 @@ Ports::InputTypedPort* ActiveSerialTesterBase :: } Ports::InputTypedReturnPort* ActiveSerialTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -1139,7 +1139,7 @@ Ports::InputTypedReturnPort* ActiveSerialTesterBase :: } Fw::InputSerializePort* ActiveSerialTesterBase :: - get_from_serialOut(NATIVE_INT_TYPE portNum) + get_from_serialOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_serialOut(), @@ -1239,7 +1239,7 @@ ActiveSerialTesterBase :: // ---------------------------------------------------------------------- void ActiveSerialTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1250,7 +1250,7 @@ void ActiveSerialTesterBase :: } U32 ActiveSerialTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1262,7 +1262,7 @@ U32 ActiveSerialTesterBase :: void ActiveSerialTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1291,7 +1291,7 @@ void ActiveSerialTesterBase :: F32 ActiveSerialTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1320,7 +1320,7 @@ F32 ActiveSerialTesterBase :: void ActiveSerialTesterBase :: from_serialOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -1340,7 +1340,7 @@ void ActiveSerialTesterBase :: // ---------------------------------------------------------------------- void ActiveSerialTesterBase :: - invoke_to_noArgsAsync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsAsync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1351,7 +1351,7 @@ void ActiveSerialTesterBase :: } void ActiveSerialTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1362,7 +1362,7 @@ void ActiveSerialTesterBase :: } U32 ActiveSerialTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1373,7 +1373,7 @@ U32 ActiveSerialTesterBase :: } U32 ActiveSerialTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1384,7 +1384,7 @@ U32 ActiveSerialTesterBase :: } void ActiveSerialTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1396,7 +1396,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1424,7 +1424,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1452,7 +1452,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1480,7 +1480,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1508,7 +1508,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1536,7 +1536,7 @@ void ActiveSerialTesterBase :: F32 ActiveSerialTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1564,7 +1564,7 @@ F32 ActiveSerialTesterBase :: F32 ActiveSerialTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1592,7 +1592,7 @@ F32 ActiveSerialTesterBase :: void ActiveSerialTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1620,7 +1620,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: invoke_to_serialAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -1636,7 +1636,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: invoke_to_serialAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -1652,7 +1652,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: invoke_to_serialAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -1668,7 +1668,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: invoke_to_serialAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -1684,7 +1684,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: invoke_to_serialGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -1700,7 +1700,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: invoke_to_serialSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -1718,206 +1718,206 @@ void ActiveSerialTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_to_noArgsAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_to_typedAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_to_typedAsyncAssert() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_to_typedAsyncBlockPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_to_typedAsyncDropPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_to_serialAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialAsync)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_to_serialAsyncAssert() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialAsyncAssert)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialAsyncAssert)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_to_serialAsyncBlockPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialAsyncBlockPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialAsyncBlockPriority)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_to_serialAsyncDropPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialAsyncDropPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialAsyncDropPriority)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_to_serialGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialGuarded)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_to_serialSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialSync)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } -NATIVE_INT_TYPE ActiveSerialTesterBase :: +FwIndexType ActiveSerialTesterBase :: getNum_from_serialOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_serialOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_serialOut)); } // ---------------------------------------------------------------------- @@ -1925,7 +1925,7 @@ NATIVE_INT_TYPE ActiveSerialTesterBase :: // ---------------------------------------------------------------------- bool ActiveSerialTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1936,7 +1936,7 @@ bool ActiveSerialTesterBase :: } bool ActiveSerialTesterBase :: - isConnected_to_noArgsAsync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsAsync(), @@ -1947,7 +1947,7 @@ bool ActiveSerialTesterBase :: } bool ActiveSerialTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1958,7 +1958,7 @@ bool ActiveSerialTesterBase :: } bool ActiveSerialTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1969,7 +1969,7 @@ bool ActiveSerialTesterBase :: } bool ActiveSerialTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1980,7 +1980,7 @@ bool ActiveSerialTesterBase :: } bool ActiveSerialTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1991,7 +1991,7 @@ bool ActiveSerialTesterBase :: } bool ActiveSerialTesterBase :: - isConnected_to_typedAsync(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsync(), @@ -2002,7 +2002,7 @@ bool ActiveSerialTesterBase :: } bool ActiveSerialTesterBase :: - isConnected_to_typedAsyncAssert(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncAssert(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncAssert(), @@ -2013,7 +2013,7 @@ bool ActiveSerialTesterBase :: } bool ActiveSerialTesterBase :: - isConnected_to_typedAsyncBlockPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncBlockPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncBlockPriority(), @@ -2024,7 +2024,7 @@ bool ActiveSerialTesterBase :: } bool ActiveSerialTesterBase :: - isConnected_to_typedAsyncDropPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncDropPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncDropPriority(), @@ -2035,7 +2035,7 @@ bool ActiveSerialTesterBase :: } bool ActiveSerialTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -2046,7 +2046,7 @@ bool ActiveSerialTesterBase :: } bool ActiveSerialTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -2057,7 +2057,7 @@ bool ActiveSerialTesterBase :: } bool ActiveSerialTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -2068,7 +2068,7 @@ bool ActiveSerialTesterBase :: } bool ActiveSerialTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -2079,7 +2079,7 @@ bool ActiveSerialTesterBase :: } bool ActiveSerialTesterBase :: - isConnected_to_serialAsync(NATIVE_INT_TYPE portNum) + isConnected_to_serialAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_serialAsync(), @@ -2090,7 +2090,7 @@ bool ActiveSerialTesterBase :: } bool ActiveSerialTesterBase :: - isConnected_to_serialAsyncAssert(NATIVE_INT_TYPE portNum) + isConnected_to_serialAsyncAssert(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_serialAsyncAssert(), @@ -2101,7 +2101,7 @@ bool ActiveSerialTesterBase :: } bool ActiveSerialTesterBase :: - isConnected_to_serialAsyncBlockPriority(NATIVE_INT_TYPE portNum) + isConnected_to_serialAsyncBlockPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_serialAsyncBlockPriority(), @@ -2112,7 +2112,7 @@ bool ActiveSerialTesterBase :: } bool ActiveSerialTesterBase :: - isConnected_to_serialAsyncDropPriority(NATIVE_INT_TYPE portNum) + isConnected_to_serialAsyncDropPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_serialAsyncDropPriority(), @@ -2123,7 +2123,7 @@ bool ActiveSerialTesterBase :: } bool ActiveSerialTesterBase :: - isConnected_to_serialGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_serialGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_serialGuarded(), @@ -2134,7 +2134,7 @@ bool ActiveSerialTesterBase :: } bool ActiveSerialTesterBase :: - isConnected_to_serialSync(NATIVE_INT_TYPE portNum) + isConnected_to_serialSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_serialSync(), @@ -2182,7 +2182,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: sendCmd_CMD_SYNC( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2207,7 +2207,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: sendCmd_CMD_SYNC_PRIMITIVE( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32, F32 f32, @@ -2255,7 +2255,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: sendCmd_CMD_SYNC_STRING( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, const Fw::CmdStringArg& str1, const Fw::CmdStringArg& str2 @@ -2296,7 +2296,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: sendCmd_CMD_SYNC_ENUM( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, E e ) @@ -2330,7 +2330,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: sendCmd_CMD_SYNC_ARRAY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, A a ) @@ -2364,7 +2364,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: sendCmd_CMD_SYNC_STRUCT( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, S s ) @@ -2398,7 +2398,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: sendCmd_CMD_GUARDED( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2423,7 +2423,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: sendCmd_CMD_GUARDED_PRIMITIVE( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32, F32 f32, @@ -2471,7 +2471,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: sendCmd_CMD_GUARDED_STRING( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, const Fw::CmdStringArg& str1, const Fw::CmdStringArg& str2 @@ -2512,7 +2512,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: sendCmd_CMD_GUARDED_ENUM( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, E e ) @@ -2546,7 +2546,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: sendCmd_CMD_GUARDED_ARRAY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, A a ) @@ -2580,7 +2580,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: sendCmd_CMD_GUARDED_STRUCT( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, S s ) @@ -2614,7 +2614,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: sendCmd_CMD_ASYNC( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2639,7 +2639,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: sendCmd_CMD_PRIORITY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2664,7 +2664,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: sendCmd_CMD_PARAMS_PRIORITY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32 ) @@ -2698,7 +2698,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: sendCmd_CMD_DROP( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2723,7 +2723,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: sendCmd_CMD_PARAMS_PRIORITY_DROP( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32 ) @@ -3463,7 +3463,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: paramSend_ParamU32( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3490,7 +3490,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: paramSave_ParamU32( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3522,7 +3522,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: paramSend_ParamF64( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3549,7 +3549,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: paramSave_ParamF64( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3581,7 +3581,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: paramSend_ParamString( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3608,7 +3608,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: paramSave_ParamString( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3640,7 +3640,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: paramSend_ParamEnum( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3667,7 +3667,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: paramSave_ParamEnum( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3699,7 +3699,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: paramSend_ParamArray( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3726,7 +3726,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: paramSave_ParamArray( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3758,7 +3758,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: paramSend_ParamStruct( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3785,7 +3785,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: paramSave_ParamStruct( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -4002,7 +4002,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode ) { @@ -4012,7 +4012,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, const Fw::CmdResponse& response @@ -4025,7 +4025,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: from_eventOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwEventIdType id, Fw::Time& timeTag, const Fw::LogSeverity& severity, @@ -4039,7 +4039,7 @@ void ActiveSerialTesterBase :: Fw::ParamValid ActiveSerialTesterBase :: from_prmGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwPrmIdType id, Fw::ParamBuffer& val ) @@ -4126,7 +4126,7 @@ Fw::ParamValid ActiveSerialTesterBase :: void ActiveSerialTesterBase :: from_prmSetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwPrmIdType id, Fw::ParamBuffer& val ) @@ -4234,7 +4234,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: from_textEventOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwEventIdType id, Fw::Time& timeTag, const Fw::LogSeverity& severity, @@ -4250,7 +4250,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -4261,7 +4261,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: from_tlmOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwChanIdType id, Fw::Time& timeTag, Fw::TlmBuffer& val @@ -4274,7 +4274,7 @@ void ActiveSerialTesterBase :: void ActiveSerialTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -4285,7 +4285,7 @@ void ActiveSerialTesterBase :: U32 ActiveSerialTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -4296,7 +4296,7 @@ U32 ActiveSerialTesterBase :: void ActiveSerialTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4323,7 +4323,7 @@ void ActiveSerialTesterBase :: F32 ActiveSerialTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4350,7 +4350,7 @@ F32 ActiveSerialTesterBase :: void ActiveSerialTesterBase :: from_serialOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.hpp index c9a85ef6d..a96771161 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSerialTesterBase.ref.hpp @@ -249,7 +249,7 @@ class ActiveSerialTesterBase : //! Initialize object ActiveSerialTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -260,121 +260,121 @@ class ActiveSerialTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to noArgsAsync[portNum] void connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedAsync[portNum] void connect_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncAssert[portNum] void connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncBlockPriority[portNum] void connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncDropPriority[portNum] void connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to serialAsync[portNum] void connect_to_serialAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The input port ); //! Connect port to serialAsyncAssert[portNum] void connect_to_serialAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The input port ); //! Connect port to serialAsyncBlockPriority[portNum] void connect_to_serialAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The input port ); //! Connect port to serialAsyncDropPriority[portNum] void connect_to_serialAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The input port ); //! Connect port to serialGuarded[portNum] void connect_to_serialGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The input port ); //! Connect port to serialSync[portNum] void connect_to_serialSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The input port ); @@ -388,35 +388,35 @@ class ActiveSerialTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -425,7 +425,7 @@ class ActiveSerialTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -434,49 +434,49 @@ class ActiveSerialTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_serialOut[portNum] Fw::InputSerializePort* get_from_serialOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -502,17 +502,17 @@ class ActiveSerialTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -524,7 +524,7 @@ class ActiveSerialTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -536,7 +536,7 @@ class ActiveSerialTesterBase : //! Handler for input port from_serialOut virtual void from_serialOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) = 0; @@ -548,17 +548,17 @@ class ActiveSerialTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -570,7 +570,7 @@ class ActiveSerialTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -582,7 +582,7 @@ class ActiveSerialTesterBase : //! Handler base-class function for from_serialOut void from_serialOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); @@ -594,32 +594,32 @@ class ActiveSerialTesterBase : //! Invoke the to port connected to noArgsAsync void invoke_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedAsync void invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -631,7 +631,7 @@ class ActiveSerialTesterBase : //! Invoke the to port connected to typedAsyncAssert void invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -643,7 +643,7 @@ class ActiveSerialTesterBase : //! Invoke the to port connected to typedAsyncBlockPriority void invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -655,7 +655,7 @@ class ActiveSerialTesterBase : //! Invoke the to port connected to typedAsyncDropPriority void invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -667,7 +667,7 @@ class ActiveSerialTesterBase : //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -679,7 +679,7 @@ class ActiveSerialTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -691,7 +691,7 @@ class ActiveSerialTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -703,7 +703,7 @@ class ActiveSerialTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -715,37 +715,37 @@ class ActiveSerialTesterBase : //! Invoke the to port connected to serialAsync void invoke_to_serialAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Invoke the to port connected to serialAsyncAssert void invoke_to_serialAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Invoke the to port connected to serialAsyncBlockPriority void invoke_to_serialAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Invoke the to port connected to serialAsyncDropPriority void invoke_to_serialAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Invoke the to port connected to serialGuarded void invoke_to_serialGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Invoke the to port connected to serialSync void invoke_to_serialSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); @@ -758,171 +758,171 @@ class ActiveSerialTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_noArgsAsync ports //! //! \return The number of to_noArgsAsync ports - NATIVE_INT_TYPE getNum_to_noArgsAsync() const; + FwIndexType getNum_to_noArgsAsync() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedAsync ports //! //! \return The number of to_typedAsync ports - NATIVE_INT_TYPE getNum_to_typedAsync() const; + FwIndexType getNum_to_typedAsync() const; //! Get the number of to_typedAsyncAssert ports //! //! \return The number of to_typedAsyncAssert ports - NATIVE_INT_TYPE getNum_to_typedAsyncAssert() const; + FwIndexType getNum_to_typedAsyncAssert() const; //! Get the number of to_typedAsyncBlockPriority ports //! //! \return The number of to_typedAsyncBlockPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncBlockPriority() const; + FwIndexType getNum_to_typedAsyncBlockPriority() const; //! Get the number of to_typedAsyncDropPriority ports //! //! \return The number of to_typedAsyncDropPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncDropPriority() const; + FwIndexType getNum_to_typedAsyncDropPriority() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of to_serialAsync ports //! //! \return The number of to_serialAsync ports - NATIVE_INT_TYPE getNum_to_serialAsync() const; + FwIndexType getNum_to_serialAsync() const; //! Get the number of to_serialAsyncAssert ports //! //! \return The number of to_serialAsyncAssert ports - NATIVE_INT_TYPE getNum_to_serialAsyncAssert() const; + FwIndexType getNum_to_serialAsyncAssert() const; //! Get the number of to_serialAsyncBlockPriority ports //! //! \return The number of to_serialAsyncBlockPriority ports - NATIVE_INT_TYPE getNum_to_serialAsyncBlockPriority() const; + FwIndexType getNum_to_serialAsyncBlockPriority() const; //! Get the number of to_serialAsyncDropPriority ports //! //! \return The number of to_serialAsyncDropPriority ports - NATIVE_INT_TYPE getNum_to_serialAsyncDropPriority() const; + FwIndexType getNum_to_serialAsyncDropPriority() const; //! Get the number of to_serialGuarded ports //! //! \return The number of to_serialGuarded ports - NATIVE_INT_TYPE getNum_to_serialGuarded() const; + FwIndexType getNum_to_serialGuarded() const; //! Get the number of to_serialSync ports //! //! \return The number of to_serialSync ports - NATIVE_INT_TYPE getNum_to_serialSync() const; + FwIndexType getNum_to_serialSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; //! Get the number of from_serialOut ports //! //! \return The number of from_serialOut ports - NATIVE_INT_TYPE getNum_from_serialOut() const; + FwIndexType getNum_from_serialOut() const; protected: @@ -934,140 +934,140 @@ class ActiveSerialTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsAsync is connected //! //! \return Whether port to_noArgsAsync is connected bool isConnected_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsync is connected //! //! \return Whether port to_typedAsync is connected bool isConnected_to_typedAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncAssert is connected //! //! \return Whether port to_typedAsyncAssert is connected bool isConnected_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncBlockPriority is connected //! //! \return Whether port to_typedAsyncBlockPriority is connected bool isConnected_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncDropPriority is connected //! //! \return Whether port to_typedAsyncDropPriority is connected bool isConnected_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_serialAsync is connected //! //! \return Whether port to_serialAsync is connected bool isConnected_to_serialAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_serialAsyncAssert is connected //! //! \return Whether port to_serialAsyncAssert is connected bool isConnected_to_serialAsyncAssert( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_serialAsyncBlockPriority is connected //! //! \return Whether port to_serialAsyncBlockPriority is connected bool isConnected_to_serialAsyncBlockPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_serialAsyncDropPriority is connected //! //! \return Whether port to_serialAsyncDropPriority is connected bool isConnected_to_serialAsyncDropPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_serialGuarded is connected //! //! \return Whether port to_serialGuarded is connected bool isConnected_to_serialGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_serialSync is connected //! //! \return Whether port to_serialSync is connected bool isConnected_to_serialSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -1092,13 +1092,13 @@ class ActiveSerialTesterBase : //! Send a CMD_SYNC command void sendCmd_CMD_SYNC( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_SYNC_PRIMITIVE command void sendCmd_CMD_SYNC_PRIMITIVE( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32, //!< A U32 F32 f32, //!< An F32 @@ -1107,7 +1107,7 @@ class ActiveSerialTesterBase : //! Send a CMD_SYNC_STRING command void sendCmd_CMD_SYNC_STRING( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number const Fw::CmdStringArg& str1, //!< A string const Fw::CmdStringArg& str2 //!< Another string @@ -1115,34 +1115,34 @@ class ActiveSerialTesterBase : //! Send a CMD_SYNC_ENUM command void sendCmd_CMD_SYNC_ENUM( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number E e //!< An enum ); //! Send a CMD_SYNC_ARRAY command void sendCmd_CMD_SYNC_ARRAY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number A a //!< An array ); //! Send a CMD_SYNC_STRUCT command void sendCmd_CMD_SYNC_STRUCT( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number S s //!< A struct ); //! Send a CMD_GUARDED command void sendCmd_CMD_GUARDED( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_GUARDED_PRIMITIVE command void sendCmd_CMD_GUARDED_PRIMITIVE( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32, //!< A U32 F32 f32, //!< An F32 @@ -1151,7 +1151,7 @@ class ActiveSerialTesterBase : //! Send a CMD_GUARDED_STRING command void sendCmd_CMD_GUARDED_STRING( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number const Fw::CmdStringArg& str1, //!< A string const Fw::CmdStringArg& str2 //!< Another string @@ -1159,53 +1159,53 @@ class ActiveSerialTesterBase : //! Send a CMD_GUARDED_ENUM command void sendCmd_CMD_GUARDED_ENUM( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number E e //!< An enum ); //! Send a CMD_GUARDED_ARRAY command void sendCmd_CMD_GUARDED_ARRAY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number A a //!< An array ); //! Send a CMD_GUARDED_STRUCT command void sendCmd_CMD_GUARDED_STRUCT( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number S s //!< A struct ); //! Send a CMD_ASYNC command void sendCmd_CMD_ASYNC( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_PRIORITY command void sendCmd_CMD_PRIORITY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_PARAMS_PRIORITY command void sendCmd_CMD_PARAMS_PRIORITY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32 ); //! Send a CMD_DROP command void sendCmd_CMD_DROP( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_PARAMS_PRIORITY_DROP command void sendCmd_CMD_PARAMS_PRIORITY_DROP( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32 ); @@ -1363,13 +1363,13 @@ class ActiveSerialTesterBase : //! Send parameter ParamU32 void paramSend_ParamU32( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamU32 void paramSave_ParamU32( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1381,13 +1381,13 @@ class ActiveSerialTesterBase : //! Send parameter ParamF64 void paramSend_ParamF64( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamF64 void paramSave_ParamF64( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1399,13 +1399,13 @@ class ActiveSerialTesterBase : //! Send parameter ParamString void paramSend_ParamString( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamString void paramSave_ParamString( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1417,13 +1417,13 @@ class ActiveSerialTesterBase : //! Send parameter ParamEnum void paramSend_ParamEnum( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamEnum void paramSave_ParamEnum( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1435,13 +1435,13 @@ class ActiveSerialTesterBase : //! Send parameter ParamArray void paramSend_ParamArray( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamArray void paramSave_ParamArray( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1453,13 +1453,13 @@ class ActiveSerialTesterBase : //! Send parameter ParamStruct void paramSend_ParamStruct( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamStruct void paramSave_ParamStruct( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1542,14 +1542,14 @@ class ActiveSerialTesterBase : //! Static function for port from_cmdRegOut static void from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode //!< Command Op Code ); //! Static function for port from_cmdResponseOut static void from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence const Fw::CmdResponse& response //!< The command response argument @@ -1558,7 +1558,7 @@ class ActiveSerialTesterBase : //! Static function for port from_eventOut static void from_eventOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwEventIdType id, //!< Log ID Fw::Time& timeTag, //!< Time Tag const Fw::LogSeverity& severity, //!< The severity argument @@ -1568,7 +1568,7 @@ class ActiveSerialTesterBase : //! Static function for port from_prmGetOut static Fw::ParamValid from_prmGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwPrmIdType id, //!< Parameter ID Fw::ParamBuffer& val //!< Buffer containing serialized parameter value ); @@ -1576,7 +1576,7 @@ class ActiveSerialTesterBase : //! Static function for port from_prmSetOut static void from_prmSetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwPrmIdType id, //!< Parameter ID Fw::ParamBuffer& val //!< Buffer containing serialized parameter value ); @@ -1586,7 +1586,7 @@ class ActiveSerialTesterBase : //! Static function for port from_textEventOut static void from_textEventOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwEventIdType id, //!< Log ID Fw::Time& timeTag, //!< Time Tag const Fw::LogSeverity& severity, //!< The severity argument @@ -1598,14 +1598,14 @@ class ActiveSerialTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_tlmOut static void from_tlmOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwChanIdType id, //!< Telemetry Channel ID Fw::Time& timeTag, //!< Time Tag Fw::TlmBuffer& val //!< Buffer containing serialized telemetry value @@ -1614,19 +1614,19 @@ class ActiveSerialTesterBase : //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1639,7 +1639,7 @@ class ActiveSerialTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1652,7 +1652,7 @@ class ActiveSerialTesterBase : //! Static function for port from_serialOut static void from_serialOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSyncProductsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSyncProductsTesterBase.ref.cpp index f3f5a0df6..36cf180bf 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSyncProductsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSyncProductsTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void ActiveSyncProductsTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productRequestOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productRequestOut()); port++ ) { this->m_from_productRequestOut[port].init(); @@ -45,8 +45,8 @@ void ActiveSyncProductsTesterBase :: // Connect input port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productSendOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productSendOut()); port++ ) { this->m_from_productSendOut[port].init(); @@ -69,8 +69,8 @@ void ActiveSyncProductsTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -93,8 +93,8 @@ void ActiveSyncProductsTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -117,8 +117,8 @@ void ActiveSyncProductsTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -141,8 +141,8 @@ void ActiveSyncProductsTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -165,8 +165,8 @@ void ActiveSyncProductsTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -189,8 +189,8 @@ void ActiveSyncProductsTesterBase :: // Connect output port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_productRecvIn()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_productRecvIn()); port++ ) { this->m_to_productRecvIn[port].init(); @@ -208,8 +208,8 @@ void ActiveSyncProductsTesterBase :: // Connect output port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsAsync()); port++ ) { this->m_to_noArgsAsync[port].init(); @@ -227,8 +227,8 @@ void ActiveSyncProductsTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -246,8 +246,8 @@ void ActiveSyncProductsTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -265,8 +265,8 @@ void ActiveSyncProductsTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -284,8 +284,8 @@ void ActiveSyncProductsTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -303,8 +303,8 @@ void ActiveSyncProductsTesterBase :: // Connect output port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsync()); port++ ) { this->m_to_typedAsync[port].init(); @@ -322,8 +322,8 @@ void ActiveSyncProductsTesterBase :: // Connect output port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncAssert()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncAssert()); port++ ) { this->m_to_typedAsyncAssert[port].init(); @@ -341,8 +341,8 @@ void ActiveSyncProductsTesterBase :: // Connect output port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncBlockPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncBlockPriority()); port++ ) { this->m_to_typedAsyncBlockPriority[port].init(); @@ -360,8 +360,8 @@ void ActiveSyncProductsTesterBase :: // Connect output port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncDropPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncDropPriority()); port++ ) { this->m_to_typedAsyncDropPriority[port].init(); @@ -379,8 +379,8 @@ void ActiveSyncProductsTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -398,8 +398,8 @@ void ActiveSyncProductsTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -417,8 +417,8 @@ void ActiveSyncProductsTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -436,8 +436,8 @@ void ActiveSyncProductsTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -460,7 +460,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -474,7 +474,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpResponsePort* port ) { @@ -488,7 +488,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -502,7 +502,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -516,7 +516,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -530,7 +530,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -544,7 +544,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -558,7 +558,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: connect_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -572,7 +572,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -586,7 +586,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -600,7 +600,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -614,7 +614,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -628,7 +628,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -642,7 +642,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -656,7 +656,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -673,7 +673,7 @@ void ActiveSyncProductsTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* ActiveSyncProductsTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -684,7 +684,7 @@ Fw::InputCmdRegPort* ActiveSyncProductsTesterBase :: } Fw::InputCmdResponsePort* ActiveSyncProductsTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -695,7 +695,7 @@ Fw::InputCmdResponsePort* ActiveSyncProductsTesterBase :: } Fw::InputLogPort* ActiveSyncProductsTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -706,7 +706,7 @@ Fw::InputLogPort* ActiveSyncProductsTesterBase :: } Fw::InputPrmGetPort* ActiveSyncProductsTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -717,7 +717,7 @@ Fw::InputPrmGetPort* ActiveSyncProductsTesterBase :: } Fw::InputPrmSetPort* ActiveSyncProductsTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -728,7 +728,7 @@ Fw::InputPrmSetPort* ActiveSyncProductsTesterBase :: } Fw::InputDpRequestPort* ActiveSyncProductsTesterBase :: - get_from_productRequestOut(NATIVE_INT_TYPE portNum) + get_from_productRequestOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productRequestOut(), @@ -739,7 +739,7 @@ Fw::InputDpRequestPort* ActiveSyncProductsTesterBase :: } Fw::InputDpSendPort* ActiveSyncProductsTesterBase :: - get_from_productSendOut(NATIVE_INT_TYPE portNum) + get_from_productSendOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productSendOut(), @@ -752,7 +752,7 @@ Fw::InputDpSendPort* ActiveSyncProductsTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* ActiveSyncProductsTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -765,7 +765,7 @@ Fw::InputLogTextPort* ActiveSyncProductsTesterBase :: #endif Fw::InputTimePort* ActiveSyncProductsTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -776,7 +776,7 @@ Fw::InputTimePort* ActiveSyncProductsTesterBase :: } Fw::InputTlmPort* ActiveSyncProductsTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -787,7 +787,7 @@ Fw::InputTlmPort* ActiveSyncProductsTesterBase :: } Ports::InputNoArgsPort* ActiveSyncProductsTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -798,7 +798,7 @@ Ports::InputNoArgsPort* ActiveSyncProductsTesterBase :: } Ports::InputNoArgsReturnPort* ActiveSyncProductsTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -809,7 +809,7 @@ Ports::InputNoArgsReturnPort* ActiveSyncProductsTesterBase :: } Ports::InputTypedPort* ActiveSyncProductsTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -820,7 +820,7 @@ Ports::InputTypedPort* ActiveSyncProductsTesterBase :: } Ports::InputTypedReturnPort* ActiveSyncProductsTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -870,7 +870,7 @@ ActiveSyncProductsTesterBase :: // ---------------------------------------------------------------------- void ActiveSyncProductsTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -881,7 +881,7 @@ void ActiveSyncProductsTesterBase :: } U32 ActiveSyncProductsTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -893,7 +893,7 @@ U32 ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -922,7 +922,7 @@ void ActiveSyncProductsTesterBase :: F32 ActiveSyncProductsTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -954,7 +954,7 @@ F32 ActiveSyncProductsTesterBase :: // ---------------------------------------------------------------------- void ActiveSyncProductsTesterBase :: - invoke_to_noArgsAsync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsAsync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -965,7 +965,7 @@ void ActiveSyncProductsTesterBase :: } void ActiveSyncProductsTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -976,7 +976,7 @@ void ActiveSyncProductsTesterBase :: } U32 ActiveSyncProductsTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -987,7 +987,7 @@ U32 ActiveSyncProductsTesterBase :: } U32 ActiveSyncProductsTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -998,7 +998,7 @@ U32 ActiveSyncProductsTesterBase :: } void ActiveSyncProductsTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1010,7 +1010,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1038,7 +1038,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1066,7 +1066,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1094,7 +1094,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1122,7 +1122,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1150,7 +1150,7 @@ void ActiveSyncProductsTesterBase :: F32 ActiveSyncProductsTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1178,7 +1178,7 @@ F32 ActiveSyncProductsTesterBase :: F32 ActiveSyncProductsTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1206,7 +1206,7 @@ F32 ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1236,182 +1236,182 @@ void ActiveSyncProductsTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_to_productRecvIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_to_noArgsAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_to_typedAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_to_typedAsyncAssert() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_to_typedAsyncBlockPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_to_typedAsyncDropPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_from_productRequestOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_from_productSendOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: +FwIndexType ActiveSyncProductsTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1419,7 +1419,7 @@ NATIVE_INT_TYPE ActiveSyncProductsTesterBase :: // ---------------------------------------------------------------------- bool ActiveSyncProductsTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1430,7 +1430,7 @@ bool ActiveSyncProductsTesterBase :: } bool ActiveSyncProductsTesterBase :: - isConnected_to_productRecvIn(NATIVE_INT_TYPE portNum) + isConnected_to_productRecvIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_productRecvIn(), @@ -1441,7 +1441,7 @@ bool ActiveSyncProductsTesterBase :: } bool ActiveSyncProductsTesterBase :: - isConnected_to_noArgsAsync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsAsync(), @@ -1452,7 +1452,7 @@ bool ActiveSyncProductsTesterBase :: } bool ActiveSyncProductsTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1463,7 +1463,7 @@ bool ActiveSyncProductsTesterBase :: } bool ActiveSyncProductsTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1474,7 +1474,7 @@ bool ActiveSyncProductsTesterBase :: } bool ActiveSyncProductsTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1485,7 +1485,7 @@ bool ActiveSyncProductsTesterBase :: } bool ActiveSyncProductsTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1496,7 +1496,7 @@ bool ActiveSyncProductsTesterBase :: } bool ActiveSyncProductsTesterBase :: - isConnected_to_typedAsync(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsync(), @@ -1507,7 +1507,7 @@ bool ActiveSyncProductsTesterBase :: } bool ActiveSyncProductsTesterBase :: - isConnected_to_typedAsyncAssert(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncAssert(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncAssert(), @@ -1518,7 +1518,7 @@ bool ActiveSyncProductsTesterBase :: } bool ActiveSyncProductsTesterBase :: - isConnected_to_typedAsyncBlockPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncBlockPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncBlockPriority(), @@ -1529,7 +1529,7 @@ bool ActiveSyncProductsTesterBase :: } bool ActiveSyncProductsTesterBase :: - isConnected_to_typedAsyncDropPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncDropPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncDropPriority(), @@ -1540,7 +1540,7 @@ bool ActiveSyncProductsTesterBase :: } bool ActiveSyncProductsTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1551,7 +1551,7 @@ bool ActiveSyncProductsTesterBase :: } bool ActiveSyncProductsTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1562,7 +1562,7 @@ bool ActiveSyncProductsTesterBase :: } bool ActiveSyncProductsTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1573,7 +1573,7 @@ bool ActiveSyncProductsTesterBase :: } bool ActiveSyncProductsTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1738,7 +1738,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: from_productRequestOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -1750,7 +1750,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: from_productSendOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -1762,7 +1762,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -1773,7 +1773,7 @@ void ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1784,7 +1784,7 @@ void ActiveSyncProductsTesterBase :: U32 ActiveSyncProductsTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1795,7 +1795,7 @@ U32 ActiveSyncProductsTesterBase :: void ActiveSyncProductsTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1822,7 +1822,7 @@ void ActiveSyncProductsTesterBase :: F32 ActiveSyncProductsTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSyncProductsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSyncProductsTesterBase.ref.hpp index 96be68ba1..eec1007d0 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSyncProductsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSyncProductsTesterBase.ref.hpp @@ -149,7 +149,7 @@ class ActiveSyncProductsTesterBase : //! Initialize object ActiveSyncProductsTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -160,91 +160,91 @@ class ActiveSyncProductsTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to productRecvIn[portNum] void connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpResponsePort* port //!< The input port ); //! Connect port to noArgsAsync[portNum] void connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedAsync[portNum] void connect_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncAssert[portNum] void connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncBlockPriority[portNum] void connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncDropPriority[portNum] void connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -258,49 +258,49 @@ class ActiveSyncProductsTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productRequestOut[portNum] Fw::InputDpRequestPort* get_from_productRequestOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productSendOut[portNum] Fw::InputDpSendPort* get_from_productSendOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -309,7 +309,7 @@ class ActiveSyncProductsTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -318,42 +318,42 @@ class ActiveSyncProductsTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -379,17 +379,17 @@ class ActiveSyncProductsTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -401,7 +401,7 @@ class ActiveSyncProductsTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -419,17 +419,17 @@ class ActiveSyncProductsTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -441,7 +441,7 @@ class ActiveSyncProductsTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -459,32 +459,32 @@ class ActiveSyncProductsTesterBase : //! Invoke the to port connected to noArgsAsync void invoke_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedAsync void invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -496,7 +496,7 @@ class ActiveSyncProductsTesterBase : //! Invoke the to port connected to typedAsyncAssert void invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -508,7 +508,7 @@ class ActiveSyncProductsTesterBase : //! Invoke the to port connected to typedAsyncBlockPriority void invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -520,7 +520,7 @@ class ActiveSyncProductsTesterBase : //! Invoke the to port connected to typedAsyncDropPriority void invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -532,7 +532,7 @@ class ActiveSyncProductsTesterBase : //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -544,7 +544,7 @@ class ActiveSyncProductsTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -556,7 +556,7 @@ class ActiveSyncProductsTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -568,7 +568,7 @@ class ActiveSyncProductsTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -587,151 +587,151 @@ class ActiveSyncProductsTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_productRecvIn ports //! //! \return The number of to_productRecvIn ports - NATIVE_INT_TYPE getNum_to_productRecvIn() const; + FwIndexType getNum_to_productRecvIn() const; //! Get the number of to_noArgsAsync ports //! //! \return The number of to_noArgsAsync ports - NATIVE_INT_TYPE getNum_to_noArgsAsync() const; + FwIndexType getNum_to_noArgsAsync() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedAsync ports //! //! \return The number of to_typedAsync ports - NATIVE_INT_TYPE getNum_to_typedAsync() const; + FwIndexType getNum_to_typedAsync() const; //! Get the number of to_typedAsyncAssert ports //! //! \return The number of to_typedAsyncAssert ports - NATIVE_INT_TYPE getNum_to_typedAsyncAssert() const; + FwIndexType getNum_to_typedAsyncAssert() const; //! Get the number of to_typedAsyncBlockPriority ports //! //! \return The number of to_typedAsyncBlockPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncBlockPriority() const; + FwIndexType getNum_to_typedAsyncBlockPriority() const; //! Get the number of to_typedAsyncDropPriority ports //! //! \return The number of to_typedAsyncDropPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncDropPriority() const; + FwIndexType getNum_to_typedAsyncDropPriority() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; //! Get the number of from_productRequestOut ports //! //! \return The number of from_productRequestOut ports - NATIVE_INT_TYPE getNum_from_productRequestOut() const; + FwIndexType getNum_from_productRequestOut() const; //! Get the number of from_productSendOut ports //! //! \return The number of from_productSendOut ports - NATIVE_INT_TYPE getNum_from_productSendOut() const; + FwIndexType getNum_from_productSendOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -743,105 +743,105 @@ class ActiveSyncProductsTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_productRecvIn is connected //! //! \return Whether port to_productRecvIn is connected bool isConnected_to_productRecvIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsAsync is connected //! //! \return Whether port to_noArgsAsync is connected bool isConnected_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsync is connected //! //! \return Whether port to_typedAsync is connected bool isConnected_to_typedAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncAssert is connected //! //! \return Whether port to_typedAsyncAssert is connected bool isConnected_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncBlockPriority is connected //! //! \return Whether port to_typedAsyncBlockPriority is connected bool isConnected_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncDropPriority is connected //! //! \return Whether port to_typedAsyncDropPriority is connected bool isConnected_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -947,7 +947,7 @@ class ActiveSyncProductsTesterBase : //! Static function for port from_productRequestOut static void from_productRequestOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); @@ -955,7 +955,7 @@ class ActiveSyncProductsTesterBase : //! Static function for port from_productSendOut static void from_productSendOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -963,26 +963,26 @@ class ActiveSyncProductsTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -995,7 +995,7 @@ class ActiveSyncProductsTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTelemetryTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTelemetryTesterBase.ref.cpp index fcb7d177d..d5bd08961 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTelemetryTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTelemetryTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void ActiveTelemetryTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -45,8 +45,8 @@ void ActiveTelemetryTesterBase :: // Connect input port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_tlmOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_tlmOut()); port++ ) { this->m_from_tlmOut[port].init(); @@ -69,8 +69,8 @@ void ActiveTelemetryTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -93,8 +93,8 @@ void ActiveTelemetryTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -117,8 +117,8 @@ void ActiveTelemetryTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -141,8 +141,8 @@ void ActiveTelemetryTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -165,8 +165,8 @@ void ActiveTelemetryTesterBase :: // Connect output port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsAsync()); port++ ) { this->m_to_noArgsAsync[port].init(); @@ -184,8 +184,8 @@ void ActiveTelemetryTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -203,8 +203,8 @@ void ActiveTelemetryTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -222,8 +222,8 @@ void ActiveTelemetryTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -241,8 +241,8 @@ void ActiveTelemetryTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -260,8 +260,8 @@ void ActiveTelemetryTesterBase :: // Connect output port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsync()); port++ ) { this->m_to_typedAsync[port].init(); @@ -279,8 +279,8 @@ void ActiveTelemetryTesterBase :: // Connect output port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncAssert()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncAssert()); port++ ) { this->m_to_typedAsyncAssert[port].init(); @@ -298,8 +298,8 @@ void ActiveTelemetryTesterBase :: // Connect output port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncBlockPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncBlockPriority()); port++ ) { this->m_to_typedAsyncBlockPriority[port].init(); @@ -317,8 +317,8 @@ void ActiveTelemetryTesterBase :: // Connect output port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncDropPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncDropPriority()); port++ ) { this->m_to_typedAsyncDropPriority[port].init(); @@ -336,8 +336,8 @@ void ActiveTelemetryTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -355,8 +355,8 @@ void ActiveTelemetryTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -374,8 +374,8 @@ void ActiveTelemetryTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -393,8 +393,8 @@ void ActiveTelemetryTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -417,7 +417,7 @@ void ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -431,7 +431,7 @@ void ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -445,7 +445,7 @@ void ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -459,7 +459,7 @@ void ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -473,7 +473,7 @@ void ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -487,7 +487,7 @@ void ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -501,7 +501,7 @@ void ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: connect_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -515,7 +515,7 @@ void ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -529,7 +529,7 @@ void ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -543,7 +543,7 @@ void ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -557,7 +557,7 @@ void ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -571,7 +571,7 @@ void ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -585,7 +585,7 @@ void ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -599,7 +599,7 @@ void ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -616,7 +616,7 @@ void ActiveTelemetryTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* ActiveTelemetryTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -627,7 +627,7 @@ Fw::InputCmdRegPort* ActiveTelemetryTesterBase :: } Fw::InputCmdResponsePort* ActiveTelemetryTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -638,7 +638,7 @@ Fw::InputCmdResponsePort* ActiveTelemetryTesterBase :: } Fw::InputLogPort* ActiveTelemetryTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -649,7 +649,7 @@ Fw::InputLogPort* ActiveTelemetryTesterBase :: } Fw::InputPrmGetPort* ActiveTelemetryTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -660,7 +660,7 @@ Fw::InputPrmGetPort* ActiveTelemetryTesterBase :: } Fw::InputPrmSetPort* ActiveTelemetryTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -673,7 +673,7 @@ Fw::InputPrmSetPort* ActiveTelemetryTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* ActiveTelemetryTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -686,7 +686,7 @@ Fw::InputLogTextPort* ActiveTelemetryTesterBase :: #endif Fw::InputTimePort* ActiveTelemetryTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -697,7 +697,7 @@ Fw::InputTimePort* ActiveTelemetryTesterBase :: } Fw::InputTlmPort* ActiveTelemetryTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -708,7 +708,7 @@ Fw::InputTlmPort* ActiveTelemetryTesterBase :: } Ports::InputNoArgsPort* ActiveTelemetryTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -719,7 +719,7 @@ Ports::InputNoArgsPort* ActiveTelemetryTesterBase :: } Ports::InputNoArgsReturnPort* ActiveTelemetryTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -730,7 +730,7 @@ Ports::InputNoArgsReturnPort* ActiveTelemetryTesterBase :: } Ports::InputTypedPort* ActiveTelemetryTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -741,7 +741,7 @@ Ports::InputTypedPort* ActiveTelemetryTesterBase :: } Ports::InputTypedReturnPort* ActiveTelemetryTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -809,7 +809,7 @@ ActiveTelemetryTesterBase :: // ---------------------------------------------------------------------- void ActiveTelemetryTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -820,7 +820,7 @@ void ActiveTelemetryTesterBase :: } U32 ActiveTelemetryTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -832,7 +832,7 @@ U32 ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -861,7 +861,7 @@ void ActiveTelemetryTesterBase :: F32 ActiveTelemetryTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -893,7 +893,7 @@ F32 ActiveTelemetryTesterBase :: // ---------------------------------------------------------------------- void ActiveTelemetryTesterBase :: - invoke_to_noArgsAsync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsAsync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -904,7 +904,7 @@ void ActiveTelemetryTesterBase :: } void ActiveTelemetryTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -915,7 +915,7 @@ void ActiveTelemetryTesterBase :: } U32 ActiveTelemetryTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -926,7 +926,7 @@ U32 ActiveTelemetryTesterBase :: } U32 ActiveTelemetryTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -937,7 +937,7 @@ U32 ActiveTelemetryTesterBase :: } void ActiveTelemetryTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -949,7 +949,7 @@ void ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -977,7 +977,7 @@ void ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1005,7 +1005,7 @@ void ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1033,7 +1033,7 @@ void ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1061,7 +1061,7 @@ void ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1089,7 +1089,7 @@ void ActiveTelemetryTesterBase :: F32 ActiveTelemetryTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1117,7 +1117,7 @@ F32 ActiveTelemetryTesterBase :: F32 ActiveTelemetryTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1145,7 +1145,7 @@ F32 ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1175,164 +1175,164 @@ void ActiveTelemetryTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_to_noArgsAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); } -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_to_typedAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); } -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_to_typedAsyncAssert() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); } -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_to_typedAsyncBlockPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); } -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_to_typedAsyncDropPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); } -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE ActiveTelemetryTesterBase :: +FwIndexType ActiveTelemetryTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1340,7 +1340,7 @@ NATIVE_INT_TYPE ActiveTelemetryTesterBase :: // ---------------------------------------------------------------------- bool ActiveTelemetryTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1351,7 +1351,7 @@ bool ActiveTelemetryTesterBase :: } bool ActiveTelemetryTesterBase :: - isConnected_to_noArgsAsync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsAsync(), @@ -1362,7 +1362,7 @@ bool ActiveTelemetryTesterBase :: } bool ActiveTelemetryTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1373,7 +1373,7 @@ bool ActiveTelemetryTesterBase :: } bool ActiveTelemetryTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1384,7 +1384,7 @@ bool ActiveTelemetryTesterBase :: } bool ActiveTelemetryTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1395,7 +1395,7 @@ bool ActiveTelemetryTesterBase :: } bool ActiveTelemetryTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1406,7 +1406,7 @@ bool ActiveTelemetryTesterBase :: } bool ActiveTelemetryTesterBase :: - isConnected_to_typedAsync(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsync(), @@ -1417,7 +1417,7 @@ bool ActiveTelemetryTesterBase :: } bool ActiveTelemetryTesterBase :: - isConnected_to_typedAsyncAssert(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncAssert(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncAssert(), @@ -1428,7 +1428,7 @@ bool ActiveTelemetryTesterBase :: } bool ActiveTelemetryTesterBase :: - isConnected_to_typedAsyncBlockPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncBlockPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncBlockPriority(), @@ -1439,7 +1439,7 @@ bool ActiveTelemetryTesterBase :: } bool ActiveTelemetryTesterBase :: - isConnected_to_typedAsyncDropPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncDropPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncDropPriority(), @@ -1450,7 +1450,7 @@ bool ActiveTelemetryTesterBase :: } bool ActiveTelemetryTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1461,7 +1461,7 @@ bool ActiveTelemetryTesterBase :: } bool ActiveTelemetryTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1472,7 +1472,7 @@ bool ActiveTelemetryTesterBase :: } bool ActiveTelemetryTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1483,7 +1483,7 @@ bool ActiveTelemetryTesterBase :: } bool ActiveTelemetryTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1898,7 +1898,7 @@ void ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -1909,7 +1909,7 @@ void ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: from_tlmOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwChanIdType id, Fw::Time& timeTag, Fw::TlmBuffer& val @@ -1922,7 +1922,7 @@ void ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1933,7 +1933,7 @@ void ActiveTelemetryTesterBase :: U32 ActiveTelemetryTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1944,7 +1944,7 @@ U32 ActiveTelemetryTesterBase :: void ActiveTelemetryTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1971,7 +1971,7 @@ void ActiveTelemetryTesterBase :: F32 ActiveTelemetryTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTelemetryTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTelemetryTesterBase.ref.hpp index 5e5fc2a4f..004fc5db5 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTelemetryTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTelemetryTesterBase.ref.hpp @@ -202,7 +202,7 @@ class ActiveTelemetryTesterBase : //! Initialize object ActiveTelemetryTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -213,85 +213,85 @@ class ActiveTelemetryTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to noArgsAsync[portNum] void connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedAsync[portNum] void connect_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncAssert[portNum] void connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncBlockPriority[portNum] void connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncDropPriority[portNum] void connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -305,35 +305,35 @@ class ActiveTelemetryTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -342,7 +342,7 @@ class ActiveTelemetryTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -351,42 +351,42 @@ class ActiveTelemetryTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -412,17 +412,17 @@ class ActiveTelemetryTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -434,7 +434,7 @@ class ActiveTelemetryTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -452,17 +452,17 @@ class ActiveTelemetryTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -474,7 +474,7 @@ class ActiveTelemetryTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -492,32 +492,32 @@ class ActiveTelemetryTesterBase : //! Invoke the to port connected to noArgsAsync void invoke_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedAsync void invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -529,7 +529,7 @@ class ActiveTelemetryTesterBase : //! Invoke the to port connected to typedAsyncAssert void invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -541,7 +541,7 @@ class ActiveTelemetryTesterBase : //! Invoke the to port connected to typedAsyncBlockPriority void invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -553,7 +553,7 @@ class ActiveTelemetryTesterBase : //! Invoke the to port connected to typedAsyncDropPriority void invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -565,7 +565,7 @@ class ActiveTelemetryTesterBase : //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -577,7 +577,7 @@ class ActiveTelemetryTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -589,7 +589,7 @@ class ActiveTelemetryTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -601,7 +601,7 @@ class ActiveTelemetryTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -620,136 +620,136 @@ class ActiveTelemetryTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_noArgsAsync ports //! //! \return The number of to_noArgsAsync ports - NATIVE_INT_TYPE getNum_to_noArgsAsync() const; + FwIndexType getNum_to_noArgsAsync() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedAsync ports //! //! \return The number of to_typedAsync ports - NATIVE_INT_TYPE getNum_to_typedAsync() const; + FwIndexType getNum_to_typedAsync() const; //! Get the number of to_typedAsyncAssert ports //! //! \return The number of to_typedAsyncAssert ports - NATIVE_INT_TYPE getNum_to_typedAsyncAssert() const; + FwIndexType getNum_to_typedAsyncAssert() const; //! Get the number of to_typedAsyncBlockPriority ports //! //! \return The number of to_typedAsyncBlockPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncBlockPriority() const; + FwIndexType getNum_to_typedAsyncBlockPriority() const; //! Get the number of to_typedAsyncDropPriority ports //! //! \return The number of to_typedAsyncDropPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncDropPriority() const; + FwIndexType getNum_to_typedAsyncDropPriority() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -761,98 +761,98 @@ class ActiveTelemetryTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsAsync is connected //! //! \return Whether port to_noArgsAsync is connected bool isConnected_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsync is connected //! //! \return Whether port to_typedAsync is connected bool isConnected_to_typedAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncAssert is connected //! //! \return Whether port to_typedAsyncAssert is connected bool isConnected_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncBlockPriority is connected //! //! \return Whether port to_typedAsyncBlockPriority is connected bool isConnected_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncDropPriority is connected //! //! \return Whether port to_typedAsyncDropPriority is connected bool isConnected_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -997,14 +997,14 @@ class ActiveTelemetryTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_tlmOut static void from_tlmOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwChanIdType id, //!< Telemetry Channel ID Fw::Time& timeTag, //!< Time Tag Fw::TlmBuffer& val //!< Buffer containing serialized telemetry value @@ -1013,19 +1013,19 @@ class ActiveTelemetryTesterBase : //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1038,7 +1038,7 @@ class ActiveTelemetryTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.cpp index 2132e262c..c42211603 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.cpp @@ -16,15 +16,15 @@ namespace M { // ---------------------------------------------------------------------- void ActiveTestTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdRegOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdRegOut()); port++ ) { this->m_from_cmdRegOut[port].init(); @@ -47,8 +47,8 @@ namespace M { // Connect input port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdResponseOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdResponseOut()); port++ ) { this->m_from_cmdResponseOut[port].init(); @@ -71,8 +71,8 @@ namespace M { // Connect input port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_eventOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_eventOut()); port++ ) { this->m_from_eventOut[port].init(); @@ -95,8 +95,8 @@ namespace M { // Connect input port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_prmGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_prmGetOut()); port++ ) { this->m_from_prmGetOut[port].init(); @@ -119,8 +119,8 @@ namespace M { // Connect input port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_prmSetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_prmSetOut()); port++ ) { this->m_from_prmSetOut[port].init(); @@ -143,8 +143,8 @@ namespace M { // Connect input port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productRequestOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productRequestOut()); port++ ) { this->m_from_productRequestOut[port].init(); @@ -167,8 +167,8 @@ namespace M { // Connect input port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productSendOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productSendOut()); port++ ) { this->m_from_productSendOut[port].init(); @@ -192,8 +192,8 @@ namespace M { #if FW_ENABLE_TEXT_LOGGING == 1 // Connect input port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_textEventOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_textEventOut()); port++ ) { this->m_from_textEventOut[port].init(); @@ -217,8 +217,8 @@ namespace M { // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -241,8 +241,8 @@ namespace M { // Connect input port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_tlmOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_tlmOut()); port++ ) { this->m_from_tlmOut[port].init(); @@ -265,8 +265,8 @@ namespace M { // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -289,8 +289,8 @@ namespace M { // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -313,8 +313,8 @@ namespace M { // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -337,8 +337,8 @@ namespace M { // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -361,8 +361,8 @@ namespace M { // Connect output port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_cmdIn()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_cmdIn()); port++ ) { this->m_to_cmdIn[port].init(); @@ -380,8 +380,8 @@ namespace M { // Connect output port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_productRecvIn()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_productRecvIn()); port++ ) { this->m_to_productRecvIn[port].init(); @@ -399,8 +399,8 @@ namespace M { // Connect output port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsAsync()); port++ ) { this->m_to_noArgsAsync[port].init(); @@ -418,8 +418,8 @@ namespace M { // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -437,8 +437,8 @@ namespace M { // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -456,8 +456,8 @@ namespace M { // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -475,8 +475,8 @@ namespace M { // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -494,8 +494,8 @@ namespace M { // Connect output port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsync()); port++ ) { this->m_to_typedAsync[port].init(); @@ -513,8 +513,8 @@ namespace M { // Connect output port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncAssert()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncAssert()); port++ ) { this->m_to_typedAsyncAssert[port].init(); @@ -532,8 +532,8 @@ namespace M { // Connect output port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncBlockPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncBlockPriority()); port++ ) { this->m_to_typedAsyncBlockPriority[port].init(); @@ -551,8 +551,8 @@ namespace M { // Connect output port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncDropPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncDropPriority()); port++ ) { this->m_to_typedAsyncDropPriority[port].init(); @@ -570,8 +570,8 @@ namespace M { // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -589,8 +589,8 @@ namespace M { // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -608,8 +608,8 @@ namespace M { // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -627,8 +627,8 @@ namespace M { // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -651,7 +651,7 @@ namespace M { void ActiveTestTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -665,7 +665,7 @@ namespace M { void ActiveTestTesterBase :: connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpResponsePort* port ) { @@ -679,7 +679,7 @@ namespace M { void ActiveTestTesterBase :: connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -693,7 +693,7 @@ namespace M { void ActiveTestTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -707,7 +707,7 @@ namespace M { void ActiveTestTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -721,7 +721,7 @@ namespace M { void ActiveTestTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -735,7 +735,7 @@ namespace M { void ActiveTestTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -749,7 +749,7 @@ namespace M { void ActiveTestTesterBase :: connect_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -763,7 +763,7 @@ namespace M { void ActiveTestTesterBase :: connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -777,7 +777,7 @@ namespace M { void ActiveTestTesterBase :: connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -791,7 +791,7 @@ namespace M { void ActiveTestTesterBase :: connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -805,7 +805,7 @@ namespace M { void ActiveTestTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -819,7 +819,7 @@ namespace M { void ActiveTestTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -833,7 +833,7 @@ namespace M { void ActiveTestTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -847,7 +847,7 @@ namespace M { void ActiveTestTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -864,7 +864,7 @@ namespace M { // ---------------------------------------------------------------------- Fw::InputCmdRegPort* ActiveTestTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -875,7 +875,7 @@ namespace M { } Fw::InputCmdResponsePort* ActiveTestTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -886,7 +886,7 @@ namespace M { } Fw::InputLogPort* ActiveTestTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -897,7 +897,7 @@ namespace M { } Fw::InputPrmGetPort* ActiveTestTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -908,7 +908,7 @@ namespace M { } Fw::InputPrmSetPort* ActiveTestTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -919,7 +919,7 @@ namespace M { } Fw::InputDpRequestPort* ActiveTestTesterBase :: - get_from_productRequestOut(NATIVE_INT_TYPE portNum) + get_from_productRequestOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productRequestOut(), @@ -930,7 +930,7 @@ namespace M { } Fw::InputDpSendPort* ActiveTestTesterBase :: - get_from_productSendOut(NATIVE_INT_TYPE portNum) + get_from_productSendOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productSendOut(), @@ -943,7 +943,7 @@ namespace M { #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* ActiveTestTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -956,7 +956,7 @@ namespace M { #endif Fw::InputTimePort* ActiveTestTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -967,7 +967,7 @@ namespace M { } Fw::InputTlmPort* ActiveTestTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -978,7 +978,7 @@ namespace M { } Ports::InputNoArgsPort* ActiveTestTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -989,7 +989,7 @@ namespace M { } Ports::InputNoArgsReturnPort* ActiveTestTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -1000,7 +1000,7 @@ namespace M { } Ports::InputTypedPort* ActiveTestTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -1011,7 +1011,7 @@ namespace M { } Ports::InputTypedReturnPort* ActiveTestTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -1119,7 +1119,7 @@ namespace M { // ---------------------------------------------------------------------- void ActiveTestTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1130,7 +1130,7 @@ namespace M { } U32 ActiveTestTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1142,7 +1142,7 @@ namespace M { void ActiveTestTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1171,7 +1171,7 @@ namespace M { F32 ActiveTestTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1203,7 +1203,7 @@ namespace M { // ---------------------------------------------------------------------- void ActiveTestTesterBase :: - invoke_to_noArgsAsync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsAsync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1214,7 +1214,7 @@ namespace M { } void ActiveTestTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1225,7 +1225,7 @@ namespace M { } U32 ActiveTestTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1236,7 +1236,7 @@ namespace M { } U32 ActiveTestTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1247,7 +1247,7 @@ namespace M { } void ActiveTestTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1259,7 +1259,7 @@ namespace M { void ActiveTestTesterBase :: invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1287,7 +1287,7 @@ namespace M { void ActiveTestTesterBase :: invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1315,7 +1315,7 @@ namespace M { void ActiveTestTesterBase :: invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1343,7 +1343,7 @@ namespace M { void ActiveTestTesterBase :: invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1371,7 +1371,7 @@ namespace M { void ActiveTestTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1399,7 +1399,7 @@ namespace M { F32 ActiveTestTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1427,7 +1427,7 @@ namespace M { F32 ActiveTestTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1455,7 +1455,7 @@ namespace M { void ActiveTestTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1485,182 +1485,182 @@ namespace M { // Getters for port counts // ---------------------------------------------------------------------- - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_to_productRecvIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_to_noArgsAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_to_typedAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_to_typedAsyncAssert() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_to_typedAsyncBlockPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_to_typedAsyncDropPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_from_productRequestOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_from_productSendOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } - NATIVE_INT_TYPE ActiveTestTesterBase :: + FwIndexType ActiveTestTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1668,7 +1668,7 @@ namespace M { // ---------------------------------------------------------------------- bool ActiveTestTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1679,7 +1679,7 @@ namespace M { } bool ActiveTestTesterBase :: - isConnected_to_productRecvIn(NATIVE_INT_TYPE portNum) + isConnected_to_productRecvIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_productRecvIn(), @@ -1690,7 +1690,7 @@ namespace M { } bool ActiveTestTesterBase :: - isConnected_to_noArgsAsync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsAsync(), @@ -1701,7 +1701,7 @@ namespace M { } bool ActiveTestTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1712,7 +1712,7 @@ namespace M { } bool ActiveTestTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1723,7 +1723,7 @@ namespace M { } bool ActiveTestTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1734,7 +1734,7 @@ namespace M { } bool ActiveTestTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1745,7 +1745,7 @@ namespace M { } bool ActiveTestTesterBase :: - isConnected_to_typedAsync(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsync(), @@ -1756,7 +1756,7 @@ namespace M { } bool ActiveTestTesterBase :: - isConnected_to_typedAsyncAssert(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncAssert(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncAssert(), @@ -1767,7 +1767,7 @@ namespace M { } bool ActiveTestTesterBase :: - isConnected_to_typedAsyncBlockPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncBlockPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncBlockPriority(), @@ -1778,7 +1778,7 @@ namespace M { } bool ActiveTestTesterBase :: - isConnected_to_typedAsyncDropPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncDropPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncDropPriority(), @@ -1789,7 +1789,7 @@ namespace M { } bool ActiveTestTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1800,7 +1800,7 @@ namespace M { } bool ActiveTestTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1811,7 +1811,7 @@ namespace M { } bool ActiveTestTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1822,7 +1822,7 @@ namespace M { } bool ActiveTestTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1870,7 +1870,7 @@ namespace M { void ActiveTestTesterBase :: sendCmd_CMD_SYNC( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -1895,7 +1895,7 @@ namespace M { void ActiveTestTesterBase :: sendCmd_CMD_SYNC_PRIMITIVE( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32, F32 f32, @@ -1943,7 +1943,7 @@ namespace M { void ActiveTestTesterBase :: sendCmd_CMD_SYNC_STRING( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, const Fw::CmdStringArg& str1, const Fw::CmdStringArg& str2 @@ -1984,7 +1984,7 @@ namespace M { void ActiveTestTesterBase :: sendCmd_CMD_SYNC_ENUM( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, E e ) @@ -2018,7 +2018,7 @@ namespace M { void ActiveTestTesterBase :: sendCmd_CMD_SYNC_ARRAY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, A a ) @@ -2052,7 +2052,7 @@ namespace M { void ActiveTestTesterBase :: sendCmd_CMD_SYNC_STRUCT( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, S s ) @@ -2086,7 +2086,7 @@ namespace M { void ActiveTestTesterBase :: sendCmd_CMD_GUARDED( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2111,7 +2111,7 @@ namespace M { void ActiveTestTesterBase :: sendCmd_CMD_GUARDED_PRIMITIVE( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32, F32 f32, @@ -2159,7 +2159,7 @@ namespace M { void ActiveTestTesterBase :: sendCmd_CMD_GUARDED_STRING( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, const Fw::CmdStringArg& str1, const Fw::CmdStringArg& str2 @@ -2200,7 +2200,7 @@ namespace M { void ActiveTestTesterBase :: sendCmd_CMD_GUARDED_ENUM( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, E e ) @@ -2234,7 +2234,7 @@ namespace M { void ActiveTestTesterBase :: sendCmd_CMD_GUARDED_ARRAY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, A a ) @@ -2268,7 +2268,7 @@ namespace M { void ActiveTestTesterBase :: sendCmd_CMD_GUARDED_STRUCT( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, S s ) @@ -2302,7 +2302,7 @@ namespace M { void ActiveTestTesterBase :: sendCmd_CMD_ASYNC( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2327,7 +2327,7 @@ namespace M { void ActiveTestTesterBase :: sendCmd_CMD_PRIORITY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2352,7 +2352,7 @@ namespace M { void ActiveTestTesterBase :: sendCmd_CMD_PARAMS_PRIORITY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32 ) @@ -2386,7 +2386,7 @@ namespace M { void ActiveTestTesterBase :: sendCmd_CMD_DROP( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2411,7 +2411,7 @@ namespace M { void ActiveTestTesterBase :: sendCmd_CMD_PARAMS_PRIORITY_DROP( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32 ) @@ -3151,7 +3151,7 @@ namespace M { void ActiveTestTesterBase :: paramSend_ParamU32( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3178,7 +3178,7 @@ namespace M { void ActiveTestTesterBase :: paramSave_ParamU32( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3210,7 +3210,7 @@ namespace M { void ActiveTestTesterBase :: paramSend_ParamF64( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3237,7 +3237,7 @@ namespace M { void ActiveTestTesterBase :: paramSave_ParamF64( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3269,7 +3269,7 @@ namespace M { void ActiveTestTesterBase :: paramSend_ParamString( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3296,7 +3296,7 @@ namespace M { void ActiveTestTesterBase :: paramSave_ParamString( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3328,7 +3328,7 @@ namespace M { void ActiveTestTesterBase :: paramSend_ParamEnum( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3355,7 +3355,7 @@ namespace M { void ActiveTestTesterBase :: paramSave_ParamEnum( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3387,7 +3387,7 @@ namespace M { void ActiveTestTesterBase :: paramSend_ParamArray( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3414,7 +3414,7 @@ namespace M { void ActiveTestTesterBase :: paramSave_ParamArray( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3446,7 +3446,7 @@ namespace M { void ActiveTestTesterBase :: paramSend_ParamStruct( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3473,7 +3473,7 @@ namespace M { void ActiveTestTesterBase :: paramSave_ParamStruct( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3746,7 +3746,7 @@ namespace M { void ActiveTestTesterBase :: from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode ) { @@ -3756,7 +3756,7 @@ namespace M { void ActiveTestTesterBase :: from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, const Fw::CmdResponse& response @@ -3769,7 +3769,7 @@ namespace M { void ActiveTestTesterBase :: from_eventOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwEventIdType id, Fw::Time& timeTag, const Fw::LogSeverity& severity, @@ -3783,7 +3783,7 @@ namespace M { Fw::ParamValid ActiveTestTesterBase :: from_prmGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwPrmIdType id, Fw::ParamBuffer& val ) @@ -3870,7 +3870,7 @@ namespace M { void ActiveTestTesterBase :: from_prmSetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwPrmIdType id, Fw::ParamBuffer& val ) @@ -3976,7 +3976,7 @@ namespace M { void ActiveTestTesterBase :: from_productRequestOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -3988,7 +3988,7 @@ namespace M { void ActiveTestTesterBase :: from_productSendOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -4002,7 +4002,7 @@ namespace M { void ActiveTestTesterBase :: from_textEventOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwEventIdType id, Fw::Time& timeTag, const Fw::LogSeverity& severity, @@ -4018,7 +4018,7 @@ namespace M { void ActiveTestTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -4029,7 +4029,7 @@ namespace M { void ActiveTestTesterBase :: from_tlmOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwChanIdType id, Fw::Time& timeTag, Fw::TlmBuffer& val @@ -4042,7 +4042,7 @@ namespace M { void ActiveTestTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -4053,7 +4053,7 @@ namespace M { U32 ActiveTestTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -4064,7 +4064,7 @@ namespace M { void ActiveTestTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4091,7 +4091,7 @@ namespace M { F32 ActiveTestTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.hpp index 5a0dbdca9..b0fbe1afe 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.hpp @@ -264,7 +264,7 @@ namespace M { //! Initialize object ActiveTestTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -275,91 +275,91 @@ namespace M { //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to productRecvIn[portNum] void connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpResponsePort* port //!< The input port ); //! Connect port to noArgsAsync[portNum] void connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedAsync[portNum] void connect_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncAssert[portNum] void connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncBlockPriority[portNum] void connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncDropPriority[portNum] void connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -373,49 +373,49 @@ namespace M { //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productRequestOut[portNum] Fw::InputDpRequestPort* get_from_productRequestOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productSendOut[portNum] Fw::InputDpSendPort* get_from_productSendOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -424,7 +424,7 @@ namespace M { //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -433,42 +433,42 @@ namespace M { //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -494,17 +494,17 @@ namespace M { //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -516,7 +516,7 @@ namespace M { //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -534,17 +534,17 @@ namespace M { //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -556,7 +556,7 @@ namespace M { //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -574,32 +574,32 @@ namespace M { //! Invoke the to port connected to noArgsAsync void invoke_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedAsync void invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -611,7 +611,7 @@ namespace M { //! Invoke the to port connected to typedAsyncAssert void invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -623,7 +623,7 @@ namespace M { //! Invoke the to port connected to typedAsyncBlockPriority void invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -635,7 +635,7 @@ namespace M { //! Invoke the to port connected to typedAsyncDropPriority void invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -647,7 +647,7 @@ namespace M { //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -659,7 +659,7 @@ namespace M { //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -671,7 +671,7 @@ namespace M { //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -683,7 +683,7 @@ namespace M { //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -702,151 +702,151 @@ namespace M { //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_productRecvIn ports //! //! \return The number of to_productRecvIn ports - NATIVE_INT_TYPE getNum_to_productRecvIn() const; + FwIndexType getNum_to_productRecvIn() const; //! Get the number of to_noArgsAsync ports //! //! \return The number of to_noArgsAsync ports - NATIVE_INT_TYPE getNum_to_noArgsAsync() const; + FwIndexType getNum_to_noArgsAsync() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedAsync ports //! //! \return The number of to_typedAsync ports - NATIVE_INT_TYPE getNum_to_typedAsync() const; + FwIndexType getNum_to_typedAsync() const; //! Get the number of to_typedAsyncAssert ports //! //! \return The number of to_typedAsyncAssert ports - NATIVE_INT_TYPE getNum_to_typedAsyncAssert() const; + FwIndexType getNum_to_typedAsyncAssert() const; //! Get the number of to_typedAsyncBlockPriority ports //! //! \return The number of to_typedAsyncBlockPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncBlockPriority() const; + FwIndexType getNum_to_typedAsyncBlockPriority() const; //! Get the number of to_typedAsyncDropPriority ports //! //! \return The number of to_typedAsyncDropPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncDropPriority() const; + FwIndexType getNum_to_typedAsyncDropPriority() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; //! Get the number of from_productRequestOut ports //! //! \return The number of from_productRequestOut ports - NATIVE_INT_TYPE getNum_from_productRequestOut() const; + FwIndexType getNum_from_productRequestOut() const; //! Get the number of from_productSendOut ports //! //! \return The number of from_productSendOut ports - NATIVE_INT_TYPE getNum_from_productSendOut() const; + FwIndexType getNum_from_productSendOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -858,105 +858,105 @@ namespace M { //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_productRecvIn is connected //! //! \return Whether port to_productRecvIn is connected bool isConnected_to_productRecvIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsAsync is connected //! //! \return Whether port to_noArgsAsync is connected bool isConnected_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsync is connected //! //! \return Whether port to_typedAsync is connected bool isConnected_to_typedAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncAssert is connected //! //! \return Whether port to_typedAsyncAssert is connected bool isConnected_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncBlockPriority is connected //! //! \return Whether port to_typedAsyncBlockPriority is connected bool isConnected_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncDropPriority is connected //! //! \return Whether port to_typedAsyncDropPriority is connected bool isConnected_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -981,13 +981,13 @@ namespace M { //! Send a CMD_SYNC command void sendCmd_CMD_SYNC( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_SYNC_PRIMITIVE command void sendCmd_CMD_SYNC_PRIMITIVE( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32, //!< A U32 F32 f32, //!< An F32 @@ -996,7 +996,7 @@ namespace M { //! Send a CMD_SYNC_STRING command void sendCmd_CMD_SYNC_STRING( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number const Fw::CmdStringArg& str1, //!< A string const Fw::CmdStringArg& str2 //!< Another string @@ -1004,34 +1004,34 @@ namespace M { //! Send a CMD_SYNC_ENUM command void sendCmd_CMD_SYNC_ENUM( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number E e //!< An enum ); //! Send a CMD_SYNC_ARRAY command void sendCmd_CMD_SYNC_ARRAY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number A a //!< An array ); //! Send a CMD_SYNC_STRUCT command void sendCmd_CMD_SYNC_STRUCT( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number S s //!< A struct ); //! Send a CMD_GUARDED command void sendCmd_CMD_GUARDED( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_GUARDED_PRIMITIVE command void sendCmd_CMD_GUARDED_PRIMITIVE( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32, //!< A U32 F32 f32, //!< An F32 @@ -1040,7 +1040,7 @@ namespace M { //! Send a CMD_GUARDED_STRING command void sendCmd_CMD_GUARDED_STRING( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number const Fw::CmdStringArg& str1, //!< A string const Fw::CmdStringArg& str2 //!< Another string @@ -1048,53 +1048,53 @@ namespace M { //! Send a CMD_GUARDED_ENUM command void sendCmd_CMD_GUARDED_ENUM( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number E e //!< An enum ); //! Send a CMD_GUARDED_ARRAY command void sendCmd_CMD_GUARDED_ARRAY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number A a //!< An array ); //! Send a CMD_GUARDED_STRUCT command void sendCmd_CMD_GUARDED_STRUCT( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number S s //!< A struct ); //! Send a CMD_ASYNC command void sendCmd_CMD_ASYNC( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_PRIORITY command void sendCmd_CMD_PRIORITY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_PARAMS_PRIORITY command void sendCmd_CMD_PARAMS_PRIORITY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32 ); //! Send a CMD_DROP command void sendCmd_CMD_DROP( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_PARAMS_PRIORITY_DROP command void sendCmd_CMD_PARAMS_PRIORITY_DROP( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32 ); @@ -1252,13 +1252,13 @@ namespace M { //! Send parameter ParamU32 void paramSend_ParamU32( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamU32 void paramSave_ParamU32( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1270,13 +1270,13 @@ namespace M { //! Send parameter ParamF64 void paramSend_ParamF64( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamF64 void paramSave_ParamF64( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1288,13 +1288,13 @@ namespace M { //! Send parameter ParamString void paramSend_ParamString( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamString void paramSave_ParamString( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1306,13 +1306,13 @@ namespace M { //! Send parameter ParamEnum void paramSend_ParamEnum( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamEnum void paramSave_ParamEnum( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1324,13 +1324,13 @@ namespace M { //! Send parameter ParamArray void paramSend_ParamArray( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamArray void paramSave_ParamArray( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1342,13 +1342,13 @@ namespace M { //! Send parameter ParamStruct void paramSend_ParamStruct( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamStruct void paramSave_ParamStruct( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1474,14 +1474,14 @@ namespace M { //! Static function for port from_cmdRegOut static void from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode //!< Command Op Code ); //! Static function for port from_cmdResponseOut static void from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence const Fw::CmdResponse& response //!< The command response argument @@ -1490,7 +1490,7 @@ namespace M { //! Static function for port from_eventOut static void from_eventOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwEventIdType id, //!< Log ID Fw::Time& timeTag, //!< Time Tag const Fw::LogSeverity& severity, //!< The severity argument @@ -1500,7 +1500,7 @@ namespace M { //! Static function for port from_prmGetOut static Fw::ParamValid from_prmGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwPrmIdType id, //!< Parameter ID Fw::ParamBuffer& val //!< Buffer containing serialized parameter value ); @@ -1508,7 +1508,7 @@ namespace M { //! Static function for port from_prmSetOut static void from_prmSetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwPrmIdType id, //!< Parameter ID Fw::ParamBuffer& val //!< Buffer containing serialized parameter value ); @@ -1516,7 +1516,7 @@ namespace M { //! Static function for port from_productRequestOut static void from_productRequestOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); @@ -1524,7 +1524,7 @@ namespace M { //! Static function for port from_productSendOut static void from_productSendOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -1534,7 +1534,7 @@ namespace M { //! Static function for port from_textEventOut static void from_textEventOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwEventIdType id, //!< Log ID Fw::Time& timeTag, //!< Time Tag const Fw::LogSeverity& severity, //!< The severity argument @@ -1546,14 +1546,14 @@ namespace M { //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_tlmOut static void from_tlmOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwChanIdType id, //!< Telemetry Channel ID Fw::Time& timeTag, //!< Time Tag Fw::TlmBuffer& val //!< Buffer containing serialized telemetry value @@ -1562,19 +1562,19 @@ namespace M { //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1587,7 +1587,7 @@ namespace M { //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/EmptyTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/EmptyTesterBase.ref.cpp index e044151f3..622003536 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/EmptyTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/EmptyTesterBase.ref.cpp @@ -14,7 +14,7 @@ // ---------------------------------------------------------------------- void EmptyTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/EmptyTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/EmptyTesterBase.ref.hpp index 46178d302..b50e28eee 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/EmptyTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/EmptyTesterBase.ref.hpp @@ -28,7 +28,7 @@ class EmptyTesterBase : //! Initialize object EmptyTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); protected: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveCommandsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveCommandsTesterBase.ref.cpp index caad054e4..cec352803 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveCommandsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveCommandsTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void PassiveCommandsTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdRegOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdRegOut()); port++ ) { this->m_from_cmdRegOut[port].init(); @@ -45,8 +45,8 @@ void PassiveCommandsTesterBase :: // Connect input port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdResponseOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdResponseOut()); port++ ) { this->m_from_cmdResponseOut[port].init(); @@ -69,8 +69,8 @@ void PassiveCommandsTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -93,8 +93,8 @@ void PassiveCommandsTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -117,8 +117,8 @@ void PassiveCommandsTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -141,8 +141,8 @@ void PassiveCommandsTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -165,8 +165,8 @@ void PassiveCommandsTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -189,8 +189,8 @@ void PassiveCommandsTesterBase :: // Connect output port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_cmdIn()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_cmdIn()); port++ ) { this->m_to_cmdIn[port].init(); @@ -208,8 +208,8 @@ void PassiveCommandsTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -227,8 +227,8 @@ void PassiveCommandsTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -246,8 +246,8 @@ void PassiveCommandsTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -265,8 +265,8 @@ void PassiveCommandsTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -284,8 +284,8 @@ void PassiveCommandsTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -303,8 +303,8 @@ void PassiveCommandsTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -322,8 +322,8 @@ void PassiveCommandsTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -341,8 +341,8 @@ void PassiveCommandsTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -365,7 +365,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -379,7 +379,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -393,7 +393,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -407,7 +407,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -421,7 +421,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -435,7 +435,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -449,7 +449,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -463,7 +463,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -477,7 +477,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -494,7 +494,7 @@ void PassiveCommandsTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* PassiveCommandsTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -505,7 +505,7 @@ Fw::InputCmdRegPort* PassiveCommandsTesterBase :: } Fw::InputCmdResponsePort* PassiveCommandsTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -516,7 +516,7 @@ Fw::InputCmdResponsePort* PassiveCommandsTesterBase :: } Fw::InputLogPort* PassiveCommandsTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -527,7 +527,7 @@ Fw::InputLogPort* PassiveCommandsTesterBase :: } Fw::InputPrmGetPort* PassiveCommandsTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -538,7 +538,7 @@ Fw::InputPrmGetPort* PassiveCommandsTesterBase :: } Fw::InputPrmSetPort* PassiveCommandsTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -551,7 +551,7 @@ Fw::InputPrmSetPort* PassiveCommandsTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* PassiveCommandsTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -564,7 +564,7 @@ Fw::InputLogTextPort* PassiveCommandsTesterBase :: #endif Fw::InputTimePort* PassiveCommandsTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -575,7 +575,7 @@ Fw::InputTimePort* PassiveCommandsTesterBase :: } Fw::InputTlmPort* PassiveCommandsTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -586,7 +586,7 @@ Fw::InputTlmPort* PassiveCommandsTesterBase :: } Ports::InputNoArgsPort* PassiveCommandsTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -597,7 +597,7 @@ Ports::InputNoArgsPort* PassiveCommandsTesterBase :: } Ports::InputNoArgsReturnPort* PassiveCommandsTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -608,7 +608,7 @@ Ports::InputNoArgsReturnPort* PassiveCommandsTesterBase :: } Ports::InputTypedPort* PassiveCommandsTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -619,7 +619,7 @@ Ports::InputTypedPort* PassiveCommandsTesterBase :: } Ports::InputTypedReturnPort* PassiveCommandsTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -667,7 +667,7 @@ PassiveCommandsTesterBase :: // ---------------------------------------------------------------------- void PassiveCommandsTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -678,7 +678,7 @@ void PassiveCommandsTesterBase :: } U32 PassiveCommandsTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -690,7 +690,7 @@ U32 PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -719,7 +719,7 @@ void PassiveCommandsTesterBase :: F32 PassiveCommandsTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -751,7 +751,7 @@ F32 PassiveCommandsTesterBase :: // ---------------------------------------------------------------------- void PassiveCommandsTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -762,7 +762,7 @@ void PassiveCommandsTesterBase :: } U32 PassiveCommandsTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -773,7 +773,7 @@ U32 PassiveCommandsTesterBase :: } U32 PassiveCommandsTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -784,7 +784,7 @@ U32 PassiveCommandsTesterBase :: } void PassiveCommandsTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -796,7 +796,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -824,7 +824,7 @@ void PassiveCommandsTesterBase :: F32 PassiveCommandsTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -852,7 +852,7 @@ F32 PassiveCommandsTesterBase :: F32 PassiveCommandsTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -880,7 +880,7 @@ F32 PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -910,134 +910,134 @@ void PassiveCommandsTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveCommandsTesterBase :: +FwIndexType PassiveCommandsTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE PassiveCommandsTesterBase :: +FwIndexType PassiveCommandsTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE PassiveCommandsTesterBase :: +FwIndexType PassiveCommandsTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE PassiveCommandsTesterBase :: +FwIndexType PassiveCommandsTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE PassiveCommandsTesterBase :: +FwIndexType PassiveCommandsTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE PassiveCommandsTesterBase :: +FwIndexType PassiveCommandsTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE PassiveCommandsTesterBase :: +FwIndexType PassiveCommandsTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE PassiveCommandsTesterBase :: +FwIndexType PassiveCommandsTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE PassiveCommandsTesterBase :: +FwIndexType PassiveCommandsTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE PassiveCommandsTesterBase :: +FwIndexType PassiveCommandsTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE PassiveCommandsTesterBase :: +FwIndexType PassiveCommandsTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE PassiveCommandsTesterBase :: +FwIndexType PassiveCommandsTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE PassiveCommandsTesterBase :: +FwIndexType PassiveCommandsTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE PassiveCommandsTesterBase :: +FwIndexType PassiveCommandsTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE PassiveCommandsTesterBase :: +FwIndexType PassiveCommandsTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE PassiveCommandsTesterBase :: +FwIndexType PassiveCommandsTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE PassiveCommandsTesterBase :: +FwIndexType PassiveCommandsTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE PassiveCommandsTesterBase :: +FwIndexType PassiveCommandsTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE PassiveCommandsTesterBase :: +FwIndexType PassiveCommandsTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE PassiveCommandsTesterBase :: +FwIndexType PassiveCommandsTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE PassiveCommandsTesterBase :: +FwIndexType PassiveCommandsTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1045,7 +1045,7 @@ NATIVE_INT_TYPE PassiveCommandsTesterBase :: // ---------------------------------------------------------------------- bool PassiveCommandsTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1056,7 +1056,7 @@ bool PassiveCommandsTesterBase :: } bool PassiveCommandsTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1067,7 +1067,7 @@ bool PassiveCommandsTesterBase :: } bool PassiveCommandsTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1078,7 +1078,7 @@ bool PassiveCommandsTesterBase :: } bool PassiveCommandsTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1089,7 +1089,7 @@ bool PassiveCommandsTesterBase :: } bool PassiveCommandsTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1100,7 +1100,7 @@ bool PassiveCommandsTesterBase :: } bool PassiveCommandsTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1111,7 +1111,7 @@ bool PassiveCommandsTesterBase :: } bool PassiveCommandsTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1122,7 +1122,7 @@ bool PassiveCommandsTesterBase :: } bool PassiveCommandsTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1133,7 +1133,7 @@ bool PassiveCommandsTesterBase :: } bool PassiveCommandsTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1181,7 +1181,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: sendCmd_CMD_SYNC( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -1206,7 +1206,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: sendCmd_CMD_SYNC_PRIMITIVE( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32, F32 f32, @@ -1254,7 +1254,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: sendCmd_CMD_SYNC_STRING( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, const Fw::CmdStringArg& str1, const Fw::CmdStringArg& str2 @@ -1295,7 +1295,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: sendCmd_CMD_SYNC_ENUM( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, E e ) @@ -1329,7 +1329,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: sendCmd_CMD_SYNC_ARRAY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, A a ) @@ -1363,7 +1363,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: sendCmd_CMD_SYNC_STRUCT( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, S s ) @@ -1397,7 +1397,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: sendCmd_CMD_GUARDED( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -1422,7 +1422,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: sendCmd_CMD_GUARDED_PRIMITIVE( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32, F32 f32, @@ -1470,7 +1470,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: sendCmd_CMD_GUARDED_STRING( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, const Fw::CmdStringArg& str1, const Fw::CmdStringArg& str2 @@ -1511,7 +1511,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: sendCmd_CMD_GUARDED_ENUM( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, E e ) @@ -1545,7 +1545,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: sendCmd_CMD_GUARDED_ARRAY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, A a ) @@ -1579,7 +1579,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: sendCmd_CMD_GUARDED_STRUCT( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, S s ) @@ -1711,7 +1711,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode ) { @@ -1721,7 +1721,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, const Fw::CmdResponse& response @@ -1734,7 +1734,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -1745,7 +1745,7 @@ void PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1756,7 +1756,7 @@ void PassiveCommandsTesterBase :: U32 PassiveCommandsTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1767,7 +1767,7 @@ U32 PassiveCommandsTesterBase :: void PassiveCommandsTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1794,7 +1794,7 @@ void PassiveCommandsTesterBase :: F32 PassiveCommandsTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveCommandsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveCommandsTesterBase.ref.hpp index d7572e1cd..a4524aa5b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveCommandsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveCommandsTesterBase.ref.hpp @@ -143,7 +143,7 @@ class PassiveCommandsTesterBase : //! Initialize object PassiveCommandsTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -154,55 +154,55 @@ class PassiveCommandsTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -216,35 +216,35 @@ class PassiveCommandsTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -253,7 +253,7 @@ class PassiveCommandsTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -262,42 +262,42 @@ class PassiveCommandsTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -323,17 +323,17 @@ class PassiveCommandsTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -345,7 +345,7 @@ class PassiveCommandsTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -363,17 +363,17 @@ class PassiveCommandsTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -385,7 +385,7 @@ class PassiveCommandsTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -403,27 +403,27 @@ class PassiveCommandsTesterBase : //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -435,7 +435,7 @@ class PassiveCommandsTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -447,7 +447,7 @@ class PassiveCommandsTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -459,7 +459,7 @@ class PassiveCommandsTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -478,111 +478,111 @@ class PassiveCommandsTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -594,63 +594,63 @@ class PassiveCommandsTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -675,13 +675,13 @@ class PassiveCommandsTesterBase : //! Send a CMD_SYNC command void sendCmd_CMD_SYNC( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_SYNC_PRIMITIVE command void sendCmd_CMD_SYNC_PRIMITIVE( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32, //!< A U32 F32 f32, //!< An F32 @@ -690,7 +690,7 @@ class PassiveCommandsTesterBase : //! Send a CMD_SYNC_STRING command void sendCmd_CMD_SYNC_STRING( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number const Fw::CmdStringArg& str1, //!< A string const Fw::CmdStringArg& str2 //!< Another string @@ -698,34 +698,34 @@ class PassiveCommandsTesterBase : //! Send a CMD_SYNC_ENUM command void sendCmd_CMD_SYNC_ENUM( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number E e //!< An enum ); //! Send a CMD_SYNC_ARRAY command void sendCmd_CMD_SYNC_ARRAY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number A a //!< An array ); //! Send a CMD_SYNC_STRUCT command void sendCmd_CMD_SYNC_STRUCT( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number S s //!< A struct ); //! Send a CMD_GUARDED command void sendCmd_CMD_GUARDED( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_GUARDED_PRIMITIVE command void sendCmd_CMD_GUARDED_PRIMITIVE( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32, //!< A U32 F32 f32, //!< An F32 @@ -734,7 +734,7 @@ class PassiveCommandsTesterBase : //! Send a CMD_GUARDED_STRING command void sendCmd_CMD_GUARDED_STRING( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number const Fw::CmdStringArg& str1, //!< A string const Fw::CmdStringArg& str2 //!< Another string @@ -742,21 +742,21 @@ class PassiveCommandsTesterBase : //! Send a CMD_GUARDED_ENUM command void sendCmd_CMD_GUARDED_ENUM( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number E e //!< An enum ); //! Send a CMD_GUARDED_ARRAY command void sendCmd_CMD_GUARDED_ARRAY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number A a //!< An array ); //! Send a CMD_GUARDED_STRUCT command void sendCmd_CMD_GUARDED_STRUCT( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number S s //!< A struct ); @@ -821,14 +821,14 @@ class PassiveCommandsTesterBase : //! Static function for port from_cmdRegOut static void from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode //!< Command Op Code ); //! Static function for port from_cmdResponseOut static void from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence const Fw::CmdResponse& response //!< The command response argument @@ -837,26 +837,26 @@ class PassiveCommandsTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -869,7 +869,7 @@ class PassiveCommandsTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveEventsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveEventsTesterBase.ref.cpp index c5d4ccc1c..ef4c91f0b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveEventsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveEventsTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void PassiveEventsTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_eventOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_eventOut()); port++ ) { this->m_from_eventOut[port].init(); @@ -46,8 +46,8 @@ void PassiveEventsTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect input port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_textEventOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_textEventOut()); port++ ) { this->m_from_textEventOut[port].init(); @@ -71,8 +71,8 @@ void PassiveEventsTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -95,8 +95,8 @@ void PassiveEventsTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -119,8 +119,8 @@ void PassiveEventsTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -143,8 +143,8 @@ void PassiveEventsTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -167,8 +167,8 @@ void PassiveEventsTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -191,8 +191,8 @@ void PassiveEventsTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -210,8 +210,8 @@ void PassiveEventsTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -229,8 +229,8 @@ void PassiveEventsTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -248,8 +248,8 @@ void PassiveEventsTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -267,8 +267,8 @@ void PassiveEventsTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -286,8 +286,8 @@ void PassiveEventsTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -305,8 +305,8 @@ void PassiveEventsTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -324,8 +324,8 @@ void PassiveEventsTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -348,7 +348,7 @@ void PassiveEventsTesterBase :: void PassiveEventsTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -362,7 +362,7 @@ void PassiveEventsTesterBase :: void PassiveEventsTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -376,7 +376,7 @@ void PassiveEventsTesterBase :: void PassiveEventsTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -390,7 +390,7 @@ void PassiveEventsTesterBase :: void PassiveEventsTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -404,7 +404,7 @@ void PassiveEventsTesterBase :: void PassiveEventsTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -418,7 +418,7 @@ void PassiveEventsTesterBase :: void PassiveEventsTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -432,7 +432,7 @@ void PassiveEventsTesterBase :: void PassiveEventsTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -446,7 +446,7 @@ void PassiveEventsTesterBase :: void PassiveEventsTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -460,7 +460,7 @@ void PassiveEventsTesterBase :: void PassiveEventsTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -477,7 +477,7 @@ void PassiveEventsTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* PassiveEventsTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -488,7 +488,7 @@ Fw::InputCmdRegPort* PassiveEventsTesterBase :: } Fw::InputCmdResponsePort* PassiveEventsTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -499,7 +499,7 @@ Fw::InputCmdResponsePort* PassiveEventsTesterBase :: } Fw::InputLogPort* PassiveEventsTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -510,7 +510,7 @@ Fw::InputLogPort* PassiveEventsTesterBase :: } Fw::InputPrmGetPort* PassiveEventsTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -521,7 +521,7 @@ Fw::InputPrmGetPort* PassiveEventsTesterBase :: } Fw::InputPrmSetPort* PassiveEventsTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -534,7 +534,7 @@ Fw::InputPrmSetPort* PassiveEventsTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* PassiveEventsTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -547,7 +547,7 @@ Fw::InputLogTextPort* PassiveEventsTesterBase :: #endif Fw::InputTimePort* PassiveEventsTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -558,7 +558,7 @@ Fw::InputTimePort* PassiveEventsTesterBase :: } Fw::InputTlmPort* PassiveEventsTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -569,7 +569,7 @@ Fw::InputTlmPort* PassiveEventsTesterBase :: } Ports::InputNoArgsPort* PassiveEventsTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -580,7 +580,7 @@ Ports::InputNoArgsPort* PassiveEventsTesterBase :: } Ports::InputNoArgsReturnPort* PassiveEventsTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -591,7 +591,7 @@ Ports::InputNoArgsReturnPort* PassiveEventsTesterBase :: } Ports::InputTypedPort* PassiveEventsTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -602,7 +602,7 @@ Ports::InputTypedPort* PassiveEventsTesterBase :: } Ports::InputTypedReturnPort* PassiveEventsTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -664,7 +664,7 @@ PassiveEventsTesterBase :: // ---------------------------------------------------------------------- void PassiveEventsTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -675,7 +675,7 @@ void PassiveEventsTesterBase :: } U32 PassiveEventsTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -687,7 +687,7 @@ U32 PassiveEventsTesterBase :: void PassiveEventsTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -716,7 +716,7 @@ void PassiveEventsTesterBase :: F32 PassiveEventsTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -748,7 +748,7 @@ F32 PassiveEventsTesterBase :: // ---------------------------------------------------------------------- void PassiveEventsTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -759,7 +759,7 @@ void PassiveEventsTesterBase :: } U32 PassiveEventsTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -770,7 +770,7 @@ U32 PassiveEventsTesterBase :: } U32 PassiveEventsTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -781,7 +781,7 @@ U32 PassiveEventsTesterBase :: } void PassiveEventsTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -793,7 +793,7 @@ void PassiveEventsTesterBase :: void PassiveEventsTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -821,7 +821,7 @@ void PassiveEventsTesterBase :: F32 PassiveEventsTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -849,7 +849,7 @@ F32 PassiveEventsTesterBase :: F32 PassiveEventsTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -877,7 +877,7 @@ F32 PassiveEventsTesterBase :: void PassiveEventsTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -907,134 +907,134 @@ void PassiveEventsTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveEventsTesterBase :: +FwIndexType PassiveEventsTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE PassiveEventsTesterBase :: +FwIndexType PassiveEventsTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE PassiveEventsTesterBase :: +FwIndexType PassiveEventsTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE PassiveEventsTesterBase :: +FwIndexType PassiveEventsTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE PassiveEventsTesterBase :: +FwIndexType PassiveEventsTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE PassiveEventsTesterBase :: +FwIndexType PassiveEventsTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE PassiveEventsTesterBase :: +FwIndexType PassiveEventsTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE PassiveEventsTesterBase :: +FwIndexType PassiveEventsTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE PassiveEventsTesterBase :: +FwIndexType PassiveEventsTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE PassiveEventsTesterBase :: +FwIndexType PassiveEventsTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE PassiveEventsTesterBase :: +FwIndexType PassiveEventsTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE PassiveEventsTesterBase :: +FwIndexType PassiveEventsTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE PassiveEventsTesterBase :: +FwIndexType PassiveEventsTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE PassiveEventsTesterBase :: +FwIndexType PassiveEventsTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE PassiveEventsTesterBase :: +FwIndexType PassiveEventsTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE PassiveEventsTesterBase :: +FwIndexType PassiveEventsTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE PassiveEventsTesterBase :: +FwIndexType PassiveEventsTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE PassiveEventsTesterBase :: +FwIndexType PassiveEventsTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE PassiveEventsTesterBase :: +FwIndexType PassiveEventsTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE PassiveEventsTesterBase :: +FwIndexType PassiveEventsTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE PassiveEventsTesterBase :: +FwIndexType PassiveEventsTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1042,7 +1042,7 @@ NATIVE_INT_TYPE PassiveEventsTesterBase :: // ---------------------------------------------------------------------- bool PassiveEventsTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1053,7 +1053,7 @@ bool PassiveEventsTesterBase :: } bool PassiveEventsTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1064,7 +1064,7 @@ bool PassiveEventsTesterBase :: } bool PassiveEventsTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1075,7 +1075,7 @@ bool PassiveEventsTesterBase :: } bool PassiveEventsTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1086,7 +1086,7 @@ bool PassiveEventsTesterBase :: } bool PassiveEventsTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1097,7 +1097,7 @@ bool PassiveEventsTesterBase :: } bool PassiveEventsTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1108,7 +1108,7 @@ bool PassiveEventsTesterBase :: } bool PassiveEventsTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1119,7 +1119,7 @@ bool PassiveEventsTesterBase :: } bool PassiveEventsTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1130,7 +1130,7 @@ bool PassiveEventsTesterBase :: } bool PassiveEventsTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1722,7 +1722,7 @@ void PassiveEventsTesterBase :: void PassiveEventsTesterBase :: from_eventOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwEventIdType id, Fw::Time& timeTag, const Fw::LogSeverity& severity, @@ -1738,7 +1738,7 @@ void PassiveEventsTesterBase :: void PassiveEventsTesterBase :: from_textEventOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwEventIdType id, Fw::Time& timeTag, const Fw::LogSeverity& severity, @@ -1754,7 +1754,7 @@ void PassiveEventsTesterBase :: void PassiveEventsTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -1765,7 +1765,7 @@ void PassiveEventsTesterBase :: void PassiveEventsTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1776,7 +1776,7 @@ void PassiveEventsTesterBase :: U32 PassiveEventsTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1787,7 +1787,7 @@ U32 PassiveEventsTesterBase :: void PassiveEventsTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1814,7 +1814,7 @@ void PassiveEventsTesterBase :: F32 PassiveEventsTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveEventsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveEventsTesterBase.ref.hpp index 9e7d9a2c5..0dbefbe02 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveEventsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveEventsTesterBase.ref.hpp @@ -176,7 +176,7 @@ class PassiveEventsTesterBase : //! Initialize object PassiveEventsTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -187,55 +187,55 @@ class PassiveEventsTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -249,35 +249,35 @@ class PassiveEventsTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -286,7 +286,7 @@ class PassiveEventsTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -295,42 +295,42 @@ class PassiveEventsTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -356,17 +356,17 @@ class PassiveEventsTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -378,7 +378,7 @@ class PassiveEventsTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -396,17 +396,17 @@ class PassiveEventsTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -418,7 +418,7 @@ class PassiveEventsTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -436,27 +436,27 @@ class PassiveEventsTesterBase : //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -468,7 +468,7 @@ class PassiveEventsTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -480,7 +480,7 @@ class PassiveEventsTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -492,7 +492,7 @@ class PassiveEventsTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -511,111 +511,111 @@ class PassiveEventsTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -627,63 +627,63 @@ class PassiveEventsTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -822,7 +822,7 @@ class PassiveEventsTesterBase : //! Static function for port from_eventOut static void from_eventOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwEventIdType id, //!< Log ID Fw::Time& timeTag, //!< Time Tag const Fw::LogSeverity& severity, //!< The severity argument @@ -834,7 +834,7 @@ class PassiveEventsTesterBase : //! Static function for port from_textEventOut static void from_textEventOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwEventIdType id, //!< Log ID Fw::Time& timeTag, //!< Time Tag const Fw::LogSeverity& severity, //!< The severity argument @@ -846,26 +846,26 @@ class PassiveEventsTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -878,7 +878,7 @@ class PassiveEventsTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductPortsOnlyTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductPortsOnlyTesterBase.ref.cpp index e3d9734d7..2d96a4733 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductPortsOnlyTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductPortsOnlyTesterBase.ref.cpp @@ -14,7 +14,7 @@ // ---------------------------------------------------------------------- void PassiveGetProductPortsOnlyTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); @@ -25,7 +25,7 @@ void PassiveGetProductPortsOnlyTesterBase :: // ---------------------------------------------------------------------- Fw::InputDpGetPort* PassiveGetProductPortsOnlyTesterBase :: - get_from_productGetOut(NATIVE_INT_TYPE portNum) + get_from_productGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productGetOut(), @@ -36,7 +36,7 @@ Fw::InputDpGetPort* PassiveGetProductPortsOnlyTesterBase :: } Fw::InputDpSendPort* PassiveGetProductPortsOnlyTesterBase :: - get_from_productSendOut(NATIVE_INT_TYPE portNum) + get_from_productSendOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productSendOut(), @@ -70,14 +70,14 @@ PassiveGetProductPortsOnlyTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveGetProductPortsOnlyTesterBase :: +FwIndexType PassiveGetProductPortsOnlyTesterBase :: getNum_from_productGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productGetOut)); } -NATIVE_INT_TYPE PassiveGetProductPortsOnlyTesterBase :: +FwIndexType PassiveGetProductPortsOnlyTesterBase :: getNum_from_productSendOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); } diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductPortsOnlyTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductPortsOnlyTesterBase.ref.hpp index 99af56596..2ba2c6925 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductPortsOnlyTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductPortsOnlyTesterBase.ref.hpp @@ -28,7 +28,7 @@ class PassiveGetProductPortsOnlyTesterBase : //! Initialize object PassiveGetProductPortsOnlyTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -41,14 +41,14 @@ class PassiveGetProductPortsOnlyTesterBase : //! //! \return from_productGetOut[portNum] Fw::InputDpGetPort* get_from_productGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productSendOut[portNum] Fw::InputDpSendPort* get_from_productSendOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -75,12 +75,12 @@ class PassiveGetProductPortsOnlyTesterBase : //! Get the number of from_productGetOut ports //! //! \return The number of from_productGetOut ports - NATIVE_INT_TYPE getNum_from_productGetOut() const; + FwIndexType getNum_from_productGetOut() const; //! Get the number of from_productSendOut ports //! //! \return The number of from_productSendOut ports - NATIVE_INT_TYPE getNum_from_productSendOut() const; + FwIndexType getNum_from_productSendOut() const; private: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductsTesterBase.ref.cpp index 05fa204c0..6613b2a40 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductsTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void PassiveGetProductsTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port productGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productGetOut()); port++ ) { this->m_from_productGetOut[port].init(); @@ -45,8 +45,8 @@ void PassiveGetProductsTesterBase :: // Connect input port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productSendOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productSendOut()); port++ ) { this->m_from_productSendOut[port].init(); @@ -69,8 +69,8 @@ void PassiveGetProductsTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -93,8 +93,8 @@ void PassiveGetProductsTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -117,8 +117,8 @@ void PassiveGetProductsTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -141,8 +141,8 @@ void PassiveGetProductsTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -165,8 +165,8 @@ void PassiveGetProductsTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -189,8 +189,8 @@ void PassiveGetProductsTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -208,8 +208,8 @@ void PassiveGetProductsTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -227,8 +227,8 @@ void PassiveGetProductsTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -246,8 +246,8 @@ void PassiveGetProductsTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -265,8 +265,8 @@ void PassiveGetProductsTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -284,8 +284,8 @@ void PassiveGetProductsTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -303,8 +303,8 @@ void PassiveGetProductsTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -322,8 +322,8 @@ void PassiveGetProductsTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -346,7 +346,7 @@ void PassiveGetProductsTesterBase :: void PassiveGetProductsTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -360,7 +360,7 @@ void PassiveGetProductsTesterBase :: void PassiveGetProductsTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -374,7 +374,7 @@ void PassiveGetProductsTesterBase :: void PassiveGetProductsTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -388,7 +388,7 @@ void PassiveGetProductsTesterBase :: void PassiveGetProductsTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -402,7 +402,7 @@ void PassiveGetProductsTesterBase :: void PassiveGetProductsTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -416,7 +416,7 @@ void PassiveGetProductsTesterBase :: void PassiveGetProductsTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -430,7 +430,7 @@ void PassiveGetProductsTesterBase :: void PassiveGetProductsTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -444,7 +444,7 @@ void PassiveGetProductsTesterBase :: void PassiveGetProductsTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -458,7 +458,7 @@ void PassiveGetProductsTesterBase :: void PassiveGetProductsTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -475,7 +475,7 @@ void PassiveGetProductsTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* PassiveGetProductsTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -486,7 +486,7 @@ Fw::InputCmdRegPort* PassiveGetProductsTesterBase :: } Fw::InputCmdResponsePort* PassiveGetProductsTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -497,7 +497,7 @@ Fw::InputCmdResponsePort* PassiveGetProductsTesterBase :: } Fw::InputLogPort* PassiveGetProductsTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -508,7 +508,7 @@ Fw::InputLogPort* PassiveGetProductsTesterBase :: } Fw::InputPrmGetPort* PassiveGetProductsTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -519,7 +519,7 @@ Fw::InputPrmGetPort* PassiveGetProductsTesterBase :: } Fw::InputPrmSetPort* PassiveGetProductsTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -530,7 +530,7 @@ Fw::InputPrmSetPort* PassiveGetProductsTesterBase :: } Fw::InputDpGetPort* PassiveGetProductsTesterBase :: - get_from_productGetOut(NATIVE_INT_TYPE portNum) + get_from_productGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productGetOut(), @@ -541,7 +541,7 @@ Fw::InputDpGetPort* PassiveGetProductsTesterBase :: } Fw::InputDpSendPort* PassiveGetProductsTesterBase :: - get_from_productSendOut(NATIVE_INT_TYPE portNum) + get_from_productSendOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productSendOut(), @@ -554,7 +554,7 @@ Fw::InputDpSendPort* PassiveGetProductsTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* PassiveGetProductsTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -567,7 +567,7 @@ Fw::InputLogTextPort* PassiveGetProductsTesterBase :: #endif Fw::InputTimePort* PassiveGetProductsTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -578,7 +578,7 @@ Fw::InputTimePort* PassiveGetProductsTesterBase :: } Fw::InputTlmPort* PassiveGetProductsTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -589,7 +589,7 @@ Fw::InputTlmPort* PassiveGetProductsTesterBase :: } Ports::InputNoArgsPort* PassiveGetProductsTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -600,7 +600,7 @@ Ports::InputNoArgsPort* PassiveGetProductsTesterBase :: } Ports::InputNoArgsReturnPort* PassiveGetProductsTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -611,7 +611,7 @@ Ports::InputNoArgsReturnPort* PassiveGetProductsTesterBase :: } Ports::InputTypedPort* PassiveGetProductsTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -622,7 +622,7 @@ Ports::InputTypedPort* PassiveGetProductsTesterBase :: } Ports::InputTypedReturnPort* PassiveGetProductsTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -672,7 +672,7 @@ PassiveGetProductsTesterBase :: // ---------------------------------------------------------------------- void PassiveGetProductsTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -683,7 +683,7 @@ void PassiveGetProductsTesterBase :: } U32 PassiveGetProductsTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -695,7 +695,7 @@ U32 PassiveGetProductsTesterBase :: void PassiveGetProductsTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -724,7 +724,7 @@ void PassiveGetProductsTesterBase :: F32 PassiveGetProductsTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -756,7 +756,7 @@ F32 PassiveGetProductsTesterBase :: // ---------------------------------------------------------------------- void PassiveGetProductsTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -767,7 +767,7 @@ void PassiveGetProductsTesterBase :: } U32 PassiveGetProductsTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -778,7 +778,7 @@ U32 PassiveGetProductsTesterBase :: } U32 PassiveGetProductsTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -789,7 +789,7 @@ U32 PassiveGetProductsTesterBase :: } void PassiveGetProductsTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -801,7 +801,7 @@ void PassiveGetProductsTesterBase :: void PassiveGetProductsTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -829,7 +829,7 @@ void PassiveGetProductsTesterBase :: F32 PassiveGetProductsTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -857,7 +857,7 @@ F32 PassiveGetProductsTesterBase :: F32 PassiveGetProductsTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -885,7 +885,7 @@ F32 PassiveGetProductsTesterBase :: void PassiveGetProductsTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -915,146 +915,146 @@ void PassiveGetProductsTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveGetProductsTesterBase :: +FwIndexType PassiveGetProductsTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE PassiveGetProductsTesterBase :: +FwIndexType PassiveGetProductsTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE PassiveGetProductsTesterBase :: +FwIndexType PassiveGetProductsTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE PassiveGetProductsTesterBase :: +FwIndexType PassiveGetProductsTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE PassiveGetProductsTesterBase :: +FwIndexType PassiveGetProductsTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE PassiveGetProductsTesterBase :: +FwIndexType PassiveGetProductsTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE PassiveGetProductsTesterBase :: +FwIndexType PassiveGetProductsTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE PassiveGetProductsTesterBase :: +FwIndexType PassiveGetProductsTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE PassiveGetProductsTesterBase :: +FwIndexType PassiveGetProductsTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE PassiveGetProductsTesterBase :: +FwIndexType PassiveGetProductsTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE PassiveGetProductsTesterBase :: +FwIndexType PassiveGetProductsTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE PassiveGetProductsTesterBase :: +FwIndexType PassiveGetProductsTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE PassiveGetProductsTesterBase :: +FwIndexType PassiveGetProductsTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE PassiveGetProductsTesterBase :: +FwIndexType PassiveGetProductsTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } -NATIVE_INT_TYPE PassiveGetProductsTesterBase :: +FwIndexType PassiveGetProductsTesterBase :: getNum_from_productGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productGetOut)); } -NATIVE_INT_TYPE PassiveGetProductsTesterBase :: +FwIndexType PassiveGetProductsTesterBase :: getNum_from_productSendOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE PassiveGetProductsTesterBase :: +FwIndexType PassiveGetProductsTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE PassiveGetProductsTesterBase :: +FwIndexType PassiveGetProductsTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE PassiveGetProductsTesterBase :: +FwIndexType PassiveGetProductsTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE PassiveGetProductsTesterBase :: +FwIndexType PassiveGetProductsTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE PassiveGetProductsTesterBase :: +FwIndexType PassiveGetProductsTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE PassiveGetProductsTesterBase :: +FwIndexType PassiveGetProductsTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE PassiveGetProductsTesterBase :: +FwIndexType PassiveGetProductsTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1062,7 +1062,7 @@ NATIVE_INT_TYPE PassiveGetProductsTesterBase :: // ---------------------------------------------------------------------- bool PassiveGetProductsTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1073,7 +1073,7 @@ bool PassiveGetProductsTesterBase :: } bool PassiveGetProductsTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1084,7 +1084,7 @@ bool PassiveGetProductsTesterBase :: } bool PassiveGetProductsTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1095,7 +1095,7 @@ bool PassiveGetProductsTesterBase :: } bool PassiveGetProductsTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1106,7 +1106,7 @@ bool PassiveGetProductsTesterBase :: } bool PassiveGetProductsTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1117,7 +1117,7 @@ bool PassiveGetProductsTesterBase :: } bool PassiveGetProductsTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1128,7 +1128,7 @@ bool PassiveGetProductsTesterBase :: } bool PassiveGetProductsTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1139,7 +1139,7 @@ bool PassiveGetProductsTesterBase :: } bool PassiveGetProductsTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1150,7 +1150,7 @@ bool PassiveGetProductsTesterBase :: } bool PassiveGetProductsTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1306,7 +1306,7 @@ void PassiveGetProductsTesterBase :: Fw::Success PassiveGetProductsTesterBase :: from_productGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize, Fw::Buffer& buffer @@ -1319,7 +1319,7 @@ Fw::Success PassiveGetProductsTesterBase :: void PassiveGetProductsTesterBase :: from_productSendOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -1331,7 +1331,7 @@ void PassiveGetProductsTesterBase :: void PassiveGetProductsTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -1342,7 +1342,7 @@ void PassiveGetProductsTesterBase :: void PassiveGetProductsTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1353,7 +1353,7 @@ void PassiveGetProductsTesterBase :: U32 PassiveGetProductsTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1364,7 +1364,7 @@ U32 PassiveGetProductsTesterBase :: void PassiveGetProductsTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1391,7 +1391,7 @@ void PassiveGetProductsTesterBase :: F32 PassiveGetProductsTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductsTesterBase.ref.hpp index 198a548c3..bb02ab167 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductsTesterBase.ref.hpp @@ -149,7 +149,7 @@ class PassiveGetProductsTesterBase : //! Initialize object PassiveGetProductsTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -160,55 +160,55 @@ class PassiveGetProductsTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -222,49 +222,49 @@ class PassiveGetProductsTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productGetOut[portNum] Fw::InputDpGetPort* get_from_productGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productSendOut[portNum] Fw::InputDpSendPort* get_from_productSendOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -273,7 +273,7 @@ class PassiveGetProductsTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -282,42 +282,42 @@ class PassiveGetProductsTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -343,17 +343,17 @@ class PassiveGetProductsTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -365,7 +365,7 @@ class PassiveGetProductsTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -383,17 +383,17 @@ class PassiveGetProductsTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -405,7 +405,7 @@ class PassiveGetProductsTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -423,27 +423,27 @@ class PassiveGetProductsTesterBase : //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -455,7 +455,7 @@ class PassiveGetProductsTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -467,7 +467,7 @@ class PassiveGetProductsTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -479,7 +479,7 @@ class PassiveGetProductsTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -498,121 +498,121 @@ class PassiveGetProductsTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; //! Get the number of from_productGetOut ports //! //! \return The number of from_productGetOut ports - NATIVE_INT_TYPE getNum_from_productGetOut() const; + FwIndexType getNum_from_productGetOut() const; //! Get the number of from_productSendOut ports //! //! \return The number of from_productSendOut ports - NATIVE_INT_TYPE getNum_from_productSendOut() const; + FwIndexType getNum_from_productSendOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -624,63 +624,63 @@ class PassiveGetProductsTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -781,7 +781,7 @@ class PassiveGetProductsTesterBase : //! Static function for port from_productGetOut static Fw::Success from_productGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID (input) FwSizeType dataSize, //!< The data size of the requested buffer (input) Fw::Buffer& buffer //!< The buffer (output) @@ -790,7 +790,7 @@ class PassiveGetProductsTesterBase : //! Static function for port from_productSendOut static void from_productSendOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -798,26 +798,26 @@ class PassiveGetProductsTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -830,7 +830,7 @@ class PassiveGetProductsTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGuardedProductsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGuardedProductsTesterBase.ref.cpp index 844056ccc..860da7382 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGuardedProductsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGuardedProductsTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void PassiveGuardedProductsTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productRequestOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productRequestOut()); port++ ) { this->m_from_productRequestOut[port].init(); @@ -45,8 +45,8 @@ void PassiveGuardedProductsTesterBase :: // Connect input port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productSendOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productSendOut()); port++ ) { this->m_from_productSendOut[port].init(); @@ -69,8 +69,8 @@ void PassiveGuardedProductsTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -93,8 +93,8 @@ void PassiveGuardedProductsTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -117,8 +117,8 @@ void PassiveGuardedProductsTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -141,8 +141,8 @@ void PassiveGuardedProductsTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -165,8 +165,8 @@ void PassiveGuardedProductsTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -189,8 +189,8 @@ void PassiveGuardedProductsTesterBase :: // Connect output port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_productRecvIn()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_productRecvIn()); port++ ) { this->m_to_productRecvIn[port].init(); @@ -208,8 +208,8 @@ void PassiveGuardedProductsTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -227,8 +227,8 @@ void PassiveGuardedProductsTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -246,8 +246,8 @@ void PassiveGuardedProductsTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -265,8 +265,8 @@ void PassiveGuardedProductsTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -284,8 +284,8 @@ void PassiveGuardedProductsTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -303,8 +303,8 @@ void PassiveGuardedProductsTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -322,8 +322,8 @@ void PassiveGuardedProductsTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -341,8 +341,8 @@ void PassiveGuardedProductsTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -365,7 +365,7 @@ void PassiveGuardedProductsTesterBase :: void PassiveGuardedProductsTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -379,7 +379,7 @@ void PassiveGuardedProductsTesterBase :: void PassiveGuardedProductsTesterBase :: connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpResponsePort* port ) { @@ -393,7 +393,7 @@ void PassiveGuardedProductsTesterBase :: void PassiveGuardedProductsTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -407,7 +407,7 @@ void PassiveGuardedProductsTesterBase :: void PassiveGuardedProductsTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -421,7 +421,7 @@ void PassiveGuardedProductsTesterBase :: void PassiveGuardedProductsTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -435,7 +435,7 @@ void PassiveGuardedProductsTesterBase :: void PassiveGuardedProductsTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -449,7 +449,7 @@ void PassiveGuardedProductsTesterBase :: void PassiveGuardedProductsTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -463,7 +463,7 @@ void PassiveGuardedProductsTesterBase :: void PassiveGuardedProductsTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -477,7 +477,7 @@ void PassiveGuardedProductsTesterBase :: void PassiveGuardedProductsTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -491,7 +491,7 @@ void PassiveGuardedProductsTesterBase :: void PassiveGuardedProductsTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -508,7 +508,7 @@ void PassiveGuardedProductsTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* PassiveGuardedProductsTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -519,7 +519,7 @@ Fw::InputCmdRegPort* PassiveGuardedProductsTesterBase :: } Fw::InputCmdResponsePort* PassiveGuardedProductsTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -530,7 +530,7 @@ Fw::InputCmdResponsePort* PassiveGuardedProductsTesterBase :: } Fw::InputLogPort* PassiveGuardedProductsTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -541,7 +541,7 @@ Fw::InputLogPort* PassiveGuardedProductsTesterBase :: } Fw::InputPrmGetPort* PassiveGuardedProductsTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -552,7 +552,7 @@ Fw::InputPrmGetPort* PassiveGuardedProductsTesterBase :: } Fw::InputPrmSetPort* PassiveGuardedProductsTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -563,7 +563,7 @@ Fw::InputPrmSetPort* PassiveGuardedProductsTesterBase :: } Fw::InputDpRequestPort* PassiveGuardedProductsTesterBase :: - get_from_productRequestOut(NATIVE_INT_TYPE portNum) + get_from_productRequestOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productRequestOut(), @@ -574,7 +574,7 @@ Fw::InputDpRequestPort* PassiveGuardedProductsTesterBase :: } Fw::InputDpSendPort* PassiveGuardedProductsTesterBase :: - get_from_productSendOut(NATIVE_INT_TYPE portNum) + get_from_productSendOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productSendOut(), @@ -587,7 +587,7 @@ Fw::InputDpSendPort* PassiveGuardedProductsTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* PassiveGuardedProductsTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -600,7 +600,7 @@ Fw::InputLogTextPort* PassiveGuardedProductsTesterBase :: #endif Fw::InputTimePort* PassiveGuardedProductsTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -611,7 +611,7 @@ Fw::InputTimePort* PassiveGuardedProductsTesterBase :: } Fw::InputTlmPort* PassiveGuardedProductsTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -622,7 +622,7 @@ Fw::InputTlmPort* PassiveGuardedProductsTesterBase :: } Ports::InputNoArgsPort* PassiveGuardedProductsTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -633,7 +633,7 @@ Ports::InputNoArgsPort* PassiveGuardedProductsTesterBase :: } Ports::InputNoArgsReturnPort* PassiveGuardedProductsTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -644,7 +644,7 @@ Ports::InputNoArgsReturnPort* PassiveGuardedProductsTesterBase :: } Ports::InputTypedPort* PassiveGuardedProductsTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -655,7 +655,7 @@ Ports::InputTypedPort* PassiveGuardedProductsTesterBase :: } Ports::InputTypedReturnPort* PassiveGuardedProductsTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -705,7 +705,7 @@ PassiveGuardedProductsTesterBase :: // ---------------------------------------------------------------------- void PassiveGuardedProductsTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -716,7 +716,7 @@ void PassiveGuardedProductsTesterBase :: } U32 PassiveGuardedProductsTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -728,7 +728,7 @@ U32 PassiveGuardedProductsTesterBase :: void PassiveGuardedProductsTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -757,7 +757,7 @@ void PassiveGuardedProductsTesterBase :: F32 PassiveGuardedProductsTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -789,7 +789,7 @@ F32 PassiveGuardedProductsTesterBase :: // ---------------------------------------------------------------------- void PassiveGuardedProductsTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -800,7 +800,7 @@ void PassiveGuardedProductsTesterBase :: } U32 PassiveGuardedProductsTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -811,7 +811,7 @@ U32 PassiveGuardedProductsTesterBase :: } U32 PassiveGuardedProductsTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -822,7 +822,7 @@ U32 PassiveGuardedProductsTesterBase :: } void PassiveGuardedProductsTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -834,7 +834,7 @@ void PassiveGuardedProductsTesterBase :: void PassiveGuardedProductsTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -862,7 +862,7 @@ void PassiveGuardedProductsTesterBase :: F32 PassiveGuardedProductsTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -890,7 +890,7 @@ F32 PassiveGuardedProductsTesterBase :: F32 PassiveGuardedProductsTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -918,7 +918,7 @@ F32 PassiveGuardedProductsTesterBase :: void PassiveGuardedProductsTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -948,152 +948,152 @@ void PassiveGuardedProductsTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_to_productRecvIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); } -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_from_productRequestOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); } -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_from_productSendOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: +FwIndexType PassiveGuardedProductsTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1101,7 +1101,7 @@ NATIVE_INT_TYPE PassiveGuardedProductsTesterBase :: // ---------------------------------------------------------------------- bool PassiveGuardedProductsTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1112,7 +1112,7 @@ bool PassiveGuardedProductsTesterBase :: } bool PassiveGuardedProductsTesterBase :: - isConnected_to_productRecvIn(NATIVE_INT_TYPE portNum) + isConnected_to_productRecvIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_productRecvIn(), @@ -1123,7 +1123,7 @@ bool PassiveGuardedProductsTesterBase :: } bool PassiveGuardedProductsTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1134,7 +1134,7 @@ bool PassiveGuardedProductsTesterBase :: } bool PassiveGuardedProductsTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1145,7 +1145,7 @@ bool PassiveGuardedProductsTesterBase :: } bool PassiveGuardedProductsTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1156,7 +1156,7 @@ bool PassiveGuardedProductsTesterBase :: } bool PassiveGuardedProductsTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1167,7 +1167,7 @@ bool PassiveGuardedProductsTesterBase :: } bool PassiveGuardedProductsTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1178,7 +1178,7 @@ bool PassiveGuardedProductsTesterBase :: } bool PassiveGuardedProductsTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1189,7 +1189,7 @@ bool PassiveGuardedProductsTesterBase :: } bool PassiveGuardedProductsTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1200,7 +1200,7 @@ bool PassiveGuardedProductsTesterBase :: } bool PassiveGuardedProductsTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1365,7 +1365,7 @@ void PassiveGuardedProductsTesterBase :: void PassiveGuardedProductsTesterBase :: from_productRequestOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -1377,7 +1377,7 @@ void PassiveGuardedProductsTesterBase :: void PassiveGuardedProductsTesterBase :: from_productSendOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -1389,7 +1389,7 @@ void PassiveGuardedProductsTesterBase :: void PassiveGuardedProductsTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -1400,7 +1400,7 @@ void PassiveGuardedProductsTesterBase :: void PassiveGuardedProductsTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1411,7 +1411,7 @@ void PassiveGuardedProductsTesterBase :: U32 PassiveGuardedProductsTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1422,7 +1422,7 @@ U32 PassiveGuardedProductsTesterBase :: void PassiveGuardedProductsTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1449,7 +1449,7 @@ void PassiveGuardedProductsTesterBase :: F32 PassiveGuardedProductsTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGuardedProductsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGuardedProductsTesterBase.ref.hpp index bd48bf7bb..c88704d5e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGuardedProductsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGuardedProductsTesterBase.ref.hpp @@ -149,7 +149,7 @@ class PassiveGuardedProductsTesterBase : //! Initialize object PassiveGuardedProductsTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -160,61 +160,61 @@ class PassiveGuardedProductsTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to productRecvIn[portNum] void connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpResponsePort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -228,49 +228,49 @@ class PassiveGuardedProductsTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productRequestOut[portNum] Fw::InputDpRequestPort* get_from_productRequestOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productSendOut[portNum] Fw::InputDpSendPort* get_from_productSendOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -279,7 +279,7 @@ class PassiveGuardedProductsTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -288,42 +288,42 @@ class PassiveGuardedProductsTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -349,17 +349,17 @@ class PassiveGuardedProductsTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -371,7 +371,7 @@ class PassiveGuardedProductsTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -389,17 +389,17 @@ class PassiveGuardedProductsTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -411,7 +411,7 @@ class PassiveGuardedProductsTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -429,27 +429,27 @@ class PassiveGuardedProductsTesterBase : //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -461,7 +461,7 @@ class PassiveGuardedProductsTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -473,7 +473,7 @@ class PassiveGuardedProductsTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -485,7 +485,7 @@ class PassiveGuardedProductsTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -504,126 +504,126 @@ class PassiveGuardedProductsTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_productRecvIn ports //! //! \return The number of to_productRecvIn ports - NATIVE_INT_TYPE getNum_to_productRecvIn() const; + FwIndexType getNum_to_productRecvIn() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; //! Get the number of from_productRequestOut ports //! //! \return The number of from_productRequestOut ports - NATIVE_INT_TYPE getNum_from_productRequestOut() const; + FwIndexType getNum_from_productRequestOut() const; //! Get the number of from_productSendOut ports //! //! \return The number of from_productSendOut ports - NATIVE_INT_TYPE getNum_from_productSendOut() const; + FwIndexType getNum_from_productSendOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -635,70 +635,70 @@ class PassiveGuardedProductsTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_productRecvIn is connected //! //! \return Whether port to_productRecvIn is connected bool isConnected_to_productRecvIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -804,7 +804,7 @@ class PassiveGuardedProductsTesterBase : //! Static function for port from_productRequestOut static void from_productRequestOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); @@ -812,7 +812,7 @@ class PassiveGuardedProductsTesterBase : //! Static function for port from_productSendOut static void from_productSendOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -820,26 +820,26 @@ class PassiveGuardedProductsTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -852,7 +852,7 @@ class PassiveGuardedProductsTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.cpp index b35ea82f0..184e95c21 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void PassiveParamsTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdRegOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdRegOut()); port++ ) { this->m_from_cmdRegOut[port].init(); @@ -45,8 +45,8 @@ void PassiveParamsTesterBase :: // Connect input port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdResponseOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdResponseOut()); port++ ) { this->m_from_cmdResponseOut[port].init(); @@ -69,8 +69,8 @@ void PassiveParamsTesterBase :: // Connect input port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_prmGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_prmGetOut()); port++ ) { this->m_from_prmGetOut[port].init(); @@ -93,8 +93,8 @@ void PassiveParamsTesterBase :: // Connect input port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_prmSetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_prmSetOut()); port++ ) { this->m_from_prmSetOut[port].init(); @@ -117,8 +117,8 @@ void PassiveParamsTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -141,8 +141,8 @@ void PassiveParamsTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -165,8 +165,8 @@ void PassiveParamsTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -189,8 +189,8 @@ void PassiveParamsTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -213,8 +213,8 @@ void PassiveParamsTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -237,8 +237,8 @@ void PassiveParamsTesterBase :: // Connect output port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_cmdIn()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_cmdIn()); port++ ) { this->m_to_cmdIn[port].init(); @@ -256,8 +256,8 @@ void PassiveParamsTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -275,8 +275,8 @@ void PassiveParamsTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -294,8 +294,8 @@ void PassiveParamsTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -313,8 +313,8 @@ void PassiveParamsTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -332,8 +332,8 @@ void PassiveParamsTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -351,8 +351,8 @@ void PassiveParamsTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -370,8 +370,8 @@ void PassiveParamsTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -389,8 +389,8 @@ void PassiveParamsTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -413,7 +413,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -427,7 +427,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -441,7 +441,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -455,7 +455,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -469,7 +469,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -483,7 +483,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -497,7 +497,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -511,7 +511,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -525,7 +525,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -542,7 +542,7 @@ void PassiveParamsTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* PassiveParamsTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -553,7 +553,7 @@ Fw::InputCmdRegPort* PassiveParamsTesterBase :: } Fw::InputCmdResponsePort* PassiveParamsTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -564,7 +564,7 @@ Fw::InputCmdResponsePort* PassiveParamsTesterBase :: } Fw::InputLogPort* PassiveParamsTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -575,7 +575,7 @@ Fw::InputLogPort* PassiveParamsTesterBase :: } Fw::InputPrmGetPort* PassiveParamsTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -586,7 +586,7 @@ Fw::InputPrmGetPort* PassiveParamsTesterBase :: } Fw::InputPrmSetPort* PassiveParamsTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -599,7 +599,7 @@ Fw::InputPrmSetPort* PassiveParamsTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* PassiveParamsTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -612,7 +612,7 @@ Fw::InputLogTextPort* PassiveParamsTesterBase :: #endif Fw::InputTimePort* PassiveParamsTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -623,7 +623,7 @@ Fw::InputTimePort* PassiveParamsTesterBase :: } Fw::InputTlmPort* PassiveParamsTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -634,7 +634,7 @@ Fw::InputTlmPort* PassiveParamsTesterBase :: } Ports::InputNoArgsPort* PassiveParamsTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -645,7 +645,7 @@ Ports::InputNoArgsPort* PassiveParamsTesterBase :: } Ports::InputNoArgsReturnPort* PassiveParamsTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -656,7 +656,7 @@ Ports::InputNoArgsReturnPort* PassiveParamsTesterBase :: } Ports::InputTypedPort* PassiveParamsTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -667,7 +667,7 @@ Ports::InputTypedPort* PassiveParamsTesterBase :: } Ports::InputTypedReturnPort* PassiveParamsTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -721,7 +721,7 @@ PassiveParamsTesterBase :: // ---------------------------------------------------------------------- void PassiveParamsTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -732,7 +732,7 @@ void PassiveParamsTesterBase :: } U32 PassiveParamsTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -744,7 +744,7 @@ U32 PassiveParamsTesterBase :: void PassiveParamsTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -773,7 +773,7 @@ void PassiveParamsTesterBase :: F32 PassiveParamsTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -805,7 +805,7 @@ F32 PassiveParamsTesterBase :: // ---------------------------------------------------------------------- void PassiveParamsTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -816,7 +816,7 @@ void PassiveParamsTesterBase :: } U32 PassiveParamsTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -827,7 +827,7 @@ U32 PassiveParamsTesterBase :: } U32 PassiveParamsTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -838,7 +838,7 @@ U32 PassiveParamsTesterBase :: } void PassiveParamsTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -850,7 +850,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -878,7 +878,7 @@ void PassiveParamsTesterBase :: F32 PassiveParamsTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -906,7 +906,7 @@ F32 PassiveParamsTesterBase :: F32 PassiveParamsTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -934,7 +934,7 @@ F32 PassiveParamsTesterBase :: void PassiveParamsTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -964,134 +964,134 @@ void PassiveParamsTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveParamsTesterBase :: +FwIndexType PassiveParamsTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE PassiveParamsTesterBase :: +FwIndexType PassiveParamsTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE PassiveParamsTesterBase :: +FwIndexType PassiveParamsTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE PassiveParamsTesterBase :: +FwIndexType PassiveParamsTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE PassiveParamsTesterBase :: +FwIndexType PassiveParamsTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE PassiveParamsTesterBase :: +FwIndexType PassiveParamsTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE PassiveParamsTesterBase :: +FwIndexType PassiveParamsTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE PassiveParamsTesterBase :: +FwIndexType PassiveParamsTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE PassiveParamsTesterBase :: +FwIndexType PassiveParamsTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE PassiveParamsTesterBase :: +FwIndexType PassiveParamsTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE PassiveParamsTesterBase :: +FwIndexType PassiveParamsTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE PassiveParamsTesterBase :: +FwIndexType PassiveParamsTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE PassiveParamsTesterBase :: +FwIndexType PassiveParamsTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE PassiveParamsTesterBase :: +FwIndexType PassiveParamsTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE PassiveParamsTesterBase :: +FwIndexType PassiveParamsTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE PassiveParamsTesterBase :: +FwIndexType PassiveParamsTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE PassiveParamsTesterBase :: +FwIndexType PassiveParamsTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE PassiveParamsTesterBase :: +FwIndexType PassiveParamsTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE PassiveParamsTesterBase :: +FwIndexType PassiveParamsTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE PassiveParamsTesterBase :: +FwIndexType PassiveParamsTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE PassiveParamsTesterBase :: +FwIndexType PassiveParamsTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1099,7 +1099,7 @@ NATIVE_INT_TYPE PassiveParamsTesterBase :: // ---------------------------------------------------------------------- bool PassiveParamsTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1110,7 +1110,7 @@ bool PassiveParamsTesterBase :: } bool PassiveParamsTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1121,7 +1121,7 @@ bool PassiveParamsTesterBase :: } bool PassiveParamsTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1132,7 +1132,7 @@ bool PassiveParamsTesterBase :: } bool PassiveParamsTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1143,7 +1143,7 @@ bool PassiveParamsTesterBase :: } bool PassiveParamsTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1154,7 +1154,7 @@ bool PassiveParamsTesterBase :: } bool PassiveParamsTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1165,7 +1165,7 @@ bool PassiveParamsTesterBase :: } bool PassiveParamsTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1176,7 +1176,7 @@ bool PassiveParamsTesterBase :: } bool PassiveParamsTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1187,7 +1187,7 @@ bool PassiveParamsTesterBase :: } bool PassiveParamsTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1249,7 +1249,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: paramSend_ParamU32( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1276,7 +1276,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: paramSave_ParamU32( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1308,7 +1308,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: paramSend_ParamF64( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1335,7 +1335,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: paramSave_ParamF64( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1367,7 +1367,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: paramSend_ParamString( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1394,7 +1394,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: paramSave_ParamString( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1426,7 +1426,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: paramSend_ParamEnum( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1453,7 +1453,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: paramSave_ParamEnum( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1485,7 +1485,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: paramSend_ParamArray( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1512,7 +1512,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: paramSave_ParamArray( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1544,7 +1544,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: paramSend_ParamStruct( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1571,7 +1571,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: paramSave_ParamStruct( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1691,7 +1691,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode ) { @@ -1701,7 +1701,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, const Fw::CmdResponse& response @@ -1714,7 +1714,7 @@ void PassiveParamsTesterBase :: Fw::ParamValid PassiveParamsTesterBase :: from_prmGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwPrmIdType id, Fw::ParamBuffer& val ) @@ -1801,7 +1801,7 @@ Fw::ParamValid PassiveParamsTesterBase :: void PassiveParamsTesterBase :: from_prmSetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwPrmIdType id, Fw::ParamBuffer& val ) @@ -1907,7 +1907,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -1918,7 +1918,7 @@ void PassiveParamsTesterBase :: void PassiveParamsTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1929,7 +1929,7 @@ void PassiveParamsTesterBase :: U32 PassiveParamsTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1940,7 +1940,7 @@ U32 PassiveParamsTesterBase :: void PassiveParamsTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1967,7 +1967,7 @@ void PassiveParamsTesterBase :: F32 PassiveParamsTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.hpp index 3f9a3e764..609675a68 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveParamsTesterBase.ref.hpp @@ -143,7 +143,7 @@ class PassiveParamsTesterBase : //! Initialize object PassiveParamsTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -154,55 +154,55 @@ class PassiveParamsTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -216,35 +216,35 @@ class PassiveParamsTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -253,7 +253,7 @@ class PassiveParamsTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -262,42 +262,42 @@ class PassiveParamsTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -323,17 +323,17 @@ class PassiveParamsTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -345,7 +345,7 @@ class PassiveParamsTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -363,17 +363,17 @@ class PassiveParamsTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -385,7 +385,7 @@ class PassiveParamsTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -403,27 +403,27 @@ class PassiveParamsTesterBase : //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -435,7 +435,7 @@ class PassiveParamsTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -447,7 +447,7 @@ class PassiveParamsTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -459,7 +459,7 @@ class PassiveParamsTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -478,111 +478,111 @@ class PassiveParamsTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -594,63 +594,63 @@ class PassiveParamsTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -687,13 +687,13 @@ class PassiveParamsTesterBase : //! Send parameter ParamU32 void paramSend_ParamU32( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamU32 void paramSave_ParamU32( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -705,13 +705,13 @@ class PassiveParamsTesterBase : //! Send parameter ParamF64 void paramSend_ParamF64( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamF64 void paramSave_ParamF64( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -723,13 +723,13 @@ class PassiveParamsTesterBase : //! Send parameter ParamString void paramSend_ParamString( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamString void paramSave_ParamString( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -741,13 +741,13 @@ class PassiveParamsTesterBase : //! Send parameter ParamEnum void paramSend_ParamEnum( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamEnum void paramSave_ParamEnum( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -759,13 +759,13 @@ class PassiveParamsTesterBase : //! Send parameter ParamArray void paramSend_ParamArray( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamArray void paramSave_ParamArray( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -777,13 +777,13 @@ class PassiveParamsTesterBase : //! Send parameter ParamStruct void paramSend_ParamStruct( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamStruct void paramSave_ParamStruct( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -847,14 +847,14 @@ class PassiveParamsTesterBase : //! Static function for port from_cmdRegOut static void from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode //!< Command Op Code ); //! Static function for port from_cmdResponseOut static void from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence const Fw::CmdResponse& response //!< The command response argument @@ -863,7 +863,7 @@ class PassiveParamsTesterBase : //! Static function for port from_prmGetOut static Fw::ParamValid from_prmGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwPrmIdType id, //!< Parameter ID Fw::ParamBuffer& val //!< Buffer containing serialized parameter value ); @@ -871,7 +871,7 @@ class PassiveParamsTesterBase : //! Static function for port from_prmSetOut static void from_prmSetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwPrmIdType id, //!< Parameter ID Fw::ParamBuffer& val //!< Buffer containing serialized parameter value ); @@ -879,26 +879,26 @@ class PassiveParamsTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -911,7 +911,7 @@ class PassiveParamsTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.cpp index 451e1908b..6fdc0c0d3 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void PassiveSerialTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdRegOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdRegOut()); port++ ) { this->m_from_cmdRegOut[port].init(); @@ -45,8 +45,8 @@ void PassiveSerialTesterBase :: // Connect input port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdResponseOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdResponseOut()); port++ ) { this->m_from_cmdResponseOut[port].init(); @@ -69,8 +69,8 @@ void PassiveSerialTesterBase :: // Connect input port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_eventOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_eventOut()); port++ ) { this->m_from_eventOut[port].init(); @@ -93,8 +93,8 @@ void PassiveSerialTesterBase :: // Connect input port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_prmGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_prmGetOut()); port++ ) { this->m_from_prmGetOut[port].init(); @@ -117,8 +117,8 @@ void PassiveSerialTesterBase :: // Connect input port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_prmSetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_prmSetOut()); port++ ) { this->m_from_prmSetOut[port].init(); @@ -142,8 +142,8 @@ void PassiveSerialTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect input port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_textEventOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_textEventOut()); port++ ) { this->m_from_textEventOut[port].init(); @@ -167,8 +167,8 @@ void PassiveSerialTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -191,8 +191,8 @@ void PassiveSerialTesterBase :: // Connect input port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_tlmOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_tlmOut()); port++ ) { this->m_from_tlmOut[port].init(); @@ -215,8 +215,8 @@ void PassiveSerialTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -239,8 +239,8 @@ void PassiveSerialTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -263,8 +263,8 @@ void PassiveSerialTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -287,8 +287,8 @@ void PassiveSerialTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -311,8 +311,8 @@ void PassiveSerialTesterBase :: // Connect input port serialOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_serialOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_serialOut()); port++ ) { this->m_from_serialOut[port].init(); @@ -335,8 +335,8 @@ void PassiveSerialTesterBase :: // Connect output port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_cmdIn()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_cmdIn()); port++ ) { this->m_to_cmdIn[port].init(); @@ -354,8 +354,8 @@ void PassiveSerialTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -373,8 +373,8 @@ void PassiveSerialTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -392,8 +392,8 @@ void PassiveSerialTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -411,8 +411,8 @@ void PassiveSerialTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -430,8 +430,8 @@ void PassiveSerialTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -449,8 +449,8 @@ void PassiveSerialTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -468,8 +468,8 @@ void PassiveSerialTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -487,8 +487,8 @@ void PassiveSerialTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -506,8 +506,8 @@ void PassiveSerialTesterBase :: // Connect output port serialGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_serialGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_serialGuarded()); port++ ) { this->m_to_serialGuarded[port].init(); @@ -525,8 +525,8 @@ void PassiveSerialTesterBase :: // Connect output port serialSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_serialSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_serialSync()); port++ ) { this->m_to_serialSync[port].init(); @@ -549,7 +549,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -563,7 +563,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -577,7 +577,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -591,7 +591,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -605,7 +605,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -619,7 +619,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -633,7 +633,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -647,7 +647,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -661,7 +661,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -675,7 +675,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: connect_to_serialGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -689,7 +689,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: connect_to_serialSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -706,7 +706,7 @@ void PassiveSerialTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* PassiveSerialTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -717,7 +717,7 @@ Fw::InputCmdRegPort* PassiveSerialTesterBase :: } Fw::InputCmdResponsePort* PassiveSerialTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -728,7 +728,7 @@ Fw::InputCmdResponsePort* PassiveSerialTesterBase :: } Fw::InputLogPort* PassiveSerialTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -739,7 +739,7 @@ Fw::InputLogPort* PassiveSerialTesterBase :: } Fw::InputPrmGetPort* PassiveSerialTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -750,7 +750,7 @@ Fw::InputPrmGetPort* PassiveSerialTesterBase :: } Fw::InputPrmSetPort* PassiveSerialTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -763,7 +763,7 @@ Fw::InputPrmSetPort* PassiveSerialTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* PassiveSerialTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -776,7 +776,7 @@ Fw::InputLogTextPort* PassiveSerialTesterBase :: #endif Fw::InputTimePort* PassiveSerialTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -787,7 +787,7 @@ Fw::InputTimePort* PassiveSerialTesterBase :: } Fw::InputTlmPort* PassiveSerialTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -798,7 +798,7 @@ Fw::InputTlmPort* PassiveSerialTesterBase :: } Ports::InputNoArgsPort* PassiveSerialTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -809,7 +809,7 @@ Ports::InputNoArgsPort* PassiveSerialTesterBase :: } Ports::InputNoArgsReturnPort* PassiveSerialTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -820,7 +820,7 @@ Ports::InputNoArgsReturnPort* PassiveSerialTesterBase :: } Ports::InputTypedPort* PassiveSerialTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -831,7 +831,7 @@ Ports::InputTypedPort* PassiveSerialTesterBase :: } Ports::InputTypedReturnPort* PassiveSerialTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -842,7 +842,7 @@ Ports::InputTypedReturnPort* PassiveSerialTesterBase :: } Fw::InputSerializePort* PassiveSerialTesterBase :: - get_from_serialOut(NATIVE_INT_TYPE portNum) + get_from_serialOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_serialOut(), @@ -942,7 +942,7 @@ PassiveSerialTesterBase :: // ---------------------------------------------------------------------- void PassiveSerialTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -953,7 +953,7 @@ void PassiveSerialTesterBase :: } U32 PassiveSerialTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -965,7 +965,7 @@ U32 PassiveSerialTesterBase :: void PassiveSerialTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -994,7 +994,7 @@ void PassiveSerialTesterBase :: F32 PassiveSerialTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1023,7 +1023,7 @@ F32 PassiveSerialTesterBase :: void PassiveSerialTesterBase :: from_serialOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -1043,7 +1043,7 @@ void PassiveSerialTesterBase :: // ---------------------------------------------------------------------- void PassiveSerialTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1054,7 +1054,7 @@ void PassiveSerialTesterBase :: } U32 PassiveSerialTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1065,7 +1065,7 @@ U32 PassiveSerialTesterBase :: } U32 PassiveSerialTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1076,7 +1076,7 @@ U32 PassiveSerialTesterBase :: } void PassiveSerialTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1088,7 +1088,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1116,7 +1116,7 @@ void PassiveSerialTesterBase :: F32 PassiveSerialTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1144,7 +1144,7 @@ F32 PassiveSerialTesterBase :: F32 PassiveSerialTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1172,7 +1172,7 @@ F32 PassiveSerialTesterBase :: void PassiveSerialTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1200,7 +1200,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: invoke_to_serialGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -1216,7 +1216,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: invoke_to_serialSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -1234,152 +1234,152 @@ void PassiveSerialTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_to_serialGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialGuarded)); } -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_to_serialSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialSync)); } -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } -NATIVE_INT_TYPE PassiveSerialTesterBase :: +FwIndexType PassiveSerialTesterBase :: getNum_from_serialOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_serialOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_serialOut)); } // ---------------------------------------------------------------------- @@ -1387,7 +1387,7 @@ NATIVE_INT_TYPE PassiveSerialTesterBase :: // ---------------------------------------------------------------------- bool PassiveSerialTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1398,7 +1398,7 @@ bool PassiveSerialTesterBase :: } bool PassiveSerialTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1409,7 +1409,7 @@ bool PassiveSerialTesterBase :: } bool PassiveSerialTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1420,7 +1420,7 @@ bool PassiveSerialTesterBase :: } bool PassiveSerialTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1431,7 +1431,7 @@ bool PassiveSerialTesterBase :: } bool PassiveSerialTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1442,7 +1442,7 @@ bool PassiveSerialTesterBase :: } bool PassiveSerialTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1453,7 +1453,7 @@ bool PassiveSerialTesterBase :: } bool PassiveSerialTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1464,7 +1464,7 @@ bool PassiveSerialTesterBase :: } bool PassiveSerialTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1475,7 +1475,7 @@ bool PassiveSerialTesterBase :: } bool PassiveSerialTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1486,7 +1486,7 @@ bool PassiveSerialTesterBase :: } bool PassiveSerialTesterBase :: - isConnected_to_serialGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_serialGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_serialGuarded(), @@ -1497,7 +1497,7 @@ bool PassiveSerialTesterBase :: } bool PassiveSerialTesterBase :: - isConnected_to_serialSync(NATIVE_INT_TYPE portNum) + isConnected_to_serialSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_serialSync(), @@ -1545,7 +1545,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: sendCmd_CMD_SYNC( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -1570,7 +1570,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: sendCmd_CMD_SYNC_PRIMITIVE( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32, F32 f32, @@ -1618,7 +1618,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: sendCmd_CMD_SYNC_STRING( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, const Fw::CmdStringArg& str1, const Fw::CmdStringArg& str2 @@ -1659,7 +1659,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: sendCmd_CMD_SYNC_ENUM( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, E e ) @@ -1693,7 +1693,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: sendCmd_CMD_SYNC_ARRAY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, A a ) @@ -1727,7 +1727,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: sendCmd_CMD_SYNC_STRUCT( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, S s ) @@ -1761,7 +1761,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: sendCmd_CMD_GUARDED( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -1786,7 +1786,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: sendCmd_CMD_GUARDED_PRIMITIVE( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32, F32 f32, @@ -1834,7 +1834,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: sendCmd_CMD_GUARDED_STRING( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, const Fw::CmdStringArg& str1, const Fw::CmdStringArg& str2 @@ -1875,7 +1875,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: sendCmd_CMD_GUARDED_ENUM( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, E e ) @@ -1909,7 +1909,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: sendCmd_CMD_GUARDED_ARRAY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, A a ) @@ -1943,7 +1943,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: sendCmd_CMD_GUARDED_STRUCT( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, S s ) @@ -2683,7 +2683,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: paramSend_ParamU32( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -2710,7 +2710,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: paramSave_ParamU32( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -2742,7 +2742,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: paramSend_ParamF64( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -2769,7 +2769,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: paramSave_ParamF64( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -2801,7 +2801,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: paramSend_ParamString( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -2828,7 +2828,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: paramSave_ParamString( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -2860,7 +2860,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: paramSend_ParamEnum( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -2887,7 +2887,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: paramSave_ParamEnum( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -2919,7 +2919,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: paramSend_ParamArray( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -2946,7 +2946,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: paramSave_ParamArray( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -2978,7 +2978,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: paramSend_ParamStruct( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3005,7 +3005,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: paramSave_ParamStruct( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3222,7 +3222,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode ) { @@ -3232,7 +3232,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, const Fw::CmdResponse& response @@ -3245,7 +3245,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: from_eventOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwEventIdType id, Fw::Time& timeTag, const Fw::LogSeverity& severity, @@ -3259,7 +3259,7 @@ void PassiveSerialTesterBase :: Fw::ParamValid PassiveSerialTesterBase :: from_prmGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwPrmIdType id, Fw::ParamBuffer& val ) @@ -3346,7 +3346,7 @@ Fw::ParamValid PassiveSerialTesterBase :: void PassiveSerialTesterBase :: from_prmSetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwPrmIdType id, Fw::ParamBuffer& val ) @@ -3454,7 +3454,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: from_textEventOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwEventIdType id, Fw::Time& timeTag, const Fw::LogSeverity& severity, @@ -3470,7 +3470,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -3481,7 +3481,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: from_tlmOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwChanIdType id, Fw::Time& timeTag, Fw::TlmBuffer& val @@ -3494,7 +3494,7 @@ void PassiveSerialTesterBase :: void PassiveSerialTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -3505,7 +3505,7 @@ void PassiveSerialTesterBase :: U32 PassiveSerialTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -3516,7 +3516,7 @@ U32 PassiveSerialTesterBase :: void PassiveSerialTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3543,7 +3543,7 @@ void PassiveSerialTesterBase :: F32 PassiveSerialTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3570,7 +3570,7 @@ F32 PassiveSerialTesterBase :: void PassiveSerialTesterBase :: from_serialOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.hpp index fa2e652cd..2c082bf19 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSerialTesterBase.ref.hpp @@ -249,7 +249,7 @@ class PassiveSerialTesterBase : //! Initialize object PassiveSerialTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -260,67 +260,67 @@ class PassiveSerialTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to serialGuarded[portNum] void connect_to_serialGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The input port ); //! Connect port to serialSync[portNum] void connect_to_serialSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The input port ); @@ -334,35 +334,35 @@ class PassiveSerialTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -371,7 +371,7 @@ class PassiveSerialTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -380,49 +380,49 @@ class PassiveSerialTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_serialOut[portNum] Fw::InputSerializePort* get_from_serialOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -448,17 +448,17 @@ class PassiveSerialTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -470,7 +470,7 @@ class PassiveSerialTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -482,7 +482,7 @@ class PassiveSerialTesterBase : //! Handler for input port from_serialOut virtual void from_serialOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) = 0; @@ -494,17 +494,17 @@ class PassiveSerialTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -516,7 +516,7 @@ class PassiveSerialTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -528,7 +528,7 @@ class PassiveSerialTesterBase : //! Handler base-class function for from_serialOut void from_serialOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); @@ -540,27 +540,27 @@ class PassiveSerialTesterBase : //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -572,7 +572,7 @@ class PassiveSerialTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -584,7 +584,7 @@ class PassiveSerialTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -596,7 +596,7 @@ class PassiveSerialTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -608,13 +608,13 @@ class PassiveSerialTesterBase : //! Invoke the to port connected to serialGuarded void invoke_to_serialGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Invoke the to port connected to serialSync void invoke_to_serialSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); @@ -627,126 +627,126 @@ class PassiveSerialTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of to_serialGuarded ports //! //! \return The number of to_serialGuarded ports - NATIVE_INT_TYPE getNum_to_serialGuarded() const; + FwIndexType getNum_to_serialGuarded() const; //! Get the number of to_serialSync ports //! //! \return The number of to_serialSync ports - NATIVE_INT_TYPE getNum_to_serialSync() const; + FwIndexType getNum_to_serialSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; //! Get the number of from_serialOut ports //! //! \return The number of from_serialOut ports - NATIVE_INT_TYPE getNum_from_serialOut() const; + FwIndexType getNum_from_serialOut() const; protected: @@ -758,77 +758,77 @@ class PassiveSerialTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_serialGuarded is connected //! //! \return Whether port to_serialGuarded is connected bool isConnected_to_serialGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_serialSync is connected //! //! \return Whether port to_serialSync is connected bool isConnected_to_serialSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -853,13 +853,13 @@ class PassiveSerialTesterBase : //! Send a CMD_SYNC command void sendCmd_CMD_SYNC( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_SYNC_PRIMITIVE command void sendCmd_CMD_SYNC_PRIMITIVE( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32, //!< A U32 F32 f32, //!< An F32 @@ -868,7 +868,7 @@ class PassiveSerialTesterBase : //! Send a CMD_SYNC_STRING command void sendCmd_CMD_SYNC_STRING( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number const Fw::CmdStringArg& str1, //!< A string const Fw::CmdStringArg& str2 //!< Another string @@ -876,34 +876,34 @@ class PassiveSerialTesterBase : //! Send a CMD_SYNC_ENUM command void sendCmd_CMD_SYNC_ENUM( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number E e //!< An enum ); //! Send a CMD_SYNC_ARRAY command void sendCmd_CMD_SYNC_ARRAY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number A a //!< An array ); //! Send a CMD_SYNC_STRUCT command void sendCmd_CMD_SYNC_STRUCT( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number S s //!< A struct ); //! Send a CMD_GUARDED command void sendCmd_CMD_GUARDED( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_GUARDED_PRIMITIVE command void sendCmd_CMD_GUARDED_PRIMITIVE( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32, //!< A U32 F32 f32, //!< An F32 @@ -912,7 +912,7 @@ class PassiveSerialTesterBase : //! Send a CMD_GUARDED_STRING command void sendCmd_CMD_GUARDED_STRING( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number const Fw::CmdStringArg& str1, //!< A string const Fw::CmdStringArg& str2 //!< Another string @@ -920,21 +920,21 @@ class PassiveSerialTesterBase : //! Send a CMD_GUARDED_ENUM command void sendCmd_CMD_GUARDED_ENUM( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number E e //!< An enum ); //! Send a CMD_GUARDED_ARRAY command void sendCmd_CMD_GUARDED_ARRAY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number A a //!< An array ); //! Send a CMD_GUARDED_STRUCT command void sendCmd_CMD_GUARDED_STRUCT( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number S s //!< A struct ); @@ -1092,13 +1092,13 @@ class PassiveSerialTesterBase : //! Send parameter ParamU32 void paramSend_ParamU32( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamU32 void paramSave_ParamU32( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1110,13 +1110,13 @@ class PassiveSerialTesterBase : //! Send parameter ParamF64 void paramSend_ParamF64( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamF64 void paramSave_ParamF64( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1128,13 +1128,13 @@ class PassiveSerialTesterBase : //! Send parameter ParamString void paramSend_ParamString( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamString void paramSave_ParamString( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1146,13 +1146,13 @@ class PassiveSerialTesterBase : //! Send parameter ParamEnum void paramSend_ParamEnum( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamEnum void paramSave_ParamEnum( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1164,13 +1164,13 @@ class PassiveSerialTesterBase : //! Send parameter ParamArray void paramSend_ParamArray( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamArray void paramSave_ParamArray( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1182,13 +1182,13 @@ class PassiveSerialTesterBase : //! Send parameter ParamStruct void paramSend_ParamStruct( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamStruct void paramSave_ParamStruct( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1271,14 +1271,14 @@ class PassiveSerialTesterBase : //! Static function for port from_cmdRegOut static void from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode //!< Command Op Code ); //! Static function for port from_cmdResponseOut static void from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence const Fw::CmdResponse& response //!< The command response argument @@ -1287,7 +1287,7 @@ class PassiveSerialTesterBase : //! Static function for port from_eventOut static void from_eventOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwEventIdType id, //!< Log ID Fw::Time& timeTag, //!< Time Tag const Fw::LogSeverity& severity, //!< The severity argument @@ -1297,7 +1297,7 @@ class PassiveSerialTesterBase : //! Static function for port from_prmGetOut static Fw::ParamValid from_prmGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwPrmIdType id, //!< Parameter ID Fw::ParamBuffer& val //!< Buffer containing serialized parameter value ); @@ -1305,7 +1305,7 @@ class PassiveSerialTesterBase : //! Static function for port from_prmSetOut static void from_prmSetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwPrmIdType id, //!< Parameter ID Fw::ParamBuffer& val //!< Buffer containing serialized parameter value ); @@ -1315,7 +1315,7 @@ class PassiveSerialTesterBase : //! Static function for port from_textEventOut static void from_textEventOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwEventIdType id, //!< Log ID Fw::Time& timeTag, //!< Time Tag const Fw::LogSeverity& severity, //!< The severity argument @@ -1327,14 +1327,14 @@ class PassiveSerialTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_tlmOut static void from_tlmOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwChanIdType id, //!< Telemetry Channel ID Fw::Time& timeTag, //!< Time Tag Fw::TlmBuffer& val //!< Buffer containing serialized telemetry value @@ -1343,19 +1343,19 @@ class PassiveSerialTesterBase : //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1368,7 +1368,7 @@ class PassiveSerialTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1381,7 +1381,7 @@ class PassiveSerialTesterBase : //! Static function for port from_serialOut static void from_serialOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductPortsOnlyTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductPortsOnlyTesterBase.ref.cpp index 244ca2492..8086d55b8 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductPortsOnlyTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductPortsOnlyTesterBase.ref.cpp @@ -14,7 +14,7 @@ // ---------------------------------------------------------------------- void PassiveSyncProductPortsOnlyTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); @@ -26,7 +26,7 @@ void PassiveSyncProductPortsOnlyTesterBase :: void PassiveSyncProductPortsOnlyTesterBase :: connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpResponsePort* port ) { @@ -43,7 +43,7 @@ void PassiveSyncProductPortsOnlyTesterBase :: // ---------------------------------------------------------------------- Fw::InputDpRequestPort* PassiveSyncProductPortsOnlyTesterBase :: - get_from_productRequestOut(NATIVE_INT_TYPE portNum) + get_from_productRequestOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productRequestOut(), @@ -54,7 +54,7 @@ Fw::InputDpRequestPort* PassiveSyncProductPortsOnlyTesterBase :: } Fw::InputDpSendPort* PassiveSyncProductPortsOnlyTesterBase :: - get_from_productSendOut(NATIVE_INT_TYPE portNum) + get_from_productSendOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productSendOut(), @@ -88,22 +88,22 @@ PassiveSyncProductPortsOnlyTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveSyncProductPortsOnlyTesterBase :: +FwIndexType PassiveSyncProductPortsOnlyTesterBase :: getNum_to_productRecvIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); } -NATIVE_INT_TYPE PassiveSyncProductPortsOnlyTesterBase :: +FwIndexType PassiveSyncProductPortsOnlyTesterBase :: getNum_from_productRequestOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); } -NATIVE_INT_TYPE PassiveSyncProductPortsOnlyTesterBase :: +FwIndexType PassiveSyncProductPortsOnlyTesterBase :: getNum_from_productSendOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); } // ---------------------------------------------------------------------- @@ -111,7 +111,7 @@ NATIVE_INT_TYPE PassiveSyncProductPortsOnlyTesterBase :: // ---------------------------------------------------------------------- bool PassiveSyncProductPortsOnlyTesterBase :: - isConnected_to_productRecvIn(NATIVE_INT_TYPE portNum) + isConnected_to_productRecvIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_productRecvIn(), diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductPortsOnlyTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductPortsOnlyTesterBase.ref.hpp index 068704384..8197f18f8 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductPortsOnlyTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductPortsOnlyTesterBase.ref.hpp @@ -28,7 +28,7 @@ class PassiveSyncProductPortsOnlyTesterBase : //! Initialize object PassiveSyncProductPortsOnlyTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -39,7 +39,7 @@ class PassiveSyncProductPortsOnlyTesterBase : //! Connect port to productRecvIn[portNum] void connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpResponsePort* port //!< The input port ); @@ -53,14 +53,14 @@ class PassiveSyncProductPortsOnlyTesterBase : //! //! \return from_productRequestOut[portNum] Fw::InputDpRequestPort* get_from_productRequestOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productSendOut[portNum] Fw::InputDpSendPort* get_from_productSendOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -87,17 +87,17 @@ class PassiveSyncProductPortsOnlyTesterBase : //! Get the number of to_productRecvIn ports //! //! \return The number of to_productRecvIn ports - NATIVE_INT_TYPE getNum_to_productRecvIn() const; + FwIndexType getNum_to_productRecvIn() const; //! Get the number of from_productRequestOut ports //! //! \return The number of from_productRequestOut ports - NATIVE_INT_TYPE getNum_from_productRequestOut() const; + FwIndexType getNum_from_productRequestOut() const; //! Get the number of from_productSendOut ports //! //! \return The number of from_productSendOut ports - NATIVE_INT_TYPE getNum_from_productSendOut() const; + FwIndexType getNum_from_productSendOut() const; protected: @@ -109,7 +109,7 @@ class PassiveSyncProductPortsOnlyTesterBase : //! //! \return Whether port to_productRecvIn is connected bool isConnected_to_productRecvIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); private: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductsTesterBase.ref.cpp index edc110d7d..0c5e347bc 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductsTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void PassiveSyncProductsTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productRequestOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productRequestOut()); port++ ) { this->m_from_productRequestOut[port].init(); @@ -45,8 +45,8 @@ void PassiveSyncProductsTesterBase :: // Connect input port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productSendOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productSendOut()); port++ ) { this->m_from_productSendOut[port].init(); @@ -69,8 +69,8 @@ void PassiveSyncProductsTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -93,8 +93,8 @@ void PassiveSyncProductsTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -117,8 +117,8 @@ void PassiveSyncProductsTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -141,8 +141,8 @@ void PassiveSyncProductsTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -165,8 +165,8 @@ void PassiveSyncProductsTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -189,8 +189,8 @@ void PassiveSyncProductsTesterBase :: // Connect output port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_productRecvIn()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_productRecvIn()); port++ ) { this->m_to_productRecvIn[port].init(); @@ -208,8 +208,8 @@ void PassiveSyncProductsTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -227,8 +227,8 @@ void PassiveSyncProductsTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -246,8 +246,8 @@ void PassiveSyncProductsTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -265,8 +265,8 @@ void PassiveSyncProductsTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -284,8 +284,8 @@ void PassiveSyncProductsTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -303,8 +303,8 @@ void PassiveSyncProductsTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -322,8 +322,8 @@ void PassiveSyncProductsTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -341,8 +341,8 @@ void PassiveSyncProductsTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -365,7 +365,7 @@ void PassiveSyncProductsTesterBase :: void PassiveSyncProductsTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -379,7 +379,7 @@ void PassiveSyncProductsTesterBase :: void PassiveSyncProductsTesterBase :: connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpResponsePort* port ) { @@ -393,7 +393,7 @@ void PassiveSyncProductsTesterBase :: void PassiveSyncProductsTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -407,7 +407,7 @@ void PassiveSyncProductsTesterBase :: void PassiveSyncProductsTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -421,7 +421,7 @@ void PassiveSyncProductsTesterBase :: void PassiveSyncProductsTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -435,7 +435,7 @@ void PassiveSyncProductsTesterBase :: void PassiveSyncProductsTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -449,7 +449,7 @@ void PassiveSyncProductsTesterBase :: void PassiveSyncProductsTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -463,7 +463,7 @@ void PassiveSyncProductsTesterBase :: void PassiveSyncProductsTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -477,7 +477,7 @@ void PassiveSyncProductsTesterBase :: void PassiveSyncProductsTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -491,7 +491,7 @@ void PassiveSyncProductsTesterBase :: void PassiveSyncProductsTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -508,7 +508,7 @@ void PassiveSyncProductsTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* PassiveSyncProductsTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -519,7 +519,7 @@ Fw::InputCmdRegPort* PassiveSyncProductsTesterBase :: } Fw::InputCmdResponsePort* PassiveSyncProductsTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -530,7 +530,7 @@ Fw::InputCmdResponsePort* PassiveSyncProductsTesterBase :: } Fw::InputLogPort* PassiveSyncProductsTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -541,7 +541,7 @@ Fw::InputLogPort* PassiveSyncProductsTesterBase :: } Fw::InputPrmGetPort* PassiveSyncProductsTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -552,7 +552,7 @@ Fw::InputPrmGetPort* PassiveSyncProductsTesterBase :: } Fw::InputPrmSetPort* PassiveSyncProductsTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -563,7 +563,7 @@ Fw::InputPrmSetPort* PassiveSyncProductsTesterBase :: } Fw::InputDpRequestPort* PassiveSyncProductsTesterBase :: - get_from_productRequestOut(NATIVE_INT_TYPE portNum) + get_from_productRequestOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productRequestOut(), @@ -574,7 +574,7 @@ Fw::InputDpRequestPort* PassiveSyncProductsTesterBase :: } Fw::InputDpSendPort* PassiveSyncProductsTesterBase :: - get_from_productSendOut(NATIVE_INT_TYPE portNum) + get_from_productSendOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productSendOut(), @@ -587,7 +587,7 @@ Fw::InputDpSendPort* PassiveSyncProductsTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* PassiveSyncProductsTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -600,7 +600,7 @@ Fw::InputLogTextPort* PassiveSyncProductsTesterBase :: #endif Fw::InputTimePort* PassiveSyncProductsTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -611,7 +611,7 @@ Fw::InputTimePort* PassiveSyncProductsTesterBase :: } Fw::InputTlmPort* PassiveSyncProductsTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -622,7 +622,7 @@ Fw::InputTlmPort* PassiveSyncProductsTesterBase :: } Ports::InputNoArgsPort* PassiveSyncProductsTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -633,7 +633,7 @@ Ports::InputNoArgsPort* PassiveSyncProductsTesterBase :: } Ports::InputNoArgsReturnPort* PassiveSyncProductsTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -644,7 +644,7 @@ Ports::InputNoArgsReturnPort* PassiveSyncProductsTesterBase :: } Ports::InputTypedPort* PassiveSyncProductsTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -655,7 +655,7 @@ Ports::InputTypedPort* PassiveSyncProductsTesterBase :: } Ports::InputTypedReturnPort* PassiveSyncProductsTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -705,7 +705,7 @@ PassiveSyncProductsTesterBase :: // ---------------------------------------------------------------------- void PassiveSyncProductsTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -716,7 +716,7 @@ void PassiveSyncProductsTesterBase :: } U32 PassiveSyncProductsTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -728,7 +728,7 @@ U32 PassiveSyncProductsTesterBase :: void PassiveSyncProductsTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -757,7 +757,7 @@ void PassiveSyncProductsTesterBase :: F32 PassiveSyncProductsTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -789,7 +789,7 @@ F32 PassiveSyncProductsTesterBase :: // ---------------------------------------------------------------------- void PassiveSyncProductsTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -800,7 +800,7 @@ void PassiveSyncProductsTesterBase :: } U32 PassiveSyncProductsTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -811,7 +811,7 @@ U32 PassiveSyncProductsTesterBase :: } U32 PassiveSyncProductsTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -822,7 +822,7 @@ U32 PassiveSyncProductsTesterBase :: } void PassiveSyncProductsTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -834,7 +834,7 @@ void PassiveSyncProductsTesterBase :: void PassiveSyncProductsTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -862,7 +862,7 @@ void PassiveSyncProductsTesterBase :: F32 PassiveSyncProductsTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -890,7 +890,7 @@ F32 PassiveSyncProductsTesterBase :: F32 PassiveSyncProductsTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -918,7 +918,7 @@ F32 PassiveSyncProductsTesterBase :: void PassiveSyncProductsTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -948,152 +948,152 @@ void PassiveSyncProductsTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_to_productRecvIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); } -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_from_productRequestOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); } -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_from_productSendOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: +FwIndexType PassiveSyncProductsTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1101,7 +1101,7 @@ NATIVE_INT_TYPE PassiveSyncProductsTesterBase :: // ---------------------------------------------------------------------- bool PassiveSyncProductsTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1112,7 +1112,7 @@ bool PassiveSyncProductsTesterBase :: } bool PassiveSyncProductsTesterBase :: - isConnected_to_productRecvIn(NATIVE_INT_TYPE portNum) + isConnected_to_productRecvIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_productRecvIn(), @@ -1123,7 +1123,7 @@ bool PassiveSyncProductsTesterBase :: } bool PassiveSyncProductsTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1134,7 +1134,7 @@ bool PassiveSyncProductsTesterBase :: } bool PassiveSyncProductsTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1145,7 +1145,7 @@ bool PassiveSyncProductsTesterBase :: } bool PassiveSyncProductsTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1156,7 +1156,7 @@ bool PassiveSyncProductsTesterBase :: } bool PassiveSyncProductsTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1167,7 +1167,7 @@ bool PassiveSyncProductsTesterBase :: } bool PassiveSyncProductsTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1178,7 +1178,7 @@ bool PassiveSyncProductsTesterBase :: } bool PassiveSyncProductsTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1189,7 +1189,7 @@ bool PassiveSyncProductsTesterBase :: } bool PassiveSyncProductsTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1200,7 +1200,7 @@ bool PassiveSyncProductsTesterBase :: } bool PassiveSyncProductsTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1365,7 +1365,7 @@ void PassiveSyncProductsTesterBase :: void PassiveSyncProductsTesterBase :: from_productRequestOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -1377,7 +1377,7 @@ void PassiveSyncProductsTesterBase :: void PassiveSyncProductsTesterBase :: from_productSendOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -1389,7 +1389,7 @@ void PassiveSyncProductsTesterBase :: void PassiveSyncProductsTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -1400,7 +1400,7 @@ void PassiveSyncProductsTesterBase :: void PassiveSyncProductsTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1411,7 +1411,7 @@ void PassiveSyncProductsTesterBase :: U32 PassiveSyncProductsTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1422,7 +1422,7 @@ U32 PassiveSyncProductsTesterBase :: void PassiveSyncProductsTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1449,7 +1449,7 @@ void PassiveSyncProductsTesterBase :: F32 PassiveSyncProductsTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductsTesterBase.ref.hpp index 272fc9d05..13a138d19 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductsTesterBase.ref.hpp @@ -149,7 +149,7 @@ class PassiveSyncProductsTesterBase : //! Initialize object PassiveSyncProductsTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -160,61 +160,61 @@ class PassiveSyncProductsTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to productRecvIn[portNum] void connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpResponsePort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -228,49 +228,49 @@ class PassiveSyncProductsTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productRequestOut[portNum] Fw::InputDpRequestPort* get_from_productRequestOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productSendOut[portNum] Fw::InputDpSendPort* get_from_productSendOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -279,7 +279,7 @@ class PassiveSyncProductsTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -288,42 +288,42 @@ class PassiveSyncProductsTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -349,17 +349,17 @@ class PassiveSyncProductsTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -371,7 +371,7 @@ class PassiveSyncProductsTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -389,17 +389,17 @@ class PassiveSyncProductsTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -411,7 +411,7 @@ class PassiveSyncProductsTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -429,27 +429,27 @@ class PassiveSyncProductsTesterBase : //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -461,7 +461,7 @@ class PassiveSyncProductsTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -473,7 +473,7 @@ class PassiveSyncProductsTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -485,7 +485,7 @@ class PassiveSyncProductsTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -504,126 +504,126 @@ class PassiveSyncProductsTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_productRecvIn ports //! //! \return The number of to_productRecvIn ports - NATIVE_INT_TYPE getNum_to_productRecvIn() const; + FwIndexType getNum_to_productRecvIn() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; //! Get the number of from_productRequestOut ports //! //! \return The number of from_productRequestOut ports - NATIVE_INT_TYPE getNum_from_productRequestOut() const; + FwIndexType getNum_from_productRequestOut() const; //! Get the number of from_productSendOut ports //! //! \return The number of from_productSendOut ports - NATIVE_INT_TYPE getNum_from_productSendOut() const; + FwIndexType getNum_from_productSendOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -635,70 +635,70 @@ class PassiveSyncProductsTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_productRecvIn is connected //! //! \return Whether port to_productRecvIn is connected bool isConnected_to_productRecvIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -804,7 +804,7 @@ class PassiveSyncProductsTesterBase : //! Static function for port from_productRequestOut static void from_productRequestOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); @@ -812,7 +812,7 @@ class PassiveSyncProductsTesterBase : //! Static function for port from_productSendOut static void from_productSendOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -820,26 +820,26 @@ class PassiveSyncProductsTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -852,7 +852,7 @@ class PassiveSyncProductsTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTelemetryTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTelemetryTesterBase.ref.cpp index e90afb370..403a82c9d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTelemetryTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTelemetryTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void PassiveTelemetryTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -45,8 +45,8 @@ void PassiveTelemetryTesterBase :: // Connect input port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_tlmOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_tlmOut()); port++ ) { this->m_from_tlmOut[port].init(); @@ -69,8 +69,8 @@ void PassiveTelemetryTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -93,8 +93,8 @@ void PassiveTelemetryTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -117,8 +117,8 @@ void PassiveTelemetryTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -141,8 +141,8 @@ void PassiveTelemetryTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -165,8 +165,8 @@ void PassiveTelemetryTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -184,8 +184,8 @@ void PassiveTelemetryTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -203,8 +203,8 @@ void PassiveTelemetryTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -222,8 +222,8 @@ void PassiveTelemetryTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -241,8 +241,8 @@ void PassiveTelemetryTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -260,8 +260,8 @@ void PassiveTelemetryTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -279,8 +279,8 @@ void PassiveTelemetryTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -298,8 +298,8 @@ void PassiveTelemetryTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -322,7 +322,7 @@ void PassiveTelemetryTesterBase :: void PassiveTelemetryTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -336,7 +336,7 @@ void PassiveTelemetryTesterBase :: void PassiveTelemetryTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -350,7 +350,7 @@ void PassiveTelemetryTesterBase :: void PassiveTelemetryTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -364,7 +364,7 @@ void PassiveTelemetryTesterBase :: void PassiveTelemetryTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -378,7 +378,7 @@ void PassiveTelemetryTesterBase :: void PassiveTelemetryTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -392,7 +392,7 @@ void PassiveTelemetryTesterBase :: void PassiveTelemetryTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -406,7 +406,7 @@ void PassiveTelemetryTesterBase :: void PassiveTelemetryTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -420,7 +420,7 @@ void PassiveTelemetryTesterBase :: void PassiveTelemetryTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -434,7 +434,7 @@ void PassiveTelemetryTesterBase :: void PassiveTelemetryTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -451,7 +451,7 @@ void PassiveTelemetryTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* PassiveTelemetryTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -462,7 +462,7 @@ Fw::InputCmdRegPort* PassiveTelemetryTesterBase :: } Fw::InputCmdResponsePort* PassiveTelemetryTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -473,7 +473,7 @@ Fw::InputCmdResponsePort* PassiveTelemetryTesterBase :: } Fw::InputLogPort* PassiveTelemetryTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -484,7 +484,7 @@ Fw::InputLogPort* PassiveTelemetryTesterBase :: } Fw::InputPrmGetPort* PassiveTelemetryTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -495,7 +495,7 @@ Fw::InputPrmGetPort* PassiveTelemetryTesterBase :: } Fw::InputPrmSetPort* PassiveTelemetryTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -508,7 +508,7 @@ Fw::InputPrmSetPort* PassiveTelemetryTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* PassiveTelemetryTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -521,7 +521,7 @@ Fw::InputLogTextPort* PassiveTelemetryTesterBase :: #endif Fw::InputTimePort* PassiveTelemetryTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -532,7 +532,7 @@ Fw::InputTimePort* PassiveTelemetryTesterBase :: } Fw::InputTlmPort* PassiveTelemetryTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -543,7 +543,7 @@ Fw::InputTlmPort* PassiveTelemetryTesterBase :: } Ports::InputNoArgsPort* PassiveTelemetryTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -554,7 +554,7 @@ Ports::InputNoArgsPort* PassiveTelemetryTesterBase :: } Ports::InputNoArgsReturnPort* PassiveTelemetryTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -565,7 +565,7 @@ Ports::InputNoArgsReturnPort* PassiveTelemetryTesterBase :: } Ports::InputTypedPort* PassiveTelemetryTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -576,7 +576,7 @@ Ports::InputTypedPort* PassiveTelemetryTesterBase :: } Ports::InputTypedReturnPort* PassiveTelemetryTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -644,7 +644,7 @@ PassiveTelemetryTesterBase :: // ---------------------------------------------------------------------- void PassiveTelemetryTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -655,7 +655,7 @@ void PassiveTelemetryTesterBase :: } U32 PassiveTelemetryTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -667,7 +667,7 @@ U32 PassiveTelemetryTesterBase :: void PassiveTelemetryTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -696,7 +696,7 @@ void PassiveTelemetryTesterBase :: F32 PassiveTelemetryTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -728,7 +728,7 @@ F32 PassiveTelemetryTesterBase :: // ---------------------------------------------------------------------- void PassiveTelemetryTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -739,7 +739,7 @@ void PassiveTelemetryTesterBase :: } U32 PassiveTelemetryTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -750,7 +750,7 @@ U32 PassiveTelemetryTesterBase :: } U32 PassiveTelemetryTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -761,7 +761,7 @@ U32 PassiveTelemetryTesterBase :: } void PassiveTelemetryTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -773,7 +773,7 @@ void PassiveTelemetryTesterBase :: void PassiveTelemetryTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -801,7 +801,7 @@ void PassiveTelemetryTesterBase :: F32 PassiveTelemetryTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -829,7 +829,7 @@ F32 PassiveTelemetryTesterBase :: F32 PassiveTelemetryTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -857,7 +857,7 @@ F32 PassiveTelemetryTesterBase :: void PassiveTelemetryTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -887,134 +887,134 @@ void PassiveTelemetryTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveTelemetryTesterBase :: +FwIndexType PassiveTelemetryTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE PassiveTelemetryTesterBase :: +FwIndexType PassiveTelemetryTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE PassiveTelemetryTesterBase :: +FwIndexType PassiveTelemetryTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE PassiveTelemetryTesterBase :: +FwIndexType PassiveTelemetryTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE PassiveTelemetryTesterBase :: +FwIndexType PassiveTelemetryTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE PassiveTelemetryTesterBase :: +FwIndexType PassiveTelemetryTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE PassiveTelemetryTesterBase :: +FwIndexType PassiveTelemetryTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE PassiveTelemetryTesterBase :: +FwIndexType PassiveTelemetryTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE PassiveTelemetryTesterBase :: +FwIndexType PassiveTelemetryTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE PassiveTelemetryTesterBase :: +FwIndexType PassiveTelemetryTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE PassiveTelemetryTesterBase :: +FwIndexType PassiveTelemetryTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE PassiveTelemetryTesterBase :: +FwIndexType PassiveTelemetryTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE PassiveTelemetryTesterBase :: +FwIndexType PassiveTelemetryTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE PassiveTelemetryTesterBase :: +FwIndexType PassiveTelemetryTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE PassiveTelemetryTesterBase :: +FwIndexType PassiveTelemetryTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE PassiveTelemetryTesterBase :: +FwIndexType PassiveTelemetryTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE PassiveTelemetryTesterBase :: +FwIndexType PassiveTelemetryTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE PassiveTelemetryTesterBase :: +FwIndexType PassiveTelemetryTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE PassiveTelemetryTesterBase :: +FwIndexType PassiveTelemetryTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE PassiveTelemetryTesterBase :: +FwIndexType PassiveTelemetryTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE PassiveTelemetryTesterBase :: +FwIndexType PassiveTelemetryTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1022,7 +1022,7 @@ NATIVE_INT_TYPE PassiveTelemetryTesterBase :: // ---------------------------------------------------------------------- bool PassiveTelemetryTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1033,7 +1033,7 @@ bool PassiveTelemetryTesterBase :: } bool PassiveTelemetryTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1044,7 +1044,7 @@ bool PassiveTelemetryTesterBase :: } bool PassiveTelemetryTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1055,7 +1055,7 @@ bool PassiveTelemetryTesterBase :: } bool PassiveTelemetryTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1066,7 +1066,7 @@ bool PassiveTelemetryTesterBase :: } bool PassiveTelemetryTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1077,7 +1077,7 @@ bool PassiveTelemetryTesterBase :: } bool PassiveTelemetryTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1088,7 +1088,7 @@ bool PassiveTelemetryTesterBase :: } bool PassiveTelemetryTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1099,7 +1099,7 @@ bool PassiveTelemetryTesterBase :: } bool PassiveTelemetryTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1110,7 +1110,7 @@ bool PassiveTelemetryTesterBase :: } bool PassiveTelemetryTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1525,7 +1525,7 @@ void PassiveTelemetryTesterBase :: void PassiveTelemetryTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -1536,7 +1536,7 @@ void PassiveTelemetryTesterBase :: void PassiveTelemetryTesterBase :: from_tlmOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwChanIdType id, Fw::Time& timeTag, Fw::TlmBuffer& val @@ -1549,7 +1549,7 @@ void PassiveTelemetryTesterBase :: void PassiveTelemetryTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1560,7 +1560,7 @@ void PassiveTelemetryTesterBase :: U32 PassiveTelemetryTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1571,7 +1571,7 @@ U32 PassiveTelemetryTesterBase :: void PassiveTelemetryTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1598,7 +1598,7 @@ void PassiveTelemetryTesterBase :: F32 PassiveTelemetryTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTelemetryTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTelemetryTesterBase.ref.hpp index bba0a4123..3763e3b02 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTelemetryTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTelemetryTesterBase.ref.hpp @@ -202,7 +202,7 @@ class PassiveTelemetryTesterBase : //! Initialize object PassiveTelemetryTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -213,55 +213,55 @@ class PassiveTelemetryTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -275,35 +275,35 @@ class PassiveTelemetryTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -312,7 +312,7 @@ class PassiveTelemetryTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -321,42 +321,42 @@ class PassiveTelemetryTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -382,17 +382,17 @@ class PassiveTelemetryTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -404,7 +404,7 @@ class PassiveTelemetryTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -422,17 +422,17 @@ class PassiveTelemetryTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -444,7 +444,7 @@ class PassiveTelemetryTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -462,27 +462,27 @@ class PassiveTelemetryTesterBase : //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -494,7 +494,7 @@ class PassiveTelemetryTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -506,7 +506,7 @@ class PassiveTelemetryTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -518,7 +518,7 @@ class PassiveTelemetryTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -537,111 +537,111 @@ class PassiveTelemetryTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -653,63 +653,63 @@ class PassiveTelemetryTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -854,14 +854,14 @@ class PassiveTelemetryTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_tlmOut static void from_tlmOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwChanIdType id, //!< Telemetry Channel ID Fw::Time& timeTag, //!< Time Tag Fw::TlmBuffer& val //!< Buffer containing serialized telemetry value @@ -870,19 +870,19 @@ class PassiveTelemetryTesterBase : //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -895,7 +895,7 @@ class PassiveTelemetryTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.cpp index 5c50511f7..5ebca4642 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void PassiveTestTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdRegOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdRegOut()); port++ ) { this->m_from_cmdRegOut[port].init(); @@ -45,8 +45,8 @@ void PassiveTestTesterBase :: // Connect input port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdResponseOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdResponseOut()); port++ ) { this->m_from_cmdResponseOut[port].init(); @@ -69,8 +69,8 @@ void PassiveTestTesterBase :: // Connect input port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_eventOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_eventOut()); port++ ) { this->m_from_eventOut[port].init(); @@ -93,8 +93,8 @@ void PassiveTestTesterBase :: // Connect input port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_prmGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_prmGetOut()); port++ ) { this->m_from_prmGetOut[port].init(); @@ -117,8 +117,8 @@ void PassiveTestTesterBase :: // Connect input port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_prmSetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_prmSetOut()); port++ ) { this->m_from_prmSetOut[port].init(); @@ -141,8 +141,8 @@ void PassiveTestTesterBase :: // Connect input port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productRequestOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productRequestOut()); port++ ) { this->m_from_productRequestOut[port].init(); @@ -165,8 +165,8 @@ void PassiveTestTesterBase :: // Connect input port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productSendOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productSendOut()); port++ ) { this->m_from_productSendOut[port].init(); @@ -190,8 +190,8 @@ void PassiveTestTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect input port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_textEventOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_textEventOut()); port++ ) { this->m_from_textEventOut[port].init(); @@ -215,8 +215,8 @@ void PassiveTestTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -239,8 +239,8 @@ void PassiveTestTesterBase :: // Connect input port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_tlmOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_tlmOut()); port++ ) { this->m_from_tlmOut[port].init(); @@ -263,8 +263,8 @@ void PassiveTestTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -287,8 +287,8 @@ void PassiveTestTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -311,8 +311,8 @@ void PassiveTestTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -335,8 +335,8 @@ void PassiveTestTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -359,8 +359,8 @@ void PassiveTestTesterBase :: // Connect output port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_cmdIn()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_cmdIn()); port++ ) { this->m_to_cmdIn[port].init(); @@ -378,8 +378,8 @@ void PassiveTestTesterBase :: // Connect output port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_productRecvIn()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_productRecvIn()); port++ ) { this->m_to_productRecvIn[port].init(); @@ -397,8 +397,8 @@ void PassiveTestTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -416,8 +416,8 @@ void PassiveTestTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -435,8 +435,8 @@ void PassiveTestTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -454,8 +454,8 @@ void PassiveTestTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -473,8 +473,8 @@ void PassiveTestTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -492,8 +492,8 @@ void PassiveTestTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -511,8 +511,8 @@ void PassiveTestTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -530,8 +530,8 @@ void PassiveTestTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -554,7 +554,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -568,7 +568,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpResponsePort* port ) { @@ -582,7 +582,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -596,7 +596,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -610,7 +610,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -624,7 +624,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -638,7 +638,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -652,7 +652,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -666,7 +666,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -680,7 +680,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -697,7 +697,7 @@ void PassiveTestTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* PassiveTestTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -708,7 +708,7 @@ Fw::InputCmdRegPort* PassiveTestTesterBase :: } Fw::InputCmdResponsePort* PassiveTestTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -719,7 +719,7 @@ Fw::InputCmdResponsePort* PassiveTestTesterBase :: } Fw::InputLogPort* PassiveTestTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -730,7 +730,7 @@ Fw::InputLogPort* PassiveTestTesterBase :: } Fw::InputPrmGetPort* PassiveTestTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -741,7 +741,7 @@ Fw::InputPrmGetPort* PassiveTestTesterBase :: } Fw::InputPrmSetPort* PassiveTestTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -752,7 +752,7 @@ Fw::InputPrmSetPort* PassiveTestTesterBase :: } Fw::InputDpRequestPort* PassiveTestTesterBase :: - get_from_productRequestOut(NATIVE_INT_TYPE portNum) + get_from_productRequestOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productRequestOut(), @@ -763,7 +763,7 @@ Fw::InputDpRequestPort* PassiveTestTesterBase :: } Fw::InputDpSendPort* PassiveTestTesterBase :: - get_from_productSendOut(NATIVE_INT_TYPE portNum) + get_from_productSendOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productSendOut(), @@ -776,7 +776,7 @@ Fw::InputDpSendPort* PassiveTestTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* PassiveTestTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -789,7 +789,7 @@ Fw::InputLogTextPort* PassiveTestTesterBase :: #endif Fw::InputTimePort* PassiveTestTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -800,7 +800,7 @@ Fw::InputTimePort* PassiveTestTesterBase :: } Fw::InputTlmPort* PassiveTestTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -811,7 +811,7 @@ Fw::InputTlmPort* PassiveTestTesterBase :: } Ports::InputNoArgsPort* PassiveTestTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -822,7 +822,7 @@ Ports::InputNoArgsPort* PassiveTestTesterBase :: } Ports::InputNoArgsReturnPort* PassiveTestTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -833,7 +833,7 @@ Ports::InputNoArgsReturnPort* PassiveTestTesterBase :: } Ports::InputTypedPort* PassiveTestTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -844,7 +844,7 @@ Ports::InputTypedPort* PassiveTestTesterBase :: } Ports::InputTypedReturnPort* PassiveTestTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -952,7 +952,7 @@ PassiveTestTesterBase :: // ---------------------------------------------------------------------- void PassiveTestTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -963,7 +963,7 @@ void PassiveTestTesterBase :: } U32 PassiveTestTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -975,7 +975,7 @@ U32 PassiveTestTesterBase :: void PassiveTestTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1004,7 +1004,7 @@ void PassiveTestTesterBase :: F32 PassiveTestTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1036,7 +1036,7 @@ F32 PassiveTestTesterBase :: // ---------------------------------------------------------------------- void PassiveTestTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1047,7 +1047,7 @@ void PassiveTestTesterBase :: } U32 PassiveTestTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1058,7 +1058,7 @@ U32 PassiveTestTesterBase :: } U32 PassiveTestTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1069,7 +1069,7 @@ U32 PassiveTestTesterBase :: } void PassiveTestTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1081,7 +1081,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1109,7 +1109,7 @@ void PassiveTestTesterBase :: F32 PassiveTestTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1137,7 +1137,7 @@ F32 PassiveTestTesterBase :: F32 PassiveTestTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1165,7 +1165,7 @@ F32 PassiveTestTesterBase :: void PassiveTestTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1195,152 +1195,152 @@ void PassiveTestTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_to_productRecvIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); } -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_from_productRequestOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); } -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_from_productSendOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE PassiveTestTesterBase :: +FwIndexType PassiveTestTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1348,7 +1348,7 @@ NATIVE_INT_TYPE PassiveTestTesterBase :: // ---------------------------------------------------------------------- bool PassiveTestTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1359,7 +1359,7 @@ bool PassiveTestTesterBase :: } bool PassiveTestTesterBase :: - isConnected_to_productRecvIn(NATIVE_INT_TYPE portNum) + isConnected_to_productRecvIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_productRecvIn(), @@ -1370,7 +1370,7 @@ bool PassiveTestTesterBase :: } bool PassiveTestTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1381,7 +1381,7 @@ bool PassiveTestTesterBase :: } bool PassiveTestTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1392,7 +1392,7 @@ bool PassiveTestTesterBase :: } bool PassiveTestTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1403,7 +1403,7 @@ bool PassiveTestTesterBase :: } bool PassiveTestTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1414,7 +1414,7 @@ bool PassiveTestTesterBase :: } bool PassiveTestTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1425,7 +1425,7 @@ bool PassiveTestTesterBase :: } bool PassiveTestTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1436,7 +1436,7 @@ bool PassiveTestTesterBase :: } bool PassiveTestTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1447,7 +1447,7 @@ bool PassiveTestTesterBase :: } bool PassiveTestTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1495,7 +1495,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: sendCmd_CMD_SYNC( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -1520,7 +1520,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: sendCmd_CMD_SYNC_PRIMITIVE( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32, F32 f32, @@ -1568,7 +1568,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: sendCmd_CMD_SYNC_STRING( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, const Fw::CmdStringArg& str1, const Fw::CmdStringArg& str2 @@ -1609,7 +1609,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: sendCmd_CMD_SYNC_ENUM( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, E e ) @@ -1643,7 +1643,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: sendCmd_CMD_SYNC_ARRAY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, A a ) @@ -1677,7 +1677,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: sendCmd_CMD_SYNC_STRUCT( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, S s ) @@ -1711,7 +1711,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: sendCmd_CMD_GUARDED( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -1736,7 +1736,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: sendCmd_CMD_GUARDED_PRIMITIVE( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32, F32 f32, @@ -1784,7 +1784,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: sendCmd_CMD_GUARDED_STRING( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, const Fw::CmdStringArg& str1, const Fw::CmdStringArg& str2 @@ -1825,7 +1825,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: sendCmd_CMD_GUARDED_ENUM( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, E e ) @@ -1859,7 +1859,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: sendCmd_CMD_GUARDED_ARRAY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, A a ) @@ -1893,7 +1893,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: sendCmd_CMD_GUARDED_STRUCT( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, S s ) @@ -2633,7 +2633,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: paramSend_ParamU32( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -2660,7 +2660,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: paramSave_ParamU32( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -2692,7 +2692,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: paramSend_ParamF64( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -2719,7 +2719,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: paramSave_ParamF64( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -2751,7 +2751,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: paramSend_ParamString( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -2778,7 +2778,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: paramSave_ParamString( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -2810,7 +2810,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: paramSend_ParamEnum( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -2837,7 +2837,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: paramSave_ParamEnum( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -2869,7 +2869,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: paramSend_ParamArray( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -2896,7 +2896,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: paramSave_ParamArray( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -2928,7 +2928,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: paramSend_ParamStruct( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -2955,7 +2955,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: paramSave_ParamStruct( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3228,7 +3228,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode ) { @@ -3238,7 +3238,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, const Fw::CmdResponse& response @@ -3251,7 +3251,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: from_eventOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwEventIdType id, Fw::Time& timeTag, const Fw::LogSeverity& severity, @@ -3265,7 +3265,7 @@ void PassiveTestTesterBase :: Fw::ParamValid PassiveTestTesterBase :: from_prmGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwPrmIdType id, Fw::ParamBuffer& val ) @@ -3352,7 +3352,7 @@ Fw::ParamValid PassiveTestTesterBase :: void PassiveTestTesterBase :: from_prmSetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwPrmIdType id, Fw::ParamBuffer& val ) @@ -3458,7 +3458,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: from_productRequestOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -3470,7 +3470,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: from_productSendOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -3484,7 +3484,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: from_textEventOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwEventIdType id, Fw::Time& timeTag, const Fw::LogSeverity& severity, @@ -3500,7 +3500,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -3511,7 +3511,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: from_tlmOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwChanIdType id, Fw::Time& timeTag, Fw::TlmBuffer& val @@ -3524,7 +3524,7 @@ void PassiveTestTesterBase :: void PassiveTestTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -3535,7 +3535,7 @@ void PassiveTestTesterBase :: U32 PassiveTestTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -3546,7 +3546,7 @@ U32 PassiveTestTesterBase :: void PassiveTestTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -3573,7 +3573,7 @@ void PassiveTestTesterBase :: F32 PassiveTestTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.hpp index 3e8eb3124..7173e9dc5 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.hpp @@ -262,7 +262,7 @@ class PassiveTestTesterBase : //! Initialize object PassiveTestTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -273,61 +273,61 @@ class PassiveTestTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to productRecvIn[portNum] void connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpResponsePort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -341,49 +341,49 @@ class PassiveTestTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productRequestOut[portNum] Fw::InputDpRequestPort* get_from_productRequestOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productSendOut[portNum] Fw::InputDpSendPort* get_from_productSendOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -392,7 +392,7 @@ class PassiveTestTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -401,42 +401,42 @@ class PassiveTestTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -462,17 +462,17 @@ class PassiveTestTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -484,7 +484,7 @@ class PassiveTestTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -502,17 +502,17 @@ class PassiveTestTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -524,7 +524,7 @@ class PassiveTestTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -542,27 +542,27 @@ class PassiveTestTesterBase : //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -574,7 +574,7 @@ class PassiveTestTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -586,7 +586,7 @@ class PassiveTestTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -598,7 +598,7 @@ class PassiveTestTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -617,126 +617,126 @@ class PassiveTestTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_productRecvIn ports //! //! \return The number of to_productRecvIn ports - NATIVE_INT_TYPE getNum_to_productRecvIn() const; + FwIndexType getNum_to_productRecvIn() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; //! Get the number of from_productRequestOut ports //! //! \return The number of from_productRequestOut ports - NATIVE_INT_TYPE getNum_from_productRequestOut() const; + FwIndexType getNum_from_productRequestOut() const; //! Get the number of from_productSendOut ports //! //! \return The number of from_productSendOut ports - NATIVE_INT_TYPE getNum_from_productSendOut() const; + FwIndexType getNum_from_productSendOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -748,70 +748,70 @@ class PassiveTestTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_productRecvIn is connected //! //! \return Whether port to_productRecvIn is connected bool isConnected_to_productRecvIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -836,13 +836,13 @@ class PassiveTestTesterBase : //! Send a CMD_SYNC command void sendCmd_CMD_SYNC( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_SYNC_PRIMITIVE command void sendCmd_CMD_SYNC_PRIMITIVE( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32, //!< A U32 F32 f32, //!< An F32 @@ -851,7 +851,7 @@ class PassiveTestTesterBase : //! Send a CMD_SYNC_STRING command void sendCmd_CMD_SYNC_STRING( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number const Fw::CmdStringArg& str1, //!< A string const Fw::CmdStringArg& str2 //!< Another string @@ -859,34 +859,34 @@ class PassiveTestTesterBase : //! Send a CMD_SYNC_ENUM command void sendCmd_CMD_SYNC_ENUM( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number E e //!< An enum ); //! Send a CMD_SYNC_ARRAY command void sendCmd_CMD_SYNC_ARRAY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number A a //!< An array ); //! Send a CMD_SYNC_STRUCT command void sendCmd_CMD_SYNC_STRUCT( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number S s //!< A struct ); //! Send a CMD_GUARDED command void sendCmd_CMD_GUARDED( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_GUARDED_PRIMITIVE command void sendCmd_CMD_GUARDED_PRIMITIVE( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32, //!< A U32 F32 f32, //!< An F32 @@ -895,7 +895,7 @@ class PassiveTestTesterBase : //! Send a CMD_GUARDED_STRING command void sendCmd_CMD_GUARDED_STRING( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number const Fw::CmdStringArg& str1, //!< A string const Fw::CmdStringArg& str2 //!< Another string @@ -903,21 +903,21 @@ class PassiveTestTesterBase : //! Send a CMD_GUARDED_ENUM command void sendCmd_CMD_GUARDED_ENUM( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number E e //!< An enum ); //! Send a CMD_GUARDED_ARRAY command void sendCmd_CMD_GUARDED_ARRAY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number A a //!< An array ); //! Send a CMD_GUARDED_STRUCT command void sendCmd_CMD_GUARDED_STRUCT( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number S s //!< A struct ); @@ -1075,13 +1075,13 @@ class PassiveTestTesterBase : //! Send parameter ParamU32 void paramSend_ParamU32( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamU32 void paramSave_ParamU32( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1093,13 +1093,13 @@ class PassiveTestTesterBase : //! Send parameter ParamF64 void paramSend_ParamF64( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamF64 void paramSave_ParamF64( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1111,13 +1111,13 @@ class PassiveTestTesterBase : //! Send parameter ParamString void paramSend_ParamString( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamString void paramSave_ParamString( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1129,13 +1129,13 @@ class PassiveTestTesterBase : //! Send parameter ParamEnum void paramSend_ParamEnum( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamEnum void paramSave_ParamEnum( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1147,13 +1147,13 @@ class PassiveTestTesterBase : //! Send parameter ParamArray void paramSend_ParamArray( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamArray void paramSave_ParamArray( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1165,13 +1165,13 @@ class PassiveTestTesterBase : //! Send parameter ParamStruct void paramSend_ParamStruct( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamStruct void paramSave_ParamStruct( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1297,14 +1297,14 @@ class PassiveTestTesterBase : //! Static function for port from_cmdRegOut static void from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode //!< Command Op Code ); //! Static function for port from_cmdResponseOut static void from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence const Fw::CmdResponse& response //!< The command response argument @@ -1313,7 +1313,7 @@ class PassiveTestTesterBase : //! Static function for port from_eventOut static void from_eventOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwEventIdType id, //!< Log ID Fw::Time& timeTag, //!< Time Tag const Fw::LogSeverity& severity, //!< The severity argument @@ -1323,7 +1323,7 @@ class PassiveTestTesterBase : //! Static function for port from_prmGetOut static Fw::ParamValid from_prmGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwPrmIdType id, //!< Parameter ID Fw::ParamBuffer& val //!< Buffer containing serialized parameter value ); @@ -1331,7 +1331,7 @@ class PassiveTestTesterBase : //! Static function for port from_prmSetOut static void from_prmSetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwPrmIdType id, //!< Parameter ID Fw::ParamBuffer& val //!< Buffer containing serialized parameter value ); @@ -1339,7 +1339,7 @@ class PassiveTestTesterBase : //! Static function for port from_productRequestOut static void from_productRequestOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); @@ -1347,7 +1347,7 @@ class PassiveTestTesterBase : //! Static function for port from_productSendOut static void from_productSendOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -1357,7 +1357,7 @@ class PassiveTestTesterBase : //! Static function for port from_textEventOut static void from_textEventOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwEventIdType id, //!< Log ID Fw::Time& timeTag, //!< Time Tag const Fw::LogSeverity& severity, //!< The severity argument @@ -1369,14 +1369,14 @@ class PassiveTestTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_tlmOut static void from_tlmOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwChanIdType id, //!< Telemetry Channel ID Fw::Time& timeTag, //!< Time Tag Fw::TlmBuffer& val //!< Buffer containing serialized telemetry value @@ -1385,19 +1385,19 @@ class PassiveTestTesterBase : //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1410,7 +1410,7 @@ class PassiveTestTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductPortsOnlyTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductPortsOnlyTesterBase.ref.cpp index 4bb12a230..96a3f9f0a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductPortsOnlyTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductPortsOnlyTesterBase.ref.cpp @@ -14,7 +14,7 @@ // ---------------------------------------------------------------------- void QueuedAsyncProductPortsOnlyTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); @@ -26,7 +26,7 @@ void QueuedAsyncProductPortsOnlyTesterBase :: void QueuedAsyncProductPortsOnlyTesterBase :: connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpResponsePort* port ) { @@ -43,7 +43,7 @@ void QueuedAsyncProductPortsOnlyTesterBase :: // ---------------------------------------------------------------------- Fw::InputDpRequestPort* QueuedAsyncProductPortsOnlyTesterBase :: - get_from_productRequestOut(NATIVE_INT_TYPE portNum) + get_from_productRequestOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productRequestOut(), @@ -54,7 +54,7 @@ Fw::InputDpRequestPort* QueuedAsyncProductPortsOnlyTesterBase :: } Fw::InputDpSendPort* QueuedAsyncProductPortsOnlyTesterBase :: - get_from_productSendOut(NATIVE_INT_TYPE portNum) + get_from_productSendOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productSendOut(), @@ -88,22 +88,22 @@ QueuedAsyncProductPortsOnlyTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedAsyncProductPortsOnlyTesterBase :: +FwIndexType QueuedAsyncProductPortsOnlyTesterBase :: getNum_to_productRecvIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); } -NATIVE_INT_TYPE QueuedAsyncProductPortsOnlyTesterBase :: +FwIndexType QueuedAsyncProductPortsOnlyTesterBase :: getNum_from_productRequestOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); } -NATIVE_INT_TYPE QueuedAsyncProductPortsOnlyTesterBase :: +FwIndexType QueuedAsyncProductPortsOnlyTesterBase :: getNum_from_productSendOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); } // ---------------------------------------------------------------------- @@ -111,7 +111,7 @@ NATIVE_INT_TYPE QueuedAsyncProductPortsOnlyTesterBase :: // ---------------------------------------------------------------------- bool QueuedAsyncProductPortsOnlyTesterBase :: - isConnected_to_productRecvIn(NATIVE_INT_TYPE portNum) + isConnected_to_productRecvIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_productRecvIn(), diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductPortsOnlyTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductPortsOnlyTesterBase.ref.hpp index 41c22de6c..627a40a61 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductPortsOnlyTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductPortsOnlyTesterBase.ref.hpp @@ -28,7 +28,7 @@ class QueuedAsyncProductPortsOnlyTesterBase : //! Initialize object QueuedAsyncProductPortsOnlyTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -39,7 +39,7 @@ class QueuedAsyncProductPortsOnlyTesterBase : //! Connect port to productRecvIn[portNum] void connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpResponsePort* port //!< The input port ); @@ -53,14 +53,14 @@ class QueuedAsyncProductPortsOnlyTesterBase : //! //! \return from_productRequestOut[portNum] Fw::InputDpRequestPort* get_from_productRequestOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productSendOut[portNum] Fw::InputDpSendPort* get_from_productSendOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -87,17 +87,17 @@ class QueuedAsyncProductPortsOnlyTesterBase : //! Get the number of to_productRecvIn ports //! //! \return The number of to_productRecvIn ports - NATIVE_INT_TYPE getNum_to_productRecvIn() const; + FwIndexType getNum_to_productRecvIn() const; //! Get the number of from_productRequestOut ports //! //! \return The number of from_productRequestOut ports - NATIVE_INT_TYPE getNum_from_productRequestOut() const; + FwIndexType getNum_from_productRequestOut() const; //! Get the number of from_productSendOut ports //! //! \return The number of from_productSendOut ports - NATIVE_INT_TYPE getNum_from_productSendOut() const; + FwIndexType getNum_from_productSendOut() const; protected: @@ -109,7 +109,7 @@ class QueuedAsyncProductPortsOnlyTesterBase : //! //! \return Whether port to_productRecvIn is connected bool isConnected_to_productRecvIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); private: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductsTesterBase.ref.cpp index 5afb480c6..99bfd73d7 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductsTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void QueuedAsyncProductsTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productRequestOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productRequestOut()); port++ ) { this->m_from_productRequestOut[port].init(); @@ -45,8 +45,8 @@ void QueuedAsyncProductsTesterBase :: // Connect input port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productSendOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productSendOut()); port++ ) { this->m_from_productSendOut[port].init(); @@ -69,8 +69,8 @@ void QueuedAsyncProductsTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -93,8 +93,8 @@ void QueuedAsyncProductsTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -117,8 +117,8 @@ void QueuedAsyncProductsTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -141,8 +141,8 @@ void QueuedAsyncProductsTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -165,8 +165,8 @@ void QueuedAsyncProductsTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -189,8 +189,8 @@ void QueuedAsyncProductsTesterBase :: // Connect output port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_productRecvIn()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_productRecvIn()); port++ ) { this->m_to_productRecvIn[port].init(); @@ -208,8 +208,8 @@ void QueuedAsyncProductsTesterBase :: // Connect output port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsAsync()); port++ ) { this->m_to_noArgsAsync[port].init(); @@ -227,8 +227,8 @@ void QueuedAsyncProductsTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -246,8 +246,8 @@ void QueuedAsyncProductsTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -265,8 +265,8 @@ void QueuedAsyncProductsTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -284,8 +284,8 @@ void QueuedAsyncProductsTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -303,8 +303,8 @@ void QueuedAsyncProductsTesterBase :: // Connect output port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsync()); port++ ) { this->m_to_typedAsync[port].init(); @@ -322,8 +322,8 @@ void QueuedAsyncProductsTesterBase :: // Connect output port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncAssert()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncAssert()); port++ ) { this->m_to_typedAsyncAssert[port].init(); @@ -341,8 +341,8 @@ void QueuedAsyncProductsTesterBase :: // Connect output port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncBlockPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncBlockPriority()); port++ ) { this->m_to_typedAsyncBlockPriority[port].init(); @@ -360,8 +360,8 @@ void QueuedAsyncProductsTesterBase :: // Connect output port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncDropPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncDropPriority()); port++ ) { this->m_to_typedAsyncDropPriority[port].init(); @@ -379,8 +379,8 @@ void QueuedAsyncProductsTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -398,8 +398,8 @@ void QueuedAsyncProductsTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -417,8 +417,8 @@ void QueuedAsyncProductsTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -436,8 +436,8 @@ void QueuedAsyncProductsTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -460,7 +460,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -474,7 +474,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpResponsePort* port ) { @@ -488,7 +488,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -502,7 +502,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -516,7 +516,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -530,7 +530,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -544,7 +544,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -558,7 +558,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: connect_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -572,7 +572,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -586,7 +586,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -600,7 +600,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -614,7 +614,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -628,7 +628,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -642,7 +642,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -656,7 +656,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -673,7 +673,7 @@ void QueuedAsyncProductsTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* QueuedAsyncProductsTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -684,7 +684,7 @@ Fw::InputCmdRegPort* QueuedAsyncProductsTesterBase :: } Fw::InputCmdResponsePort* QueuedAsyncProductsTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -695,7 +695,7 @@ Fw::InputCmdResponsePort* QueuedAsyncProductsTesterBase :: } Fw::InputLogPort* QueuedAsyncProductsTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -706,7 +706,7 @@ Fw::InputLogPort* QueuedAsyncProductsTesterBase :: } Fw::InputPrmGetPort* QueuedAsyncProductsTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -717,7 +717,7 @@ Fw::InputPrmGetPort* QueuedAsyncProductsTesterBase :: } Fw::InputPrmSetPort* QueuedAsyncProductsTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -728,7 +728,7 @@ Fw::InputPrmSetPort* QueuedAsyncProductsTesterBase :: } Fw::InputDpRequestPort* QueuedAsyncProductsTesterBase :: - get_from_productRequestOut(NATIVE_INT_TYPE portNum) + get_from_productRequestOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productRequestOut(), @@ -739,7 +739,7 @@ Fw::InputDpRequestPort* QueuedAsyncProductsTesterBase :: } Fw::InputDpSendPort* QueuedAsyncProductsTesterBase :: - get_from_productSendOut(NATIVE_INT_TYPE portNum) + get_from_productSendOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productSendOut(), @@ -752,7 +752,7 @@ Fw::InputDpSendPort* QueuedAsyncProductsTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* QueuedAsyncProductsTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -765,7 +765,7 @@ Fw::InputLogTextPort* QueuedAsyncProductsTesterBase :: #endif Fw::InputTimePort* QueuedAsyncProductsTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -776,7 +776,7 @@ Fw::InputTimePort* QueuedAsyncProductsTesterBase :: } Fw::InputTlmPort* QueuedAsyncProductsTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -787,7 +787,7 @@ Fw::InputTlmPort* QueuedAsyncProductsTesterBase :: } Ports::InputNoArgsPort* QueuedAsyncProductsTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -798,7 +798,7 @@ Ports::InputNoArgsPort* QueuedAsyncProductsTesterBase :: } Ports::InputNoArgsReturnPort* QueuedAsyncProductsTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -809,7 +809,7 @@ Ports::InputNoArgsReturnPort* QueuedAsyncProductsTesterBase :: } Ports::InputTypedPort* QueuedAsyncProductsTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -820,7 +820,7 @@ Ports::InputTypedPort* QueuedAsyncProductsTesterBase :: } Ports::InputTypedReturnPort* QueuedAsyncProductsTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -870,7 +870,7 @@ QueuedAsyncProductsTesterBase :: // ---------------------------------------------------------------------- void QueuedAsyncProductsTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -881,7 +881,7 @@ void QueuedAsyncProductsTesterBase :: } U32 QueuedAsyncProductsTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -893,7 +893,7 @@ U32 QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -922,7 +922,7 @@ void QueuedAsyncProductsTesterBase :: F32 QueuedAsyncProductsTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -954,7 +954,7 @@ F32 QueuedAsyncProductsTesterBase :: // ---------------------------------------------------------------------- void QueuedAsyncProductsTesterBase :: - invoke_to_noArgsAsync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsAsync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -965,7 +965,7 @@ void QueuedAsyncProductsTesterBase :: } void QueuedAsyncProductsTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -976,7 +976,7 @@ void QueuedAsyncProductsTesterBase :: } U32 QueuedAsyncProductsTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -987,7 +987,7 @@ U32 QueuedAsyncProductsTesterBase :: } U32 QueuedAsyncProductsTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -998,7 +998,7 @@ U32 QueuedAsyncProductsTesterBase :: } void QueuedAsyncProductsTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1010,7 +1010,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1038,7 +1038,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1066,7 +1066,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1094,7 +1094,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1122,7 +1122,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1150,7 +1150,7 @@ void QueuedAsyncProductsTesterBase :: F32 QueuedAsyncProductsTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1178,7 +1178,7 @@ F32 QueuedAsyncProductsTesterBase :: F32 QueuedAsyncProductsTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1206,7 +1206,7 @@ F32 QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1236,182 +1236,182 @@ void QueuedAsyncProductsTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_to_productRecvIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_to_noArgsAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_to_typedAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_to_typedAsyncAssert() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_to_typedAsyncBlockPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_to_typedAsyncDropPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_from_productRequestOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_from_productSendOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: +FwIndexType QueuedAsyncProductsTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1419,7 +1419,7 @@ NATIVE_INT_TYPE QueuedAsyncProductsTesterBase :: // ---------------------------------------------------------------------- bool QueuedAsyncProductsTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1430,7 +1430,7 @@ bool QueuedAsyncProductsTesterBase :: } bool QueuedAsyncProductsTesterBase :: - isConnected_to_productRecvIn(NATIVE_INT_TYPE portNum) + isConnected_to_productRecvIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_productRecvIn(), @@ -1441,7 +1441,7 @@ bool QueuedAsyncProductsTesterBase :: } bool QueuedAsyncProductsTesterBase :: - isConnected_to_noArgsAsync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsAsync(), @@ -1452,7 +1452,7 @@ bool QueuedAsyncProductsTesterBase :: } bool QueuedAsyncProductsTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1463,7 +1463,7 @@ bool QueuedAsyncProductsTesterBase :: } bool QueuedAsyncProductsTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1474,7 +1474,7 @@ bool QueuedAsyncProductsTesterBase :: } bool QueuedAsyncProductsTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1485,7 +1485,7 @@ bool QueuedAsyncProductsTesterBase :: } bool QueuedAsyncProductsTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1496,7 +1496,7 @@ bool QueuedAsyncProductsTesterBase :: } bool QueuedAsyncProductsTesterBase :: - isConnected_to_typedAsync(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsync(), @@ -1507,7 +1507,7 @@ bool QueuedAsyncProductsTesterBase :: } bool QueuedAsyncProductsTesterBase :: - isConnected_to_typedAsyncAssert(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncAssert(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncAssert(), @@ -1518,7 +1518,7 @@ bool QueuedAsyncProductsTesterBase :: } bool QueuedAsyncProductsTesterBase :: - isConnected_to_typedAsyncBlockPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncBlockPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncBlockPriority(), @@ -1529,7 +1529,7 @@ bool QueuedAsyncProductsTesterBase :: } bool QueuedAsyncProductsTesterBase :: - isConnected_to_typedAsyncDropPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncDropPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncDropPriority(), @@ -1540,7 +1540,7 @@ bool QueuedAsyncProductsTesterBase :: } bool QueuedAsyncProductsTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1551,7 +1551,7 @@ bool QueuedAsyncProductsTesterBase :: } bool QueuedAsyncProductsTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1562,7 +1562,7 @@ bool QueuedAsyncProductsTesterBase :: } bool QueuedAsyncProductsTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1573,7 +1573,7 @@ bool QueuedAsyncProductsTesterBase :: } bool QueuedAsyncProductsTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1738,7 +1738,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: from_productRequestOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -1750,7 +1750,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: from_productSendOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -1762,7 +1762,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -1773,7 +1773,7 @@ void QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1784,7 +1784,7 @@ void QueuedAsyncProductsTesterBase :: U32 QueuedAsyncProductsTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1795,7 +1795,7 @@ U32 QueuedAsyncProductsTesterBase :: void QueuedAsyncProductsTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1822,7 +1822,7 @@ void QueuedAsyncProductsTesterBase :: F32 QueuedAsyncProductsTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductsTesterBase.ref.hpp index 02e19549a..ac215a516 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductsTesterBase.ref.hpp @@ -149,7 +149,7 @@ class QueuedAsyncProductsTesterBase : //! Initialize object QueuedAsyncProductsTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -160,91 +160,91 @@ class QueuedAsyncProductsTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to productRecvIn[portNum] void connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpResponsePort* port //!< The input port ); //! Connect port to noArgsAsync[portNum] void connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedAsync[portNum] void connect_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncAssert[portNum] void connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncBlockPriority[portNum] void connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncDropPriority[portNum] void connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -258,49 +258,49 @@ class QueuedAsyncProductsTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productRequestOut[portNum] Fw::InputDpRequestPort* get_from_productRequestOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productSendOut[portNum] Fw::InputDpSendPort* get_from_productSendOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -309,7 +309,7 @@ class QueuedAsyncProductsTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -318,42 +318,42 @@ class QueuedAsyncProductsTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -379,17 +379,17 @@ class QueuedAsyncProductsTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -401,7 +401,7 @@ class QueuedAsyncProductsTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -419,17 +419,17 @@ class QueuedAsyncProductsTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -441,7 +441,7 @@ class QueuedAsyncProductsTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -459,32 +459,32 @@ class QueuedAsyncProductsTesterBase : //! Invoke the to port connected to noArgsAsync void invoke_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedAsync void invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -496,7 +496,7 @@ class QueuedAsyncProductsTesterBase : //! Invoke the to port connected to typedAsyncAssert void invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -508,7 +508,7 @@ class QueuedAsyncProductsTesterBase : //! Invoke the to port connected to typedAsyncBlockPriority void invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -520,7 +520,7 @@ class QueuedAsyncProductsTesterBase : //! Invoke the to port connected to typedAsyncDropPriority void invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -532,7 +532,7 @@ class QueuedAsyncProductsTesterBase : //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -544,7 +544,7 @@ class QueuedAsyncProductsTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -556,7 +556,7 @@ class QueuedAsyncProductsTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -568,7 +568,7 @@ class QueuedAsyncProductsTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -587,151 +587,151 @@ class QueuedAsyncProductsTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_productRecvIn ports //! //! \return The number of to_productRecvIn ports - NATIVE_INT_TYPE getNum_to_productRecvIn() const; + FwIndexType getNum_to_productRecvIn() const; //! Get the number of to_noArgsAsync ports //! //! \return The number of to_noArgsAsync ports - NATIVE_INT_TYPE getNum_to_noArgsAsync() const; + FwIndexType getNum_to_noArgsAsync() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedAsync ports //! //! \return The number of to_typedAsync ports - NATIVE_INT_TYPE getNum_to_typedAsync() const; + FwIndexType getNum_to_typedAsync() const; //! Get the number of to_typedAsyncAssert ports //! //! \return The number of to_typedAsyncAssert ports - NATIVE_INT_TYPE getNum_to_typedAsyncAssert() const; + FwIndexType getNum_to_typedAsyncAssert() const; //! Get the number of to_typedAsyncBlockPriority ports //! //! \return The number of to_typedAsyncBlockPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncBlockPriority() const; + FwIndexType getNum_to_typedAsyncBlockPriority() const; //! Get the number of to_typedAsyncDropPriority ports //! //! \return The number of to_typedAsyncDropPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncDropPriority() const; + FwIndexType getNum_to_typedAsyncDropPriority() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; //! Get the number of from_productRequestOut ports //! //! \return The number of from_productRequestOut ports - NATIVE_INT_TYPE getNum_from_productRequestOut() const; + FwIndexType getNum_from_productRequestOut() const; //! Get the number of from_productSendOut ports //! //! \return The number of from_productSendOut ports - NATIVE_INT_TYPE getNum_from_productSendOut() const; + FwIndexType getNum_from_productSendOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -743,105 +743,105 @@ class QueuedAsyncProductsTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_productRecvIn is connected //! //! \return Whether port to_productRecvIn is connected bool isConnected_to_productRecvIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsAsync is connected //! //! \return Whether port to_noArgsAsync is connected bool isConnected_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsync is connected //! //! \return Whether port to_typedAsync is connected bool isConnected_to_typedAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncAssert is connected //! //! \return Whether port to_typedAsyncAssert is connected bool isConnected_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncBlockPriority is connected //! //! \return Whether port to_typedAsyncBlockPriority is connected bool isConnected_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncDropPriority is connected //! //! \return Whether port to_typedAsyncDropPriority is connected bool isConnected_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -947,7 +947,7 @@ class QueuedAsyncProductsTesterBase : //! Static function for port from_productRequestOut static void from_productRequestOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); @@ -955,7 +955,7 @@ class QueuedAsyncProductsTesterBase : //! Static function for port from_productSendOut static void from_productSendOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -963,26 +963,26 @@ class QueuedAsyncProductsTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -995,7 +995,7 @@ class QueuedAsyncProductsTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedCommandsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedCommandsTesterBase.ref.cpp index 16e5b33b3..3bdadcbf3 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedCommandsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedCommandsTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void QueuedCommandsTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdRegOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdRegOut()); port++ ) { this->m_from_cmdRegOut[port].init(); @@ -45,8 +45,8 @@ void QueuedCommandsTesterBase :: // Connect input port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdResponseOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdResponseOut()); port++ ) { this->m_from_cmdResponseOut[port].init(); @@ -69,8 +69,8 @@ void QueuedCommandsTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -93,8 +93,8 @@ void QueuedCommandsTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -117,8 +117,8 @@ void QueuedCommandsTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -141,8 +141,8 @@ void QueuedCommandsTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -165,8 +165,8 @@ void QueuedCommandsTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -189,8 +189,8 @@ void QueuedCommandsTesterBase :: // Connect output port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_cmdIn()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_cmdIn()); port++ ) { this->m_to_cmdIn[port].init(); @@ -208,8 +208,8 @@ void QueuedCommandsTesterBase :: // Connect output port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsAsync()); port++ ) { this->m_to_noArgsAsync[port].init(); @@ -227,8 +227,8 @@ void QueuedCommandsTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -246,8 +246,8 @@ void QueuedCommandsTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -265,8 +265,8 @@ void QueuedCommandsTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -284,8 +284,8 @@ void QueuedCommandsTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -303,8 +303,8 @@ void QueuedCommandsTesterBase :: // Connect output port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsync()); port++ ) { this->m_to_typedAsync[port].init(); @@ -322,8 +322,8 @@ void QueuedCommandsTesterBase :: // Connect output port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncAssert()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncAssert()); port++ ) { this->m_to_typedAsyncAssert[port].init(); @@ -341,8 +341,8 @@ void QueuedCommandsTesterBase :: // Connect output port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncBlockPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncBlockPriority()); port++ ) { this->m_to_typedAsyncBlockPriority[port].init(); @@ -360,8 +360,8 @@ void QueuedCommandsTesterBase :: // Connect output port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncDropPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncDropPriority()); port++ ) { this->m_to_typedAsyncDropPriority[port].init(); @@ -379,8 +379,8 @@ void QueuedCommandsTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -398,8 +398,8 @@ void QueuedCommandsTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -417,8 +417,8 @@ void QueuedCommandsTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -436,8 +436,8 @@ void QueuedCommandsTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -460,7 +460,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -474,7 +474,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -488,7 +488,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -502,7 +502,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -516,7 +516,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -530,7 +530,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -544,7 +544,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: connect_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -558,7 +558,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -572,7 +572,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -586,7 +586,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -600,7 +600,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -614,7 +614,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -628,7 +628,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -642,7 +642,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -659,7 +659,7 @@ void QueuedCommandsTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* QueuedCommandsTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -670,7 +670,7 @@ Fw::InputCmdRegPort* QueuedCommandsTesterBase :: } Fw::InputCmdResponsePort* QueuedCommandsTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -681,7 +681,7 @@ Fw::InputCmdResponsePort* QueuedCommandsTesterBase :: } Fw::InputLogPort* QueuedCommandsTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -692,7 +692,7 @@ Fw::InputLogPort* QueuedCommandsTesterBase :: } Fw::InputPrmGetPort* QueuedCommandsTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -703,7 +703,7 @@ Fw::InputPrmGetPort* QueuedCommandsTesterBase :: } Fw::InputPrmSetPort* QueuedCommandsTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -716,7 +716,7 @@ Fw::InputPrmSetPort* QueuedCommandsTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* QueuedCommandsTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -729,7 +729,7 @@ Fw::InputLogTextPort* QueuedCommandsTesterBase :: #endif Fw::InputTimePort* QueuedCommandsTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -740,7 +740,7 @@ Fw::InputTimePort* QueuedCommandsTesterBase :: } Fw::InputTlmPort* QueuedCommandsTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -751,7 +751,7 @@ Fw::InputTlmPort* QueuedCommandsTesterBase :: } Ports::InputNoArgsPort* QueuedCommandsTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -762,7 +762,7 @@ Ports::InputNoArgsPort* QueuedCommandsTesterBase :: } Ports::InputNoArgsReturnPort* QueuedCommandsTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -773,7 +773,7 @@ Ports::InputNoArgsReturnPort* QueuedCommandsTesterBase :: } Ports::InputTypedPort* QueuedCommandsTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -784,7 +784,7 @@ Ports::InputTypedPort* QueuedCommandsTesterBase :: } Ports::InputTypedReturnPort* QueuedCommandsTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -832,7 +832,7 @@ QueuedCommandsTesterBase :: // ---------------------------------------------------------------------- void QueuedCommandsTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -843,7 +843,7 @@ void QueuedCommandsTesterBase :: } U32 QueuedCommandsTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -855,7 +855,7 @@ U32 QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -884,7 +884,7 @@ void QueuedCommandsTesterBase :: F32 QueuedCommandsTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -916,7 +916,7 @@ F32 QueuedCommandsTesterBase :: // ---------------------------------------------------------------------- void QueuedCommandsTesterBase :: - invoke_to_noArgsAsync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsAsync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -927,7 +927,7 @@ void QueuedCommandsTesterBase :: } void QueuedCommandsTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -938,7 +938,7 @@ void QueuedCommandsTesterBase :: } U32 QueuedCommandsTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -949,7 +949,7 @@ U32 QueuedCommandsTesterBase :: } U32 QueuedCommandsTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -960,7 +960,7 @@ U32 QueuedCommandsTesterBase :: } void QueuedCommandsTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -972,7 +972,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1000,7 +1000,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1028,7 +1028,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1056,7 +1056,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1084,7 +1084,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1112,7 +1112,7 @@ void QueuedCommandsTesterBase :: F32 QueuedCommandsTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1140,7 +1140,7 @@ F32 QueuedCommandsTesterBase :: F32 QueuedCommandsTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1168,7 +1168,7 @@ F32 QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1198,164 +1198,164 @@ void QueuedCommandsTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_to_noArgsAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); } -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_to_typedAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); } -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_to_typedAsyncAssert() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); } -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_to_typedAsyncBlockPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); } -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_to_typedAsyncDropPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); } -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE QueuedCommandsTesterBase :: +FwIndexType QueuedCommandsTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1363,7 +1363,7 @@ NATIVE_INT_TYPE QueuedCommandsTesterBase :: // ---------------------------------------------------------------------- bool QueuedCommandsTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1374,7 +1374,7 @@ bool QueuedCommandsTesterBase :: } bool QueuedCommandsTesterBase :: - isConnected_to_noArgsAsync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsAsync(), @@ -1385,7 +1385,7 @@ bool QueuedCommandsTesterBase :: } bool QueuedCommandsTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1396,7 +1396,7 @@ bool QueuedCommandsTesterBase :: } bool QueuedCommandsTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1407,7 +1407,7 @@ bool QueuedCommandsTesterBase :: } bool QueuedCommandsTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1418,7 +1418,7 @@ bool QueuedCommandsTesterBase :: } bool QueuedCommandsTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1429,7 +1429,7 @@ bool QueuedCommandsTesterBase :: } bool QueuedCommandsTesterBase :: - isConnected_to_typedAsync(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsync(), @@ -1440,7 +1440,7 @@ bool QueuedCommandsTesterBase :: } bool QueuedCommandsTesterBase :: - isConnected_to_typedAsyncAssert(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncAssert(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncAssert(), @@ -1451,7 +1451,7 @@ bool QueuedCommandsTesterBase :: } bool QueuedCommandsTesterBase :: - isConnected_to_typedAsyncBlockPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncBlockPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncBlockPriority(), @@ -1462,7 +1462,7 @@ bool QueuedCommandsTesterBase :: } bool QueuedCommandsTesterBase :: - isConnected_to_typedAsyncDropPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncDropPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncDropPriority(), @@ -1473,7 +1473,7 @@ bool QueuedCommandsTesterBase :: } bool QueuedCommandsTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1484,7 +1484,7 @@ bool QueuedCommandsTesterBase :: } bool QueuedCommandsTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1495,7 +1495,7 @@ bool QueuedCommandsTesterBase :: } bool QueuedCommandsTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1506,7 +1506,7 @@ bool QueuedCommandsTesterBase :: } bool QueuedCommandsTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1554,7 +1554,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: sendCmd_CMD_SYNC( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -1579,7 +1579,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: sendCmd_CMD_SYNC_PRIMITIVE( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32, F32 f32, @@ -1627,7 +1627,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: sendCmd_CMD_SYNC_STRING( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, const Fw::CmdStringArg& str1, const Fw::CmdStringArg& str2 @@ -1668,7 +1668,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: sendCmd_CMD_SYNC_ENUM( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, E e ) @@ -1702,7 +1702,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: sendCmd_CMD_SYNC_ARRAY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, A a ) @@ -1736,7 +1736,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: sendCmd_CMD_SYNC_STRUCT( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, S s ) @@ -1770,7 +1770,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: sendCmd_CMD_GUARDED( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -1795,7 +1795,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: sendCmd_CMD_GUARDED_PRIMITIVE( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32, F32 f32, @@ -1843,7 +1843,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: sendCmd_CMD_GUARDED_STRING( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, const Fw::CmdStringArg& str1, const Fw::CmdStringArg& str2 @@ -1884,7 +1884,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: sendCmd_CMD_GUARDED_ENUM( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, E e ) @@ -1918,7 +1918,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: sendCmd_CMD_GUARDED_ARRAY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, A a ) @@ -1952,7 +1952,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: sendCmd_CMD_GUARDED_STRUCT( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, S s ) @@ -1986,7 +1986,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: sendCmd_CMD_ASYNC( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2011,7 +2011,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: sendCmd_CMD_PRIORITY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2036,7 +2036,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: sendCmd_CMD_PARAMS_PRIORITY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32 ) @@ -2070,7 +2070,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: sendCmd_CMD_DROP( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2095,7 +2095,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: sendCmd_CMD_PARAMS_PRIORITY_DROP( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32 ) @@ -2227,7 +2227,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode ) { @@ -2237,7 +2237,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, const Fw::CmdResponse& response @@ -2250,7 +2250,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -2261,7 +2261,7 @@ void QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -2272,7 +2272,7 @@ void QueuedCommandsTesterBase :: U32 QueuedCommandsTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -2283,7 +2283,7 @@ U32 QueuedCommandsTesterBase :: void QueuedCommandsTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2310,7 +2310,7 @@ void QueuedCommandsTesterBase :: F32 QueuedCommandsTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedCommandsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedCommandsTesterBase.ref.hpp index a67a003bf..4fa35f553 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedCommandsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedCommandsTesterBase.ref.hpp @@ -143,7 +143,7 @@ class QueuedCommandsTesterBase : //! Initialize object QueuedCommandsTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -154,85 +154,85 @@ class QueuedCommandsTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to noArgsAsync[portNum] void connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedAsync[portNum] void connect_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncAssert[portNum] void connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncBlockPriority[portNum] void connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncDropPriority[portNum] void connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -246,35 +246,35 @@ class QueuedCommandsTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -283,7 +283,7 @@ class QueuedCommandsTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -292,42 +292,42 @@ class QueuedCommandsTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -353,17 +353,17 @@ class QueuedCommandsTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -375,7 +375,7 @@ class QueuedCommandsTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -393,17 +393,17 @@ class QueuedCommandsTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -415,7 +415,7 @@ class QueuedCommandsTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -433,32 +433,32 @@ class QueuedCommandsTesterBase : //! Invoke the to port connected to noArgsAsync void invoke_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedAsync void invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -470,7 +470,7 @@ class QueuedCommandsTesterBase : //! Invoke the to port connected to typedAsyncAssert void invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -482,7 +482,7 @@ class QueuedCommandsTesterBase : //! Invoke the to port connected to typedAsyncBlockPriority void invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -494,7 +494,7 @@ class QueuedCommandsTesterBase : //! Invoke the to port connected to typedAsyncDropPriority void invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -506,7 +506,7 @@ class QueuedCommandsTesterBase : //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -518,7 +518,7 @@ class QueuedCommandsTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -530,7 +530,7 @@ class QueuedCommandsTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -542,7 +542,7 @@ class QueuedCommandsTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -561,136 +561,136 @@ class QueuedCommandsTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_noArgsAsync ports //! //! \return The number of to_noArgsAsync ports - NATIVE_INT_TYPE getNum_to_noArgsAsync() const; + FwIndexType getNum_to_noArgsAsync() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedAsync ports //! //! \return The number of to_typedAsync ports - NATIVE_INT_TYPE getNum_to_typedAsync() const; + FwIndexType getNum_to_typedAsync() const; //! Get the number of to_typedAsyncAssert ports //! //! \return The number of to_typedAsyncAssert ports - NATIVE_INT_TYPE getNum_to_typedAsyncAssert() const; + FwIndexType getNum_to_typedAsyncAssert() const; //! Get the number of to_typedAsyncBlockPriority ports //! //! \return The number of to_typedAsyncBlockPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncBlockPriority() const; + FwIndexType getNum_to_typedAsyncBlockPriority() const; //! Get the number of to_typedAsyncDropPriority ports //! //! \return The number of to_typedAsyncDropPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncDropPriority() const; + FwIndexType getNum_to_typedAsyncDropPriority() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -702,98 +702,98 @@ class QueuedCommandsTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsAsync is connected //! //! \return Whether port to_noArgsAsync is connected bool isConnected_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsync is connected //! //! \return Whether port to_typedAsync is connected bool isConnected_to_typedAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncAssert is connected //! //! \return Whether port to_typedAsyncAssert is connected bool isConnected_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncBlockPriority is connected //! //! \return Whether port to_typedAsyncBlockPriority is connected bool isConnected_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncDropPriority is connected //! //! \return Whether port to_typedAsyncDropPriority is connected bool isConnected_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -818,13 +818,13 @@ class QueuedCommandsTesterBase : //! Send a CMD_SYNC command void sendCmd_CMD_SYNC( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_SYNC_PRIMITIVE command void sendCmd_CMD_SYNC_PRIMITIVE( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32, //!< A U32 F32 f32, //!< An F32 @@ -833,7 +833,7 @@ class QueuedCommandsTesterBase : //! Send a CMD_SYNC_STRING command void sendCmd_CMD_SYNC_STRING( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number const Fw::CmdStringArg& str1, //!< A string const Fw::CmdStringArg& str2 //!< Another string @@ -841,34 +841,34 @@ class QueuedCommandsTesterBase : //! Send a CMD_SYNC_ENUM command void sendCmd_CMD_SYNC_ENUM( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number E e //!< An enum ); //! Send a CMD_SYNC_ARRAY command void sendCmd_CMD_SYNC_ARRAY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number A a //!< An array ); //! Send a CMD_SYNC_STRUCT command void sendCmd_CMD_SYNC_STRUCT( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number S s //!< A struct ); //! Send a CMD_GUARDED command void sendCmd_CMD_GUARDED( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_GUARDED_PRIMITIVE command void sendCmd_CMD_GUARDED_PRIMITIVE( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32, //!< A U32 F32 f32, //!< An F32 @@ -877,7 +877,7 @@ class QueuedCommandsTesterBase : //! Send a CMD_GUARDED_STRING command void sendCmd_CMD_GUARDED_STRING( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number const Fw::CmdStringArg& str1, //!< A string const Fw::CmdStringArg& str2 //!< Another string @@ -885,53 +885,53 @@ class QueuedCommandsTesterBase : //! Send a CMD_GUARDED_ENUM command void sendCmd_CMD_GUARDED_ENUM( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number E e //!< An enum ); //! Send a CMD_GUARDED_ARRAY command void sendCmd_CMD_GUARDED_ARRAY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number A a //!< An array ); //! Send a CMD_GUARDED_STRUCT command void sendCmd_CMD_GUARDED_STRUCT( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number S s //!< A struct ); //! Send a CMD_ASYNC command void sendCmd_CMD_ASYNC( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_PRIORITY command void sendCmd_CMD_PRIORITY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_PARAMS_PRIORITY command void sendCmd_CMD_PARAMS_PRIORITY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32 ); //! Send a CMD_DROP command void sendCmd_CMD_DROP( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_PARAMS_PRIORITY_DROP command void sendCmd_CMD_PARAMS_PRIORITY_DROP( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32 ); @@ -996,14 +996,14 @@ class QueuedCommandsTesterBase : //! Static function for port from_cmdRegOut static void from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode //!< Command Op Code ); //! Static function for port from_cmdResponseOut static void from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence const Fw::CmdResponse& response //!< The command response argument @@ -1012,26 +1012,26 @@ class QueuedCommandsTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1044,7 +1044,7 @@ class QueuedCommandsTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedEventsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedEventsTesterBase.ref.cpp index 6ddbc8d0a..e32b6480b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedEventsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedEventsTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void QueuedEventsTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_eventOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_eventOut()); port++ ) { this->m_from_eventOut[port].init(); @@ -46,8 +46,8 @@ void QueuedEventsTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect input port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_textEventOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_textEventOut()); port++ ) { this->m_from_textEventOut[port].init(); @@ -71,8 +71,8 @@ void QueuedEventsTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -95,8 +95,8 @@ void QueuedEventsTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -119,8 +119,8 @@ void QueuedEventsTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -143,8 +143,8 @@ void QueuedEventsTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -167,8 +167,8 @@ void QueuedEventsTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -191,8 +191,8 @@ void QueuedEventsTesterBase :: // Connect output port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsAsync()); port++ ) { this->m_to_noArgsAsync[port].init(); @@ -210,8 +210,8 @@ void QueuedEventsTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -229,8 +229,8 @@ void QueuedEventsTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -248,8 +248,8 @@ void QueuedEventsTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -267,8 +267,8 @@ void QueuedEventsTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -286,8 +286,8 @@ void QueuedEventsTesterBase :: // Connect output port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsync()); port++ ) { this->m_to_typedAsync[port].init(); @@ -305,8 +305,8 @@ void QueuedEventsTesterBase :: // Connect output port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncAssert()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncAssert()); port++ ) { this->m_to_typedAsyncAssert[port].init(); @@ -324,8 +324,8 @@ void QueuedEventsTesterBase :: // Connect output port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncBlockPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncBlockPriority()); port++ ) { this->m_to_typedAsyncBlockPriority[port].init(); @@ -343,8 +343,8 @@ void QueuedEventsTesterBase :: // Connect output port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncDropPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncDropPriority()); port++ ) { this->m_to_typedAsyncDropPriority[port].init(); @@ -362,8 +362,8 @@ void QueuedEventsTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -381,8 +381,8 @@ void QueuedEventsTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -400,8 +400,8 @@ void QueuedEventsTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -419,8 +419,8 @@ void QueuedEventsTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -443,7 +443,7 @@ void QueuedEventsTesterBase :: void QueuedEventsTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -457,7 +457,7 @@ void QueuedEventsTesterBase :: void QueuedEventsTesterBase :: connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -471,7 +471,7 @@ void QueuedEventsTesterBase :: void QueuedEventsTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -485,7 +485,7 @@ void QueuedEventsTesterBase :: void QueuedEventsTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -499,7 +499,7 @@ void QueuedEventsTesterBase :: void QueuedEventsTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -513,7 +513,7 @@ void QueuedEventsTesterBase :: void QueuedEventsTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -527,7 +527,7 @@ void QueuedEventsTesterBase :: void QueuedEventsTesterBase :: connect_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -541,7 +541,7 @@ void QueuedEventsTesterBase :: void QueuedEventsTesterBase :: connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -555,7 +555,7 @@ void QueuedEventsTesterBase :: void QueuedEventsTesterBase :: connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -569,7 +569,7 @@ void QueuedEventsTesterBase :: void QueuedEventsTesterBase :: connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -583,7 +583,7 @@ void QueuedEventsTesterBase :: void QueuedEventsTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -597,7 +597,7 @@ void QueuedEventsTesterBase :: void QueuedEventsTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -611,7 +611,7 @@ void QueuedEventsTesterBase :: void QueuedEventsTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -625,7 +625,7 @@ void QueuedEventsTesterBase :: void QueuedEventsTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -642,7 +642,7 @@ void QueuedEventsTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* QueuedEventsTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -653,7 +653,7 @@ Fw::InputCmdRegPort* QueuedEventsTesterBase :: } Fw::InputCmdResponsePort* QueuedEventsTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -664,7 +664,7 @@ Fw::InputCmdResponsePort* QueuedEventsTesterBase :: } Fw::InputLogPort* QueuedEventsTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -675,7 +675,7 @@ Fw::InputLogPort* QueuedEventsTesterBase :: } Fw::InputPrmGetPort* QueuedEventsTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -686,7 +686,7 @@ Fw::InputPrmGetPort* QueuedEventsTesterBase :: } Fw::InputPrmSetPort* QueuedEventsTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -699,7 +699,7 @@ Fw::InputPrmSetPort* QueuedEventsTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* QueuedEventsTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -712,7 +712,7 @@ Fw::InputLogTextPort* QueuedEventsTesterBase :: #endif Fw::InputTimePort* QueuedEventsTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -723,7 +723,7 @@ Fw::InputTimePort* QueuedEventsTesterBase :: } Fw::InputTlmPort* QueuedEventsTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -734,7 +734,7 @@ Fw::InputTlmPort* QueuedEventsTesterBase :: } Ports::InputNoArgsPort* QueuedEventsTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -745,7 +745,7 @@ Ports::InputNoArgsPort* QueuedEventsTesterBase :: } Ports::InputNoArgsReturnPort* QueuedEventsTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -756,7 +756,7 @@ Ports::InputNoArgsReturnPort* QueuedEventsTesterBase :: } Ports::InputTypedPort* QueuedEventsTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -767,7 +767,7 @@ Ports::InputTypedPort* QueuedEventsTesterBase :: } Ports::InputTypedReturnPort* QueuedEventsTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -829,7 +829,7 @@ QueuedEventsTesterBase :: // ---------------------------------------------------------------------- void QueuedEventsTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -840,7 +840,7 @@ void QueuedEventsTesterBase :: } U32 QueuedEventsTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -852,7 +852,7 @@ U32 QueuedEventsTesterBase :: void QueuedEventsTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -881,7 +881,7 @@ void QueuedEventsTesterBase :: F32 QueuedEventsTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -913,7 +913,7 @@ F32 QueuedEventsTesterBase :: // ---------------------------------------------------------------------- void QueuedEventsTesterBase :: - invoke_to_noArgsAsync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsAsync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -924,7 +924,7 @@ void QueuedEventsTesterBase :: } void QueuedEventsTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -935,7 +935,7 @@ void QueuedEventsTesterBase :: } U32 QueuedEventsTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -946,7 +946,7 @@ U32 QueuedEventsTesterBase :: } U32 QueuedEventsTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -957,7 +957,7 @@ U32 QueuedEventsTesterBase :: } void QueuedEventsTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -969,7 +969,7 @@ void QueuedEventsTesterBase :: void QueuedEventsTesterBase :: invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -997,7 +997,7 @@ void QueuedEventsTesterBase :: void QueuedEventsTesterBase :: invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1025,7 +1025,7 @@ void QueuedEventsTesterBase :: void QueuedEventsTesterBase :: invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1053,7 +1053,7 @@ void QueuedEventsTesterBase :: void QueuedEventsTesterBase :: invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1081,7 +1081,7 @@ void QueuedEventsTesterBase :: void QueuedEventsTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1109,7 +1109,7 @@ void QueuedEventsTesterBase :: F32 QueuedEventsTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1137,7 +1137,7 @@ F32 QueuedEventsTesterBase :: F32 QueuedEventsTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1165,7 +1165,7 @@ F32 QueuedEventsTesterBase :: void QueuedEventsTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1195,164 +1195,164 @@ void QueuedEventsTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_to_noArgsAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); } -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_to_typedAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); } -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_to_typedAsyncAssert() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); } -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_to_typedAsyncBlockPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); } -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_to_typedAsyncDropPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); } -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE QueuedEventsTesterBase :: +FwIndexType QueuedEventsTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1360,7 +1360,7 @@ NATIVE_INT_TYPE QueuedEventsTesterBase :: // ---------------------------------------------------------------------- bool QueuedEventsTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1371,7 +1371,7 @@ bool QueuedEventsTesterBase :: } bool QueuedEventsTesterBase :: - isConnected_to_noArgsAsync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsAsync(), @@ -1382,7 +1382,7 @@ bool QueuedEventsTesterBase :: } bool QueuedEventsTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1393,7 +1393,7 @@ bool QueuedEventsTesterBase :: } bool QueuedEventsTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1404,7 +1404,7 @@ bool QueuedEventsTesterBase :: } bool QueuedEventsTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1415,7 +1415,7 @@ bool QueuedEventsTesterBase :: } bool QueuedEventsTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1426,7 +1426,7 @@ bool QueuedEventsTesterBase :: } bool QueuedEventsTesterBase :: - isConnected_to_typedAsync(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsync(), @@ -1437,7 +1437,7 @@ bool QueuedEventsTesterBase :: } bool QueuedEventsTesterBase :: - isConnected_to_typedAsyncAssert(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncAssert(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncAssert(), @@ -1448,7 +1448,7 @@ bool QueuedEventsTesterBase :: } bool QueuedEventsTesterBase :: - isConnected_to_typedAsyncBlockPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncBlockPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncBlockPriority(), @@ -1459,7 +1459,7 @@ bool QueuedEventsTesterBase :: } bool QueuedEventsTesterBase :: - isConnected_to_typedAsyncDropPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncDropPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncDropPriority(), @@ -1470,7 +1470,7 @@ bool QueuedEventsTesterBase :: } bool QueuedEventsTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1481,7 +1481,7 @@ bool QueuedEventsTesterBase :: } bool QueuedEventsTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1492,7 +1492,7 @@ bool QueuedEventsTesterBase :: } bool QueuedEventsTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1503,7 +1503,7 @@ bool QueuedEventsTesterBase :: } bool QueuedEventsTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -2095,7 +2095,7 @@ void QueuedEventsTesterBase :: void QueuedEventsTesterBase :: from_eventOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwEventIdType id, Fw::Time& timeTag, const Fw::LogSeverity& severity, @@ -2111,7 +2111,7 @@ void QueuedEventsTesterBase :: void QueuedEventsTesterBase :: from_textEventOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwEventIdType id, Fw::Time& timeTag, const Fw::LogSeverity& severity, @@ -2127,7 +2127,7 @@ void QueuedEventsTesterBase :: void QueuedEventsTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -2138,7 +2138,7 @@ void QueuedEventsTesterBase :: void QueuedEventsTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -2149,7 +2149,7 @@ void QueuedEventsTesterBase :: U32 QueuedEventsTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -2160,7 +2160,7 @@ U32 QueuedEventsTesterBase :: void QueuedEventsTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2187,7 +2187,7 @@ void QueuedEventsTesterBase :: F32 QueuedEventsTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedEventsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedEventsTesterBase.ref.hpp index d1a7af7f5..a35b54241 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedEventsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedEventsTesterBase.ref.hpp @@ -176,7 +176,7 @@ class QueuedEventsTesterBase : //! Initialize object QueuedEventsTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -187,85 +187,85 @@ class QueuedEventsTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to noArgsAsync[portNum] void connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedAsync[portNum] void connect_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncAssert[portNum] void connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncBlockPriority[portNum] void connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncDropPriority[portNum] void connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -279,35 +279,35 @@ class QueuedEventsTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -316,7 +316,7 @@ class QueuedEventsTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -325,42 +325,42 @@ class QueuedEventsTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -386,17 +386,17 @@ class QueuedEventsTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -408,7 +408,7 @@ class QueuedEventsTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -426,17 +426,17 @@ class QueuedEventsTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -448,7 +448,7 @@ class QueuedEventsTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -466,32 +466,32 @@ class QueuedEventsTesterBase : //! Invoke the to port connected to noArgsAsync void invoke_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedAsync void invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -503,7 +503,7 @@ class QueuedEventsTesterBase : //! Invoke the to port connected to typedAsyncAssert void invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -515,7 +515,7 @@ class QueuedEventsTesterBase : //! Invoke the to port connected to typedAsyncBlockPriority void invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -527,7 +527,7 @@ class QueuedEventsTesterBase : //! Invoke the to port connected to typedAsyncDropPriority void invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -539,7 +539,7 @@ class QueuedEventsTesterBase : //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -551,7 +551,7 @@ class QueuedEventsTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -563,7 +563,7 @@ class QueuedEventsTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -575,7 +575,7 @@ class QueuedEventsTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -594,136 +594,136 @@ class QueuedEventsTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_noArgsAsync ports //! //! \return The number of to_noArgsAsync ports - NATIVE_INT_TYPE getNum_to_noArgsAsync() const; + FwIndexType getNum_to_noArgsAsync() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedAsync ports //! //! \return The number of to_typedAsync ports - NATIVE_INT_TYPE getNum_to_typedAsync() const; + FwIndexType getNum_to_typedAsync() const; //! Get the number of to_typedAsyncAssert ports //! //! \return The number of to_typedAsyncAssert ports - NATIVE_INT_TYPE getNum_to_typedAsyncAssert() const; + FwIndexType getNum_to_typedAsyncAssert() const; //! Get the number of to_typedAsyncBlockPriority ports //! //! \return The number of to_typedAsyncBlockPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncBlockPriority() const; + FwIndexType getNum_to_typedAsyncBlockPriority() const; //! Get the number of to_typedAsyncDropPriority ports //! //! \return The number of to_typedAsyncDropPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncDropPriority() const; + FwIndexType getNum_to_typedAsyncDropPriority() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -735,98 +735,98 @@ class QueuedEventsTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsAsync is connected //! //! \return Whether port to_noArgsAsync is connected bool isConnected_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsync is connected //! //! \return Whether port to_typedAsync is connected bool isConnected_to_typedAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncAssert is connected //! //! \return Whether port to_typedAsyncAssert is connected bool isConnected_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncBlockPriority is connected //! //! \return Whether port to_typedAsyncBlockPriority is connected bool isConnected_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncDropPriority is connected //! //! \return Whether port to_typedAsyncDropPriority is connected bool isConnected_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -965,7 +965,7 @@ class QueuedEventsTesterBase : //! Static function for port from_eventOut static void from_eventOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwEventIdType id, //!< Log ID Fw::Time& timeTag, //!< Time Tag const Fw::LogSeverity& severity, //!< The severity argument @@ -977,7 +977,7 @@ class QueuedEventsTesterBase : //! Static function for port from_textEventOut static void from_textEventOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwEventIdType id, //!< Log ID Fw::Time& timeTag, //!< Time Tag const Fw::LogSeverity& severity, //!< The severity argument @@ -989,26 +989,26 @@ class QueuedEventsTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1021,7 +1021,7 @@ class QueuedEventsTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGetProductsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGetProductsTesterBase.ref.cpp index e6b1289e1..610d965ed 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGetProductsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGetProductsTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void QueuedGetProductsTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port productGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productGetOut()); port++ ) { this->m_from_productGetOut[port].init(); @@ -45,8 +45,8 @@ void QueuedGetProductsTesterBase :: // Connect input port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productSendOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productSendOut()); port++ ) { this->m_from_productSendOut[port].init(); @@ -69,8 +69,8 @@ void QueuedGetProductsTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -93,8 +93,8 @@ void QueuedGetProductsTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -117,8 +117,8 @@ void QueuedGetProductsTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -141,8 +141,8 @@ void QueuedGetProductsTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -165,8 +165,8 @@ void QueuedGetProductsTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -189,8 +189,8 @@ void QueuedGetProductsTesterBase :: // Connect output port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsAsync()); port++ ) { this->m_to_noArgsAsync[port].init(); @@ -208,8 +208,8 @@ void QueuedGetProductsTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -227,8 +227,8 @@ void QueuedGetProductsTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -246,8 +246,8 @@ void QueuedGetProductsTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -265,8 +265,8 @@ void QueuedGetProductsTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -284,8 +284,8 @@ void QueuedGetProductsTesterBase :: // Connect output port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsync()); port++ ) { this->m_to_typedAsync[port].init(); @@ -303,8 +303,8 @@ void QueuedGetProductsTesterBase :: // Connect output port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncAssert()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncAssert()); port++ ) { this->m_to_typedAsyncAssert[port].init(); @@ -322,8 +322,8 @@ void QueuedGetProductsTesterBase :: // Connect output port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncBlockPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncBlockPriority()); port++ ) { this->m_to_typedAsyncBlockPriority[port].init(); @@ -341,8 +341,8 @@ void QueuedGetProductsTesterBase :: // Connect output port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncDropPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncDropPriority()); port++ ) { this->m_to_typedAsyncDropPriority[port].init(); @@ -360,8 +360,8 @@ void QueuedGetProductsTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -379,8 +379,8 @@ void QueuedGetProductsTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -398,8 +398,8 @@ void QueuedGetProductsTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -417,8 +417,8 @@ void QueuedGetProductsTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -441,7 +441,7 @@ void QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -455,7 +455,7 @@ void QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -469,7 +469,7 @@ void QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -483,7 +483,7 @@ void QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -497,7 +497,7 @@ void QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -511,7 +511,7 @@ void QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -525,7 +525,7 @@ void QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: connect_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -539,7 +539,7 @@ void QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -553,7 +553,7 @@ void QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -567,7 +567,7 @@ void QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -581,7 +581,7 @@ void QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -595,7 +595,7 @@ void QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -609,7 +609,7 @@ void QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -623,7 +623,7 @@ void QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -640,7 +640,7 @@ void QueuedGetProductsTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* QueuedGetProductsTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -651,7 +651,7 @@ Fw::InputCmdRegPort* QueuedGetProductsTesterBase :: } Fw::InputCmdResponsePort* QueuedGetProductsTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -662,7 +662,7 @@ Fw::InputCmdResponsePort* QueuedGetProductsTesterBase :: } Fw::InputLogPort* QueuedGetProductsTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -673,7 +673,7 @@ Fw::InputLogPort* QueuedGetProductsTesterBase :: } Fw::InputPrmGetPort* QueuedGetProductsTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -684,7 +684,7 @@ Fw::InputPrmGetPort* QueuedGetProductsTesterBase :: } Fw::InputPrmSetPort* QueuedGetProductsTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -695,7 +695,7 @@ Fw::InputPrmSetPort* QueuedGetProductsTesterBase :: } Fw::InputDpGetPort* QueuedGetProductsTesterBase :: - get_from_productGetOut(NATIVE_INT_TYPE portNum) + get_from_productGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productGetOut(), @@ -706,7 +706,7 @@ Fw::InputDpGetPort* QueuedGetProductsTesterBase :: } Fw::InputDpSendPort* QueuedGetProductsTesterBase :: - get_from_productSendOut(NATIVE_INT_TYPE portNum) + get_from_productSendOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productSendOut(), @@ -719,7 +719,7 @@ Fw::InputDpSendPort* QueuedGetProductsTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* QueuedGetProductsTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -732,7 +732,7 @@ Fw::InputLogTextPort* QueuedGetProductsTesterBase :: #endif Fw::InputTimePort* QueuedGetProductsTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -743,7 +743,7 @@ Fw::InputTimePort* QueuedGetProductsTesterBase :: } Fw::InputTlmPort* QueuedGetProductsTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -754,7 +754,7 @@ Fw::InputTlmPort* QueuedGetProductsTesterBase :: } Ports::InputNoArgsPort* QueuedGetProductsTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -765,7 +765,7 @@ Ports::InputNoArgsPort* QueuedGetProductsTesterBase :: } Ports::InputNoArgsReturnPort* QueuedGetProductsTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -776,7 +776,7 @@ Ports::InputNoArgsReturnPort* QueuedGetProductsTesterBase :: } Ports::InputTypedPort* QueuedGetProductsTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -787,7 +787,7 @@ Ports::InputTypedPort* QueuedGetProductsTesterBase :: } Ports::InputTypedReturnPort* QueuedGetProductsTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -837,7 +837,7 @@ QueuedGetProductsTesterBase :: // ---------------------------------------------------------------------- void QueuedGetProductsTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -848,7 +848,7 @@ void QueuedGetProductsTesterBase :: } U32 QueuedGetProductsTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -860,7 +860,7 @@ U32 QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -889,7 +889,7 @@ void QueuedGetProductsTesterBase :: F32 QueuedGetProductsTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -921,7 +921,7 @@ F32 QueuedGetProductsTesterBase :: // ---------------------------------------------------------------------- void QueuedGetProductsTesterBase :: - invoke_to_noArgsAsync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsAsync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -932,7 +932,7 @@ void QueuedGetProductsTesterBase :: } void QueuedGetProductsTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -943,7 +943,7 @@ void QueuedGetProductsTesterBase :: } U32 QueuedGetProductsTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -954,7 +954,7 @@ U32 QueuedGetProductsTesterBase :: } U32 QueuedGetProductsTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -965,7 +965,7 @@ U32 QueuedGetProductsTesterBase :: } void QueuedGetProductsTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -977,7 +977,7 @@ void QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1005,7 +1005,7 @@ void QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1033,7 +1033,7 @@ void QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1061,7 +1061,7 @@ void QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1089,7 +1089,7 @@ void QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1117,7 +1117,7 @@ void QueuedGetProductsTesterBase :: F32 QueuedGetProductsTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1145,7 +1145,7 @@ F32 QueuedGetProductsTesterBase :: F32 QueuedGetProductsTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1173,7 +1173,7 @@ F32 QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1203,176 +1203,176 @@ void QueuedGetProductsTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_to_noArgsAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_to_typedAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_to_typedAsyncAssert() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_to_typedAsyncBlockPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_to_typedAsyncDropPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_from_productGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productGetOut)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_from_productSendOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE QueuedGetProductsTesterBase :: +FwIndexType QueuedGetProductsTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1380,7 +1380,7 @@ NATIVE_INT_TYPE QueuedGetProductsTesterBase :: // ---------------------------------------------------------------------- bool QueuedGetProductsTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1391,7 +1391,7 @@ bool QueuedGetProductsTesterBase :: } bool QueuedGetProductsTesterBase :: - isConnected_to_noArgsAsync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsAsync(), @@ -1402,7 +1402,7 @@ bool QueuedGetProductsTesterBase :: } bool QueuedGetProductsTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1413,7 +1413,7 @@ bool QueuedGetProductsTesterBase :: } bool QueuedGetProductsTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1424,7 +1424,7 @@ bool QueuedGetProductsTesterBase :: } bool QueuedGetProductsTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1435,7 +1435,7 @@ bool QueuedGetProductsTesterBase :: } bool QueuedGetProductsTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1446,7 +1446,7 @@ bool QueuedGetProductsTesterBase :: } bool QueuedGetProductsTesterBase :: - isConnected_to_typedAsync(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsync(), @@ -1457,7 +1457,7 @@ bool QueuedGetProductsTesterBase :: } bool QueuedGetProductsTesterBase :: - isConnected_to_typedAsyncAssert(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncAssert(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncAssert(), @@ -1468,7 +1468,7 @@ bool QueuedGetProductsTesterBase :: } bool QueuedGetProductsTesterBase :: - isConnected_to_typedAsyncBlockPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncBlockPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncBlockPriority(), @@ -1479,7 +1479,7 @@ bool QueuedGetProductsTesterBase :: } bool QueuedGetProductsTesterBase :: - isConnected_to_typedAsyncDropPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncDropPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncDropPriority(), @@ -1490,7 +1490,7 @@ bool QueuedGetProductsTesterBase :: } bool QueuedGetProductsTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1501,7 +1501,7 @@ bool QueuedGetProductsTesterBase :: } bool QueuedGetProductsTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1512,7 +1512,7 @@ bool QueuedGetProductsTesterBase :: } bool QueuedGetProductsTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1523,7 +1523,7 @@ bool QueuedGetProductsTesterBase :: } bool QueuedGetProductsTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1679,7 +1679,7 @@ void QueuedGetProductsTesterBase :: Fw::Success QueuedGetProductsTesterBase :: from_productGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize, Fw::Buffer& buffer @@ -1692,7 +1692,7 @@ Fw::Success QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: from_productSendOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -1704,7 +1704,7 @@ void QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -1715,7 +1715,7 @@ void QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1726,7 +1726,7 @@ void QueuedGetProductsTesterBase :: U32 QueuedGetProductsTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1737,7 +1737,7 @@ U32 QueuedGetProductsTesterBase :: void QueuedGetProductsTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1764,7 +1764,7 @@ void QueuedGetProductsTesterBase :: F32 QueuedGetProductsTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGetProductsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGetProductsTesterBase.ref.hpp index 4a993382c..60c38541d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGetProductsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGetProductsTesterBase.ref.hpp @@ -149,7 +149,7 @@ class QueuedGetProductsTesterBase : //! Initialize object QueuedGetProductsTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -160,85 +160,85 @@ class QueuedGetProductsTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to noArgsAsync[portNum] void connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedAsync[portNum] void connect_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncAssert[portNum] void connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncBlockPriority[portNum] void connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncDropPriority[portNum] void connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -252,49 +252,49 @@ class QueuedGetProductsTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productGetOut[portNum] Fw::InputDpGetPort* get_from_productGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productSendOut[portNum] Fw::InputDpSendPort* get_from_productSendOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -303,7 +303,7 @@ class QueuedGetProductsTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -312,42 +312,42 @@ class QueuedGetProductsTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -373,17 +373,17 @@ class QueuedGetProductsTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -395,7 +395,7 @@ class QueuedGetProductsTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -413,17 +413,17 @@ class QueuedGetProductsTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -435,7 +435,7 @@ class QueuedGetProductsTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -453,32 +453,32 @@ class QueuedGetProductsTesterBase : //! Invoke the to port connected to noArgsAsync void invoke_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedAsync void invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -490,7 +490,7 @@ class QueuedGetProductsTesterBase : //! Invoke the to port connected to typedAsyncAssert void invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -502,7 +502,7 @@ class QueuedGetProductsTesterBase : //! Invoke the to port connected to typedAsyncBlockPriority void invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -514,7 +514,7 @@ class QueuedGetProductsTesterBase : //! Invoke the to port connected to typedAsyncDropPriority void invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -526,7 +526,7 @@ class QueuedGetProductsTesterBase : //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -538,7 +538,7 @@ class QueuedGetProductsTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -550,7 +550,7 @@ class QueuedGetProductsTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -562,7 +562,7 @@ class QueuedGetProductsTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -581,146 +581,146 @@ class QueuedGetProductsTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_noArgsAsync ports //! //! \return The number of to_noArgsAsync ports - NATIVE_INT_TYPE getNum_to_noArgsAsync() const; + FwIndexType getNum_to_noArgsAsync() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedAsync ports //! //! \return The number of to_typedAsync ports - NATIVE_INT_TYPE getNum_to_typedAsync() const; + FwIndexType getNum_to_typedAsync() const; //! Get the number of to_typedAsyncAssert ports //! //! \return The number of to_typedAsyncAssert ports - NATIVE_INT_TYPE getNum_to_typedAsyncAssert() const; + FwIndexType getNum_to_typedAsyncAssert() const; //! Get the number of to_typedAsyncBlockPriority ports //! //! \return The number of to_typedAsyncBlockPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncBlockPriority() const; + FwIndexType getNum_to_typedAsyncBlockPriority() const; //! Get the number of to_typedAsyncDropPriority ports //! //! \return The number of to_typedAsyncDropPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncDropPriority() const; + FwIndexType getNum_to_typedAsyncDropPriority() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; //! Get the number of from_productGetOut ports //! //! \return The number of from_productGetOut ports - NATIVE_INT_TYPE getNum_from_productGetOut() const; + FwIndexType getNum_from_productGetOut() const; //! Get the number of from_productSendOut ports //! //! \return The number of from_productSendOut ports - NATIVE_INT_TYPE getNum_from_productSendOut() const; + FwIndexType getNum_from_productSendOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -732,98 +732,98 @@ class QueuedGetProductsTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsAsync is connected //! //! \return Whether port to_noArgsAsync is connected bool isConnected_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsync is connected //! //! \return Whether port to_typedAsync is connected bool isConnected_to_typedAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncAssert is connected //! //! \return Whether port to_typedAsyncAssert is connected bool isConnected_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncBlockPriority is connected //! //! \return Whether port to_typedAsyncBlockPriority is connected bool isConnected_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncDropPriority is connected //! //! \return Whether port to_typedAsyncDropPriority is connected bool isConnected_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -924,7 +924,7 @@ class QueuedGetProductsTesterBase : //! Static function for port from_productGetOut static Fw::Success from_productGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID (input) FwSizeType dataSize, //!< The data size of the requested buffer (input) Fw::Buffer& buffer //!< The buffer (output) @@ -933,7 +933,7 @@ class QueuedGetProductsTesterBase : //! Static function for port from_productSendOut static void from_productSendOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -941,26 +941,26 @@ class QueuedGetProductsTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -973,7 +973,7 @@ class QueuedGetProductsTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGuardedProductsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGuardedProductsTesterBase.ref.cpp index 51b23d7ef..299ceb35f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGuardedProductsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGuardedProductsTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void QueuedGuardedProductsTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productRequestOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productRequestOut()); port++ ) { this->m_from_productRequestOut[port].init(); @@ -45,8 +45,8 @@ void QueuedGuardedProductsTesterBase :: // Connect input port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productSendOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productSendOut()); port++ ) { this->m_from_productSendOut[port].init(); @@ -69,8 +69,8 @@ void QueuedGuardedProductsTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -93,8 +93,8 @@ void QueuedGuardedProductsTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -117,8 +117,8 @@ void QueuedGuardedProductsTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -141,8 +141,8 @@ void QueuedGuardedProductsTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -165,8 +165,8 @@ void QueuedGuardedProductsTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -189,8 +189,8 @@ void QueuedGuardedProductsTesterBase :: // Connect output port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_productRecvIn()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_productRecvIn()); port++ ) { this->m_to_productRecvIn[port].init(); @@ -208,8 +208,8 @@ void QueuedGuardedProductsTesterBase :: // Connect output port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsAsync()); port++ ) { this->m_to_noArgsAsync[port].init(); @@ -227,8 +227,8 @@ void QueuedGuardedProductsTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -246,8 +246,8 @@ void QueuedGuardedProductsTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -265,8 +265,8 @@ void QueuedGuardedProductsTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -284,8 +284,8 @@ void QueuedGuardedProductsTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -303,8 +303,8 @@ void QueuedGuardedProductsTesterBase :: // Connect output port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsync()); port++ ) { this->m_to_typedAsync[port].init(); @@ -322,8 +322,8 @@ void QueuedGuardedProductsTesterBase :: // Connect output port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncAssert()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncAssert()); port++ ) { this->m_to_typedAsyncAssert[port].init(); @@ -341,8 +341,8 @@ void QueuedGuardedProductsTesterBase :: // Connect output port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncBlockPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncBlockPriority()); port++ ) { this->m_to_typedAsyncBlockPriority[port].init(); @@ -360,8 +360,8 @@ void QueuedGuardedProductsTesterBase :: // Connect output port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncDropPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncDropPriority()); port++ ) { this->m_to_typedAsyncDropPriority[port].init(); @@ -379,8 +379,8 @@ void QueuedGuardedProductsTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -398,8 +398,8 @@ void QueuedGuardedProductsTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -417,8 +417,8 @@ void QueuedGuardedProductsTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -436,8 +436,8 @@ void QueuedGuardedProductsTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -460,7 +460,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -474,7 +474,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpResponsePort* port ) { @@ -488,7 +488,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -502,7 +502,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -516,7 +516,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -530,7 +530,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -544,7 +544,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -558,7 +558,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: connect_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -572,7 +572,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -586,7 +586,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -600,7 +600,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -614,7 +614,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -628,7 +628,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -642,7 +642,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -656,7 +656,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -673,7 +673,7 @@ void QueuedGuardedProductsTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* QueuedGuardedProductsTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -684,7 +684,7 @@ Fw::InputCmdRegPort* QueuedGuardedProductsTesterBase :: } Fw::InputCmdResponsePort* QueuedGuardedProductsTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -695,7 +695,7 @@ Fw::InputCmdResponsePort* QueuedGuardedProductsTesterBase :: } Fw::InputLogPort* QueuedGuardedProductsTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -706,7 +706,7 @@ Fw::InputLogPort* QueuedGuardedProductsTesterBase :: } Fw::InputPrmGetPort* QueuedGuardedProductsTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -717,7 +717,7 @@ Fw::InputPrmGetPort* QueuedGuardedProductsTesterBase :: } Fw::InputPrmSetPort* QueuedGuardedProductsTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -728,7 +728,7 @@ Fw::InputPrmSetPort* QueuedGuardedProductsTesterBase :: } Fw::InputDpRequestPort* QueuedGuardedProductsTesterBase :: - get_from_productRequestOut(NATIVE_INT_TYPE portNum) + get_from_productRequestOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productRequestOut(), @@ -739,7 +739,7 @@ Fw::InputDpRequestPort* QueuedGuardedProductsTesterBase :: } Fw::InputDpSendPort* QueuedGuardedProductsTesterBase :: - get_from_productSendOut(NATIVE_INT_TYPE portNum) + get_from_productSendOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productSendOut(), @@ -752,7 +752,7 @@ Fw::InputDpSendPort* QueuedGuardedProductsTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* QueuedGuardedProductsTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -765,7 +765,7 @@ Fw::InputLogTextPort* QueuedGuardedProductsTesterBase :: #endif Fw::InputTimePort* QueuedGuardedProductsTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -776,7 +776,7 @@ Fw::InputTimePort* QueuedGuardedProductsTesterBase :: } Fw::InputTlmPort* QueuedGuardedProductsTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -787,7 +787,7 @@ Fw::InputTlmPort* QueuedGuardedProductsTesterBase :: } Ports::InputNoArgsPort* QueuedGuardedProductsTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -798,7 +798,7 @@ Ports::InputNoArgsPort* QueuedGuardedProductsTesterBase :: } Ports::InputNoArgsReturnPort* QueuedGuardedProductsTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -809,7 +809,7 @@ Ports::InputNoArgsReturnPort* QueuedGuardedProductsTesterBase :: } Ports::InputTypedPort* QueuedGuardedProductsTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -820,7 +820,7 @@ Ports::InputTypedPort* QueuedGuardedProductsTesterBase :: } Ports::InputTypedReturnPort* QueuedGuardedProductsTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -870,7 +870,7 @@ QueuedGuardedProductsTesterBase :: // ---------------------------------------------------------------------- void QueuedGuardedProductsTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -881,7 +881,7 @@ void QueuedGuardedProductsTesterBase :: } U32 QueuedGuardedProductsTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -893,7 +893,7 @@ U32 QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -922,7 +922,7 @@ void QueuedGuardedProductsTesterBase :: F32 QueuedGuardedProductsTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -954,7 +954,7 @@ F32 QueuedGuardedProductsTesterBase :: // ---------------------------------------------------------------------- void QueuedGuardedProductsTesterBase :: - invoke_to_noArgsAsync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsAsync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -965,7 +965,7 @@ void QueuedGuardedProductsTesterBase :: } void QueuedGuardedProductsTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -976,7 +976,7 @@ void QueuedGuardedProductsTesterBase :: } U32 QueuedGuardedProductsTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -987,7 +987,7 @@ U32 QueuedGuardedProductsTesterBase :: } U32 QueuedGuardedProductsTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -998,7 +998,7 @@ U32 QueuedGuardedProductsTesterBase :: } void QueuedGuardedProductsTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1010,7 +1010,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1038,7 +1038,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1066,7 +1066,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1094,7 +1094,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1122,7 +1122,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1150,7 +1150,7 @@ void QueuedGuardedProductsTesterBase :: F32 QueuedGuardedProductsTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1178,7 +1178,7 @@ F32 QueuedGuardedProductsTesterBase :: F32 QueuedGuardedProductsTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1206,7 +1206,7 @@ F32 QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1236,182 +1236,182 @@ void QueuedGuardedProductsTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_to_productRecvIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_to_noArgsAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_to_typedAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_to_typedAsyncAssert() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_to_typedAsyncBlockPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_to_typedAsyncDropPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_from_productRequestOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_from_productSendOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: +FwIndexType QueuedGuardedProductsTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1419,7 +1419,7 @@ NATIVE_INT_TYPE QueuedGuardedProductsTesterBase :: // ---------------------------------------------------------------------- bool QueuedGuardedProductsTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1430,7 +1430,7 @@ bool QueuedGuardedProductsTesterBase :: } bool QueuedGuardedProductsTesterBase :: - isConnected_to_productRecvIn(NATIVE_INT_TYPE portNum) + isConnected_to_productRecvIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_productRecvIn(), @@ -1441,7 +1441,7 @@ bool QueuedGuardedProductsTesterBase :: } bool QueuedGuardedProductsTesterBase :: - isConnected_to_noArgsAsync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsAsync(), @@ -1452,7 +1452,7 @@ bool QueuedGuardedProductsTesterBase :: } bool QueuedGuardedProductsTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1463,7 +1463,7 @@ bool QueuedGuardedProductsTesterBase :: } bool QueuedGuardedProductsTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1474,7 +1474,7 @@ bool QueuedGuardedProductsTesterBase :: } bool QueuedGuardedProductsTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1485,7 +1485,7 @@ bool QueuedGuardedProductsTesterBase :: } bool QueuedGuardedProductsTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1496,7 +1496,7 @@ bool QueuedGuardedProductsTesterBase :: } bool QueuedGuardedProductsTesterBase :: - isConnected_to_typedAsync(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsync(), @@ -1507,7 +1507,7 @@ bool QueuedGuardedProductsTesterBase :: } bool QueuedGuardedProductsTesterBase :: - isConnected_to_typedAsyncAssert(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncAssert(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncAssert(), @@ -1518,7 +1518,7 @@ bool QueuedGuardedProductsTesterBase :: } bool QueuedGuardedProductsTesterBase :: - isConnected_to_typedAsyncBlockPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncBlockPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncBlockPriority(), @@ -1529,7 +1529,7 @@ bool QueuedGuardedProductsTesterBase :: } bool QueuedGuardedProductsTesterBase :: - isConnected_to_typedAsyncDropPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncDropPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncDropPriority(), @@ -1540,7 +1540,7 @@ bool QueuedGuardedProductsTesterBase :: } bool QueuedGuardedProductsTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1551,7 +1551,7 @@ bool QueuedGuardedProductsTesterBase :: } bool QueuedGuardedProductsTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1562,7 +1562,7 @@ bool QueuedGuardedProductsTesterBase :: } bool QueuedGuardedProductsTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1573,7 +1573,7 @@ bool QueuedGuardedProductsTesterBase :: } bool QueuedGuardedProductsTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1738,7 +1738,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: from_productRequestOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -1750,7 +1750,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: from_productSendOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -1762,7 +1762,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -1773,7 +1773,7 @@ void QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1784,7 +1784,7 @@ void QueuedGuardedProductsTesterBase :: U32 QueuedGuardedProductsTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1795,7 +1795,7 @@ U32 QueuedGuardedProductsTesterBase :: void QueuedGuardedProductsTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1822,7 +1822,7 @@ void QueuedGuardedProductsTesterBase :: F32 QueuedGuardedProductsTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGuardedProductsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGuardedProductsTesterBase.ref.hpp index 9d6223e46..03b2294be 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGuardedProductsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGuardedProductsTesterBase.ref.hpp @@ -149,7 +149,7 @@ class QueuedGuardedProductsTesterBase : //! Initialize object QueuedGuardedProductsTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -160,91 +160,91 @@ class QueuedGuardedProductsTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to productRecvIn[portNum] void connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpResponsePort* port //!< The input port ); //! Connect port to noArgsAsync[portNum] void connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedAsync[portNum] void connect_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncAssert[portNum] void connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncBlockPriority[portNum] void connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncDropPriority[portNum] void connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -258,49 +258,49 @@ class QueuedGuardedProductsTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productRequestOut[portNum] Fw::InputDpRequestPort* get_from_productRequestOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productSendOut[portNum] Fw::InputDpSendPort* get_from_productSendOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -309,7 +309,7 @@ class QueuedGuardedProductsTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -318,42 +318,42 @@ class QueuedGuardedProductsTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -379,17 +379,17 @@ class QueuedGuardedProductsTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -401,7 +401,7 @@ class QueuedGuardedProductsTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -419,17 +419,17 @@ class QueuedGuardedProductsTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -441,7 +441,7 @@ class QueuedGuardedProductsTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -459,32 +459,32 @@ class QueuedGuardedProductsTesterBase : //! Invoke the to port connected to noArgsAsync void invoke_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedAsync void invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -496,7 +496,7 @@ class QueuedGuardedProductsTesterBase : //! Invoke the to port connected to typedAsyncAssert void invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -508,7 +508,7 @@ class QueuedGuardedProductsTesterBase : //! Invoke the to port connected to typedAsyncBlockPriority void invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -520,7 +520,7 @@ class QueuedGuardedProductsTesterBase : //! Invoke the to port connected to typedAsyncDropPriority void invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -532,7 +532,7 @@ class QueuedGuardedProductsTesterBase : //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -544,7 +544,7 @@ class QueuedGuardedProductsTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -556,7 +556,7 @@ class QueuedGuardedProductsTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -568,7 +568,7 @@ class QueuedGuardedProductsTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -587,151 +587,151 @@ class QueuedGuardedProductsTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_productRecvIn ports //! //! \return The number of to_productRecvIn ports - NATIVE_INT_TYPE getNum_to_productRecvIn() const; + FwIndexType getNum_to_productRecvIn() const; //! Get the number of to_noArgsAsync ports //! //! \return The number of to_noArgsAsync ports - NATIVE_INT_TYPE getNum_to_noArgsAsync() const; + FwIndexType getNum_to_noArgsAsync() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedAsync ports //! //! \return The number of to_typedAsync ports - NATIVE_INT_TYPE getNum_to_typedAsync() const; + FwIndexType getNum_to_typedAsync() const; //! Get the number of to_typedAsyncAssert ports //! //! \return The number of to_typedAsyncAssert ports - NATIVE_INT_TYPE getNum_to_typedAsyncAssert() const; + FwIndexType getNum_to_typedAsyncAssert() const; //! Get the number of to_typedAsyncBlockPriority ports //! //! \return The number of to_typedAsyncBlockPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncBlockPriority() const; + FwIndexType getNum_to_typedAsyncBlockPriority() const; //! Get the number of to_typedAsyncDropPriority ports //! //! \return The number of to_typedAsyncDropPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncDropPriority() const; + FwIndexType getNum_to_typedAsyncDropPriority() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; //! Get the number of from_productRequestOut ports //! //! \return The number of from_productRequestOut ports - NATIVE_INT_TYPE getNum_from_productRequestOut() const; + FwIndexType getNum_from_productRequestOut() const; //! Get the number of from_productSendOut ports //! //! \return The number of from_productSendOut ports - NATIVE_INT_TYPE getNum_from_productSendOut() const; + FwIndexType getNum_from_productSendOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -743,105 +743,105 @@ class QueuedGuardedProductsTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_productRecvIn is connected //! //! \return Whether port to_productRecvIn is connected bool isConnected_to_productRecvIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsAsync is connected //! //! \return Whether port to_noArgsAsync is connected bool isConnected_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsync is connected //! //! \return Whether port to_typedAsync is connected bool isConnected_to_typedAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncAssert is connected //! //! \return Whether port to_typedAsyncAssert is connected bool isConnected_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncBlockPriority is connected //! //! \return Whether port to_typedAsyncBlockPriority is connected bool isConnected_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncDropPriority is connected //! //! \return Whether port to_typedAsyncDropPriority is connected bool isConnected_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -947,7 +947,7 @@ class QueuedGuardedProductsTesterBase : //! Static function for port from_productRequestOut static void from_productRequestOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); @@ -955,7 +955,7 @@ class QueuedGuardedProductsTesterBase : //! Static function for port from_productSendOut static void from_productSendOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -963,26 +963,26 @@ class QueuedGuardedProductsTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -995,7 +995,7 @@ class QueuedGuardedProductsTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedNoArgsPortsOnlyTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedNoArgsPortsOnlyTesterBase.ref.cpp index 48b38a1a6..78cc85da8 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedNoArgsPortsOnlyTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedNoArgsPortsOnlyTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void QueuedNoArgsPortsOnlyTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -45,8 +45,8 @@ void QueuedNoArgsPortsOnlyTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -69,8 +69,8 @@ void QueuedNoArgsPortsOnlyTesterBase :: // Connect output port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsAsync()); port++ ) { this->m_to_noArgsAsync[port].init(); @@ -88,8 +88,8 @@ void QueuedNoArgsPortsOnlyTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -107,8 +107,8 @@ void QueuedNoArgsPortsOnlyTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -126,8 +126,8 @@ void QueuedNoArgsPortsOnlyTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -150,7 +150,7 @@ void QueuedNoArgsPortsOnlyTesterBase :: void QueuedNoArgsPortsOnlyTesterBase :: connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -164,7 +164,7 @@ void QueuedNoArgsPortsOnlyTesterBase :: void QueuedNoArgsPortsOnlyTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -178,7 +178,7 @@ void QueuedNoArgsPortsOnlyTesterBase :: void QueuedNoArgsPortsOnlyTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -192,7 +192,7 @@ void QueuedNoArgsPortsOnlyTesterBase :: void QueuedNoArgsPortsOnlyTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -209,7 +209,7 @@ void QueuedNoArgsPortsOnlyTesterBase :: // ---------------------------------------------------------------------- Ports::InputNoArgsPort* QueuedNoArgsPortsOnlyTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -220,7 +220,7 @@ Ports::InputNoArgsPort* QueuedNoArgsPortsOnlyTesterBase :: } Ports::InputNoArgsReturnPort* QueuedNoArgsPortsOnlyTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -258,7 +258,7 @@ QueuedNoArgsPortsOnlyTesterBase :: // ---------------------------------------------------------------------- void QueuedNoArgsPortsOnlyTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -269,7 +269,7 @@ void QueuedNoArgsPortsOnlyTesterBase :: } U32 QueuedNoArgsPortsOnlyTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -284,7 +284,7 @@ U32 QueuedNoArgsPortsOnlyTesterBase :: // ---------------------------------------------------------------------- void QueuedNoArgsPortsOnlyTesterBase :: - invoke_to_noArgsAsync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsAsync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -295,7 +295,7 @@ void QueuedNoArgsPortsOnlyTesterBase :: } void QueuedNoArgsPortsOnlyTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -306,7 +306,7 @@ void QueuedNoArgsPortsOnlyTesterBase :: } U32 QueuedNoArgsPortsOnlyTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -317,7 +317,7 @@ U32 QueuedNoArgsPortsOnlyTesterBase :: } U32 QueuedNoArgsPortsOnlyTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -331,40 +331,40 @@ U32 QueuedNoArgsPortsOnlyTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedNoArgsPortsOnlyTesterBase :: +FwIndexType QueuedNoArgsPortsOnlyTesterBase :: getNum_to_noArgsAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); } -NATIVE_INT_TYPE QueuedNoArgsPortsOnlyTesterBase :: +FwIndexType QueuedNoArgsPortsOnlyTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE QueuedNoArgsPortsOnlyTesterBase :: +FwIndexType QueuedNoArgsPortsOnlyTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE QueuedNoArgsPortsOnlyTesterBase :: +FwIndexType QueuedNoArgsPortsOnlyTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE QueuedNoArgsPortsOnlyTesterBase :: +FwIndexType QueuedNoArgsPortsOnlyTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE QueuedNoArgsPortsOnlyTesterBase :: +FwIndexType QueuedNoArgsPortsOnlyTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } // ---------------------------------------------------------------------- @@ -372,7 +372,7 @@ NATIVE_INT_TYPE QueuedNoArgsPortsOnlyTesterBase :: // ---------------------------------------------------------------------- bool QueuedNoArgsPortsOnlyTesterBase :: - isConnected_to_noArgsAsync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsAsync(), @@ -383,7 +383,7 @@ bool QueuedNoArgsPortsOnlyTesterBase :: } bool QueuedNoArgsPortsOnlyTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -394,7 +394,7 @@ bool QueuedNoArgsPortsOnlyTesterBase :: } bool QueuedNoArgsPortsOnlyTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -405,7 +405,7 @@ bool QueuedNoArgsPortsOnlyTesterBase :: } bool QueuedNoArgsPortsOnlyTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -454,7 +454,7 @@ void QueuedNoArgsPortsOnlyTesterBase :: void QueuedNoArgsPortsOnlyTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -465,7 +465,7 @@ void QueuedNoArgsPortsOnlyTesterBase :: U32 QueuedNoArgsPortsOnlyTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedNoArgsPortsOnlyTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedNoArgsPortsOnlyTesterBase.ref.hpp index bdeb26214..b106a4014 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedNoArgsPortsOnlyTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedNoArgsPortsOnlyTesterBase.ref.hpp @@ -114,7 +114,7 @@ class QueuedNoArgsPortsOnlyTesterBase : //! Initialize object QueuedNoArgsPortsOnlyTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -125,25 +125,25 @@ class QueuedNoArgsPortsOnlyTesterBase : //! Connect port to noArgsAsync[portNum] void connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); @@ -157,14 +157,14 @@ class QueuedNoArgsPortsOnlyTesterBase : //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -190,12 +190,12 @@ class QueuedNoArgsPortsOnlyTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; protected: @@ -206,12 +206,12 @@ class QueuedNoArgsPortsOnlyTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -222,22 +222,22 @@ class QueuedNoArgsPortsOnlyTesterBase : //! Invoke the to port connected to noArgsAsync void invoke_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -249,32 +249,32 @@ class QueuedNoArgsPortsOnlyTesterBase : //! Get the number of to_noArgsAsync ports //! //! \return The number of to_noArgsAsync ports - NATIVE_INT_TYPE getNum_to_noArgsAsync() const; + FwIndexType getNum_to_noArgsAsync() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; protected: @@ -286,28 +286,28 @@ class QueuedNoArgsPortsOnlyTesterBase : //! //! \return Whether port to_noArgsAsync is connected bool isConnected_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -337,13 +337,13 @@ class QueuedNoArgsPortsOnlyTesterBase : //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.cpp index 272311993..14dd2efb8 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void QueuedParamsTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdRegOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdRegOut()); port++ ) { this->m_from_cmdRegOut[port].init(); @@ -45,8 +45,8 @@ void QueuedParamsTesterBase :: // Connect input port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdResponseOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdResponseOut()); port++ ) { this->m_from_cmdResponseOut[port].init(); @@ -69,8 +69,8 @@ void QueuedParamsTesterBase :: // Connect input port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_prmGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_prmGetOut()); port++ ) { this->m_from_prmGetOut[port].init(); @@ -93,8 +93,8 @@ void QueuedParamsTesterBase :: // Connect input port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_prmSetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_prmSetOut()); port++ ) { this->m_from_prmSetOut[port].init(); @@ -117,8 +117,8 @@ void QueuedParamsTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -141,8 +141,8 @@ void QueuedParamsTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -165,8 +165,8 @@ void QueuedParamsTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -189,8 +189,8 @@ void QueuedParamsTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -213,8 +213,8 @@ void QueuedParamsTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -237,8 +237,8 @@ void QueuedParamsTesterBase :: // Connect output port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_cmdIn()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_cmdIn()); port++ ) { this->m_to_cmdIn[port].init(); @@ -256,8 +256,8 @@ void QueuedParamsTesterBase :: // Connect output port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsAsync()); port++ ) { this->m_to_noArgsAsync[port].init(); @@ -275,8 +275,8 @@ void QueuedParamsTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -294,8 +294,8 @@ void QueuedParamsTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -313,8 +313,8 @@ void QueuedParamsTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -332,8 +332,8 @@ void QueuedParamsTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -351,8 +351,8 @@ void QueuedParamsTesterBase :: // Connect output port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsync()); port++ ) { this->m_to_typedAsync[port].init(); @@ -370,8 +370,8 @@ void QueuedParamsTesterBase :: // Connect output port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncAssert()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncAssert()); port++ ) { this->m_to_typedAsyncAssert[port].init(); @@ -389,8 +389,8 @@ void QueuedParamsTesterBase :: // Connect output port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncBlockPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncBlockPriority()); port++ ) { this->m_to_typedAsyncBlockPriority[port].init(); @@ -408,8 +408,8 @@ void QueuedParamsTesterBase :: // Connect output port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncDropPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncDropPriority()); port++ ) { this->m_to_typedAsyncDropPriority[port].init(); @@ -427,8 +427,8 @@ void QueuedParamsTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -446,8 +446,8 @@ void QueuedParamsTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -465,8 +465,8 @@ void QueuedParamsTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -484,8 +484,8 @@ void QueuedParamsTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -508,7 +508,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -522,7 +522,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -536,7 +536,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -550,7 +550,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -564,7 +564,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -578,7 +578,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -592,7 +592,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: connect_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -606,7 +606,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -620,7 +620,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -634,7 +634,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -648,7 +648,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -662,7 +662,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -676,7 +676,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -690,7 +690,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -707,7 +707,7 @@ void QueuedParamsTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* QueuedParamsTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -718,7 +718,7 @@ Fw::InputCmdRegPort* QueuedParamsTesterBase :: } Fw::InputCmdResponsePort* QueuedParamsTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -729,7 +729,7 @@ Fw::InputCmdResponsePort* QueuedParamsTesterBase :: } Fw::InputLogPort* QueuedParamsTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -740,7 +740,7 @@ Fw::InputLogPort* QueuedParamsTesterBase :: } Fw::InputPrmGetPort* QueuedParamsTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -751,7 +751,7 @@ Fw::InputPrmGetPort* QueuedParamsTesterBase :: } Fw::InputPrmSetPort* QueuedParamsTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -764,7 +764,7 @@ Fw::InputPrmSetPort* QueuedParamsTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* QueuedParamsTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -777,7 +777,7 @@ Fw::InputLogTextPort* QueuedParamsTesterBase :: #endif Fw::InputTimePort* QueuedParamsTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -788,7 +788,7 @@ Fw::InputTimePort* QueuedParamsTesterBase :: } Fw::InputTlmPort* QueuedParamsTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -799,7 +799,7 @@ Fw::InputTlmPort* QueuedParamsTesterBase :: } Ports::InputNoArgsPort* QueuedParamsTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -810,7 +810,7 @@ Ports::InputNoArgsPort* QueuedParamsTesterBase :: } Ports::InputNoArgsReturnPort* QueuedParamsTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -821,7 +821,7 @@ Ports::InputNoArgsReturnPort* QueuedParamsTesterBase :: } Ports::InputTypedPort* QueuedParamsTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -832,7 +832,7 @@ Ports::InputTypedPort* QueuedParamsTesterBase :: } Ports::InputTypedReturnPort* QueuedParamsTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -886,7 +886,7 @@ QueuedParamsTesterBase :: // ---------------------------------------------------------------------- void QueuedParamsTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -897,7 +897,7 @@ void QueuedParamsTesterBase :: } U32 QueuedParamsTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -909,7 +909,7 @@ U32 QueuedParamsTesterBase :: void QueuedParamsTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -938,7 +938,7 @@ void QueuedParamsTesterBase :: F32 QueuedParamsTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -970,7 +970,7 @@ F32 QueuedParamsTesterBase :: // ---------------------------------------------------------------------- void QueuedParamsTesterBase :: - invoke_to_noArgsAsync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsAsync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -981,7 +981,7 @@ void QueuedParamsTesterBase :: } void QueuedParamsTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -992,7 +992,7 @@ void QueuedParamsTesterBase :: } U32 QueuedParamsTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1003,7 +1003,7 @@ U32 QueuedParamsTesterBase :: } U32 QueuedParamsTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1014,7 +1014,7 @@ U32 QueuedParamsTesterBase :: } void QueuedParamsTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1026,7 +1026,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1054,7 +1054,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1082,7 +1082,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1110,7 +1110,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1138,7 +1138,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1166,7 +1166,7 @@ void QueuedParamsTesterBase :: F32 QueuedParamsTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1194,7 +1194,7 @@ F32 QueuedParamsTesterBase :: F32 QueuedParamsTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1222,7 +1222,7 @@ F32 QueuedParamsTesterBase :: void QueuedParamsTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1252,164 +1252,164 @@ void QueuedParamsTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_to_noArgsAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); } -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_to_typedAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); } -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_to_typedAsyncAssert() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); } -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_to_typedAsyncBlockPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); } -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_to_typedAsyncDropPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); } -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE QueuedParamsTesterBase :: +FwIndexType QueuedParamsTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1417,7 +1417,7 @@ NATIVE_INT_TYPE QueuedParamsTesterBase :: // ---------------------------------------------------------------------- bool QueuedParamsTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1428,7 +1428,7 @@ bool QueuedParamsTesterBase :: } bool QueuedParamsTesterBase :: - isConnected_to_noArgsAsync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsAsync(), @@ -1439,7 +1439,7 @@ bool QueuedParamsTesterBase :: } bool QueuedParamsTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1450,7 +1450,7 @@ bool QueuedParamsTesterBase :: } bool QueuedParamsTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1461,7 +1461,7 @@ bool QueuedParamsTesterBase :: } bool QueuedParamsTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1472,7 +1472,7 @@ bool QueuedParamsTesterBase :: } bool QueuedParamsTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1483,7 +1483,7 @@ bool QueuedParamsTesterBase :: } bool QueuedParamsTesterBase :: - isConnected_to_typedAsync(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsync(), @@ -1494,7 +1494,7 @@ bool QueuedParamsTesterBase :: } bool QueuedParamsTesterBase :: - isConnected_to_typedAsyncAssert(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncAssert(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncAssert(), @@ -1505,7 +1505,7 @@ bool QueuedParamsTesterBase :: } bool QueuedParamsTesterBase :: - isConnected_to_typedAsyncBlockPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncBlockPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncBlockPriority(), @@ -1516,7 +1516,7 @@ bool QueuedParamsTesterBase :: } bool QueuedParamsTesterBase :: - isConnected_to_typedAsyncDropPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncDropPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncDropPriority(), @@ -1527,7 +1527,7 @@ bool QueuedParamsTesterBase :: } bool QueuedParamsTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1538,7 +1538,7 @@ bool QueuedParamsTesterBase :: } bool QueuedParamsTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1549,7 +1549,7 @@ bool QueuedParamsTesterBase :: } bool QueuedParamsTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1560,7 +1560,7 @@ bool QueuedParamsTesterBase :: } bool QueuedParamsTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1622,7 +1622,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: paramSend_ParamU32( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1649,7 +1649,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: paramSave_ParamU32( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1681,7 +1681,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: paramSend_ParamF64( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1708,7 +1708,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: paramSave_ParamF64( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1740,7 +1740,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: paramSend_ParamString( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1767,7 +1767,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: paramSave_ParamString( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1799,7 +1799,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: paramSend_ParamEnum( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1826,7 +1826,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: paramSave_ParamEnum( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1858,7 +1858,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: paramSend_ParamArray( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1885,7 +1885,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: paramSave_ParamArray( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1917,7 +1917,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: paramSend_ParamStruct( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -1944,7 +1944,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: paramSave_ParamStruct( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -2064,7 +2064,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode ) { @@ -2074,7 +2074,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, const Fw::CmdResponse& response @@ -2087,7 +2087,7 @@ void QueuedParamsTesterBase :: Fw::ParamValid QueuedParamsTesterBase :: from_prmGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwPrmIdType id, Fw::ParamBuffer& val ) @@ -2174,7 +2174,7 @@ Fw::ParamValid QueuedParamsTesterBase :: void QueuedParamsTesterBase :: from_prmSetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwPrmIdType id, Fw::ParamBuffer& val ) @@ -2280,7 +2280,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -2291,7 +2291,7 @@ void QueuedParamsTesterBase :: void QueuedParamsTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -2302,7 +2302,7 @@ void QueuedParamsTesterBase :: U32 QueuedParamsTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -2313,7 +2313,7 @@ U32 QueuedParamsTesterBase :: void QueuedParamsTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -2340,7 +2340,7 @@ void QueuedParamsTesterBase :: F32 QueuedParamsTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.hpp index 7cfa4cccd..f555850f0 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedParamsTesterBase.ref.hpp @@ -143,7 +143,7 @@ class QueuedParamsTesterBase : //! Initialize object QueuedParamsTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -154,85 +154,85 @@ class QueuedParamsTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to noArgsAsync[portNum] void connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedAsync[portNum] void connect_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncAssert[portNum] void connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncBlockPriority[portNum] void connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncDropPriority[portNum] void connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -246,35 +246,35 @@ class QueuedParamsTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -283,7 +283,7 @@ class QueuedParamsTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -292,42 +292,42 @@ class QueuedParamsTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -353,17 +353,17 @@ class QueuedParamsTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -375,7 +375,7 @@ class QueuedParamsTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -393,17 +393,17 @@ class QueuedParamsTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -415,7 +415,7 @@ class QueuedParamsTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -433,32 +433,32 @@ class QueuedParamsTesterBase : //! Invoke the to port connected to noArgsAsync void invoke_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedAsync void invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -470,7 +470,7 @@ class QueuedParamsTesterBase : //! Invoke the to port connected to typedAsyncAssert void invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -482,7 +482,7 @@ class QueuedParamsTesterBase : //! Invoke the to port connected to typedAsyncBlockPriority void invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -494,7 +494,7 @@ class QueuedParamsTesterBase : //! Invoke the to port connected to typedAsyncDropPriority void invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -506,7 +506,7 @@ class QueuedParamsTesterBase : //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -518,7 +518,7 @@ class QueuedParamsTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -530,7 +530,7 @@ class QueuedParamsTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -542,7 +542,7 @@ class QueuedParamsTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -561,136 +561,136 @@ class QueuedParamsTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_noArgsAsync ports //! //! \return The number of to_noArgsAsync ports - NATIVE_INT_TYPE getNum_to_noArgsAsync() const; + FwIndexType getNum_to_noArgsAsync() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedAsync ports //! //! \return The number of to_typedAsync ports - NATIVE_INT_TYPE getNum_to_typedAsync() const; + FwIndexType getNum_to_typedAsync() const; //! Get the number of to_typedAsyncAssert ports //! //! \return The number of to_typedAsyncAssert ports - NATIVE_INT_TYPE getNum_to_typedAsyncAssert() const; + FwIndexType getNum_to_typedAsyncAssert() const; //! Get the number of to_typedAsyncBlockPriority ports //! //! \return The number of to_typedAsyncBlockPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncBlockPriority() const; + FwIndexType getNum_to_typedAsyncBlockPriority() const; //! Get the number of to_typedAsyncDropPriority ports //! //! \return The number of to_typedAsyncDropPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncDropPriority() const; + FwIndexType getNum_to_typedAsyncDropPriority() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -702,98 +702,98 @@ class QueuedParamsTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsAsync is connected //! //! \return Whether port to_noArgsAsync is connected bool isConnected_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsync is connected //! //! \return Whether port to_typedAsync is connected bool isConnected_to_typedAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncAssert is connected //! //! \return Whether port to_typedAsyncAssert is connected bool isConnected_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncBlockPriority is connected //! //! \return Whether port to_typedAsyncBlockPriority is connected bool isConnected_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncDropPriority is connected //! //! \return Whether port to_typedAsyncDropPriority is connected bool isConnected_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -830,13 +830,13 @@ class QueuedParamsTesterBase : //! Send parameter ParamU32 void paramSend_ParamU32( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamU32 void paramSave_ParamU32( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -848,13 +848,13 @@ class QueuedParamsTesterBase : //! Send parameter ParamF64 void paramSend_ParamF64( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamF64 void paramSave_ParamF64( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -866,13 +866,13 @@ class QueuedParamsTesterBase : //! Send parameter ParamString void paramSend_ParamString( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamString void paramSave_ParamString( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -884,13 +884,13 @@ class QueuedParamsTesterBase : //! Send parameter ParamEnum void paramSend_ParamEnum( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamEnum void paramSave_ParamEnum( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -902,13 +902,13 @@ class QueuedParamsTesterBase : //! Send parameter ParamArray void paramSend_ParamArray( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamArray void paramSave_ParamArray( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -920,13 +920,13 @@ class QueuedParamsTesterBase : //! Send parameter ParamStruct void paramSend_ParamStruct( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamStruct void paramSave_ParamStruct( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -990,14 +990,14 @@ class QueuedParamsTesterBase : //! Static function for port from_cmdRegOut static void from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode //!< Command Op Code ); //! Static function for port from_cmdResponseOut static void from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence const Fw::CmdResponse& response //!< The command response argument @@ -1006,7 +1006,7 @@ class QueuedParamsTesterBase : //! Static function for port from_prmGetOut static Fw::ParamValid from_prmGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwPrmIdType id, //!< Parameter ID Fw::ParamBuffer& val //!< Buffer containing serialized parameter value ); @@ -1014,7 +1014,7 @@ class QueuedParamsTesterBase : //! Static function for port from_prmSetOut static void from_prmSetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwPrmIdType id, //!< Parameter ID Fw::ParamBuffer& val //!< Buffer containing serialized parameter value ); @@ -1022,26 +1022,26 @@ class QueuedParamsTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1054,7 +1054,7 @@ class QueuedParamsTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.cpp index 0fb478c99..e3375c719 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void QueuedSerialTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdRegOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdRegOut()); port++ ) { this->m_from_cmdRegOut[port].init(); @@ -45,8 +45,8 @@ void QueuedSerialTesterBase :: // Connect input port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdResponseOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdResponseOut()); port++ ) { this->m_from_cmdResponseOut[port].init(); @@ -69,8 +69,8 @@ void QueuedSerialTesterBase :: // Connect input port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_eventOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_eventOut()); port++ ) { this->m_from_eventOut[port].init(); @@ -93,8 +93,8 @@ void QueuedSerialTesterBase :: // Connect input port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_prmGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_prmGetOut()); port++ ) { this->m_from_prmGetOut[port].init(); @@ -117,8 +117,8 @@ void QueuedSerialTesterBase :: // Connect input port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_prmSetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_prmSetOut()); port++ ) { this->m_from_prmSetOut[port].init(); @@ -142,8 +142,8 @@ void QueuedSerialTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect input port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_textEventOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_textEventOut()); port++ ) { this->m_from_textEventOut[port].init(); @@ -167,8 +167,8 @@ void QueuedSerialTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -191,8 +191,8 @@ void QueuedSerialTesterBase :: // Connect input port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_tlmOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_tlmOut()); port++ ) { this->m_from_tlmOut[port].init(); @@ -215,8 +215,8 @@ void QueuedSerialTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -239,8 +239,8 @@ void QueuedSerialTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -263,8 +263,8 @@ void QueuedSerialTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -287,8 +287,8 @@ void QueuedSerialTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -311,8 +311,8 @@ void QueuedSerialTesterBase :: // Connect input port serialOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_serialOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_serialOut()); port++ ) { this->m_from_serialOut[port].init(); @@ -335,8 +335,8 @@ void QueuedSerialTesterBase :: // Connect output port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_cmdIn()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_cmdIn()); port++ ) { this->m_to_cmdIn[port].init(); @@ -354,8 +354,8 @@ void QueuedSerialTesterBase :: // Connect output port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsAsync()); port++ ) { this->m_to_noArgsAsync[port].init(); @@ -373,8 +373,8 @@ void QueuedSerialTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -392,8 +392,8 @@ void QueuedSerialTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -411,8 +411,8 @@ void QueuedSerialTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -430,8 +430,8 @@ void QueuedSerialTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -449,8 +449,8 @@ void QueuedSerialTesterBase :: // Connect output port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsync()); port++ ) { this->m_to_typedAsync[port].init(); @@ -468,8 +468,8 @@ void QueuedSerialTesterBase :: // Connect output port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncAssert()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncAssert()); port++ ) { this->m_to_typedAsyncAssert[port].init(); @@ -487,8 +487,8 @@ void QueuedSerialTesterBase :: // Connect output port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncBlockPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncBlockPriority()); port++ ) { this->m_to_typedAsyncBlockPriority[port].init(); @@ -506,8 +506,8 @@ void QueuedSerialTesterBase :: // Connect output port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncDropPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncDropPriority()); port++ ) { this->m_to_typedAsyncDropPriority[port].init(); @@ -525,8 +525,8 @@ void QueuedSerialTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -544,8 +544,8 @@ void QueuedSerialTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -563,8 +563,8 @@ void QueuedSerialTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -582,8 +582,8 @@ void QueuedSerialTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -601,8 +601,8 @@ void QueuedSerialTesterBase :: // Connect output port serialAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_serialAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_serialAsync()); port++ ) { this->m_to_serialAsync[port].init(); @@ -620,8 +620,8 @@ void QueuedSerialTesterBase :: // Connect output port serialAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_serialAsyncAssert()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_serialAsyncAssert()); port++ ) { this->m_to_serialAsyncAssert[port].init(); @@ -639,8 +639,8 @@ void QueuedSerialTesterBase :: // Connect output port serialAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_serialAsyncBlockPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_serialAsyncBlockPriority()); port++ ) { this->m_to_serialAsyncBlockPriority[port].init(); @@ -658,8 +658,8 @@ void QueuedSerialTesterBase :: // Connect output port serialAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_serialAsyncDropPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_serialAsyncDropPriority()); port++ ) { this->m_to_serialAsyncDropPriority[port].init(); @@ -677,8 +677,8 @@ void QueuedSerialTesterBase :: // Connect output port serialGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_serialGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_serialGuarded()); port++ ) { this->m_to_serialGuarded[port].init(); @@ -696,8 +696,8 @@ void QueuedSerialTesterBase :: // Connect output port serialSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_serialSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_serialSync()); port++ ) { this->m_to_serialSync[port].init(); @@ -720,7 +720,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -734,7 +734,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -748,7 +748,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -762,7 +762,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -776,7 +776,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -790,7 +790,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -804,7 +804,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: connect_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -818,7 +818,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -832,7 +832,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -846,7 +846,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -860,7 +860,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -874,7 +874,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -888,7 +888,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -902,7 +902,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -916,7 +916,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: connect_to_serialAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -930,7 +930,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: connect_to_serialAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -944,7 +944,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: connect_to_serialAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -958,7 +958,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: connect_to_serialAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -972,7 +972,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: connect_to_serialGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -986,7 +986,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: connect_to_serialSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputSerializePort* port ) { @@ -1003,7 +1003,7 @@ void QueuedSerialTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* QueuedSerialTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -1014,7 +1014,7 @@ Fw::InputCmdRegPort* QueuedSerialTesterBase :: } Fw::InputCmdResponsePort* QueuedSerialTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -1025,7 +1025,7 @@ Fw::InputCmdResponsePort* QueuedSerialTesterBase :: } Fw::InputLogPort* QueuedSerialTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -1036,7 +1036,7 @@ Fw::InputLogPort* QueuedSerialTesterBase :: } Fw::InputPrmGetPort* QueuedSerialTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -1047,7 +1047,7 @@ Fw::InputPrmGetPort* QueuedSerialTesterBase :: } Fw::InputPrmSetPort* QueuedSerialTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -1060,7 +1060,7 @@ Fw::InputPrmSetPort* QueuedSerialTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* QueuedSerialTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -1073,7 +1073,7 @@ Fw::InputLogTextPort* QueuedSerialTesterBase :: #endif Fw::InputTimePort* QueuedSerialTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -1084,7 +1084,7 @@ Fw::InputTimePort* QueuedSerialTesterBase :: } Fw::InputTlmPort* QueuedSerialTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -1095,7 +1095,7 @@ Fw::InputTlmPort* QueuedSerialTesterBase :: } Ports::InputNoArgsPort* QueuedSerialTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -1106,7 +1106,7 @@ Ports::InputNoArgsPort* QueuedSerialTesterBase :: } Ports::InputNoArgsReturnPort* QueuedSerialTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -1117,7 +1117,7 @@ Ports::InputNoArgsReturnPort* QueuedSerialTesterBase :: } Ports::InputTypedPort* QueuedSerialTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -1128,7 +1128,7 @@ Ports::InputTypedPort* QueuedSerialTesterBase :: } Ports::InputTypedReturnPort* QueuedSerialTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -1139,7 +1139,7 @@ Ports::InputTypedReturnPort* QueuedSerialTesterBase :: } Fw::InputSerializePort* QueuedSerialTesterBase :: - get_from_serialOut(NATIVE_INT_TYPE portNum) + get_from_serialOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_serialOut(), @@ -1239,7 +1239,7 @@ QueuedSerialTesterBase :: // ---------------------------------------------------------------------- void QueuedSerialTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1250,7 +1250,7 @@ void QueuedSerialTesterBase :: } U32 QueuedSerialTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1262,7 +1262,7 @@ U32 QueuedSerialTesterBase :: void QueuedSerialTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1291,7 +1291,7 @@ void QueuedSerialTesterBase :: F32 QueuedSerialTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1320,7 +1320,7 @@ F32 QueuedSerialTesterBase :: void QueuedSerialTesterBase :: from_serialOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -1340,7 +1340,7 @@ void QueuedSerialTesterBase :: // ---------------------------------------------------------------------- void QueuedSerialTesterBase :: - invoke_to_noArgsAsync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsAsync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1351,7 +1351,7 @@ void QueuedSerialTesterBase :: } void QueuedSerialTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1362,7 +1362,7 @@ void QueuedSerialTesterBase :: } U32 QueuedSerialTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1373,7 +1373,7 @@ U32 QueuedSerialTesterBase :: } U32 QueuedSerialTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1384,7 +1384,7 @@ U32 QueuedSerialTesterBase :: } void QueuedSerialTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1396,7 +1396,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1424,7 +1424,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1452,7 +1452,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1480,7 +1480,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1508,7 +1508,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1536,7 +1536,7 @@ void QueuedSerialTesterBase :: F32 QueuedSerialTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1564,7 +1564,7 @@ F32 QueuedSerialTesterBase :: F32 QueuedSerialTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1592,7 +1592,7 @@ F32 QueuedSerialTesterBase :: void QueuedSerialTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1620,7 +1620,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: invoke_to_serialAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -1636,7 +1636,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: invoke_to_serialAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -1652,7 +1652,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: invoke_to_serialAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -1668,7 +1668,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: invoke_to_serialAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -1684,7 +1684,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: invoke_to_serialGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -1700,7 +1700,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: invoke_to_serialSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { @@ -1718,206 +1718,206 @@ void QueuedSerialTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_to_noArgsAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_to_typedAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_to_typedAsyncAssert() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_to_typedAsyncBlockPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_to_typedAsyncDropPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_to_serialAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialAsync)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_to_serialAsyncAssert() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialAsyncAssert)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialAsyncAssert)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_to_serialAsyncBlockPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialAsyncBlockPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialAsyncBlockPriority)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_to_serialAsyncDropPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialAsyncDropPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialAsyncDropPriority)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_to_serialGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialGuarded)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_to_serialSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_serialSync)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } -NATIVE_INT_TYPE QueuedSerialTesterBase :: +FwIndexType QueuedSerialTesterBase :: getNum_from_serialOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_serialOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_serialOut)); } // ---------------------------------------------------------------------- @@ -1925,7 +1925,7 @@ NATIVE_INT_TYPE QueuedSerialTesterBase :: // ---------------------------------------------------------------------- bool QueuedSerialTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1936,7 +1936,7 @@ bool QueuedSerialTesterBase :: } bool QueuedSerialTesterBase :: - isConnected_to_noArgsAsync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsAsync(), @@ -1947,7 +1947,7 @@ bool QueuedSerialTesterBase :: } bool QueuedSerialTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1958,7 +1958,7 @@ bool QueuedSerialTesterBase :: } bool QueuedSerialTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1969,7 +1969,7 @@ bool QueuedSerialTesterBase :: } bool QueuedSerialTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1980,7 +1980,7 @@ bool QueuedSerialTesterBase :: } bool QueuedSerialTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1991,7 +1991,7 @@ bool QueuedSerialTesterBase :: } bool QueuedSerialTesterBase :: - isConnected_to_typedAsync(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsync(), @@ -2002,7 +2002,7 @@ bool QueuedSerialTesterBase :: } bool QueuedSerialTesterBase :: - isConnected_to_typedAsyncAssert(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncAssert(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncAssert(), @@ -2013,7 +2013,7 @@ bool QueuedSerialTesterBase :: } bool QueuedSerialTesterBase :: - isConnected_to_typedAsyncBlockPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncBlockPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncBlockPriority(), @@ -2024,7 +2024,7 @@ bool QueuedSerialTesterBase :: } bool QueuedSerialTesterBase :: - isConnected_to_typedAsyncDropPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncDropPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncDropPriority(), @@ -2035,7 +2035,7 @@ bool QueuedSerialTesterBase :: } bool QueuedSerialTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -2046,7 +2046,7 @@ bool QueuedSerialTesterBase :: } bool QueuedSerialTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -2057,7 +2057,7 @@ bool QueuedSerialTesterBase :: } bool QueuedSerialTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -2068,7 +2068,7 @@ bool QueuedSerialTesterBase :: } bool QueuedSerialTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -2079,7 +2079,7 @@ bool QueuedSerialTesterBase :: } bool QueuedSerialTesterBase :: - isConnected_to_serialAsync(NATIVE_INT_TYPE portNum) + isConnected_to_serialAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_serialAsync(), @@ -2090,7 +2090,7 @@ bool QueuedSerialTesterBase :: } bool QueuedSerialTesterBase :: - isConnected_to_serialAsyncAssert(NATIVE_INT_TYPE portNum) + isConnected_to_serialAsyncAssert(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_serialAsyncAssert(), @@ -2101,7 +2101,7 @@ bool QueuedSerialTesterBase :: } bool QueuedSerialTesterBase :: - isConnected_to_serialAsyncBlockPriority(NATIVE_INT_TYPE portNum) + isConnected_to_serialAsyncBlockPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_serialAsyncBlockPriority(), @@ -2112,7 +2112,7 @@ bool QueuedSerialTesterBase :: } bool QueuedSerialTesterBase :: - isConnected_to_serialAsyncDropPriority(NATIVE_INT_TYPE portNum) + isConnected_to_serialAsyncDropPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_serialAsyncDropPriority(), @@ -2123,7 +2123,7 @@ bool QueuedSerialTesterBase :: } bool QueuedSerialTesterBase :: - isConnected_to_serialGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_serialGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_serialGuarded(), @@ -2134,7 +2134,7 @@ bool QueuedSerialTesterBase :: } bool QueuedSerialTesterBase :: - isConnected_to_serialSync(NATIVE_INT_TYPE portNum) + isConnected_to_serialSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_serialSync(), @@ -2182,7 +2182,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: sendCmd_CMD_SYNC( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2207,7 +2207,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: sendCmd_CMD_SYNC_PRIMITIVE( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32, F32 f32, @@ -2255,7 +2255,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: sendCmd_CMD_SYNC_STRING( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, const Fw::CmdStringArg& str1, const Fw::CmdStringArg& str2 @@ -2296,7 +2296,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: sendCmd_CMD_SYNC_ENUM( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, E e ) @@ -2330,7 +2330,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: sendCmd_CMD_SYNC_ARRAY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, A a ) @@ -2364,7 +2364,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: sendCmd_CMD_SYNC_STRUCT( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, S s ) @@ -2398,7 +2398,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: sendCmd_CMD_GUARDED( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2423,7 +2423,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: sendCmd_CMD_GUARDED_PRIMITIVE( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32, F32 f32, @@ -2471,7 +2471,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: sendCmd_CMD_GUARDED_STRING( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, const Fw::CmdStringArg& str1, const Fw::CmdStringArg& str2 @@ -2512,7 +2512,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: sendCmd_CMD_GUARDED_ENUM( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, E e ) @@ -2546,7 +2546,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: sendCmd_CMD_GUARDED_ARRAY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, A a ) @@ -2580,7 +2580,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: sendCmd_CMD_GUARDED_STRUCT( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, S s ) @@ -2614,7 +2614,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: sendCmd_CMD_ASYNC( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2639,7 +2639,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: sendCmd_CMD_PRIORITY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2664,7 +2664,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: sendCmd_CMD_PARAMS_PRIORITY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32 ) @@ -2698,7 +2698,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: sendCmd_CMD_DROP( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2723,7 +2723,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: sendCmd_CMD_PARAMS_PRIORITY_DROP( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32 ) @@ -3463,7 +3463,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: paramSend_ParamU32( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3490,7 +3490,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: paramSave_ParamU32( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3522,7 +3522,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: paramSend_ParamF64( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3549,7 +3549,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: paramSave_ParamF64( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3581,7 +3581,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: paramSend_ParamString( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3608,7 +3608,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: paramSave_ParamString( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3640,7 +3640,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: paramSend_ParamEnum( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3667,7 +3667,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: paramSave_ParamEnum( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3699,7 +3699,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: paramSend_ParamArray( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3726,7 +3726,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: paramSave_ParamArray( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3758,7 +3758,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: paramSend_ParamStruct( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3785,7 +3785,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: paramSave_ParamStruct( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -4002,7 +4002,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode ) { @@ -4012,7 +4012,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, const Fw::CmdResponse& response @@ -4025,7 +4025,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: from_eventOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwEventIdType id, Fw::Time& timeTag, const Fw::LogSeverity& severity, @@ -4039,7 +4039,7 @@ void QueuedSerialTesterBase :: Fw::ParamValid QueuedSerialTesterBase :: from_prmGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwPrmIdType id, Fw::ParamBuffer& val ) @@ -4126,7 +4126,7 @@ Fw::ParamValid QueuedSerialTesterBase :: void QueuedSerialTesterBase :: from_prmSetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwPrmIdType id, Fw::ParamBuffer& val ) @@ -4234,7 +4234,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: from_textEventOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwEventIdType id, Fw::Time& timeTag, const Fw::LogSeverity& severity, @@ -4250,7 +4250,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -4261,7 +4261,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: from_tlmOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwChanIdType id, Fw::Time& timeTag, Fw::TlmBuffer& val @@ -4274,7 +4274,7 @@ void QueuedSerialTesterBase :: void QueuedSerialTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -4285,7 +4285,7 @@ void QueuedSerialTesterBase :: U32 QueuedSerialTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -4296,7 +4296,7 @@ U32 QueuedSerialTesterBase :: void QueuedSerialTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4323,7 +4323,7 @@ void QueuedSerialTesterBase :: F32 QueuedSerialTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4350,7 +4350,7 @@ F32 QueuedSerialTesterBase :: void QueuedSerialTesterBase :: from_serialOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.hpp index 090d4fc35..b4d17aa48 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSerialTesterBase.ref.hpp @@ -249,7 +249,7 @@ class QueuedSerialTesterBase : //! Initialize object QueuedSerialTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -260,121 +260,121 @@ class QueuedSerialTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to noArgsAsync[portNum] void connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedAsync[portNum] void connect_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncAssert[portNum] void connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncBlockPriority[portNum] void connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncDropPriority[portNum] void connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to serialAsync[portNum] void connect_to_serialAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The input port ); //! Connect port to serialAsyncAssert[portNum] void connect_to_serialAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The input port ); //! Connect port to serialAsyncBlockPriority[portNum] void connect_to_serialAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The input port ); //! Connect port to serialAsyncDropPriority[portNum] void connect_to_serialAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The input port ); //! Connect port to serialGuarded[portNum] void connect_to_serialGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The input port ); //! Connect port to serialSync[portNum] void connect_to_serialSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputSerializePort* port //!< The input port ); @@ -388,35 +388,35 @@ class QueuedSerialTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -425,7 +425,7 @@ class QueuedSerialTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -434,49 +434,49 @@ class QueuedSerialTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_serialOut[portNum] Fw::InputSerializePort* get_from_serialOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -502,17 +502,17 @@ class QueuedSerialTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -524,7 +524,7 @@ class QueuedSerialTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -536,7 +536,7 @@ class QueuedSerialTesterBase : //! Handler for input port from_serialOut virtual void from_serialOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ) = 0; @@ -548,17 +548,17 @@ class QueuedSerialTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -570,7 +570,7 @@ class QueuedSerialTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -582,7 +582,7 @@ class QueuedSerialTesterBase : //! Handler base-class function for from_serialOut void from_serialOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); @@ -594,32 +594,32 @@ class QueuedSerialTesterBase : //! Invoke the to port connected to noArgsAsync void invoke_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedAsync void invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -631,7 +631,7 @@ class QueuedSerialTesterBase : //! Invoke the to port connected to typedAsyncAssert void invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -643,7 +643,7 @@ class QueuedSerialTesterBase : //! Invoke the to port connected to typedAsyncBlockPriority void invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -655,7 +655,7 @@ class QueuedSerialTesterBase : //! Invoke the to port connected to typedAsyncDropPriority void invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -667,7 +667,7 @@ class QueuedSerialTesterBase : //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -679,7 +679,7 @@ class QueuedSerialTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -691,7 +691,7 @@ class QueuedSerialTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -703,7 +703,7 @@ class QueuedSerialTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -715,37 +715,37 @@ class QueuedSerialTesterBase : //! Invoke the to port connected to serialAsync void invoke_to_serialAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Invoke the to port connected to serialAsyncAssert void invoke_to_serialAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Invoke the to port connected to serialAsyncBlockPriority void invoke_to_serialAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Invoke the to port connected to serialAsyncDropPriority void invoke_to_serialAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Invoke the to port connected to serialGuarded void invoke_to_serialGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); //! Invoke the to port connected to serialSync void invoke_to_serialSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); @@ -758,171 +758,171 @@ class QueuedSerialTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_noArgsAsync ports //! //! \return The number of to_noArgsAsync ports - NATIVE_INT_TYPE getNum_to_noArgsAsync() const; + FwIndexType getNum_to_noArgsAsync() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedAsync ports //! //! \return The number of to_typedAsync ports - NATIVE_INT_TYPE getNum_to_typedAsync() const; + FwIndexType getNum_to_typedAsync() const; //! Get the number of to_typedAsyncAssert ports //! //! \return The number of to_typedAsyncAssert ports - NATIVE_INT_TYPE getNum_to_typedAsyncAssert() const; + FwIndexType getNum_to_typedAsyncAssert() const; //! Get the number of to_typedAsyncBlockPriority ports //! //! \return The number of to_typedAsyncBlockPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncBlockPriority() const; + FwIndexType getNum_to_typedAsyncBlockPriority() const; //! Get the number of to_typedAsyncDropPriority ports //! //! \return The number of to_typedAsyncDropPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncDropPriority() const; + FwIndexType getNum_to_typedAsyncDropPriority() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of to_serialAsync ports //! //! \return The number of to_serialAsync ports - NATIVE_INT_TYPE getNum_to_serialAsync() const; + FwIndexType getNum_to_serialAsync() const; //! Get the number of to_serialAsyncAssert ports //! //! \return The number of to_serialAsyncAssert ports - NATIVE_INT_TYPE getNum_to_serialAsyncAssert() const; + FwIndexType getNum_to_serialAsyncAssert() const; //! Get the number of to_serialAsyncBlockPriority ports //! //! \return The number of to_serialAsyncBlockPriority ports - NATIVE_INT_TYPE getNum_to_serialAsyncBlockPriority() const; + FwIndexType getNum_to_serialAsyncBlockPriority() const; //! Get the number of to_serialAsyncDropPriority ports //! //! \return The number of to_serialAsyncDropPriority ports - NATIVE_INT_TYPE getNum_to_serialAsyncDropPriority() const; + FwIndexType getNum_to_serialAsyncDropPriority() const; //! Get the number of to_serialGuarded ports //! //! \return The number of to_serialGuarded ports - NATIVE_INT_TYPE getNum_to_serialGuarded() const; + FwIndexType getNum_to_serialGuarded() const; //! Get the number of to_serialSync ports //! //! \return The number of to_serialSync ports - NATIVE_INT_TYPE getNum_to_serialSync() const; + FwIndexType getNum_to_serialSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; //! Get the number of from_serialOut ports //! //! \return The number of from_serialOut ports - NATIVE_INT_TYPE getNum_from_serialOut() const; + FwIndexType getNum_from_serialOut() const; protected: @@ -934,140 +934,140 @@ class QueuedSerialTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsAsync is connected //! //! \return Whether port to_noArgsAsync is connected bool isConnected_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsync is connected //! //! \return Whether port to_typedAsync is connected bool isConnected_to_typedAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncAssert is connected //! //! \return Whether port to_typedAsyncAssert is connected bool isConnected_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncBlockPriority is connected //! //! \return Whether port to_typedAsyncBlockPriority is connected bool isConnected_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncDropPriority is connected //! //! \return Whether port to_typedAsyncDropPriority is connected bool isConnected_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_serialAsync is connected //! //! \return Whether port to_serialAsync is connected bool isConnected_to_serialAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_serialAsyncAssert is connected //! //! \return Whether port to_serialAsyncAssert is connected bool isConnected_to_serialAsyncAssert( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_serialAsyncBlockPriority is connected //! //! \return Whether port to_serialAsyncBlockPriority is connected bool isConnected_to_serialAsyncBlockPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_serialAsyncDropPriority is connected //! //! \return Whether port to_serialAsyncDropPriority is connected bool isConnected_to_serialAsyncDropPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_serialGuarded is connected //! //! \return Whether port to_serialGuarded is connected bool isConnected_to_serialGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_serialSync is connected //! //! \return Whether port to_serialSync is connected bool isConnected_to_serialSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -1092,13 +1092,13 @@ class QueuedSerialTesterBase : //! Send a CMD_SYNC command void sendCmd_CMD_SYNC( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_SYNC_PRIMITIVE command void sendCmd_CMD_SYNC_PRIMITIVE( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32, //!< A U32 F32 f32, //!< An F32 @@ -1107,7 +1107,7 @@ class QueuedSerialTesterBase : //! Send a CMD_SYNC_STRING command void sendCmd_CMD_SYNC_STRING( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number const Fw::CmdStringArg& str1, //!< A string const Fw::CmdStringArg& str2 //!< Another string @@ -1115,34 +1115,34 @@ class QueuedSerialTesterBase : //! Send a CMD_SYNC_ENUM command void sendCmd_CMD_SYNC_ENUM( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number E e //!< An enum ); //! Send a CMD_SYNC_ARRAY command void sendCmd_CMD_SYNC_ARRAY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number A a //!< An array ); //! Send a CMD_SYNC_STRUCT command void sendCmd_CMD_SYNC_STRUCT( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number S s //!< A struct ); //! Send a CMD_GUARDED command void sendCmd_CMD_GUARDED( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_GUARDED_PRIMITIVE command void sendCmd_CMD_GUARDED_PRIMITIVE( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32, //!< A U32 F32 f32, //!< An F32 @@ -1151,7 +1151,7 @@ class QueuedSerialTesterBase : //! Send a CMD_GUARDED_STRING command void sendCmd_CMD_GUARDED_STRING( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number const Fw::CmdStringArg& str1, //!< A string const Fw::CmdStringArg& str2 //!< Another string @@ -1159,53 +1159,53 @@ class QueuedSerialTesterBase : //! Send a CMD_GUARDED_ENUM command void sendCmd_CMD_GUARDED_ENUM( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number E e //!< An enum ); //! Send a CMD_GUARDED_ARRAY command void sendCmd_CMD_GUARDED_ARRAY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number A a //!< An array ); //! Send a CMD_GUARDED_STRUCT command void sendCmd_CMD_GUARDED_STRUCT( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number S s //!< A struct ); //! Send a CMD_ASYNC command void sendCmd_CMD_ASYNC( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_PRIORITY command void sendCmd_CMD_PRIORITY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_PARAMS_PRIORITY command void sendCmd_CMD_PARAMS_PRIORITY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32 ); //! Send a CMD_DROP command void sendCmd_CMD_DROP( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_PARAMS_PRIORITY_DROP command void sendCmd_CMD_PARAMS_PRIORITY_DROP( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32 ); @@ -1363,13 +1363,13 @@ class QueuedSerialTesterBase : //! Send parameter ParamU32 void paramSend_ParamU32( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamU32 void paramSave_ParamU32( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1381,13 +1381,13 @@ class QueuedSerialTesterBase : //! Send parameter ParamF64 void paramSend_ParamF64( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamF64 void paramSave_ParamF64( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1399,13 +1399,13 @@ class QueuedSerialTesterBase : //! Send parameter ParamString void paramSend_ParamString( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamString void paramSave_ParamString( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1417,13 +1417,13 @@ class QueuedSerialTesterBase : //! Send parameter ParamEnum void paramSend_ParamEnum( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamEnum void paramSave_ParamEnum( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1435,13 +1435,13 @@ class QueuedSerialTesterBase : //! Send parameter ParamArray void paramSend_ParamArray( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamArray void paramSave_ParamArray( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1453,13 +1453,13 @@ class QueuedSerialTesterBase : //! Send parameter ParamStruct void paramSend_ParamStruct( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamStruct void paramSave_ParamStruct( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1542,14 +1542,14 @@ class QueuedSerialTesterBase : //! Static function for port from_cmdRegOut static void from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode //!< Command Op Code ); //! Static function for port from_cmdResponseOut static void from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence const Fw::CmdResponse& response //!< The command response argument @@ -1558,7 +1558,7 @@ class QueuedSerialTesterBase : //! Static function for port from_eventOut static void from_eventOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwEventIdType id, //!< Log ID Fw::Time& timeTag, //!< Time Tag const Fw::LogSeverity& severity, //!< The severity argument @@ -1568,7 +1568,7 @@ class QueuedSerialTesterBase : //! Static function for port from_prmGetOut static Fw::ParamValid from_prmGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwPrmIdType id, //!< Parameter ID Fw::ParamBuffer& val //!< Buffer containing serialized parameter value ); @@ -1576,7 +1576,7 @@ class QueuedSerialTesterBase : //! Static function for port from_prmSetOut static void from_prmSetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwPrmIdType id, //!< Parameter ID Fw::ParamBuffer& val //!< Buffer containing serialized parameter value ); @@ -1586,7 +1586,7 @@ class QueuedSerialTesterBase : //! Static function for port from_textEventOut static void from_textEventOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwEventIdType id, //!< Log ID Fw::Time& timeTag, //!< Time Tag const Fw::LogSeverity& severity, //!< The severity argument @@ -1598,14 +1598,14 @@ class QueuedSerialTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_tlmOut static void from_tlmOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwChanIdType id, //!< Telemetry Channel ID Fw::Time& timeTag, //!< Time Tag Fw::TlmBuffer& val //!< Buffer containing serialized telemetry value @@ -1614,19 +1614,19 @@ class QueuedSerialTesterBase : //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1639,7 +1639,7 @@ class QueuedSerialTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1652,7 +1652,7 @@ class QueuedSerialTesterBase : //! Static function for port from_serialOut static void from_serialOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSyncProductsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSyncProductsTesterBase.ref.cpp index c10ce7f65..1d9b88227 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSyncProductsTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSyncProductsTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void QueuedSyncProductsTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productRequestOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productRequestOut()); port++ ) { this->m_from_productRequestOut[port].init(); @@ -45,8 +45,8 @@ void QueuedSyncProductsTesterBase :: // Connect input port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productSendOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productSendOut()); port++ ) { this->m_from_productSendOut[port].init(); @@ -69,8 +69,8 @@ void QueuedSyncProductsTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -93,8 +93,8 @@ void QueuedSyncProductsTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -117,8 +117,8 @@ void QueuedSyncProductsTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -141,8 +141,8 @@ void QueuedSyncProductsTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -165,8 +165,8 @@ void QueuedSyncProductsTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -189,8 +189,8 @@ void QueuedSyncProductsTesterBase :: // Connect output port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_productRecvIn()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_productRecvIn()); port++ ) { this->m_to_productRecvIn[port].init(); @@ -208,8 +208,8 @@ void QueuedSyncProductsTesterBase :: // Connect output port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsAsync()); port++ ) { this->m_to_noArgsAsync[port].init(); @@ -227,8 +227,8 @@ void QueuedSyncProductsTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -246,8 +246,8 @@ void QueuedSyncProductsTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -265,8 +265,8 @@ void QueuedSyncProductsTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -284,8 +284,8 @@ void QueuedSyncProductsTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -303,8 +303,8 @@ void QueuedSyncProductsTesterBase :: // Connect output port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsync()); port++ ) { this->m_to_typedAsync[port].init(); @@ -322,8 +322,8 @@ void QueuedSyncProductsTesterBase :: // Connect output port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncAssert()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncAssert()); port++ ) { this->m_to_typedAsyncAssert[port].init(); @@ -341,8 +341,8 @@ void QueuedSyncProductsTesterBase :: // Connect output port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncBlockPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncBlockPriority()); port++ ) { this->m_to_typedAsyncBlockPriority[port].init(); @@ -360,8 +360,8 @@ void QueuedSyncProductsTesterBase :: // Connect output port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncDropPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncDropPriority()); port++ ) { this->m_to_typedAsyncDropPriority[port].init(); @@ -379,8 +379,8 @@ void QueuedSyncProductsTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -398,8 +398,8 @@ void QueuedSyncProductsTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -417,8 +417,8 @@ void QueuedSyncProductsTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -436,8 +436,8 @@ void QueuedSyncProductsTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -460,7 +460,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -474,7 +474,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpResponsePort* port ) { @@ -488,7 +488,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -502,7 +502,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -516,7 +516,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -530,7 +530,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -544,7 +544,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -558,7 +558,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: connect_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -572,7 +572,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -586,7 +586,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -600,7 +600,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -614,7 +614,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -628,7 +628,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -642,7 +642,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -656,7 +656,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -673,7 +673,7 @@ void QueuedSyncProductsTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* QueuedSyncProductsTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -684,7 +684,7 @@ Fw::InputCmdRegPort* QueuedSyncProductsTesterBase :: } Fw::InputCmdResponsePort* QueuedSyncProductsTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -695,7 +695,7 @@ Fw::InputCmdResponsePort* QueuedSyncProductsTesterBase :: } Fw::InputLogPort* QueuedSyncProductsTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -706,7 +706,7 @@ Fw::InputLogPort* QueuedSyncProductsTesterBase :: } Fw::InputPrmGetPort* QueuedSyncProductsTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -717,7 +717,7 @@ Fw::InputPrmGetPort* QueuedSyncProductsTesterBase :: } Fw::InputPrmSetPort* QueuedSyncProductsTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -728,7 +728,7 @@ Fw::InputPrmSetPort* QueuedSyncProductsTesterBase :: } Fw::InputDpRequestPort* QueuedSyncProductsTesterBase :: - get_from_productRequestOut(NATIVE_INT_TYPE portNum) + get_from_productRequestOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productRequestOut(), @@ -739,7 +739,7 @@ Fw::InputDpRequestPort* QueuedSyncProductsTesterBase :: } Fw::InputDpSendPort* QueuedSyncProductsTesterBase :: - get_from_productSendOut(NATIVE_INT_TYPE portNum) + get_from_productSendOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productSendOut(), @@ -752,7 +752,7 @@ Fw::InputDpSendPort* QueuedSyncProductsTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* QueuedSyncProductsTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -765,7 +765,7 @@ Fw::InputLogTextPort* QueuedSyncProductsTesterBase :: #endif Fw::InputTimePort* QueuedSyncProductsTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -776,7 +776,7 @@ Fw::InputTimePort* QueuedSyncProductsTesterBase :: } Fw::InputTlmPort* QueuedSyncProductsTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -787,7 +787,7 @@ Fw::InputTlmPort* QueuedSyncProductsTesterBase :: } Ports::InputNoArgsPort* QueuedSyncProductsTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -798,7 +798,7 @@ Ports::InputNoArgsPort* QueuedSyncProductsTesterBase :: } Ports::InputNoArgsReturnPort* QueuedSyncProductsTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -809,7 +809,7 @@ Ports::InputNoArgsReturnPort* QueuedSyncProductsTesterBase :: } Ports::InputTypedPort* QueuedSyncProductsTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -820,7 +820,7 @@ Ports::InputTypedPort* QueuedSyncProductsTesterBase :: } Ports::InputTypedReturnPort* QueuedSyncProductsTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -870,7 +870,7 @@ QueuedSyncProductsTesterBase :: // ---------------------------------------------------------------------- void QueuedSyncProductsTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -881,7 +881,7 @@ void QueuedSyncProductsTesterBase :: } U32 QueuedSyncProductsTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -893,7 +893,7 @@ U32 QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -922,7 +922,7 @@ void QueuedSyncProductsTesterBase :: F32 QueuedSyncProductsTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -954,7 +954,7 @@ F32 QueuedSyncProductsTesterBase :: // ---------------------------------------------------------------------- void QueuedSyncProductsTesterBase :: - invoke_to_noArgsAsync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsAsync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -965,7 +965,7 @@ void QueuedSyncProductsTesterBase :: } void QueuedSyncProductsTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -976,7 +976,7 @@ void QueuedSyncProductsTesterBase :: } U32 QueuedSyncProductsTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -987,7 +987,7 @@ U32 QueuedSyncProductsTesterBase :: } U32 QueuedSyncProductsTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -998,7 +998,7 @@ U32 QueuedSyncProductsTesterBase :: } void QueuedSyncProductsTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1010,7 +1010,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1038,7 +1038,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1066,7 +1066,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1094,7 +1094,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1122,7 +1122,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1150,7 +1150,7 @@ void QueuedSyncProductsTesterBase :: F32 QueuedSyncProductsTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1178,7 +1178,7 @@ F32 QueuedSyncProductsTesterBase :: F32 QueuedSyncProductsTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1206,7 +1206,7 @@ F32 QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1236,182 +1236,182 @@ void QueuedSyncProductsTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_to_productRecvIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_to_noArgsAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_to_typedAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_to_typedAsyncAssert() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_to_typedAsyncBlockPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_to_typedAsyncDropPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_from_productRequestOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_from_productSendOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: +FwIndexType QueuedSyncProductsTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1419,7 +1419,7 @@ NATIVE_INT_TYPE QueuedSyncProductsTesterBase :: // ---------------------------------------------------------------------- bool QueuedSyncProductsTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1430,7 +1430,7 @@ bool QueuedSyncProductsTesterBase :: } bool QueuedSyncProductsTesterBase :: - isConnected_to_productRecvIn(NATIVE_INT_TYPE portNum) + isConnected_to_productRecvIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_productRecvIn(), @@ -1441,7 +1441,7 @@ bool QueuedSyncProductsTesterBase :: } bool QueuedSyncProductsTesterBase :: - isConnected_to_noArgsAsync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsAsync(), @@ -1452,7 +1452,7 @@ bool QueuedSyncProductsTesterBase :: } bool QueuedSyncProductsTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1463,7 +1463,7 @@ bool QueuedSyncProductsTesterBase :: } bool QueuedSyncProductsTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1474,7 +1474,7 @@ bool QueuedSyncProductsTesterBase :: } bool QueuedSyncProductsTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1485,7 +1485,7 @@ bool QueuedSyncProductsTesterBase :: } bool QueuedSyncProductsTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1496,7 +1496,7 @@ bool QueuedSyncProductsTesterBase :: } bool QueuedSyncProductsTesterBase :: - isConnected_to_typedAsync(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsync(), @@ -1507,7 +1507,7 @@ bool QueuedSyncProductsTesterBase :: } bool QueuedSyncProductsTesterBase :: - isConnected_to_typedAsyncAssert(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncAssert(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncAssert(), @@ -1518,7 +1518,7 @@ bool QueuedSyncProductsTesterBase :: } bool QueuedSyncProductsTesterBase :: - isConnected_to_typedAsyncBlockPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncBlockPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncBlockPriority(), @@ -1529,7 +1529,7 @@ bool QueuedSyncProductsTesterBase :: } bool QueuedSyncProductsTesterBase :: - isConnected_to_typedAsyncDropPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncDropPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncDropPriority(), @@ -1540,7 +1540,7 @@ bool QueuedSyncProductsTesterBase :: } bool QueuedSyncProductsTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1551,7 +1551,7 @@ bool QueuedSyncProductsTesterBase :: } bool QueuedSyncProductsTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1562,7 +1562,7 @@ bool QueuedSyncProductsTesterBase :: } bool QueuedSyncProductsTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1573,7 +1573,7 @@ bool QueuedSyncProductsTesterBase :: } bool QueuedSyncProductsTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1738,7 +1738,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: from_productRequestOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -1750,7 +1750,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: from_productSendOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -1762,7 +1762,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -1773,7 +1773,7 @@ void QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1784,7 +1784,7 @@ void QueuedSyncProductsTesterBase :: U32 QueuedSyncProductsTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1795,7 +1795,7 @@ U32 QueuedSyncProductsTesterBase :: void QueuedSyncProductsTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1822,7 +1822,7 @@ void QueuedSyncProductsTesterBase :: F32 QueuedSyncProductsTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSyncProductsTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSyncProductsTesterBase.ref.hpp index 642c3f36d..3b0718a6a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSyncProductsTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSyncProductsTesterBase.ref.hpp @@ -149,7 +149,7 @@ class QueuedSyncProductsTesterBase : //! Initialize object QueuedSyncProductsTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -160,91 +160,91 @@ class QueuedSyncProductsTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to productRecvIn[portNum] void connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpResponsePort* port //!< The input port ); //! Connect port to noArgsAsync[portNum] void connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedAsync[portNum] void connect_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncAssert[portNum] void connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncBlockPriority[portNum] void connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncDropPriority[portNum] void connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -258,49 +258,49 @@ class QueuedSyncProductsTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productRequestOut[portNum] Fw::InputDpRequestPort* get_from_productRequestOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productSendOut[portNum] Fw::InputDpSendPort* get_from_productSendOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -309,7 +309,7 @@ class QueuedSyncProductsTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -318,42 +318,42 @@ class QueuedSyncProductsTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -379,17 +379,17 @@ class QueuedSyncProductsTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -401,7 +401,7 @@ class QueuedSyncProductsTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -419,17 +419,17 @@ class QueuedSyncProductsTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -441,7 +441,7 @@ class QueuedSyncProductsTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -459,32 +459,32 @@ class QueuedSyncProductsTesterBase : //! Invoke the to port connected to noArgsAsync void invoke_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedAsync void invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -496,7 +496,7 @@ class QueuedSyncProductsTesterBase : //! Invoke the to port connected to typedAsyncAssert void invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -508,7 +508,7 @@ class QueuedSyncProductsTesterBase : //! Invoke the to port connected to typedAsyncBlockPriority void invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -520,7 +520,7 @@ class QueuedSyncProductsTesterBase : //! Invoke the to port connected to typedAsyncDropPriority void invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -532,7 +532,7 @@ class QueuedSyncProductsTesterBase : //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -544,7 +544,7 @@ class QueuedSyncProductsTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -556,7 +556,7 @@ class QueuedSyncProductsTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -568,7 +568,7 @@ class QueuedSyncProductsTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -587,151 +587,151 @@ class QueuedSyncProductsTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_productRecvIn ports //! //! \return The number of to_productRecvIn ports - NATIVE_INT_TYPE getNum_to_productRecvIn() const; + FwIndexType getNum_to_productRecvIn() const; //! Get the number of to_noArgsAsync ports //! //! \return The number of to_noArgsAsync ports - NATIVE_INT_TYPE getNum_to_noArgsAsync() const; + FwIndexType getNum_to_noArgsAsync() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedAsync ports //! //! \return The number of to_typedAsync ports - NATIVE_INT_TYPE getNum_to_typedAsync() const; + FwIndexType getNum_to_typedAsync() const; //! Get the number of to_typedAsyncAssert ports //! //! \return The number of to_typedAsyncAssert ports - NATIVE_INT_TYPE getNum_to_typedAsyncAssert() const; + FwIndexType getNum_to_typedAsyncAssert() const; //! Get the number of to_typedAsyncBlockPriority ports //! //! \return The number of to_typedAsyncBlockPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncBlockPriority() const; + FwIndexType getNum_to_typedAsyncBlockPriority() const; //! Get the number of to_typedAsyncDropPriority ports //! //! \return The number of to_typedAsyncDropPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncDropPriority() const; + FwIndexType getNum_to_typedAsyncDropPriority() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; //! Get the number of from_productRequestOut ports //! //! \return The number of from_productRequestOut ports - NATIVE_INT_TYPE getNum_from_productRequestOut() const; + FwIndexType getNum_from_productRequestOut() const; //! Get the number of from_productSendOut ports //! //! \return The number of from_productSendOut ports - NATIVE_INT_TYPE getNum_from_productSendOut() const; + FwIndexType getNum_from_productSendOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -743,105 +743,105 @@ class QueuedSyncProductsTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_productRecvIn is connected //! //! \return Whether port to_productRecvIn is connected bool isConnected_to_productRecvIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsAsync is connected //! //! \return Whether port to_noArgsAsync is connected bool isConnected_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsync is connected //! //! \return Whether port to_typedAsync is connected bool isConnected_to_typedAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncAssert is connected //! //! \return Whether port to_typedAsyncAssert is connected bool isConnected_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncBlockPriority is connected //! //! \return Whether port to_typedAsyncBlockPriority is connected bool isConnected_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncDropPriority is connected //! //! \return Whether port to_typedAsyncDropPriority is connected bool isConnected_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -947,7 +947,7 @@ class QueuedSyncProductsTesterBase : //! Static function for port from_productRequestOut static void from_productRequestOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); @@ -955,7 +955,7 @@ class QueuedSyncProductsTesterBase : //! Static function for port from_productSendOut static void from_productSendOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -963,26 +963,26 @@ class QueuedSyncProductsTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -995,7 +995,7 @@ class QueuedSyncProductsTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTelemetryTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTelemetryTesterBase.ref.cpp index 04ee1e982..5bdfede09 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTelemetryTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTelemetryTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void QueuedTelemetryTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -45,8 +45,8 @@ void QueuedTelemetryTesterBase :: // Connect input port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_tlmOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_tlmOut()); port++ ) { this->m_from_tlmOut[port].init(); @@ -69,8 +69,8 @@ void QueuedTelemetryTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -93,8 +93,8 @@ void QueuedTelemetryTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -117,8 +117,8 @@ void QueuedTelemetryTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -141,8 +141,8 @@ void QueuedTelemetryTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -165,8 +165,8 @@ void QueuedTelemetryTesterBase :: // Connect output port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsAsync()); port++ ) { this->m_to_noArgsAsync[port].init(); @@ -184,8 +184,8 @@ void QueuedTelemetryTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -203,8 +203,8 @@ void QueuedTelemetryTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -222,8 +222,8 @@ void QueuedTelemetryTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -241,8 +241,8 @@ void QueuedTelemetryTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -260,8 +260,8 @@ void QueuedTelemetryTesterBase :: // Connect output port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsync()); port++ ) { this->m_to_typedAsync[port].init(); @@ -279,8 +279,8 @@ void QueuedTelemetryTesterBase :: // Connect output port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncAssert()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncAssert()); port++ ) { this->m_to_typedAsyncAssert[port].init(); @@ -298,8 +298,8 @@ void QueuedTelemetryTesterBase :: // Connect output port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncBlockPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncBlockPriority()); port++ ) { this->m_to_typedAsyncBlockPriority[port].init(); @@ -317,8 +317,8 @@ void QueuedTelemetryTesterBase :: // Connect output port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncDropPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncDropPriority()); port++ ) { this->m_to_typedAsyncDropPriority[port].init(); @@ -336,8 +336,8 @@ void QueuedTelemetryTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -355,8 +355,8 @@ void QueuedTelemetryTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -374,8 +374,8 @@ void QueuedTelemetryTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -393,8 +393,8 @@ void QueuedTelemetryTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -417,7 +417,7 @@ void QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -431,7 +431,7 @@ void QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -445,7 +445,7 @@ void QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -459,7 +459,7 @@ void QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -473,7 +473,7 @@ void QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -487,7 +487,7 @@ void QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -501,7 +501,7 @@ void QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: connect_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -515,7 +515,7 @@ void QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -529,7 +529,7 @@ void QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -543,7 +543,7 @@ void QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -557,7 +557,7 @@ void QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -571,7 +571,7 @@ void QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -585,7 +585,7 @@ void QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -599,7 +599,7 @@ void QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -616,7 +616,7 @@ void QueuedTelemetryTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* QueuedTelemetryTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -627,7 +627,7 @@ Fw::InputCmdRegPort* QueuedTelemetryTesterBase :: } Fw::InputCmdResponsePort* QueuedTelemetryTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -638,7 +638,7 @@ Fw::InputCmdResponsePort* QueuedTelemetryTesterBase :: } Fw::InputLogPort* QueuedTelemetryTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -649,7 +649,7 @@ Fw::InputLogPort* QueuedTelemetryTesterBase :: } Fw::InputPrmGetPort* QueuedTelemetryTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -660,7 +660,7 @@ Fw::InputPrmGetPort* QueuedTelemetryTesterBase :: } Fw::InputPrmSetPort* QueuedTelemetryTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -673,7 +673,7 @@ Fw::InputPrmSetPort* QueuedTelemetryTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* QueuedTelemetryTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -686,7 +686,7 @@ Fw::InputLogTextPort* QueuedTelemetryTesterBase :: #endif Fw::InputTimePort* QueuedTelemetryTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -697,7 +697,7 @@ Fw::InputTimePort* QueuedTelemetryTesterBase :: } Fw::InputTlmPort* QueuedTelemetryTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -708,7 +708,7 @@ Fw::InputTlmPort* QueuedTelemetryTesterBase :: } Ports::InputNoArgsPort* QueuedTelemetryTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -719,7 +719,7 @@ Ports::InputNoArgsPort* QueuedTelemetryTesterBase :: } Ports::InputNoArgsReturnPort* QueuedTelemetryTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -730,7 +730,7 @@ Ports::InputNoArgsReturnPort* QueuedTelemetryTesterBase :: } Ports::InputTypedPort* QueuedTelemetryTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -741,7 +741,7 @@ Ports::InputTypedPort* QueuedTelemetryTesterBase :: } Ports::InputTypedReturnPort* QueuedTelemetryTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -809,7 +809,7 @@ QueuedTelemetryTesterBase :: // ---------------------------------------------------------------------- void QueuedTelemetryTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -820,7 +820,7 @@ void QueuedTelemetryTesterBase :: } U32 QueuedTelemetryTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -832,7 +832,7 @@ U32 QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -861,7 +861,7 @@ void QueuedTelemetryTesterBase :: F32 QueuedTelemetryTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -893,7 +893,7 @@ F32 QueuedTelemetryTesterBase :: // ---------------------------------------------------------------------- void QueuedTelemetryTesterBase :: - invoke_to_noArgsAsync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsAsync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -904,7 +904,7 @@ void QueuedTelemetryTesterBase :: } void QueuedTelemetryTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -915,7 +915,7 @@ void QueuedTelemetryTesterBase :: } U32 QueuedTelemetryTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -926,7 +926,7 @@ U32 QueuedTelemetryTesterBase :: } U32 QueuedTelemetryTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -937,7 +937,7 @@ U32 QueuedTelemetryTesterBase :: } void QueuedTelemetryTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -949,7 +949,7 @@ void QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -977,7 +977,7 @@ void QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1005,7 +1005,7 @@ void QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1033,7 +1033,7 @@ void QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1061,7 +1061,7 @@ void QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1089,7 +1089,7 @@ void QueuedTelemetryTesterBase :: F32 QueuedTelemetryTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1117,7 +1117,7 @@ F32 QueuedTelemetryTesterBase :: F32 QueuedTelemetryTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1145,7 +1145,7 @@ F32 QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1175,164 +1175,164 @@ void QueuedTelemetryTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_to_noArgsAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); } -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_to_typedAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); } -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_to_typedAsyncAssert() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); } -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_to_typedAsyncBlockPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); } -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_to_typedAsyncDropPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); } -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE QueuedTelemetryTesterBase :: +FwIndexType QueuedTelemetryTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1340,7 +1340,7 @@ NATIVE_INT_TYPE QueuedTelemetryTesterBase :: // ---------------------------------------------------------------------- bool QueuedTelemetryTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1351,7 +1351,7 @@ bool QueuedTelemetryTesterBase :: } bool QueuedTelemetryTesterBase :: - isConnected_to_noArgsAsync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsAsync(), @@ -1362,7 +1362,7 @@ bool QueuedTelemetryTesterBase :: } bool QueuedTelemetryTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1373,7 +1373,7 @@ bool QueuedTelemetryTesterBase :: } bool QueuedTelemetryTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1384,7 +1384,7 @@ bool QueuedTelemetryTesterBase :: } bool QueuedTelemetryTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1395,7 +1395,7 @@ bool QueuedTelemetryTesterBase :: } bool QueuedTelemetryTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1406,7 +1406,7 @@ bool QueuedTelemetryTesterBase :: } bool QueuedTelemetryTesterBase :: - isConnected_to_typedAsync(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsync(), @@ -1417,7 +1417,7 @@ bool QueuedTelemetryTesterBase :: } bool QueuedTelemetryTesterBase :: - isConnected_to_typedAsyncAssert(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncAssert(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncAssert(), @@ -1428,7 +1428,7 @@ bool QueuedTelemetryTesterBase :: } bool QueuedTelemetryTesterBase :: - isConnected_to_typedAsyncBlockPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncBlockPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncBlockPriority(), @@ -1439,7 +1439,7 @@ bool QueuedTelemetryTesterBase :: } bool QueuedTelemetryTesterBase :: - isConnected_to_typedAsyncDropPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncDropPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncDropPriority(), @@ -1450,7 +1450,7 @@ bool QueuedTelemetryTesterBase :: } bool QueuedTelemetryTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1461,7 +1461,7 @@ bool QueuedTelemetryTesterBase :: } bool QueuedTelemetryTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1472,7 +1472,7 @@ bool QueuedTelemetryTesterBase :: } bool QueuedTelemetryTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1483,7 +1483,7 @@ bool QueuedTelemetryTesterBase :: } bool QueuedTelemetryTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1898,7 +1898,7 @@ void QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -1909,7 +1909,7 @@ void QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: from_tlmOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwChanIdType id, Fw::Time& timeTag, Fw::TlmBuffer& val @@ -1922,7 +1922,7 @@ void QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1933,7 +1933,7 @@ void QueuedTelemetryTesterBase :: U32 QueuedTelemetryTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -1944,7 +1944,7 @@ U32 QueuedTelemetryTesterBase :: void QueuedTelemetryTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1971,7 +1971,7 @@ void QueuedTelemetryTesterBase :: F32 QueuedTelemetryTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTelemetryTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTelemetryTesterBase.ref.hpp index a888ac773..0272a204b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTelemetryTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTelemetryTesterBase.ref.hpp @@ -202,7 +202,7 @@ class QueuedTelemetryTesterBase : //! Initialize object QueuedTelemetryTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -213,85 +213,85 @@ class QueuedTelemetryTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to noArgsAsync[portNum] void connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedAsync[portNum] void connect_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncAssert[portNum] void connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncBlockPriority[portNum] void connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncDropPriority[portNum] void connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -305,35 +305,35 @@ class QueuedTelemetryTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -342,7 +342,7 @@ class QueuedTelemetryTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -351,42 +351,42 @@ class QueuedTelemetryTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -412,17 +412,17 @@ class QueuedTelemetryTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -434,7 +434,7 @@ class QueuedTelemetryTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -452,17 +452,17 @@ class QueuedTelemetryTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -474,7 +474,7 @@ class QueuedTelemetryTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -492,32 +492,32 @@ class QueuedTelemetryTesterBase : //! Invoke the to port connected to noArgsAsync void invoke_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedAsync void invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -529,7 +529,7 @@ class QueuedTelemetryTesterBase : //! Invoke the to port connected to typedAsyncAssert void invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -541,7 +541,7 @@ class QueuedTelemetryTesterBase : //! Invoke the to port connected to typedAsyncBlockPriority void invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -553,7 +553,7 @@ class QueuedTelemetryTesterBase : //! Invoke the to port connected to typedAsyncDropPriority void invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -565,7 +565,7 @@ class QueuedTelemetryTesterBase : //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -577,7 +577,7 @@ class QueuedTelemetryTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -589,7 +589,7 @@ class QueuedTelemetryTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -601,7 +601,7 @@ class QueuedTelemetryTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -620,136 +620,136 @@ class QueuedTelemetryTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_noArgsAsync ports //! //! \return The number of to_noArgsAsync ports - NATIVE_INT_TYPE getNum_to_noArgsAsync() const; + FwIndexType getNum_to_noArgsAsync() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedAsync ports //! //! \return The number of to_typedAsync ports - NATIVE_INT_TYPE getNum_to_typedAsync() const; + FwIndexType getNum_to_typedAsync() const; //! Get the number of to_typedAsyncAssert ports //! //! \return The number of to_typedAsyncAssert ports - NATIVE_INT_TYPE getNum_to_typedAsyncAssert() const; + FwIndexType getNum_to_typedAsyncAssert() const; //! Get the number of to_typedAsyncBlockPriority ports //! //! \return The number of to_typedAsyncBlockPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncBlockPriority() const; + FwIndexType getNum_to_typedAsyncBlockPriority() const; //! Get the number of to_typedAsyncDropPriority ports //! //! \return The number of to_typedAsyncDropPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncDropPriority() const; + FwIndexType getNum_to_typedAsyncDropPriority() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -761,98 +761,98 @@ class QueuedTelemetryTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsAsync is connected //! //! \return Whether port to_noArgsAsync is connected bool isConnected_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsync is connected //! //! \return Whether port to_typedAsync is connected bool isConnected_to_typedAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncAssert is connected //! //! \return Whether port to_typedAsyncAssert is connected bool isConnected_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncBlockPriority is connected //! //! \return Whether port to_typedAsyncBlockPriority is connected bool isConnected_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncDropPriority is connected //! //! \return Whether port to_typedAsyncDropPriority is connected bool isConnected_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -997,14 +997,14 @@ class QueuedTelemetryTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_tlmOut static void from_tlmOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwChanIdType id, //!< Telemetry Channel ID Fw::Time& timeTag, //!< Time Tag Fw::TlmBuffer& val //!< Buffer containing serialized telemetry value @@ -1013,19 +1013,19 @@ class QueuedTelemetryTesterBase : //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1038,7 +1038,7 @@ class QueuedTelemetryTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.cpp index 735734a52..aee3a6d22 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.cpp @@ -14,15 +14,15 @@ // ---------------------------------------------------------------------- void QueuedTestTesterBase :: - init(NATIVE_INT_TYPE instance) + init(FwEnumStoreType instance) { // Initialize base class Fw::PassiveComponentBase::init(instance); // Connect input port cmdRegOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdRegOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdRegOut()); port++ ) { this->m_from_cmdRegOut[port].init(); @@ -45,8 +45,8 @@ void QueuedTestTesterBase :: // Connect input port cmdResponseOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_cmdResponseOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_cmdResponseOut()); port++ ) { this->m_from_cmdResponseOut[port].init(); @@ -69,8 +69,8 @@ void QueuedTestTesterBase :: // Connect input port eventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_eventOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_eventOut()); port++ ) { this->m_from_eventOut[port].init(); @@ -93,8 +93,8 @@ void QueuedTestTesterBase :: // Connect input port prmGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_prmGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_prmGetOut()); port++ ) { this->m_from_prmGetOut[port].init(); @@ -117,8 +117,8 @@ void QueuedTestTesterBase :: // Connect input port prmSetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_prmSetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_prmSetOut()); port++ ) { this->m_from_prmSetOut[port].init(); @@ -141,8 +141,8 @@ void QueuedTestTesterBase :: // Connect input port productRequestOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productRequestOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productRequestOut()); port++ ) { this->m_from_productRequestOut[port].init(); @@ -165,8 +165,8 @@ void QueuedTestTesterBase :: // Connect input port productSendOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_productSendOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_productSendOut()); port++ ) { this->m_from_productSendOut[port].init(); @@ -190,8 +190,8 @@ void QueuedTestTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 // Connect input port textEventOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_textEventOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_textEventOut()); port++ ) { this->m_from_textEventOut[port].init(); @@ -215,8 +215,8 @@ void QueuedTestTesterBase :: // Connect input port timeGetOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_timeGetOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_timeGetOut()); port++ ) { this->m_from_timeGetOut[port].init(); @@ -239,8 +239,8 @@ void QueuedTestTesterBase :: // Connect input port tlmOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_tlmOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_tlmOut()); port++ ) { this->m_from_tlmOut[port].init(); @@ -263,8 +263,8 @@ void QueuedTestTesterBase :: // Connect input port noArgsOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsOut()); port++ ) { this->m_from_noArgsOut[port].init(); @@ -287,8 +287,8 @@ void QueuedTestTesterBase :: // Connect input port noArgsReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_noArgsReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_noArgsReturnOut()); port++ ) { this->m_from_noArgsReturnOut[port].init(); @@ -311,8 +311,8 @@ void QueuedTestTesterBase :: // Connect input port typedOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedOut()); port++ ) { this->m_from_typedOut[port].init(); @@ -335,8 +335,8 @@ void QueuedTestTesterBase :: // Connect input port typedReturnOut for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_from_typedReturnOut()); + FwIndexType port = 0; + port < static_cast(this->getNum_from_typedReturnOut()); port++ ) { this->m_from_typedReturnOut[port].init(); @@ -359,8 +359,8 @@ void QueuedTestTesterBase :: // Connect output port cmdIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_cmdIn()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_cmdIn()); port++ ) { this->m_to_cmdIn[port].init(); @@ -378,8 +378,8 @@ void QueuedTestTesterBase :: // Connect output port productRecvIn for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_productRecvIn()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_productRecvIn()); port++ ) { this->m_to_productRecvIn[port].init(); @@ -397,8 +397,8 @@ void QueuedTestTesterBase :: // Connect output port noArgsAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsAsync()); port++ ) { this->m_to_noArgsAsync[port].init(); @@ -416,8 +416,8 @@ void QueuedTestTesterBase :: // Connect output port noArgsGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsGuarded()); port++ ) { this->m_to_noArgsGuarded[port].init(); @@ -435,8 +435,8 @@ void QueuedTestTesterBase :: // Connect output port noArgsReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnGuarded()); port++ ) { this->m_to_noArgsReturnGuarded[port].init(); @@ -454,8 +454,8 @@ void QueuedTestTesterBase :: // Connect output port noArgsReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsReturnSync()); port++ ) { this->m_to_noArgsReturnSync[port].init(); @@ -473,8 +473,8 @@ void QueuedTestTesterBase :: // Connect output port noArgsSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_noArgsSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_noArgsSync()); port++ ) { this->m_to_noArgsSync[port].init(); @@ -492,8 +492,8 @@ void QueuedTestTesterBase :: // Connect output port typedAsync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsync()); port++ ) { this->m_to_typedAsync[port].init(); @@ -511,8 +511,8 @@ void QueuedTestTesterBase :: // Connect output port typedAsyncAssert for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncAssert()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncAssert()); port++ ) { this->m_to_typedAsyncAssert[port].init(); @@ -530,8 +530,8 @@ void QueuedTestTesterBase :: // Connect output port typedAsyncBlockPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncBlockPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncBlockPriority()); port++ ) { this->m_to_typedAsyncBlockPriority[port].init(); @@ -549,8 +549,8 @@ void QueuedTestTesterBase :: // Connect output port typedAsyncDropPriority for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedAsyncDropPriority()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedAsyncDropPriority()); port++ ) { this->m_to_typedAsyncDropPriority[port].init(); @@ -568,8 +568,8 @@ void QueuedTestTesterBase :: // Connect output port typedGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedGuarded()); port++ ) { this->m_to_typedGuarded[port].init(); @@ -587,8 +587,8 @@ void QueuedTestTesterBase :: // Connect output port typedReturnGuarded for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnGuarded()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnGuarded()); port++ ) { this->m_to_typedReturnGuarded[port].init(); @@ -606,8 +606,8 @@ void QueuedTestTesterBase :: // Connect output port typedReturnSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedReturnSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedReturnSync()); port++ ) { this->m_to_typedReturnSync[port].init(); @@ -625,8 +625,8 @@ void QueuedTestTesterBase :: // Connect output port typedSync for ( - PlatformIntType port = 0; - port < static_cast(this->getNum_to_typedSync()); + FwIndexType port = 0; + port < static_cast(this->getNum_to_typedSync()); port++ ) { this->m_to_typedSync[port].init(); @@ -649,7 +649,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: connect_to_cmdIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputCmdPort* port ) { @@ -663,7 +663,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::InputDpResponsePort* port ) { @@ -677,7 +677,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -691,7 +691,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -705,7 +705,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -719,7 +719,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsReturnPort* port ) { @@ -733,7 +733,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputNoArgsPort* port ) { @@ -747,7 +747,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: connect_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -761,7 +761,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -775,7 +775,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -789,7 +789,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -803,7 +803,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -817,7 +817,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -831,7 +831,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedReturnPort* port ) { @@ -845,7 +845,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: connect_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Ports::InputTypedPort* port ) { @@ -862,7 +862,7 @@ void QueuedTestTesterBase :: // ---------------------------------------------------------------------- Fw::InputCmdRegPort* QueuedTestTesterBase :: - get_from_cmdRegOut(NATIVE_INT_TYPE portNum) + get_from_cmdRegOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdRegOut(), @@ -873,7 +873,7 @@ Fw::InputCmdRegPort* QueuedTestTesterBase :: } Fw::InputCmdResponsePort* QueuedTestTesterBase :: - get_from_cmdResponseOut(NATIVE_INT_TYPE portNum) + get_from_cmdResponseOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_cmdResponseOut(), @@ -884,7 +884,7 @@ Fw::InputCmdResponsePort* QueuedTestTesterBase :: } Fw::InputLogPort* QueuedTestTesterBase :: - get_from_eventOut(NATIVE_INT_TYPE portNum) + get_from_eventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_eventOut(), @@ -895,7 +895,7 @@ Fw::InputLogPort* QueuedTestTesterBase :: } Fw::InputPrmGetPort* QueuedTestTesterBase :: - get_from_prmGetOut(NATIVE_INT_TYPE portNum) + get_from_prmGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmGetOut(), @@ -906,7 +906,7 @@ Fw::InputPrmGetPort* QueuedTestTesterBase :: } Fw::InputPrmSetPort* QueuedTestTesterBase :: - get_from_prmSetOut(NATIVE_INT_TYPE portNum) + get_from_prmSetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_prmSetOut(), @@ -917,7 +917,7 @@ Fw::InputPrmSetPort* QueuedTestTesterBase :: } Fw::InputDpRequestPort* QueuedTestTesterBase :: - get_from_productRequestOut(NATIVE_INT_TYPE portNum) + get_from_productRequestOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productRequestOut(), @@ -928,7 +928,7 @@ Fw::InputDpRequestPort* QueuedTestTesterBase :: } Fw::InputDpSendPort* QueuedTestTesterBase :: - get_from_productSendOut(NATIVE_INT_TYPE portNum) + get_from_productSendOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_productSendOut(), @@ -941,7 +941,7 @@ Fw::InputDpSendPort* QueuedTestTesterBase :: #if FW_ENABLE_TEXT_LOGGING == 1 Fw::InputLogTextPort* QueuedTestTesterBase :: - get_from_textEventOut(NATIVE_INT_TYPE portNum) + get_from_textEventOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_textEventOut(), @@ -954,7 +954,7 @@ Fw::InputLogTextPort* QueuedTestTesterBase :: #endif Fw::InputTimePort* QueuedTestTesterBase :: - get_from_timeGetOut(NATIVE_INT_TYPE portNum) + get_from_timeGetOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_timeGetOut(), @@ -965,7 +965,7 @@ Fw::InputTimePort* QueuedTestTesterBase :: } Fw::InputTlmPort* QueuedTestTesterBase :: - get_from_tlmOut(NATIVE_INT_TYPE portNum) + get_from_tlmOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_tlmOut(), @@ -976,7 +976,7 @@ Fw::InputTlmPort* QueuedTestTesterBase :: } Ports::InputNoArgsPort* QueuedTestTesterBase :: - get_from_noArgsOut(NATIVE_INT_TYPE portNum) + get_from_noArgsOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsOut(), @@ -987,7 +987,7 @@ Ports::InputNoArgsPort* QueuedTestTesterBase :: } Ports::InputNoArgsReturnPort* QueuedTestTesterBase :: - get_from_noArgsReturnOut(NATIVE_INT_TYPE portNum) + get_from_noArgsReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_noArgsReturnOut(), @@ -998,7 +998,7 @@ Ports::InputNoArgsReturnPort* QueuedTestTesterBase :: } Ports::InputTypedPort* QueuedTestTesterBase :: - get_from_typedOut(NATIVE_INT_TYPE portNum) + get_from_typedOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedOut(), @@ -1009,7 +1009,7 @@ Ports::InputTypedPort* QueuedTestTesterBase :: } Ports::InputTypedReturnPort* QueuedTestTesterBase :: - get_from_typedReturnOut(NATIVE_INT_TYPE portNum) + get_from_typedReturnOut(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_from_typedReturnOut(), @@ -1117,7 +1117,7 @@ QueuedTestTesterBase :: // ---------------------------------------------------------------------- void QueuedTestTesterBase :: - from_noArgsOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1128,7 +1128,7 @@ void QueuedTestTesterBase :: } U32 QueuedTestTesterBase :: - from_noArgsReturnOut_handlerBase(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handlerBase(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1140,7 +1140,7 @@ U32 QueuedTestTesterBase :: void QueuedTestTesterBase :: from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1169,7 +1169,7 @@ void QueuedTestTesterBase :: F32 QueuedTestTesterBase :: from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1201,7 +1201,7 @@ F32 QueuedTestTesterBase :: // ---------------------------------------------------------------------- void QueuedTestTesterBase :: - invoke_to_noArgsAsync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsAsync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1212,7 +1212,7 @@ void QueuedTestTesterBase :: } void QueuedTestTesterBase :: - invoke_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1223,7 +1223,7 @@ void QueuedTestTesterBase :: } U32 QueuedTestTesterBase :: - invoke_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnGuarded(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1234,7 +1234,7 @@ U32 QueuedTestTesterBase :: } U32 QueuedTestTesterBase :: - invoke_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsReturnSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1245,7 +1245,7 @@ U32 QueuedTestTesterBase :: } void QueuedTestTesterBase :: - invoke_to_noArgsSync(NATIVE_INT_TYPE portNum) + invoke_to_noArgsSync(FwIndexType portNum) { // Make sure port number is valid FW_ASSERT( @@ -1257,7 +1257,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1285,7 +1285,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1313,7 +1313,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1341,7 +1341,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1369,7 +1369,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1397,7 +1397,7 @@ void QueuedTestTesterBase :: F32 QueuedTestTesterBase :: invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1425,7 +1425,7 @@ F32 QueuedTestTesterBase :: F32 QueuedTestTesterBase :: invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1453,7 +1453,7 @@ F32 QueuedTestTesterBase :: void QueuedTestTesterBase :: invoke_to_typedSync( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -1483,182 +1483,182 @@ void QueuedTestTesterBase :: // Getters for port counts // ---------------------------------------------------------------------- -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_to_cmdIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_cmdIn)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_to_productRecvIn() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_productRecvIn)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_to_noArgsAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsAsync)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_to_noArgsGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsGuarded)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_to_noArgsReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnGuarded)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_to_noArgsReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsReturnSync)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_to_noArgsSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_noArgsSync)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_to_typedAsync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsync)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_to_typedAsyncAssert() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncAssert)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_to_typedAsyncBlockPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncBlockPriority)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_to_typedAsyncDropPriority() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedAsyncDropPriority)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_to_typedGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedGuarded)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_to_typedReturnGuarded() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnGuarded)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_to_typedReturnSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedReturnSync)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_to_typedSync() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_to_typedSync)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_from_cmdRegOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdRegOut)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_from_cmdResponseOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_cmdResponseOut)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_from_eventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_eventOut)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_from_prmGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmGetOut)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_from_prmSetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_prmSetOut)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_from_productRequestOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productRequestOut)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_from_productSendOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_productSendOut)); } #if FW_ENABLE_TEXT_LOGGING == 1 -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_from_textEventOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_textEventOut)); } #endif -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_from_timeGetOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_timeGetOut)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_from_tlmOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_tlmOut)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_from_noArgsOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsOut)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_from_noArgsReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_noArgsReturnOut)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_from_typedOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedOut)); } -NATIVE_INT_TYPE QueuedTestTesterBase :: +FwIndexType QueuedTestTesterBase :: getNum_from_typedReturnOut() const { - return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); + return static_cast(FW_NUM_ARRAY_ELEMENTS(this->m_from_typedReturnOut)); } // ---------------------------------------------------------------------- @@ -1666,7 +1666,7 @@ NATIVE_INT_TYPE QueuedTestTesterBase :: // ---------------------------------------------------------------------- bool QueuedTestTesterBase :: - isConnected_to_cmdIn(NATIVE_INT_TYPE portNum) + isConnected_to_cmdIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_cmdIn(), @@ -1677,7 +1677,7 @@ bool QueuedTestTesterBase :: } bool QueuedTestTesterBase :: - isConnected_to_productRecvIn(NATIVE_INT_TYPE portNum) + isConnected_to_productRecvIn(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_productRecvIn(), @@ -1688,7 +1688,7 @@ bool QueuedTestTesterBase :: } bool QueuedTestTesterBase :: - isConnected_to_noArgsAsync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsAsync(), @@ -1699,7 +1699,7 @@ bool QueuedTestTesterBase :: } bool QueuedTestTesterBase :: - isConnected_to_noArgsGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsGuarded(), @@ -1710,7 +1710,7 @@ bool QueuedTestTesterBase :: } bool QueuedTestTesterBase :: - isConnected_to_noArgsReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnGuarded(), @@ -1721,7 +1721,7 @@ bool QueuedTestTesterBase :: } bool QueuedTestTesterBase :: - isConnected_to_noArgsReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsReturnSync(), @@ -1732,7 +1732,7 @@ bool QueuedTestTesterBase :: } bool QueuedTestTesterBase :: - isConnected_to_noArgsSync(NATIVE_INT_TYPE portNum) + isConnected_to_noArgsSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_noArgsSync(), @@ -1743,7 +1743,7 @@ bool QueuedTestTesterBase :: } bool QueuedTestTesterBase :: - isConnected_to_typedAsync(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsync(), @@ -1754,7 +1754,7 @@ bool QueuedTestTesterBase :: } bool QueuedTestTesterBase :: - isConnected_to_typedAsyncAssert(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncAssert(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncAssert(), @@ -1765,7 +1765,7 @@ bool QueuedTestTesterBase :: } bool QueuedTestTesterBase :: - isConnected_to_typedAsyncBlockPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncBlockPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncBlockPriority(), @@ -1776,7 +1776,7 @@ bool QueuedTestTesterBase :: } bool QueuedTestTesterBase :: - isConnected_to_typedAsyncDropPriority(NATIVE_INT_TYPE portNum) + isConnected_to_typedAsyncDropPriority(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedAsyncDropPriority(), @@ -1787,7 +1787,7 @@ bool QueuedTestTesterBase :: } bool QueuedTestTesterBase :: - isConnected_to_typedGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedGuarded(), @@ -1798,7 +1798,7 @@ bool QueuedTestTesterBase :: } bool QueuedTestTesterBase :: - isConnected_to_typedReturnGuarded(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnGuarded(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnGuarded(), @@ -1809,7 +1809,7 @@ bool QueuedTestTesterBase :: } bool QueuedTestTesterBase :: - isConnected_to_typedReturnSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedReturnSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedReturnSync(), @@ -1820,7 +1820,7 @@ bool QueuedTestTesterBase :: } bool QueuedTestTesterBase :: - isConnected_to_typedSync(NATIVE_INT_TYPE portNum) + isConnected_to_typedSync(FwIndexType portNum) { FW_ASSERT( portNum < this->getNum_to_typedSync(), @@ -1868,7 +1868,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: sendCmd_CMD_SYNC( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -1893,7 +1893,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: sendCmd_CMD_SYNC_PRIMITIVE( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32, F32 f32, @@ -1941,7 +1941,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: sendCmd_CMD_SYNC_STRING( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, const Fw::CmdStringArg& str1, const Fw::CmdStringArg& str2 @@ -1982,7 +1982,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: sendCmd_CMD_SYNC_ENUM( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, E e ) @@ -2016,7 +2016,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: sendCmd_CMD_SYNC_ARRAY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, A a ) @@ -2050,7 +2050,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: sendCmd_CMD_SYNC_STRUCT( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, S s ) @@ -2084,7 +2084,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: sendCmd_CMD_GUARDED( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2109,7 +2109,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: sendCmd_CMD_GUARDED_PRIMITIVE( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32, F32 f32, @@ -2157,7 +2157,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: sendCmd_CMD_GUARDED_STRING( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, const Fw::CmdStringArg& str1, const Fw::CmdStringArg& str2 @@ -2198,7 +2198,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: sendCmd_CMD_GUARDED_ENUM( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, E e ) @@ -2232,7 +2232,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: sendCmd_CMD_GUARDED_ARRAY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, A a ) @@ -2266,7 +2266,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: sendCmd_CMD_GUARDED_STRUCT( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, S s ) @@ -2300,7 +2300,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: sendCmd_CMD_ASYNC( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2325,7 +2325,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: sendCmd_CMD_PRIORITY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2350,7 +2350,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: sendCmd_CMD_PARAMS_PRIORITY( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32 ) @@ -2384,7 +2384,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: sendCmd_CMD_DROP( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq ) { @@ -2409,7 +2409,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: sendCmd_CMD_PARAMS_PRIORITY_DROP( - const NATIVE_INT_TYPE instance, + const FwEnumStoreType instance, U32 cmdSeq, U32 u32 ) @@ -3149,7 +3149,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: paramSend_ParamU32( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3176,7 +3176,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: paramSave_ParamU32( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3208,7 +3208,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: paramSend_ParamF64( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3235,7 +3235,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: paramSave_ParamF64( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3267,7 +3267,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: paramSend_ParamString( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3294,7 +3294,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: paramSave_ParamString( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3326,7 +3326,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: paramSend_ParamEnum( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3353,7 +3353,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: paramSave_ParamEnum( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3385,7 +3385,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: paramSend_ParamArray( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3412,7 +3412,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: paramSave_ParamArray( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3444,7 +3444,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: paramSend_ParamStruct( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3471,7 +3471,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: paramSave_ParamStruct( - NATIVE_INT_TYPE instance, + FwEnumStoreType instance, U32 cmdSeq ) { @@ -3744,7 +3744,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode ) { @@ -3754,7 +3754,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, const Fw::CmdResponse& response @@ -3767,7 +3767,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: from_eventOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwEventIdType id, Fw::Time& timeTag, const Fw::LogSeverity& severity, @@ -3781,7 +3781,7 @@ void QueuedTestTesterBase :: Fw::ParamValid QueuedTestTesterBase :: from_prmGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwPrmIdType id, Fw::ParamBuffer& val ) @@ -3868,7 +3868,7 @@ Fw::ParamValid QueuedTestTesterBase :: void QueuedTestTesterBase :: from_prmSetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwPrmIdType id, Fw::ParamBuffer& val ) @@ -3974,7 +3974,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: from_productRequestOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, FwSizeType dataSize ) @@ -3986,7 +3986,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: from_productSendOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwDpIdType id, const Fw::Buffer& buffer ) @@ -4000,7 +4000,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: from_textEventOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwEventIdType id, Fw::Time& timeTag, const Fw::LogSeverity& severity, @@ -4016,7 +4016,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::Time& time ) { @@ -4027,7 +4027,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: from_tlmOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwChanIdType id, Fw::Time& timeTag, Fw::TlmBuffer& val @@ -4040,7 +4040,7 @@ void QueuedTestTesterBase :: void QueuedTestTesterBase :: from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -4051,7 +4051,7 @@ void QueuedTestTesterBase :: U32 QueuedTestTesterBase :: from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ) { FW_ASSERT(callComp != nullptr); @@ -4062,7 +4062,7 @@ U32 QueuedTestTesterBase :: void QueuedTestTesterBase :: from_typedOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -4089,7 +4089,7 @@ void QueuedTestTesterBase :: F32 QueuedTestTesterBase :: from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.hpp index 99ab7197b..6aee6f596 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.hpp @@ -262,7 +262,7 @@ class QueuedTestTesterBase : //! Initialize object QueuedTestTesterBase virtual void init( - NATIVE_INT_TYPE instance = 0 //!< The instance number + FwEnumStoreType instance = 0 //!< The instance number ); public: @@ -273,91 +273,91 @@ class QueuedTestTesterBase : //! Connect port to cmdIn[portNum] void connect_to_cmdIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputCmdPort* port //!< The input port ); //! Connect port to productRecvIn[portNum] void connect_to_productRecvIn( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::InputDpResponsePort* port //!< The input port ); //! Connect port to noArgsAsync[portNum] void connect_to_noArgsAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsGuarded[portNum] void connect_to_noArgsGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to noArgsReturnGuarded[portNum] void connect_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsReturnSync[portNum] void connect_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsReturnPort* port //!< The input port ); //! Connect port to noArgsSync[portNum] void connect_to_noArgsSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputNoArgsPort* port //!< The input port ); //! Connect port to typedAsync[portNum] void connect_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncAssert[portNum] void connect_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncBlockPriority[portNum] void connect_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedAsyncDropPriority[portNum] void connect_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedGuarded[portNum] void connect_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); //! Connect port to typedReturnGuarded[portNum] void connect_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedReturnSync[portNum] void connect_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedReturnPort* port //!< The input port ); //! Connect port to typedSync[portNum] void connect_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Ports::InputTypedPort* port //!< The input port ); @@ -371,49 +371,49 @@ class QueuedTestTesterBase : //! //! \return from_cmdRegOut[portNum] Fw::InputCmdRegPort* get_from_cmdRegOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_cmdResponseOut[portNum] Fw::InputCmdResponsePort* get_from_cmdResponseOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_eventOut[portNum] Fw::InputLogPort* get_from_eventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmGetOut[portNum] Fw::InputPrmGetPort* get_from_prmGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_prmSetOut[portNum] Fw::InputPrmSetPort* get_from_prmSetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productRequestOut[portNum] Fw::InputDpRequestPort* get_from_productRequestOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_productSendOut[portNum] Fw::InputDpSendPort* get_from_productSendOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #if FW_ENABLE_TEXT_LOGGING == 1 @@ -422,7 +422,7 @@ class QueuedTestTesterBase : //! //! \return from_textEventOut[portNum] Fw::InputLogTextPort* get_from_textEventOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); #endif @@ -431,42 +431,42 @@ class QueuedTestTesterBase : //! //! \return from_timeGetOut[portNum] Fw::InputTimePort* get_from_timeGetOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_tlmOut[portNum] Fw::InputTlmPort* get_from_tlmOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsOut[portNum] Ports::InputNoArgsPort* get_from_noArgsOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_noArgsReturnOut[portNum] Ports::InputNoArgsReturnPort* get_from_noArgsReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedOut[portNum] Ports::InputTypedPort* get_from_typedOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Get from port at index //! //! \return from_typedReturnOut[portNum] Ports::InputTypedReturnPort* get_from_typedReturnOut( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -492,17 +492,17 @@ class QueuedTestTesterBase : //! Handler for input port from_noArgsOut virtual void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_noArgsReturnOut virtual U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ) = 0; //! Handler for input port from_typedOut virtual void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -514,7 +514,7 @@ class QueuedTestTesterBase : //! Handler for input port from_typedReturnOut virtual F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -532,17 +532,17 @@ class QueuedTestTesterBase : //! Handler base-class function for from_noArgsOut void from_noArgsOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_noArgsReturnOut U32 from_noArgsReturnOut_handlerBase( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler base-class function for from_typedOut void from_typedOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -554,7 +554,7 @@ class QueuedTestTesterBase : //! Handler base-class function for from_typedReturnOut F32 from_typedReturnOut_handlerBase( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -572,32 +572,32 @@ class QueuedTestTesterBase : //! Invoke the to port connected to noArgsAsync void invoke_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsGuarded void invoke_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnGuarded U32 invoke_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsReturnSync U32 invoke_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to noArgsSync void invoke_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Invoke the to port connected to typedAsync void invoke_to_typedAsync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -609,7 +609,7 @@ class QueuedTestTesterBase : //! Invoke the to port connected to typedAsyncAssert void invoke_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -621,7 +621,7 @@ class QueuedTestTesterBase : //! Invoke the to port connected to typedAsyncBlockPriority void invoke_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -633,7 +633,7 @@ class QueuedTestTesterBase : //! Invoke the to port connected to typedAsyncDropPriority void invoke_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -645,7 +645,7 @@ class QueuedTestTesterBase : //! Invoke the to port connected to typedGuarded void invoke_to_typedGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -657,7 +657,7 @@ class QueuedTestTesterBase : //! Invoke the to port connected to typedReturnGuarded F32 invoke_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -669,7 +669,7 @@ class QueuedTestTesterBase : //! Invoke the to port connected to typedReturnSync F32 invoke_to_typedReturnSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -681,7 +681,7 @@ class QueuedTestTesterBase : //! Invoke the to port connected to typedSync void invoke_to_typedSync( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -700,151 +700,151 @@ class QueuedTestTesterBase : //! Get the number of to_cmdIn ports //! //! \return The number of to_cmdIn ports - NATIVE_INT_TYPE getNum_to_cmdIn() const; + FwIndexType getNum_to_cmdIn() const; //! Get the number of to_productRecvIn ports //! //! \return The number of to_productRecvIn ports - NATIVE_INT_TYPE getNum_to_productRecvIn() const; + FwIndexType getNum_to_productRecvIn() const; //! Get the number of to_noArgsAsync ports //! //! \return The number of to_noArgsAsync ports - NATIVE_INT_TYPE getNum_to_noArgsAsync() const; + FwIndexType getNum_to_noArgsAsync() const; //! Get the number of to_noArgsGuarded ports //! //! \return The number of to_noArgsGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsGuarded() const; + FwIndexType getNum_to_noArgsGuarded() const; //! Get the number of to_noArgsReturnGuarded ports //! //! \return The number of to_noArgsReturnGuarded ports - NATIVE_INT_TYPE getNum_to_noArgsReturnGuarded() const; + FwIndexType getNum_to_noArgsReturnGuarded() const; //! Get the number of to_noArgsReturnSync ports //! //! \return The number of to_noArgsReturnSync ports - NATIVE_INT_TYPE getNum_to_noArgsReturnSync() const; + FwIndexType getNum_to_noArgsReturnSync() const; //! Get the number of to_noArgsSync ports //! //! \return The number of to_noArgsSync ports - NATIVE_INT_TYPE getNum_to_noArgsSync() const; + FwIndexType getNum_to_noArgsSync() const; //! Get the number of to_typedAsync ports //! //! \return The number of to_typedAsync ports - NATIVE_INT_TYPE getNum_to_typedAsync() const; + FwIndexType getNum_to_typedAsync() const; //! Get the number of to_typedAsyncAssert ports //! //! \return The number of to_typedAsyncAssert ports - NATIVE_INT_TYPE getNum_to_typedAsyncAssert() const; + FwIndexType getNum_to_typedAsyncAssert() const; //! Get the number of to_typedAsyncBlockPriority ports //! //! \return The number of to_typedAsyncBlockPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncBlockPriority() const; + FwIndexType getNum_to_typedAsyncBlockPriority() const; //! Get the number of to_typedAsyncDropPriority ports //! //! \return The number of to_typedAsyncDropPriority ports - NATIVE_INT_TYPE getNum_to_typedAsyncDropPriority() const; + FwIndexType getNum_to_typedAsyncDropPriority() const; //! Get the number of to_typedGuarded ports //! //! \return The number of to_typedGuarded ports - NATIVE_INT_TYPE getNum_to_typedGuarded() const; + FwIndexType getNum_to_typedGuarded() const; //! Get the number of to_typedReturnGuarded ports //! //! \return The number of to_typedReturnGuarded ports - NATIVE_INT_TYPE getNum_to_typedReturnGuarded() const; + FwIndexType getNum_to_typedReturnGuarded() const; //! Get the number of to_typedReturnSync ports //! //! \return The number of to_typedReturnSync ports - NATIVE_INT_TYPE getNum_to_typedReturnSync() const; + FwIndexType getNum_to_typedReturnSync() const; //! Get the number of to_typedSync ports //! //! \return The number of to_typedSync ports - NATIVE_INT_TYPE getNum_to_typedSync() const; + FwIndexType getNum_to_typedSync() const; //! Get the number of from_cmdRegOut ports //! //! \return The number of from_cmdRegOut ports - NATIVE_INT_TYPE getNum_from_cmdRegOut() const; + FwIndexType getNum_from_cmdRegOut() const; //! Get the number of from_cmdResponseOut ports //! //! \return The number of from_cmdResponseOut ports - NATIVE_INT_TYPE getNum_from_cmdResponseOut() const; + FwIndexType getNum_from_cmdResponseOut() const; //! Get the number of from_eventOut ports //! //! \return The number of from_eventOut ports - NATIVE_INT_TYPE getNum_from_eventOut() const; + FwIndexType getNum_from_eventOut() const; //! Get the number of from_prmGetOut ports //! //! \return The number of from_prmGetOut ports - NATIVE_INT_TYPE getNum_from_prmGetOut() const; + FwIndexType getNum_from_prmGetOut() const; //! Get the number of from_prmSetOut ports //! //! \return The number of from_prmSetOut ports - NATIVE_INT_TYPE getNum_from_prmSetOut() const; + FwIndexType getNum_from_prmSetOut() const; //! Get the number of from_productRequestOut ports //! //! \return The number of from_productRequestOut ports - NATIVE_INT_TYPE getNum_from_productRequestOut() const; + FwIndexType getNum_from_productRequestOut() const; //! Get the number of from_productSendOut ports //! //! \return The number of from_productSendOut ports - NATIVE_INT_TYPE getNum_from_productSendOut() const; + FwIndexType getNum_from_productSendOut() const; #if FW_ENABLE_TEXT_LOGGING == 1 //! Get the number of from_textEventOut ports //! //! \return The number of from_textEventOut ports - NATIVE_INT_TYPE getNum_from_textEventOut() const; + FwIndexType getNum_from_textEventOut() const; #endif //! Get the number of from_timeGetOut ports //! //! \return The number of from_timeGetOut ports - NATIVE_INT_TYPE getNum_from_timeGetOut() const; + FwIndexType getNum_from_timeGetOut() const; //! Get the number of from_tlmOut ports //! //! \return The number of from_tlmOut ports - NATIVE_INT_TYPE getNum_from_tlmOut() const; + FwIndexType getNum_from_tlmOut() const; //! Get the number of from_noArgsOut ports //! //! \return The number of from_noArgsOut ports - NATIVE_INT_TYPE getNum_from_noArgsOut() const; + FwIndexType getNum_from_noArgsOut() const; //! Get the number of from_noArgsReturnOut ports //! //! \return The number of from_noArgsReturnOut ports - NATIVE_INT_TYPE getNum_from_noArgsReturnOut() const; + FwIndexType getNum_from_noArgsReturnOut() const; //! Get the number of from_typedOut ports //! //! \return The number of from_typedOut ports - NATIVE_INT_TYPE getNum_from_typedOut() const; + FwIndexType getNum_from_typedOut() const; //! Get the number of from_typedReturnOut ports //! //! \return The number of from_typedReturnOut ports - NATIVE_INT_TYPE getNum_from_typedReturnOut() const; + FwIndexType getNum_from_typedReturnOut() const; protected: @@ -856,105 +856,105 @@ class QueuedTestTesterBase : //! //! \return Whether port to_cmdIn is connected bool isConnected_to_cmdIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_productRecvIn is connected //! //! \return Whether port to_productRecvIn is connected bool isConnected_to_productRecvIn( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsAsync is connected //! //! \return Whether port to_noArgsAsync is connected bool isConnected_to_noArgsAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsGuarded is connected //! //! \return Whether port to_noArgsGuarded is connected bool isConnected_to_noArgsGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnGuarded is connected //! //! \return Whether port to_noArgsReturnGuarded is connected bool isConnected_to_noArgsReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsReturnSync is connected //! //! \return Whether port to_noArgsReturnSync is connected bool isConnected_to_noArgsReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_noArgsSync is connected //! //! \return Whether port to_noArgsSync is connected bool isConnected_to_noArgsSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsync is connected //! //! \return Whether port to_typedAsync is connected bool isConnected_to_typedAsync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncAssert is connected //! //! \return Whether port to_typedAsyncAssert is connected bool isConnected_to_typedAsyncAssert( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncBlockPriority is connected //! //! \return Whether port to_typedAsyncBlockPriority is connected bool isConnected_to_typedAsyncBlockPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedAsyncDropPriority is connected //! //! \return Whether port to_typedAsyncDropPriority is connected bool isConnected_to_typedAsyncDropPriority( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedGuarded is connected //! //! \return Whether port to_typedGuarded is connected bool isConnected_to_typedGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnGuarded is connected //! //! \return Whether port to_typedReturnGuarded is connected bool isConnected_to_typedReturnGuarded( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedReturnSync is connected //! //! \return Whether port to_typedReturnSync is connected bool isConnected_to_typedReturnSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Check whether port to_typedSync is connected //! //! \return Whether port to_typedSync is connected bool isConnected_to_typedSync( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); protected: @@ -979,13 +979,13 @@ class QueuedTestTesterBase : //! Send a CMD_SYNC command void sendCmd_CMD_SYNC( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_SYNC_PRIMITIVE command void sendCmd_CMD_SYNC_PRIMITIVE( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32, //!< A U32 F32 f32, //!< An F32 @@ -994,7 +994,7 @@ class QueuedTestTesterBase : //! Send a CMD_SYNC_STRING command void sendCmd_CMD_SYNC_STRING( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number const Fw::CmdStringArg& str1, //!< A string const Fw::CmdStringArg& str2 //!< Another string @@ -1002,34 +1002,34 @@ class QueuedTestTesterBase : //! Send a CMD_SYNC_ENUM command void sendCmd_CMD_SYNC_ENUM( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number E e //!< An enum ); //! Send a CMD_SYNC_ARRAY command void sendCmd_CMD_SYNC_ARRAY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number A a //!< An array ); //! Send a CMD_SYNC_STRUCT command void sendCmd_CMD_SYNC_STRUCT( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number S s //!< A struct ); //! Send a CMD_GUARDED command void sendCmd_CMD_GUARDED( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_GUARDED_PRIMITIVE command void sendCmd_CMD_GUARDED_PRIMITIVE( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32, //!< A U32 F32 f32, //!< An F32 @@ -1038,7 +1038,7 @@ class QueuedTestTesterBase : //! Send a CMD_GUARDED_STRING command void sendCmd_CMD_GUARDED_STRING( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number const Fw::CmdStringArg& str1, //!< A string const Fw::CmdStringArg& str2 //!< Another string @@ -1046,53 +1046,53 @@ class QueuedTestTesterBase : //! Send a CMD_GUARDED_ENUM command void sendCmd_CMD_GUARDED_ENUM( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number E e //!< An enum ); //! Send a CMD_GUARDED_ARRAY command void sendCmd_CMD_GUARDED_ARRAY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number A a //!< An array ); //! Send a CMD_GUARDED_STRUCT command void sendCmd_CMD_GUARDED_STRUCT( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number S s //!< A struct ); //! Send a CMD_ASYNC command void sendCmd_CMD_ASYNC( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_PRIORITY command void sendCmd_CMD_PRIORITY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_PARAMS_PRIORITY command void sendCmd_CMD_PARAMS_PRIORITY( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32 ); //! Send a CMD_DROP command void sendCmd_CMD_DROP( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq //!< The command sequence number ); //! Send a CMD_PARAMS_PRIORITY_DROP command void sendCmd_CMD_PARAMS_PRIORITY_DROP( - const NATIVE_INT_TYPE instance, //!< The instance number + const FwEnumStoreType instance, //!< The instance number U32 cmdSeq, //!< The command sequence number U32 u32 ); @@ -1250,13 +1250,13 @@ class QueuedTestTesterBase : //! Send parameter ParamU32 void paramSend_ParamU32( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamU32 void paramSave_ParamU32( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1268,13 +1268,13 @@ class QueuedTestTesterBase : //! Send parameter ParamF64 void paramSend_ParamF64( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamF64 void paramSave_ParamF64( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1286,13 +1286,13 @@ class QueuedTestTesterBase : //! Send parameter ParamString void paramSend_ParamString( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamString void paramSave_ParamString( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1304,13 +1304,13 @@ class QueuedTestTesterBase : //! Send parameter ParamEnum void paramSend_ParamEnum( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamEnum void paramSave_ParamEnum( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1322,13 +1322,13 @@ class QueuedTestTesterBase : //! Send parameter ParamArray void paramSend_ParamArray( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamArray void paramSave_ParamArray( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1340,13 +1340,13 @@ class QueuedTestTesterBase : //! Send parameter ParamStruct void paramSend_ParamStruct( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); //! Save parameter ParamStruct void paramSave_ParamStruct( - NATIVE_INT_TYPE instance, //!< The component instance + FwEnumStoreType instance, //!< The component instance U32 cmdSeq //!< The command sequence number ); @@ -1472,14 +1472,14 @@ class QueuedTestTesterBase : //! Static function for port from_cmdRegOut static void from_cmdRegOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode //!< Command Op Code ); //! Static function for port from_cmdResponseOut static void from_cmdResponseOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwOpcodeType opCode, //!< Command Op Code U32 cmdSeq, //!< Command Sequence const Fw::CmdResponse& response //!< The command response argument @@ -1488,7 +1488,7 @@ class QueuedTestTesterBase : //! Static function for port from_eventOut static void from_eventOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwEventIdType id, //!< Log ID Fw::Time& timeTag, //!< Time Tag const Fw::LogSeverity& severity, //!< The severity argument @@ -1498,7 +1498,7 @@ class QueuedTestTesterBase : //! Static function for port from_prmGetOut static Fw::ParamValid from_prmGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwPrmIdType id, //!< Parameter ID Fw::ParamBuffer& val //!< Buffer containing serialized parameter value ); @@ -1506,7 +1506,7 @@ class QueuedTestTesterBase : //! Static function for port from_prmSetOut static void from_prmSetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwPrmIdType id, //!< Parameter ID Fw::ParamBuffer& val //!< Buffer containing serialized parameter value ); @@ -1514,7 +1514,7 @@ class QueuedTestTesterBase : //! Static function for port from_productRequestOut static void from_productRequestOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID FwSizeType dataSize //!< The data size of the requested buffer ); @@ -1522,7 +1522,7 @@ class QueuedTestTesterBase : //! Static function for port from_productSendOut static void from_productSendOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwDpIdType id, //!< The container ID const Fw::Buffer& buffer //!< The buffer ); @@ -1532,7 +1532,7 @@ class QueuedTestTesterBase : //! Static function for port from_textEventOut static void from_textEventOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwEventIdType id, //!< Log ID Fw::Time& timeTag, //!< Time Tag const Fw::LogSeverity& severity, //!< The severity argument @@ -1544,14 +1544,14 @@ class QueuedTestTesterBase : //! Static function for port from_timeGetOut static void from_timeGetOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::Time& time //!< The time tag ); //! Static function for port from_tlmOut static void from_tlmOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number FwChanIdType id, //!< Telemetry Channel ID Fw::Time& timeTag, //!< Time Tag Fw::TlmBuffer& val //!< Buffer containing serialized telemetry value @@ -1560,19 +1560,19 @@ class QueuedTestTesterBase : //! Static function for port from_noArgsOut static void from_noArgsOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_noArgsReturnOut static U32 from_noArgsReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Static function for port from_typedOut static void from_typedOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -1585,7 +1585,7 @@ class QueuedTestTesterBase : //! Static function for port from_typedReturnOut static F32 from_typedReturnOut_static( Fw::PassiveComponentBase* const callComp, //!< The component instance - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveAsyncProductPortsOnlyTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveAsyncProductPortsOnlyTester.ref.hpp index 62a60b662..e6b3973e8 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveAsyncProductPortsOnlyTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveAsyncProductPortsOnlyTester.ref.hpp @@ -21,13 +21,13 @@ class ActiveAsyncProductPortsOnlyTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveAsyncProductsTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveAsyncProductsTester.ref.cpp index 2019cea94..3b9ed918e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveAsyncProductsTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveAsyncProductsTester.ref.cpp @@ -40,20 +40,20 @@ void ActiveAsyncProductsTester :: // ---------------------------------------------------------------------- void ActiveAsyncProductsTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 ActiveAsyncProductsTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void ActiveAsyncProductsTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void ActiveAsyncProductsTester :: F32 ActiveAsyncProductsTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveAsyncProductsTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveAsyncProductsTester.ref.hpp index a132978bf..35291552e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveAsyncProductsTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveAsyncProductsTester.ref.hpp @@ -21,13 +21,13 @@ class ActiveAsyncProductsTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: @@ -58,17 +58,17 @@ class ActiveAsyncProductsTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -80,7 +80,7 @@ class ActiveAsyncProductsTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveAsyncProductsTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveAsyncProductsTesterHelpers.ref.cpp index aa4295d8a..f17d92e1e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveAsyncProductsTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveAsyncProductsTesterHelpers.ref.cpp @@ -54,14 +54,14 @@ void ActiveAsyncProductsTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -98,14 +98,14 @@ void ActiveAsyncProductsTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveCommandsTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveCommandsTester.ref.cpp index 8dd3b9244..3833442fc 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveCommandsTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveCommandsTester.ref.cpp @@ -40,20 +40,20 @@ void ActiveCommandsTester :: // ---------------------------------------------------------------------- void ActiveCommandsTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 ActiveCommandsTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void ActiveCommandsTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void ActiveCommandsTester :: F32 ActiveCommandsTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveCommandsTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveCommandsTester.ref.hpp index c7b5866e9..dd0cc27b6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveCommandsTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveCommandsTester.ref.hpp @@ -21,13 +21,13 @@ class ActiveCommandsTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: @@ -58,17 +58,17 @@ class ActiveCommandsTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -80,7 +80,7 @@ class ActiveCommandsTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveCommandsTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveCommandsTesterHelpers.ref.cpp index a4bb591ec..980cf441e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveCommandsTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveCommandsTesterHelpers.ref.cpp @@ -54,14 +54,14 @@ void ActiveCommandsTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -98,14 +98,14 @@ void ActiveCommandsTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveEventsTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveEventsTester.ref.cpp index 385e1eea8..ea4a4360f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveEventsTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveEventsTester.ref.cpp @@ -40,20 +40,20 @@ void ActiveEventsTester :: // ---------------------------------------------------------------------- void ActiveEventsTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 ActiveEventsTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void ActiveEventsTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void ActiveEventsTester :: F32 ActiveEventsTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveEventsTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveEventsTester.ref.hpp index be1a960e0..e6ba33bbc 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveEventsTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveEventsTester.ref.hpp @@ -21,13 +21,13 @@ class ActiveEventsTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: @@ -58,17 +58,17 @@ class ActiveEventsTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -80,7 +80,7 @@ class ActiveEventsTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveEventsTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveEventsTesterHelpers.ref.cpp index edeaf57cf..3c9a66a51 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveEventsTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveEventsTesterHelpers.ref.cpp @@ -47,14 +47,14 @@ void ActiveEventsTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -91,14 +91,14 @@ void ActiveEventsTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGetProductsTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGetProductsTester.ref.cpp index 77effd6f1..9cf6de62e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGetProductsTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGetProductsTester.ref.cpp @@ -40,20 +40,20 @@ void ActiveGetProductsTester :: // ---------------------------------------------------------------------- void ActiveGetProductsTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 ActiveGetProductsTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void ActiveGetProductsTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void ActiveGetProductsTester :: F32 ActiveGetProductsTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGetProductsTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGetProductsTester.ref.hpp index 6efd6d9f3..8138c21d8 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGetProductsTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGetProductsTester.ref.hpp @@ -21,13 +21,13 @@ class ActiveGetProductsTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: @@ -58,17 +58,17 @@ class ActiveGetProductsTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -80,7 +80,7 @@ class ActiveGetProductsTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGetProductsTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGetProductsTesterHelpers.ref.cpp index 764b91dbd..a4148971b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGetProductsTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGetProductsTesterHelpers.ref.cpp @@ -47,14 +47,14 @@ void ActiveGetProductsTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -91,14 +91,14 @@ void ActiveGetProductsTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGuardedProductsTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGuardedProductsTester.ref.cpp index 0acf18ffb..4f6cfb564 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGuardedProductsTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGuardedProductsTester.ref.cpp @@ -40,20 +40,20 @@ void ActiveGuardedProductsTester :: // ---------------------------------------------------------------------- void ActiveGuardedProductsTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 ActiveGuardedProductsTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void ActiveGuardedProductsTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void ActiveGuardedProductsTester :: F32 ActiveGuardedProductsTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGuardedProductsTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGuardedProductsTester.ref.hpp index d570aeadb..fd04db28a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGuardedProductsTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGuardedProductsTester.ref.hpp @@ -21,13 +21,13 @@ class ActiveGuardedProductsTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: @@ -58,17 +58,17 @@ class ActiveGuardedProductsTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -80,7 +80,7 @@ class ActiveGuardedProductsTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGuardedProductsTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGuardedProductsTesterHelpers.ref.cpp index 7c6a73380..dea8e3dac 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGuardedProductsTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveGuardedProductsTesterHelpers.ref.cpp @@ -54,14 +54,14 @@ void ActiveGuardedProductsTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -98,14 +98,14 @@ void ActiveGuardedProductsTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveNoArgsPortsOnlyTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveNoArgsPortsOnlyTester.ref.cpp index fda2874a7..de846f196 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveNoArgsPortsOnlyTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveNoArgsPortsOnlyTester.ref.cpp @@ -40,13 +40,13 @@ void ActiveNoArgsPortsOnlyTester :: // ---------------------------------------------------------------------- void ActiveNoArgsPortsOnlyTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 ActiveNoArgsPortsOnlyTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveNoArgsPortsOnlyTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveNoArgsPortsOnlyTester.ref.hpp index 7e9e3ba86..a9fb1c08b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveNoArgsPortsOnlyTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveNoArgsPortsOnlyTester.ref.hpp @@ -21,13 +21,13 @@ class ActiveNoArgsPortsOnlyTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: @@ -58,12 +58,12 @@ class ActiveNoArgsPortsOnlyTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); private: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveNoArgsPortsOnlyTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveNoArgsPortsOnlyTesterHelpers.ref.cpp index aab63ee9b..807ad64e2 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveNoArgsPortsOnlyTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveNoArgsPortsOnlyTesterHelpers.ref.cpp @@ -15,7 +15,7 @@ void ActiveNoArgsPortsOnlyTester :: { // Connect typed input ports - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsAsync( i, this->component.get_noArgsAsync_InputPort(i) @@ -32,7 +32,7 @@ void ActiveNoArgsPortsOnlyTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveParamsTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveParamsTester.ref.cpp index 113aab194..b80cbf0b1 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveParamsTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveParamsTester.ref.cpp @@ -40,20 +40,20 @@ void ActiveParamsTester :: // ---------------------------------------------------------------------- void ActiveParamsTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 ActiveParamsTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void ActiveParamsTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void ActiveParamsTester :: F32 ActiveParamsTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveParamsTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveParamsTester.ref.hpp index 602d99523..8cb51de35 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveParamsTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveParamsTester.ref.hpp @@ -21,13 +21,13 @@ class ActiveParamsTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: @@ -58,17 +58,17 @@ class ActiveParamsTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -80,7 +80,7 @@ class ActiveParamsTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveParamsTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveParamsTesterHelpers.ref.cpp index ec0340ee9..43993a7c7 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveParamsTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveParamsTesterHelpers.ref.cpp @@ -64,14 +64,14 @@ void ActiveParamsTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -108,14 +108,14 @@ void ActiveParamsTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSerialTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSerialTester.ref.cpp index 13f82184c..78cda4b43 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSerialTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSerialTester.ref.cpp @@ -40,20 +40,20 @@ void ActiveSerialTester :: // ---------------------------------------------------------------------- void ActiveSerialTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 ActiveSerialTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void ActiveSerialTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void ActiveSerialTester :: F32 ActiveSerialTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -87,7 +87,7 @@ F32 ActiveSerialTester :: void ActiveSerialTester :: from_serialOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSerialTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSerialTester.ref.hpp index 6672189d7..2f6ffb9fe 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSerialTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSerialTester.ref.hpp @@ -21,13 +21,13 @@ class ActiveSerialTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: @@ -58,17 +58,17 @@ class ActiveSerialTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -80,7 +80,7 @@ class ActiveSerialTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -98,7 +98,7 @@ class ActiveSerialTester : //! Handler implementation for serialOut void from_serialOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSerialTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSerialTesterHelpers.ref.cpp index a32e010ba..1cd151262 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSerialTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSerialTesterHelpers.ref.cpp @@ -79,14 +79,14 @@ void ActiveSerialTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -123,14 +123,14 @@ void ActiveSerialTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) @@ -193,7 +193,7 @@ void ActiveSerialTester :: // Connect serial output ports - for (NATIVE_UINT_TYPE i = 0; i < 5; i++) { + for (FwIndexType i = 0; i < 5; i++) { this->component.set_serialOut_OutputPort( i, this->get_from_serialOut(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSyncProductsTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSyncProductsTester.ref.cpp index 386972ea4..0a8fd2102 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSyncProductsTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSyncProductsTester.ref.cpp @@ -40,20 +40,20 @@ void ActiveSyncProductsTester :: // ---------------------------------------------------------------------- void ActiveSyncProductsTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 ActiveSyncProductsTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void ActiveSyncProductsTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void ActiveSyncProductsTester :: F32 ActiveSyncProductsTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSyncProductsTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSyncProductsTester.ref.hpp index a561972d1..355eb1ed7 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSyncProductsTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSyncProductsTester.ref.hpp @@ -21,13 +21,13 @@ class ActiveSyncProductsTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: @@ -58,17 +58,17 @@ class ActiveSyncProductsTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -80,7 +80,7 @@ class ActiveSyncProductsTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSyncProductsTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSyncProductsTesterHelpers.ref.cpp index 6ed2c3d0c..36d19ab87 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSyncProductsTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveSyncProductsTesterHelpers.ref.cpp @@ -54,14 +54,14 @@ void ActiveSyncProductsTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -98,14 +98,14 @@ void ActiveSyncProductsTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTelemetryTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTelemetryTester.ref.cpp index 87d9a31d5..fd6d5b80e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTelemetryTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTelemetryTester.ref.cpp @@ -40,20 +40,20 @@ void ActiveTelemetryTester :: // ---------------------------------------------------------------------- void ActiveTelemetryTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 ActiveTelemetryTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void ActiveTelemetryTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void ActiveTelemetryTester :: F32 ActiveTelemetryTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTelemetryTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTelemetryTester.ref.hpp index d490b81d3..6bc6c6969 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTelemetryTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTelemetryTester.ref.hpp @@ -21,13 +21,13 @@ class ActiveTelemetryTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: @@ -58,17 +58,17 @@ class ActiveTelemetryTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -80,7 +80,7 @@ class ActiveTelemetryTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTelemetryTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTelemetryTesterHelpers.ref.cpp index a753ceca3..db478237a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTelemetryTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTelemetryTesterHelpers.ref.cpp @@ -42,14 +42,14 @@ void ActiveTelemetryTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -86,14 +86,14 @@ void ActiveTelemetryTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTestTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTestTester.ref.cpp index 4235d6162..956bb77a4 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTestTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTestTester.ref.cpp @@ -42,20 +42,20 @@ namespace M { // ---------------------------------------------------------------------- void ActiveTestTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 ActiveTestTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void ActiveTestTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -70,7 +70,7 @@ namespace M { F32 ActiveTestTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTestTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTestTester.ref.hpp index dd5f44e94..9196b921b 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTestTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTestTester.ref.hpp @@ -23,13 +23,13 @@ namespace M { // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: @@ -60,17 +60,17 @@ namespace M { //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -82,7 +82,7 @@ namespace M { //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTestTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTestTesterHelpers.ref.cpp index 996274432..08261a1c1 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTestTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/ActiveTestTesterHelpers.ref.cpp @@ -96,14 +96,14 @@ namespace M { this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -140,14 +140,14 @@ namespace M { this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/EmptyTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/EmptyTester.ref.hpp index dbdfbf3a6..80db07ab8 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/EmptyTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/EmptyTester.ref.hpp @@ -21,10 +21,10 @@ class EmptyTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; public: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveCommandsTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveCommandsTester.ref.cpp index 52c8de5df..31e5e59de 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveCommandsTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveCommandsTester.ref.cpp @@ -40,20 +40,20 @@ void PassiveCommandsTester :: // ---------------------------------------------------------------------- void PassiveCommandsTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 PassiveCommandsTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void PassiveCommandsTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void PassiveCommandsTester :: F32 PassiveCommandsTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveCommandsTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveCommandsTester.ref.hpp index f281cffa8..5b6f15832 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveCommandsTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveCommandsTester.ref.hpp @@ -21,10 +21,10 @@ class PassiveCommandsTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; public: @@ -55,17 +55,17 @@ class PassiveCommandsTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -77,7 +77,7 @@ class PassiveCommandsTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveCommandsTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveCommandsTesterHelpers.ref.cpp index 4710dc709..b0e2dc96e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveCommandsTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveCommandsTesterHelpers.ref.cpp @@ -49,14 +49,14 @@ void PassiveCommandsTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -73,14 +73,14 @@ void PassiveCommandsTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveEventsTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveEventsTester.ref.cpp index eb55f01a1..6f864b0e5 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveEventsTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveEventsTester.ref.cpp @@ -40,20 +40,20 @@ void PassiveEventsTester :: // ---------------------------------------------------------------------- void PassiveEventsTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 PassiveEventsTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void PassiveEventsTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void PassiveEventsTester :: F32 PassiveEventsTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveEventsTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveEventsTester.ref.hpp index 17e7f3e0e..ec3868bf4 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveEventsTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveEventsTester.ref.hpp @@ -21,10 +21,10 @@ class PassiveEventsTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; public: @@ -55,17 +55,17 @@ class PassiveEventsTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -77,7 +77,7 @@ class PassiveEventsTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveEventsTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveEventsTesterHelpers.ref.cpp index c930d5c2a..d9088f8fb 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveEventsTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveEventsTesterHelpers.ref.cpp @@ -42,14 +42,14 @@ void PassiveEventsTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -66,14 +66,14 @@ void PassiveEventsTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGetProductPortsOnlyTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGetProductPortsOnlyTester.ref.hpp index fa984057d..e824d23a9 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGetProductPortsOnlyTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGetProductPortsOnlyTester.ref.hpp @@ -21,10 +21,10 @@ class PassiveGetProductPortsOnlyTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; public: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGetProductsTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGetProductsTester.ref.cpp index a6a534569..c8fdf8236 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGetProductsTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGetProductsTester.ref.cpp @@ -40,20 +40,20 @@ void PassiveGetProductsTester :: // ---------------------------------------------------------------------- void PassiveGetProductsTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 PassiveGetProductsTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void PassiveGetProductsTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void PassiveGetProductsTester :: F32 PassiveGetProductsTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGetProductsTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGetProductsTester.ref.hpp index 6eb0ab56b..ce5387538 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGetProductsTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGetProductsTester.ref.hpp @@ -21,10 +21,10 @@ class PassiveGetProductsTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; public: @@ -55,17 +55,17 @@ class PassiveGetProductsTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -77,7 +77,7 @@ class PassiveGetProductsTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGetProductsTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGetProductsTesterHelpers.ref.cpp index 3e650e51f..ef8fb2991 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGetProductsTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGetProductsTesterHelpers.ref.cpp @@ -42,14 +42,14 @@ void PassiveGetProductsTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -66,14 +66,14 @@ void PassiveGetProductsTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGuardedProductsTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGuardedProductsTester.ref.cpp index a1672337e..134731ba5 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGuardedProductsTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGuardedProductsTester.ref.cpp @@ -40,20 +40,20 @@ void PassiveGuardedProductsTester :: // ---------------------------------------------------------------------- void PassiveGuardedProductsTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 PassiveGuardedProductsTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void PassiveGuardedProductsTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void PassiveGuardedProductsTester :: F32 PassiveGuardedProductsTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGuardedProductsTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGuardedProductsTester.ref.hpp index 63789e031..0aa71573f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGuardedProductsTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGuardedProductsTester.ref.hpp @@ -21,10 +21,10 @@ class PassiveGuardedProductsTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; public: @@ -55,17 +55,17 @@ class PassiveGuardedProductsTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -77,7 +77,7 @@ class PassiveGuardedProductsTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGuardedProductsTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGuardedProductsTesterHelpers.ref.cpp index fb739b455..0c3f5e05c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGuardedProductsTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveGuardedProductsTesterHelpers.ref.cpp @@ -49,14 +49,14 @@ void PassiveGuardedProductsTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -73,14 +73,14 @@ void PassiveGuardedProductsTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveParamsTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveParamsTester.ref.cpp index d9bec4483..e50ccd9c4 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveParamsTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveParamsTester.ref.cpp @@ -40,20 +40,20 @@ void PassiveParamsTester :: // ---------------------------------------------------------------------- void PassiveParamsTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 PassiveParamsTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void PassiveParamsTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void PassiveParamsTester :: F32 PassiveParamsTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveParamsTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveParamsTester.ref.hpp index 95ea913aa..189095947 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveParamsTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveParamsTester.ref.hpp @@ -21,10 +21,10 @@ class PassiveParamsTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; public: @@ -55,17 +55,17 @@ class PassiveParamsTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -77,7 +77,7 @@ class PassiveParamsTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveParamsTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveParamsTesterHelpers.ref.cpp index 86c667e69..bf833921f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveParamsTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveParamsTesterHelpers.ref.cpp @@ -59,14 +59,14 @@ void PassiveParamsTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -83,14 +83,14 @@ void PassiveParamsTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSerialTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSerialTester.ref.cpp index 5a992fbe6..193cefc9f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSerialTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSerialTester.ref.cpp @@ -40,20 +40,20 @@ void PassiveSerialTester :: // ---------------------------------------------------------------------- void PassiveSerialTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 PassiveSerialTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void PassiveSerialTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void PassiveSerialTester :: F32 PassiveSerialTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -87,7 +87,7 @@ F32 PassiveSerialTester :: void PassiveSerialTester :: from_serialOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSerialTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSerialTester.ref.hpp index 7ed98ac44..234076003 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSerialTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSerialTester.ref.hpp @@ -21,10 +21,10 @@ class PassiveSerialTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; public: @@ -55,17 +55,17 @@ class PassiveSerialTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -77,7 +77,7 @@ class PassiveSerialTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -95,7 +95,7 @@ class PassiveSerialTester : //! Handler implementation for serialOut void from_serialOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSerialTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSerialTesterHelpers.ref.cpp index 8dcec9111..a26f1df04 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSerialTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSerialTesterHelpers.ref.cpp @@ -74,14 +74,14 @@ void PassiveSerialTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -98,14 +98,14 @@ void PassiveSerialTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) @@ -148,7 +148,7 @@ void PassiveSerialTester :: // Connect serial output ports - for (NATIVE_UINT_TYPE i = 0; i < 5; i++) { + for (FwIndexType i = 0; i < 5; i++) { this->component.set_serialOut_OutputPort( i, this->get_from_serialOut(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSyncProductPortsOnlyTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSyncProductPortsOnlyTester.ref.hpp index 0839a5e91..d8314c6fd 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSyncProductPortsOnlyTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSyncProductPortsOnlyTester.ref.hpp @@ -21,10 +21,10 @@ class PassiveSyncProductPortsOnlyTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; public: diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSyncProductsTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSyncProductsTester.ref.cpp index d81982b47..d93e3287a 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSyncProductsTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSyncProductsTester.ref.cpp @@ -40,20 +40,20 @@ void PassiveSyncProductsTester :: // ---------------------------------------------------------------------- void PassiveSyncProductsTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 PassiveSyncProductsTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void PassiveSyncProductsTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void PassiveSyncProductsTester :: F32 PassiveSyncProductsTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSyncProductsTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSyncProductsTester.ref.hpp index 22e063b92..ff7f8a2fa 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSyncProductsTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSyncProductsTester.ref.hpp @@ -21,10 +21,10 @@ class PassiveSyncProductsTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; public: @@ -55,17 +55,17 @@ class PassiveSyncProductsTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -77,7 +77,7 @@ class PassiveSyncProductsTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSyncProductsTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSyncProductsTesterHelpers.ref.cpp index 1299785c7..d5c98dc73 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSyncProductsTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveSyncProductsTesterHelpers.ref.cpp @@ -49,14 +49,14 @@ void PassiveSyncProductsTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -73,14 +73,14 @@ void PassiveSyncProductsTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTelemetryTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTelemetryTester.ref.cpp index b838e7b61..0c79ab810 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTelemetryTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTelemetryTester.ref.cpp @@ -40,20 +40,20 @@ void PassiveTelemetryTester :: // ---------------------------------------------------------------------- void PassiveTelemetryTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 PassiveTelemetryTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void PassiveTelemetryTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void PassiveTelemetryTester :: F32 PassiveTelemetryTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTelemetryTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTelemetryTester.ref.hpp index c5b5e33b3..89e1cd2ff 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTelemetryTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTelemetryTester.ref.hpp @@ -21,10 +21,10 @@ class PassiveTelemetryTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; public: @@ -55,17 +55,17 @@ class PassiveTelemetryTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -77,7 +77,7 @@ class PassiveTelemetryTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTelemetryTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTelemetryTesterHelpers.ref.cpp index c80a1d535..432580dfa 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTelemetryTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTelemetryTesterHelpers.ref.cpp @@ -37,14 +37,14 @@ void PassiveTelemetryTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -61,14 +61,14 @@ void PassiveTelemetryTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTestTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTestTester.ref.cpp index 6f2b2ae55..71b661d72 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTestTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTestTester.ref.cpp @@ -40,20 +40,20 @@ void PassiveTestTester :: // ---------------------------------------------------------------------- void PassiveTestTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 PassiveTestTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void PassiveTestTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void PassiveTestTester :: F32 PassiveTestTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTestTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTestTester.ref.hpp index 590a45e24..85f8908d6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTestTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTestTester.ref.hpp @@ -21,10 +21,10 @@ class PassiveTestTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; public: @@ -55,17 +55,17 @@ class PassiveTestTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -77,7 +77,7 @@ class PassiveTestTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTestTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTestTesterHelpers.ref.cpp index 29c27aeeb..1411c7850 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTestTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/PassiveTestTesterHelpers.ref.cpp @@ -89,14 +89,14 @@ void PassiveTestTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -113,14 +113,14 @@ void PassiveTestTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedCommandsTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedCommandsTester.ref.cpp index fb87cdae1..37855c119 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedCommandsTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedCommandsTester.ref.cpp @@ -40,20 +40,20 @@ void QueuedCommandsTester :: // ---------------------------------------------------------------------- void QueuedCommandsTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 QueuedCommandsTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void QueuedCommandsTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void QueuedCommandsTester :: F32 QueuedCommandsTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedCommandsTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedCommandsTester.ref.hpp index 6f562592a..d6ca74745 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedCommandsTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedCommandsTester.ref.hpp @@ -21,13 +21,13 @@ class QueuedCommandsTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: @@ -58,17 +58,17 @@ class QueuedCommandsTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -80,7 +80,7 @@ class QueuedCommandsTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedCommandsTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedCommandsTesterHelpers.ref.cpp index 17f0d715d..501e64715 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedCommandsTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedCommandsTesterHelpers.ref.cpp @@ -54,14 +54,14 @@ void QueuedCommandsTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -98,14 +98,14 @@ void QueuedCommandsTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedEventsTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedEventsTester.ref.cpp index b1325b006..edf2ad833 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedEventsTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedEventsTester.ref.cpp @@ -40,20 +40,20 @@ void QueuedEventsTester :: // ---------------------------------------------------------------------- void QueuedEventsTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 QueuedEventsTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void QueuedEventsTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void QueuedEventsTester :: F32 QueuedEventsTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedEventsTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedEventsTester.ref.hpp index 6040562aa..fa6b109cd 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedEventsTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedEventsTester.ref.hpp @@ -21,13 +21,13 @@ class QueuedEventsTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: @@ -58,17 +58,17 @@ class QueuedEventsTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -80,7 +80,7 @@ class QueuedEventsTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedEventsTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedEventsTesterHelpers.ref.cpp index 1acd4923d..ba2f2cd10 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedEventsTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedEventsTesterHelpers.ref.cpp @@ -47,14 +47,14 @@ void QueuedEventsTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -91,14 +91,14 @@ void QueuedEventsTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGetProductsTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGetProductsTester.ref.cpp index 35851c6fa..8cd3b82f3 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGetProductsTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGetProductsTester.ref.cpp @@ -40,20 +40,20 @@ void QueuedGetProductsTester :: // ---------------------------------------------------------------------- void QueuedGetProductsTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 QueuedGetProductsTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void QueuedGetProductsTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void QueuedGetProductsTester :: F32 QueuedGetProductsTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGetProductsTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGetProductsTester.ref.hpp index 0baf3300e..8decea64e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGetProductsTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGetProductsTester.ref.hpp @@ -21,13 +21,13 @@ class QueuedGetProductsTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: @@ -58,17 +58,17 @@ class QueuedGetProductsTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -80,7 +80,7 @@ class QueuedGetProductsTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGetProductsTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGetProductsTesterHelpers.ref.cpp index a8e7ad8ab..e0ef61749 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGetProductsTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGetProductsTesterHelpers.ref.cpp @@ -47,14 +47,14 @@ void QueuedGetProductsTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -91,14 +91,14 @@ void QueuedGetProductsTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGuardedProductsTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGuardedProductsTester.ref.cpp index 25dc7c331..292236629 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGuardedProductsTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGuardedProductsTester.ref.cpp @@ -40,20 +40,20 @@ void QueuedGuardedProductsTester :: // ---------------------------------------------------------------------- void QueuedGuardedProductsTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 QueuedGuardedProductsTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void QueuedGuardedProductsTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void QueuedGuardedProductsTester :: F32 QueuedGuardedProductsTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGuardedProductsTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGuardedProductsTester.ref.hpp index 4bdd3e8e6..bbc052af6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGuardedProductsTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGuardedProductsTester.ref.hpp @@ -21,13 +21,13 @@ class QueuedGuardedProductsTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: @@ -58,17 +58,17 @@ class QueuedGuardedProductsTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -80,7 +80,7 @@ class QueuedGuardedProductsTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGuardedProductsTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGuardedProductsTesterHelpers.ref.cpp index 1a8e5af01..740e3433d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGuardedProductsTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedGuardedProductsTesterHelpers.ref.cpp @@ -54,14 +54,14 @@ void QueuedGuardedProductsTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -98,14 +98,14 @@ void QueuedGuardedProductsTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedParamsTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedParamsTester.ref.cpp index 4508265b5..2a6c04e46 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedParamsTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedParamsTester.ref.cpp @@ -40,20 +40,20 @@ void QueuedParamsTester :: // ---------------------------------------------------------------------- void QueuedParamsTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 QueuedParamsTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void QueuedParamsTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void QueuedParamsTester :: F32 QueuedParamsTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedParamsTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedParamsTester.ref.hpp index fd63938ea..1eaae9ec6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedParamsTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedParamsTester.ref.hpp @@ -21,13 +21,13 @@ class QueuedParamsTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: @@ -58,17 +58,17 @@ class QueuedParamsTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -80,7 +80,7 @@ class QueuedParamsTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedParamsTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedParamsTesterHelpers.ref.cpp index 7663f3a15..4b11c49d0 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedParamsTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedParamsTesterHelpers.ref.cpp @@ -64,14 +64,14 @@ void QueuedParamsTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -108,14 +108,14 @@ void QueuedParamsTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSerialTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSerialTester.ref.cpp index efedcf7c0..f588f7e71 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSerialTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSerialTester.ref.cpp @@ -40,20 +40,20 @@ void QueuedSerialTester :: // ---------------------------------------------------------------------- void QueuedSerialTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 QueuedSerialTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void QueuedSerialTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void QueuedSerialTester :: F32 QueuedSerialTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -87,7 +87,7 @@ F32 QueuedSerialTester :: void QueuedSerialTester :: from_serialOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, Fw::SerializeBufferBase& buffer ) { diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSerialTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSerialTester.ref.hpp index bbb34385e..5d3c3726c 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSerialTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSerialTester.ref.hpp @@ -21,13 +21,13 @@ class QueuedSerialTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: @@ -58,17 +58,17 @@ class QueuedSerialTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -80,7 +80,7 @@ class QueuedSerialTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -98,7 +98,7 @@ class QueuedSerialTester : //! Handler implementation for serialOut void from_serialOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number Fw::SerializeBufferBase& buffer //!< The serialization buffer ); diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSerialTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSerialTesterHelpers.ref.cpp index d7a96a807..ffd2b9587 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSerialTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSerialTesterHelpers.ref.cpp @@ -79,14 +79,14 @@ void QueuedSerialTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -123,14 +123,14 @@ void QueuedSerialTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) @@ -193,7 +193,7 @@ void QueuedSerialTester :: // Connect serial output ports - for (NATIVE_UINT_TYPE i = 0; i < 5; i++) { + for (FwIndexType i = 0; i < 5; i++) { this->component.set_serialOut_OutputPort( i, this->get_from_serialOut(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSyncProductsTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSyncProductsTester.ref.cpp index cb98c26d9..ada36f5c0 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSyncProductsTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSyncProductsTester.ref.cpp @@ -40,20 +40,20 @@ void QueuedSyncProductsTester :: // ---------------------------------------------------------------------- void QueuedSyncProductsTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 QueuedSyncProductsTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void QueuedSyncProductsTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void QueuedSyncProductsTester :: F32 QueuedSyncProductsTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSyncProductsTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSyncProductsTester.ref.hpp index e1a5f04df..2a9b826d0 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSyncProductsTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSyncProductsTester.ref.hpp @@ -21,13 +21,13 @@ class QueuedSyncProductsTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: @@ -58,17 +58,17 @@ class QueuedSyncProductsTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -80,7 +80,7 @@ class QueuedSyncProductsTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSyncProductsTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSyncProductsTesterHelpers.ref.cpp index aa8efcabf..1eba60b51 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSyncProductsTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedSyncProductsTesterHelpers.ref.cpp @@ -54,14 +54,14 @@ void QueuedSyncProductsTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -98,14 +98,14 @@ void QueuedSyncProductsTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTelemetryTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTelemetryTester.ref.cpp index 1f5c1554f..71c550ce9 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTelemetryTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTelemetryTester.ref.cpp @@ -40,20 +40,20 @@ void QueuedTelemetryTester :: // ---------------------------------------------------------------------- void QueuedTelemetryTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 QueuedTelemetryTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void QueuedTelemetryTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void QueuedTelemetryTester :: F32 QueuedTelemetryTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTelemetryTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTelemetryTester.ref.hpp index c953234c1..465b674da 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTelemetryTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTelemetryTester.ref.hpp @@ -21,13 +21,13 @@ class QueuedTelemetryTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: @@ -58,17 +58,17 @@ class QueuedTelemetryTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -80,7 +80,7 @@ class QueuedTelemetryTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTelemetryTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTelemetryTesterHelpers.ref.cpp index 302343805..eb6044115 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTelemetryTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTelemetryTesterHelpers.ref.cpp @@ -42,14 +42,14 @@ void QueuedTelemetryTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -86,14 +86,14 @@ void QueuedTelemetryTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTestTester.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTestTester.ref.cpp index f425c81de..e3085c1ee 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTestTester.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTestTester.ref.cpp @@ -40,20 +40,20 @@ void QueuedTestTester :: // ---------------------------------------------------------------------- void QueuedTestTester :: - from_noArgsOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsOut_handler(FwIndexType portNum) { // TODO } U32 QueuedTestTester :: - from_noArgsReturnOut_handler(NATIVE_INT_TYPE portNum) + from_noArgsReturnOut_handler(FwIndexType portNum) { // TODO return } void QueuedTestTester :: from_typedOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, @@ -68,7 +68,7 @@ void QueuedTestTester :: F32 QueuedTestTester :: from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, F32 f32, bool b, diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTestTester.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTestTester.ref.hpp index cfea5d9df..e08ae6cf1 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTestTester.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTestTester.ref.hpp @@ -21,13 +21,13 @@ class QueuedTestTester : // ---------------------------------------------------------------------- // Maximum size of histories storing events, telemetry, and port outputs - static const NATIVE_INT_TYPE MAX_HISTORY_SIZE = 10; + static const FwSizeType MAX_HISTORY_SIZE = 10; // Instance ID supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_ID = 0; + static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const NATIVE_INT_TYPE TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: @@ -58,17 +58,17 @@ class QueuedTestTester : //! Handler implementation for noArgsOut void from_noArgsOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for noArgsReturnOut U32 from_noArgsReturnOut_handler( - NATIVE_INT_TYPE portNum //!< The port number + FwIndexType portNum //!< The port number ); //! Handler implementation for typedOut void from_typedOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean @@ -80,7 +80,7 @@ class QueuedTestTester : //! Handler implementation for typedReturnOut F32 from_typedReturnOut_handler( - NATIVE_INT_TYPE portNum, //!< The port number + FwIndexType portNum, //!< The port number U32 u32, //!< A U32 F32 f32, //!< An F32 bool b, //!< A boolean diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTestTesterHelpers.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTestTesterHelpers.ref.cpp index 728283613..27f9f71db 100644 --- a/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTestTesterHelpers.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/QueuedTestTesterHelpers.ref.cpp @@ -94,14 +94,14 @@ void QueuedTestTester :: this->component.get_noArgsReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsReturnSync( i, this->component.get_noArgsReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_noArgsSync( i, this->component.get_noArgsSync_InputPort(i) @@ -138,14 +138,14 @@ void QueuedTestTester :: this->component.get_typedReturnGuarded_InputPort(0) ); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedReturnSync( i, this->component.get_typedReturnSync_InputPort(i) ); } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwIndexType i = 0; i < 3; i++) { this->connect_to_typedSync( i, this->component.get_typedSync_InputPort(i) diff --git a/compiler/tools/fpp-to-cpp/test/fprime/Svc/Sched/Sched.fpp b/compiler/tools/fpp-to-cpp/test/fprime/Svc/Sched/Sched.fpp index 9911bf48b..fdc57b8e6 100644 --- a/compiler/tools/fpp-to-cpp/test/fprime/Svc/Sched/Sched.fpp +++ b/compiler/tools/fpp-to-cpp/test/fprime/Svc/Sched/Sched.fpp @@ -2,7 +2,7 @@ module Svc { @ Scheduler Port with order argument port Sched( - context: NATIVE_UINT_TYPE @< The call order + context: U32 @< The call order ) } diff --git a/compiler/tools/fpp-to-cpp/test/fprime/config/FpConfig.fpp b/compiler/tools/fpp-to-cpp/test/fprime/config/FpConfig.fpp index 1769f8c45..2a643d7a0 100644 --- a/compiler/tools/fpp-to-cpp/test/fprime/config/FpConfig.fpp +++ b/compiler/tools/fpp-to-cpp/test/fprime/config/FpConfig.fpp @@ -12,6 +12,4 @@ type FwSizeType type FwTimeBaseStoreType type FwTimeContextStoreType type FwTlmPacketizeIdType -type NATIVE_INT_TYPE -type NATIVE_UINT_TYPE type POINTER_CAST diff --git a/compiler/tools/fpp-to-cpp/test/port/AbsTypePortAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/port/AbsTypePortAc.ref.cpp index 076661381..3d2b68779 100644 --- a/compiler/tools/fpp-to-cpp/test/port/AbsTypePortAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/port/AbsTypePortAc.ref.cpp @@ -18,7 +18,7 @@ namespace { public: - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return InputAbsTypePort::SERIALIZED_SIZE; } diff --git a/compiler/tools/fpp-to-cpp/test/port/AbsTypePortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/port/AbsTypePortAc.ref.hpp index 1348a75e7..25f6794d7 100644 --- a/compiler/tools/fpp-to-cpp/test/port/AbsTypePortAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/port/AbsTypePortAc.ref.hpp @@ -46,7 +46,7 @@ class InputAbsTypePort : //! The port callback function type typedef void (*CompFuncPtr)( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, const T& t, T& tRef ); diff --git a/compiler/tools/fpp-to-cpp/test/port/BuiltInTypePortAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/port/BuiltInTypePortAc.ref.cpp index fd48ff284..72a5251c4 100644 --- a/compiler/tools/fpp-to-cpp/test/port/BuiltInTypePortAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/port/BuiltInTypePortAc.ref.cpp @@ -18,7 +18,7 @@ namespace { public: - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return InputBuiltInTypePort::SERIALIZED_SIZE; } diff --git a/compiler/tools/fpp-to-cpp/test/port/BuiltInTypePortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/port/BuiltInTypePortAc.ref.hpp index 4f10bc458..e4671f126 100644 --- a/compiler/tools/fpp-to-cpp/test/port/BuiltInTypePortAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/port/BuiltInTypePortAc.ref.hpp @@ -45,7 +45,7 @@ class InputBuiltInTypePort : //! The port callback function type typedef void (*CompFuncPtr)( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, FwOpcodeType t, FwOpcodeType& tRef ); diff --git a/compiler/tools/fpp-to-cpp/test/port/EmptyPortAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/port/EmptyPortAc.ref.cpp index caf681e67..e10bb951a 100644 --- a/compiler/tools/fpp-to-cpp/test/port/EmptyPortAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/port/EmptyPortAc.ref.cpp @@ -18,7 +18,7 @@ namespace { public: - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return InputEmptyPort::SERIALIZED_SIZE; } diff --git a/compiler/tools/fpp-to-cpp/test/port/EmptyPortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/port/EmptyPortAc.ref.hpp index dee21801a..9bd250e51 100644 --- a/compiler/tools/fpp-to-cpp/test/port/EmptyPortAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/port/EmptyPortAc.ref.hpp @@ -43,7 +43,7 @@ class InputEmptyPort : //! The port callback function type typedef void (*CompFuncPtr)( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum + FwIndexType portNum ); public: diff --git a/compiler/tools/fpp-to-cpp/test/port/FppTypePortAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/port/FppTypePortAc.ref.cpp index 79e63d18e..67f40f168 100644 --- a/compiler/tools/fpp-to-cpp/test/port/FppTypePortAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/port/FppTypePortAc.ref.cpp @@ -18,7 +18,7 @@ namespace { public: - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return InputFppTypePort::SERIALIZED_SIZE; } diff --git a/compiler/tools/fpp-to-cpp/test/port/FppTypePortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/port/FppTypePortAc.ref.hpp index bb3cb3e16..9e8472e9d 100644 --- a/compiler/tools/fpp-to-cpp/test/port/FppTypePortAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/port/FppTypePortAc.ref.hpp @@ -52,7 +52,7 @@ class InputFppTypePort : //! The port callback function type typedef void (*CompFuncPtr)( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, const E& e, E& eRef, const A& a, diff --git a/compiler/tools/fpp-to-cpp/test/port/KwdNamePortAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/port/KwdNamePortAc.ref.cpp index 9ba68f231..c0e263627 100644 --- a/compiler/tools/fpp-to-cpp/test/port/KwdNamePortAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/port/KwdNamePortAc.ref.cpp @@ -18,7 +18,7 @@ namespace { public: - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return InputKwdNamePort::SERIALIZED_SIZE; } diff --git a/compiler/tools/fpp-to-cpp/test/port/KwdNamePortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/port/KwdNamePortAc.ref.hpp index 19800e5ca..0e42614a6 100644 --- a/compiler/tools/fpp-to-cpp/test/port/KwdNamePortAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/port/KwdNamePortAc.ref.hpp @@ -44,7 +44,7 @@ class InputKwdNamePort : //! The port callback function type typedef void (*CompFuncPtr)( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32& time ); diff --git a/compiler/tools/fpp-to-cpp/test/port/PrimitivePortAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/port/PrimitivePortAc.ref.cpp index 8f5d1dfff..07b0f98a8 100644 --- a/compiler/tools/fpp-to-cpp/test/port/PrimitivePortAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/port/PrimitivePortAc.ref.cpp @@ -18,7 +18,7 @@ namespace { public: - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return InputPrimitivePort::SERIALIZED_SIZE; } diff --git a/compiler/tools/fpp-to-cpp/test/port/PrimitivePortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/port/PrimitivePortAc.ref.hpp index 558e551bc..de2993821 100644 --- a/compiler/tools/fpp-to-cpp/test/port/PrimitivePortAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/port/PrimitivePortAc.ref.hpp @@ -49,7 +49,7 @@ class InputPrimitivePort : //! The port callback function type typedef void (*CompFuncPtr)( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u32, U32& u32Ref, F32 f32, diff --git a/compiler/tools/fpp-to-cpp/test/port/ReturnTypePortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/port/ReturnTypePortAc.ref.hpp index e800c06d8..6baec14d4 100644 --- a/compiler/tools/fpp-to-cpp/test/port/ReturnTypePortAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/port/ReturnTypePortAc.ref.hpp @@ -45,7 +45,7 @@ namespace M { //! The port callback function type typedef U32 (*CompFuncPtr)( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, U32 u ); diff --git a/compiler/tools/fpp-to-cpp/test/port/StringPortAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/port/StringPortAc.ref.cpp index 5fff8cfed..103d567fc 100644 --- a/compiler/tools/fpp-to-cpp/test/port/StringPortAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/port/StringPortAc.ref.cpp @@ -83,7 +83,7 @@ namespace StringPortStrings { return this->m_buf; } - NATIVE_UINT_TYPE StringSize80 :: + Fw::StringBase::SizeType StringSize80 :: getCapacity() const { return sizeof(this->m_buf); @@ -162,7 +162,7 @@ namespace StringPortStrings { return this->m_buf; } - NATIVE_UINT_TYPE StringSize100 :: + Fw::StringBase::SizeType StringSize100 :: getCapacity() const { return sizeof(this->m_buf); @@ -180,7 +180,7 @@ namespace { public: - NATIVE_UINT_TYPE getBuffCapacity() const { + Fw::Serializable::SizeType getBuffCapacity() const { return InputStringPort::SERIALIZED_SIZE; } diff --git a/compiler/tools/fpp-to-cpp/test/port/StringPortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/port/StringPortAc.ref.hpp index 2694d8a41..a67151ea4 100644 --- a/compiler/tools/fpp-to-cpp/test/port/StringPortAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/port/StringPortAc.ref.hpp @@ -61,7 +61,7 @@ namespace StringPortStrings { //! Retrieves char buffer of string const char* toChar() const; - NATIVE_UINT_TYPE getCapacity() const; + Fw::StringBase::SizeType getCapacity() const; private: @@ -111,7 +111,7 @@ namespace StringPortStrings { //! Retrieves char buffer of string const char* toChar() const; - NATIVE_UINT_TYPE getCapacity() const; + Fw::StringBase::SizeType getCapacity() const; private: @@ -160,7 +160,7 @@ class InputStringPort : //! The port callback function type typedef void (*CompFuncPtr)( Fw::PassiveComponentBase* callComp, - NATIVE_INT_TYPE portNum, + FwIndexType portNum, const StringPortStrings::StringSize80& str80, StringPortStrings::StringSize80& str80Ref, const StringPortStrings::StringSize100& str100, diff --git a/compiler/tools/fpp-to-cpp/test/struct/DefaultSerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/struct/DefaultSerializableAc.ref.cpp index b62a791e3..a447a45c9 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/DefaultSerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/struct/DefaultSerializableAc.ref.cpp @@ -84,7 +84,7 @@ const char* Default::StringSize40 :: return this->m_buf; } -NATIVE_UINT_TYPE Default::StringSize40 :: +Fw::StringBase::SizeType Default::StringSize40 :: getCapacity() const { return sizeof(this->m_buf); diff --git a/compiler/tools/fpp-to-cpp/test/struct/DefaultSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/DefaultSerializableAc.ref.hpp index ddb877597..6d7460de4 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/DefaultSerializableAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/struct/DefaultSerializableAc.ref.hpp @@ -59,7 +59,7 @@ class Default : //! Retrieves char buffer of string const char* toChar() const; - NATIVE_UINT_TYPE getCapacity() const; + Fw::StringBase::SizeType getCapacity() const; private: diff --git a/compiler/tools/fpp-to-cpp/test/struct/EnumSerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/struct/EnumSerializableAc.ref.cpp index 5953e28be..3fdb0413d 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/EnumSerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/struct/EnumSerializableAc.ref.cpp @@ -20,7 +20,7 @@ Enum :: Serializable(), m_e(M::E::X) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_eArr[i] = M::E::X; } } @@ -33,7 +33,7 @@ Enum :: Serializable(), m_e(e) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_eArr[i] = eArr[i]; } } @@ -43,7 +43,7 @@ Enum :: Serializable(), m_e(obj.m_e) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_eArr[i] = obj.m_eArr[i]; } } @@ -56,7 +56,7 @@ Enum :: Serializable(), m_e(e) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_eArr[i] = eArr; } } @@ -86,7 +86,7 @@ bool Enum :: // Compare array members if (!(this->m_eArr == obj.m_eArr)) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { if (!(this->m_eArr[i] == obj.m_eArr[i])) { return false; } @@ -126,7 +126,7 @@ Fw::SerializeStatus Enum :: if (status != Fw::FW_SERIALIZE_OK) { return status; } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { status = buffer.serialize(this->m_eArr[i]); if (status != Fw::FW_SERIALIZE_OK) { return status; @@ -145,7 +145,7 @@ Fw::SerializeStatus Enum :: if (status != Fw::FW_SERIALIZE_OK) { return status; } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { status = buffer.deserialize(this->m_eArr[i]); if (status != Fw::FW_SERIALIZE_OK) { return status; @@ -174,7 +174,7 @@ void Enum :: // Call toString for arrays and serializable types this->m_e.toString(eStr); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_eArr[i].toString(eArrStr[i]); } @@ -207,7 +207,7 @@ void Enum :: { this->m_e = e; - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_eArr[i] = eArr[i]; } } @@ -221,7 +221,7 @@ void Enum :: void Enum :: seteArr(const Type_of_eArr& eArr) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_eArr[i] = eArr[i]; } } diff --git a/compiler/tools/fpp-to-cpp/test/struct/Modules3SerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/struct/Modules3SerializableAc.ref.cpp index 5addce38a..eb301a10d 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/Modules3SerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/struct/Modules3SerializableAc.ref.cpp @@ -20,7 +20,7 @@ Modules3 :: Serializable(), m_x(M::Modules1(0, 0.0f)) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_arr[i] = M::Modules2(M::Modules1(0, 0.0f)); } } @@ -33,7 +33,7 @@ Modules3 :: Serializable(), m_x(x) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_arr[i] = arr[i]; } } @@ -43,7 +43,7 @@ Modules3 :: Serializable(), m_x(obj.m_x) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_arr[i] = obj.m_arr[i]; } } @@ -56,7 +56,7 @@ Modules3 :: Serializable(), m_x(x) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_arr[i] = arr; } } @@ -86,7 +86,7 @@ bool Modules3 :: // Compare array members if (!(this->m_arr == obj.m_arr)) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { if (!(this->m_arr[i] == obj.m_arr[i])) { return false; } @@ -126,7 +126,7 @@ Fw::SerializeStatus Modules3 :: if (status != Fw::FW_SERIALIZE_OK) { return status; } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { status = buffer.serialize(this->m_arr[i]); if (status != Fw::FW_SERIALIZE_OK) { return status; @@ -145,7 +145,7 @@ Fw::SerializeStatus Modules3 :: if (status != Fw::FW_SERIALIZE_OK) { return status; } - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { status = buffer.deserialize(this->m_arr[i]); if (status != Fw::FW_SERIALIZE_OK) { return status; @@ -174,7 +174,7 @@ void Modules3 :: // Call toString for arrays and serializable types this->m_x.toString(xStr); - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_arr[i].toString(arrStr[i]); } @@ -207,7 +207,7 @@ void Modules3 :: { this->m_x = x; - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_arr[i] = arr[i]; } } @@ -221,7 +221,7 @@ void Modules3 :: void Modules3 :: setarr(const Type_of_arr& arr) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_arr[i] = arr[i]; } } diff --git a/compiler/tools/fpp-to-cpp/test/struct/Modules4SerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/struct/Modules4SerializableAc.ref.cpp index 816893b45..8fe0f217b 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/Modules4SerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/struct/Modules4SerializableAc.ref.cpp @@ -19,10 +19,10 @@ Modules4 :: Modules4() : Serializable() { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_arr1[i] = M::Modules2(M::Modules1(0, 0.0f)); } - for (NATIVE_UINT_TYPE i = 0; i < 6; i++) { + for (FwSizeType i = 0; i < 6; i++) { this->m_arr2[i] = M::Modules2(M::Modules1(0, 0.0f)); } } @@ -34,10 +34,10 @@ Modules4 :: ) : Serializable() { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_arr1[i] = arr1[i]; } - for (NATIVE_UINT_TYPE i = 0; i < 6; i++) { + for (FwSizeType i = 0; i < 6; i++) { this->m_arr2[i] = arr2[i]; } } @@ -46,10 +46,10 @@ Modules4 :: Modules4(const Modules4& obj) : Serializable() { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_arr1[i] = obj.m_arr1[i]; } - for (NATIVE_UINT_TYPE i = 0; i < 6; i++) { + for (FwSizeType i = 0; i < 6; i++) { this->m_arr2[i] = obj.m_arr2[i]; } } @@ -61,10 +61,10 @@ Modules4 :: ) : Serializable() { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_arr1[i] = arr1; } - for (NATIVE_UINT_TYPE i = 0; i < 6; i++) { + for (FwSizeType i = 0; i < 6; i++) { this->m_arr2[i] = arr2; } } @@ -91,14 +91,14 @@ bool Modules4 :: // Compare array members if (!(this->m_arr1 == obj.m_arr1)) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { if (!(this->m_arr1[i] == obj.m_arr1[i])) { return false; } } } if (!(this->m_arr2 == obj.m_arr2)) { - for (NATIVE_UINT_TYPE i = 0; i < 6; i++) { + for (FwSizeType i = 0; i < 6; i++) { if (!(this->m_arr2[i] == obj.m_arr2[i])) { return false; } @@ -134,13 +134,13 @@ Fw::SerializeStatus Modules4 :: { Fw::SerializeStatus status; - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { status = buffer.serialize(this->m_arr1[i]); if (status != Fw::FW_SERIALIZE_OK) { return status; } } - for (NATIVE_UINT_TYPE i = 0; i < 6; i++) { + for (FwSizeType i = 0; i < 6; i++) { status = buffer.serialize(this->m_arr2[i]); if (status != Fw::FW_SERIALIZE_OK) { return status; @@ -155,13 +155,13 @@ Fw::SerializeStatus Modules4 :: { Fw::SerializeStatus status; - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { status = buffer.deserialize(this->m_arr1[i]); if (status != Fw::FW_SERIALIZE_OK) { return status; } } - for (NATIVE_UINT_TYPE i = 0; i < 6; i++) { + for (FwSizeType i = 0; i < 6; i++) { status = buffer.deserialize(this->m_arr2[i]); if (status != Fw::FW_SERIALIZE_OK) { return status; @@ -194,10 +194,10 @@ void Modules4 :: Fw::String arr2Str[6]; // Call toString for arrays and serializable types - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_arr1[i].toString(arr1Str[i]); } - for (NATIVE_UINT_TYPE i = 0; i < 6; i++) { + for (FwSizeType i = 0; i < 6; i++) { this->m_arr2[i].toString(arr2Str[i]); } @@ -234,10 +234,10 @@ void Modules4 :: ) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_arr1[i] = arr1[i]; } - for (NATIVE_UINT_TYPE i = 0; i < 6; i++) { + for (FwSizeType i = 0; i < 6; i++) { this->m_arr2[i] = arr2[i]; } } @@ -245,7 +245,7 @@ void Modules4 :: void Modules4 :: setarr1(const Type_of_arr1& arr1) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_arr1[i] = arr1[i]; } } @@ -253,7 +253,7 @@ void Modules4 :: void Modules4 :: setarr2(const Type_of_arr2& arr2) { - for (NATIVE_UINT_TYPE i = 0; i < 6; i++) { + for (FwSizeType i = 0; i < 6; i++) { this->m_arr2[i] = arr2[i]; } } diff --git a/compiler/tools/fpp-to-cpp/test/struct/PrimitiveSerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/struct/PrimitiveSerializableAc.ref.cpp index f00f9a8b6..c2d3d4fd9 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/PrimitiveSerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/struct/PrimitiveSerializableAc.ref.cpp @@ -84,7 +84,7 @@ const char* Primitive::StringSize80 :: return this->m_buf; } -NATIVE_UINT_TYPE Primitive::StringSize80 :: +Fw::StringBase::SizeType Primitive::StringSize80 :: getCapacity() const { return sizeof(this->m_buf); @@ -109,7 +109,7 @@ Primitive :: m_m_bool(false), m_m_string("") { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_mF32[i] = 0.0f; } } @@ -142,7 +142,7 @@ Primitive :: m_m_bool(m_bool), m_m_string(m_string) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_mF32[i] = mF32[i]; } } @@ -162,7 +162,7 @@ Primitive :: m_m_bool(obj.m_m_bool), m_m_string(obj.m_m_string) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_mF32[i] = obj.m_mF32[i]; } } @@ -195,7 +195,7 @@ Primitive :: m_m_bool(m_bool), m_m_string(m_string) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_mF32[i] = mF32; } } @@ -237,7 +237,7 @@ bool Primitive :: // Compare array members if (!(this->m_mF32 == obj.m_mF32)) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { if (!(this->m_mF32[i] == obj.m_mF32[i])) { return false; } @@ -273,7 +273,7 @@ Fw::SerializeStatus Primitive :: { Fw::SerializeStatus status; - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { status = buffer.serialize(this->m_mF32[i]); if (status != Fw::FW_SERIALIZE_OK) { return status; @@ -332,7 +332,7 @@ Fw::SerializeStatus Primitive :: { Fw::SerializeStatus status; - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { status = buffer.deserialize(this->m_mF32[i]); if (status != Fw::FW_SERIALIZE_OK) { return status; @@ -468,7 +468,7 @@ void Primitive :: this->m_m_bool = m_bool; this->m_m_string = m_string; - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_mF32[i] = mF32[i]; } } @@ -476,7 +476,7 @@ void Primitive :: void Primitive :: setmF32(const Type_of_mF32& mF32) { - for (NATIVE_UINT_TYPE i = 0; i < 3; i++) { + for (FwSizeType i = 0; i < 3; i++) { this->m_mF32[i] = mF32[i]; } } diff --git a/compiler/tools/fpp-to-cpp/test/struct/PrimitiveSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/PrimitiveSerializableAc.ref.hpp index 5769f5eca..551c0901e 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/PrimitiveSerializableAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/struct/PrimitiveSerializableAc.ref.hpp @@ -61,7 +61,7 @@ class Primitive : //! Retrieves char buffer of string const char* toChar() const; - NATIVE_UINT_TYPE getCapacity() const; + Fw::StringBase::SizeType getCapacity() const; private: diff --git a/compiler/tools/fpp-to-cpp/test/struct/StringArraySerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/struct/StringArraySerializableAc.ref.cpp index b19899841..5af469d2a 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/StringArraySerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/struct/StringArraySerializableAc.ref.cpp @@ -84,7 +84,7 @@ const char* StringArray::StringSize80 :: return this->m_buf; } -NATIVE_UINT_TYPE StringArray::StringSize80 :: +Fw::StringBase::SizeType StringArray::StringSize80 :: getCapacity() const { return sizeof(this->m_buf); @@ -163,7 +163,7 @@ const char* StringArray::StringSize40 :: return this->m_buf; } -NATIVE_UINT_TYPE StringArray::StringSize40 :: +Fw::StringBase::SizeType StringArray::StringSize40 :: getCapacity() const { return sizeof(this->m_buf); @@ -178,7 +178,7 @@ StringArray :: Serializable(), m_s1("") { - for (NATIVE_UINT_TYPE i = 0; i < 16; i++) { + for (FwSizeType i = 0; i < 16; i++) { this->m_s2[i] = ""; } } @@ -191,7 +191,7 @@ StringArray :: Serializable(), m_s1(s1) { - for (NATIVE_UINT_TYPE i = 0; i < 16; i++) { + for (FwSizeType i = 0; i < 16; i++) { this->m_s2[i] = s2[i]; } } @@ -201,7 +201,7 @@ StringArray :: Serializable(), m_s1(obj.m_s1) { - for (NATIVE_UINT_TYPE i = 0; i < 16; i++) { + for (FwSizeType i = 0; i < 16; i++) { this->m_s2[i] = obj.m_s2[i]; } } @@ -214,7 +214,7 @@ StringArray :: Serializable(), m_s1(s1) { - for (NATIVE_UINT_TYPE i = 0; i < 16; i++) { + for (FwSizeType i = 0; i < 16; i++) { this->m_s2[i] = s2; } } @@ -244,7 +244,7 @@ bool StringArray :: // Compare array members if (!(this->m_s2 == obj.m_s2)) { - for (NATIVE_UINT_TYPE i = 0; i < 16; i++) { + for (FwSizeType i = 0; i < 16; i++) { if (!(this->m_s2[i] == obj.m_s2[i])) { return false; } @@ -284,7 +284,7 @@ Fw::SerializeStatus StringArray :: if (status != Fw::FW_SERIALIZE_OK) { return status; } - for (NATIVE_UINT_TYPE i = 0; i < 16; i++) { + for (FwSizeType i = 0; i < 16; i++) { status = buffer.serialize(this->m_s2[i]); if (status != Fw::FW_SERIALIZE_OK) { return status; @@ -303,7 +303,7 @@ Fw::SerializeStatus StringArray :: if (status != Fw::FW_SERIALIZE_OK) { return status; } - for (NATIVE_UINT_TYPE i = 0; i < 16; i++) { + for (FwSizeType i = 0; i < 16; i++) { status = buffer.deserialize(this->m_s2[i]); if (status != Fw::FW_SERIALIZE_OK) { return status; @@ -381,7 +381,7 @@ void StringArray :: { this->m_s1 = s1; - for (NATIVE_UINT_TYPE i = 0; i < 16; i++) { + for (FwSizeType i = 0; i < 16; i++) { this->m_s2[i] = s2[i]; } } @@ -395,7 +395,7 @@ void StringArray :: void StringArray :: sets2(const Type_of_s2& s2) { - for (NATIVE_UINT_TYPE i = 0; i < 16; i++) { + for (FwSizeType i = 0; i < 16; i++) { this->m_s2[i] = s2[i]; } } diff --git a/compiler/tools/fpp-to-cpp/test/struct/StringArraySerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/StringArraySerializableAc.ref.hpp index 9096f2726..e702c7cdd 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/StringArraySerializableAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/struct/StringArraySerializableAc.ref.hpp @@ -59,7 +59,7 @@ class StringArray : //! Retrieves char buffer of string const char* toChar() const; - NATIVE_UINT_TYPE getCapacity() const; + Fw::StringBase::SizeType getCapacity() const; private: @@ -109,7 +109,7 @@ class StringArray : //! Retrieves char buffer of string const char* toChar() const; - NATIVE_UINT_TYPE getCapacity() const; + Fw::StringBase::SizeType getCapacity() const; private: diff --git a/compiler/tools/fpp-to-cpp/test/struct/StringSerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/struct/StringSerializableAc.ref.cpp index c852568f0..4d5d53e4f 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/StringSerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/struct/StringSerializableAc.ref.cpp @@ -84,7 +84,7 @@ const char* String::StringSize80 :: return this->m_buf; } -NATIVE_UINT_TYPE String::StringSize80 :: +Fw::StringBase::SizeType String::StringSize80 :: getCapacity() const { return sizeof(this->m_buf); @@ -163,7 +163,7 @@ const char* String::StringSize40 :: return this->m_buf; } -NATIVE_UINT_TYPE String::StringSize40 :: +Fw::StringBase::SizeType String::StringSize40 :: getCapacity() const { return sizeof(this->m_buf); diff --git a/compiler/tools/fpp-to-cpp/test/struct/StringSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/StringSerializableAc.ref.hpp index 510791c8e..cb0fee399 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/StringSerializableAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/struct/StringSerializableAc.ref.hpp @@ -59,7 +59,7 @@ class String : //! Retrieves char buffer of string const char* toChar() const; - NATIVE_UINT_TYPE getCapacity() const; + Fw::StringBase::SizeType getCapacity() const; private: @@ -109,7 +109,7 @@ class String : //! Retrieves char buffer of string const char* toChar() const; - NATIVE_UINT_TYPE getCapacity() const; + Fw::StringBase::SizeType getCapacity() const; private: diff --git a/compiler/tools/fpp-to-cpp/test/top/BasicTopologyAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/top/BasicTopologyAc.ref.cpp index a42669e8c..bdf981bdf 100644 --- a/compiler/tools/fpp-to-cpp/test/top/BasicTopologyAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/top/BasicTopologyAc.ref.cpp @@ -89,17 +89,17 @@ namespace M { void startTasks(const TopologyState& state) { active1.start( - static_cast(Priorities::active1), - static_cast(StackSizes::active1), - static_cast(CPUs::active1), - static_cast(TaskIds::active1) + static_cast(Priorities::active1), + static_cast(StackSizes::active1), + static_cast(CPUs::active1), + static_cast(TaskIds::active1) ); active2.startSpecial(); active3.start( Os::Task::TASK_DEFAULT, // Default priority Os::Task::TASK_DEFAULT, // Default stack size Os::Task::TASK_DEFAULT, // Default CPU - static_cast(TaskIds::active3) + static_cast(TaskIds::active3) ); } diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Basic/Active.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Basic/Active.hpp index 25b6116a0..faf5b9332 100644 --- a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Basic/Active.hpp +++ b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Basic/Active.hpp @@ -35,7 +35,7 @@ namespace M { } - void p_handler(NATIVE_INT_TYPE portNum) { + void p_handler(FwIndexType portNum) { } diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/C.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/C.hpp index f0550f9e9..d23a0aaed 100644 --- a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/C.hpp +++ b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/C.hpp @@ -19,7 +19,7 @@ namespace M { } - virtual void pingIn_handler(NATIVE_INT_TYPE portNum) { + virtual void pingIn_handler(FwIndexType portNum) { } diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/Health.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/Health.hpp index f7fea1673..7d10874ea 100644 --- a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/Health.hpp +++ b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/Health.hpp @@ -25,7 +25,7 @@ namespace Svc { } - virtual void pingIn_handler(NATIVE_INT_TYPE portNum) { + virtual void pingIn_handler(FwIndexType portNum) { } diff --git a/docs/fpp-spec.html b/docs/fpp-spec.html index 8166185b7..933b77c1a 100644 --- a/docs/fpp-spec.html +++ b/docs/fpp-spec.html @@ -8494,7 +8494,7 @@

20.4. Translation Tools

diff --git a/docs/fpp-users-guide.html b/docs/fpp-users-guide.html index d0d598b34..e830482fd 100644 --- a/docs/fpp-users-guide.html +++ b/docs/fpp-users-guide.html @@ -11344,8 +11344,7 @@

14.1. I
-
type FwBuffSizeType
-type FwChanIdType
+
type FwChanIdType
 type FwDpIdType
 type FwDpPriorityType
 type FwEnumStoreType
@@ -11354,13 +11353,12 @@ 
14.1. I
 type FwOpcodeType
 type FwPacketDescriptorType
 type FwPrmIdType
+type FwSignedSizeType
+type FwSizeStoreType
 type FwSizeType
 type FwTimeBaseStoreType
 type FwTimeContextStoreType
-type FwTlmPacketizeIdType
-type NATIVE_INT_TYPE
-type NATIVE_UINT_TYPE
-type POINTER_CAST

+type FwTlmPacketizeIdType
@@ -11731,7 +11729,7 @@

-Last updated 2023-12-11 17:50:36 -0800 +Last updated 2024-03-07 15:17:49 -0800

diff --git a/docs/users-guide/Writing-C-Plus-Plus-Implementations.adoc b/docs/users-guide/Writing-C-Plus-Plus-Implementations.adoc index c89fee7c6..a48325fa6 100644 --- a/docs/users-guide/Writing-C-Plus-Plus-Implementations.adoc +++ b/docs/users-guide/Writing-C-Plus-Plus-Implementations.adoc @@ -147,7 +147,6 @@ The following types are abstract in the FPP model but are known to the {cpp} translator: ---- -type FwBuffSizeType type FwChanIdType type FwDpIdType type FwDpPriorityType @@ -157,13 +156,12 @@ type FwIndexType type FwOpcodeType type FwPacketDescriptorType type FwPrmIdType +type FwSignedSizeType +type FwSizeStoreType type FwSizeType type FwTimeBaseStoreType type FwTimeContextStoreType type FwTlmPacketizeIdType -type NATIVE_INT_TYPE -type NATIVE_UINT_TYPE -type POINTER_CAST ---- Each of these types is an alias for a {cpp} integer type, and each