NATIVE_INT_TYPE portNum to FwIndexType portNum (#3236)

nasa · Feb 14, 2025 · a5c853b · a5c853b
1 parent 0a822b5
commit a5c853b
Show file tree

Hide file tree

Showing 340 changed files with 920 additions and 920 deletions.
diff --git a/Autocoders/Python/templates/ExampleComponentImpl.cpp b/Autocoders/Python/templates/ExampleComponentImpl.cpp
@@ -20,7 +20,7 @@ namespace ExampleComponents {
         ExampleComponentBase::init(queueDepth,instance);
     }
 
-    void ExampleComponentImpl::exampleInput_handler(NATIVE_INT_TYPE portNum, I32 arg1, const ANameSpace::mytype& arg2, U8 arg3, const Example3::ExampleSerializable& arg4, AnotherExample::SomeEnum arg5) {
+    void ExampleComponentImpl::exampleInput_handler(FwIndexType portNum, I32 arg1, const ANameSpace::mytype& arg2, U8 arg3, const Example3::ExampleSerializable& arg4, AnotherExample::SomeEnum arg5) {
         Fw::TlmString arg = "A string arg";
         // write some telemetry
         this->tlmWrite_stringchan(arg);
@@ -33,7 +33,7 @@ namespace ExampleComponents {
 
     }
 
-    SomeOtherNamespace::AnotherEnum ExampleComponentImpl::anotherInput_handler(NATIVE_INT_TYPE portNum, I32 arg1, F64 arg2, SomeOtherNamespace::SomeEnum arg3) {
+    SomeOtherNamespace::AnotherEnum ExampleComponentImpl::anotherInput_handler(FwIndexType portNum, I32 arg1, F64 arg2, SomeOtherNamespace::SomeEnum arg3) {
 
     	return SomeOtherNamespace::MEMB1;
     }

diff --git a/Autocoders/Python/templates/ExampleComponentImpl.hpp b/Autocoders/Python/templates/ExampleComponentImpl.hpp
@@ -19,8 +19,8 @@ namespace ExampleComponents {
             virtual ~ExampleComponentImpl();
         protected:
         private:
-            void exampleInput_handler(NATIVE_INT_TYPE portNum, I32 arg1, const ANameSpace::mytype& arg2, U8 arg3, const Example3::ExampleSerializable& arg4, AnotherExample::SomeEnum arg5);
-            SomeOtherNamespace::AnotherEnum anotherInput_handler(NATIVE_INT_TYPE portNum, I32 arg1, F64 arg2, SomeOtherNamespace::SomeEnum arg3);
+            void exampleInput_handler(FwIndexType portNum, I32 arg1, const ANameSpace::mytype& arg2, U8 arg3, const Example3::ExampleSerializable& arg4, AnotherExample::SomeEnum arg5);
+            SomeOtherNamespace::AnotherEnum anotherInput_handler(FwIndexType portNum, I32 arg1, F64 arg2, SomeOtherNamespace::SomeEnum arg3);
             void TEST_CMD_1_cmdHandler(FwOpcodeType opCode, U32 cmdSeq, I32 arg1, ExampleComponentBase::CmdEnum arg2, const Fw::CmdStringArg& arg3);
             void TEST_CMD_2_cmdHandler(FwOpcodeType opCode, U32 cmdSeq, I32 arg1, F32 arg2);
 

diff --git a/Autocoders/Python/templates/test/ut/main.cpp b/Autocoders/Python/templates/test/ut/main.cpp
@@ -10,7 +10,7 @@ class ATester : public ExampleComponents::ExampleGTestBase {
     ATester() : ExampleComponents::ExampleGTestBase("comp",10) {}
 
         void from_exampleOutput_handler(
-            const NATIVE_INT_TYPE portNum, //!< The port number
+            const FwIndexType portNum, //!< The port number
             I32 arg1, //!< A built-in type argument
             const ANameSpace::mytype &arg2, //!< A user-defined type argument
             U8 arg3, //!< The third argument

diff --git a/Autocoders/Python/test/array_xml/ExampleArrayImpl.cpp b/Autocoders/Python/test/array_xml/ExampleArrayImpl.cpp
@@ -19,15 +19,15 @@ namespace Example {
         Component1ComponentBase::init(queueDepth);
     }
 
-    void ExampleArrayImpl::ExArrayIn_handler(NATIVE_INT_TYPE portNum, const Example::SubNameSpace::ArrayType& array1, const Example::ArrSerial& serial1) {
+    void ExampleArrayImpl::ExArrayIn_handler(FwIndexType portNum, const Example::SubNameSpace::ArrayType& array1, const Example::ArrSerial& serial1) {
         Fw::String s;
         array1.toString(s);
 
         printf("%s Invoked ExArrayIn_handler();\n%s", FW_OPTIONAL_NAME(this->getObjName()), s.toChar());
         this->ArrayOut_out(0, array1, serial1);
     }
 
-    void ExampleArrayImpl::ArrayIn_handler(NATIVE_INT_TYPE portNum, const Example::SubNameSpace::ArrayType& array1, const Example::ArrSerial& serial1) {
+    void ExampleArrayImpl::ArrayIn_handler(FwIndexType portNum, const Example::SubNameSpace::ArrayType& array1, const Example::ArrSerial& serial1) {
         Fw::String s;
         array1.toString(s);
 

diff --git a/Autocoders/Python/test/array_xml/ExampleArrayImpl.hpp b/Autocoders/Python/test/array_xml/ExampleArrayImpl.hpp
@@ -14,8 +14,8 @@ namespace Example {
 		void init(NATIVE_INT_TYPE queueDepth);
 
     private:
-        void ExArrayIn_handler(NATIVE_INT_TYPE portNum, const Example::SubNameSpace::ArrayType& array1, const Example::ArrSerial& serial1);
-        void ArrayIn_handler(NATIVE_INT_TYPE portNum, const Example::SubNameSpace::ArrayType& array1, const Example::ArrSerial& serial1);
+        void ExArrayIn_handler(FwIndexType portNum, const Example::SubNameSpace::ArrayType& array1, const Example::ArrSerial& serial1);
+        void ArrayIn_handler(FwIndexType portNum, const Example::SubNameSpace::ArrayType& array1, const Example::ArrSerial& serial1);
 	};
 
 };

diff --git a/Autocoders/Python/test/command1/TestCommand1Impl.cpp b/Autocoders/Python/test/command1/TestCommand1Impl.cpp
@@ -22,7 +22,7 @@ void TestCommand1Impl::init() {
     Test1ComponentBase::init();
 }
 
-void TestCommand1Impl::aport_handler(NATIVE_INT_TYPE portNum, I32 arg4, F32 arg5, U8 arg6) {
+void TestCommand1Impl::aport_handler(FwIndexType portNum, I32 arg4, F32 arg5, U8 arg6) {
 }
 
 void TestCommand1Impl::TEST_CMD_1_cmdHandler(FwOpcodeType opCode, U32 cmdSeq, I32 arg1, F32 arg2, U8 arg3) {

diff --git a/Autocoders/Python/test/command1/TestCommand1Impl.hpp b/Autocoders/Python/test/command1/TestCommand1Impl.hpp
@@ -16,7 +16,7 @@ class TestCommand1Impl: public Cmd::Test1ComponentBase {
         virtual ~TestCommand1Impl();
         void init();
     protected:
-        void aport_handler(NATIVE_INT_TYPE portNum, I32 arg4, F32 arg5, U8 arg6);
+        void aport_handler(FwIndexType portNum, I32 arg4, F32 arg5, U8 arg6);
         void TEST_CMD_1_cmdHandler(FwOpcodeType opCode, U32 cmdSeq, I32 arg1, F32 arg2, U8 arg3);
 };
 

diff --git a/Autocoders/Python/test/command1/TestCommandSourceImpl.cpp b/Autocoders/Python/test/command1/TestCommandSourceImpl.cpp
@@ -19,12 +19,12 @@ TestCommandSourceImpl::~TestCommandSourceImpl() {
 }
 
 void TestCommandSourceImpl::cmdStatusPort_handler(
-        NATIVE_INT_TYPE portNum, FwOpcodeType opCode, U32 cmdSeq,
+        FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq,
         const Fw::CmdResponse& response) {
     this->printStatus(response);
 }
 
-void TestCommandSourceImpl::cmdRegPort_handler(NATIVE_INT_TYPE portNum, FwOpcodeType opCode) {
+void TestCommandSourceImpl::cmdRegPort_handler(FwIndexType portNum, FwOpcodeType opCode) {
     printf("Received registration for opcode %d\n",opCode);
 }
 

diff --git a/Autocoders/Python/test/command1/TestCommandSourceImpl.hpp b/Autocoders/Python/test/command1/TestCommandSourceImpl.hpp
@@ -17,8 +17,8 @@ class TestCommandSourceImpl: public Cmd::CommandTesterComponentBase {
         void init();
         void test_TEST_CMD_1(I32 arg1, F32 arg2, U8 arg3);
     protected:
-        void cmdStatusPort_handler(NATIVE_INT_TYPE portNum, FwOpcodeType opCode, U32 cmdSeq, const Fw::CmdResponse& response);
-        void cmdRegPort_handler(NATIVE_INT_TYPE portNum, FwOpcodeType opCode);
+        void cmdStatusPort_handler(FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, const Fw::CmdResponse& response);
+        void cmdRegPort_handler(FwIndexType portNum, FwOpcodeType opCode);
     private:
         void printStatus(Fw::CmdResponse response);
 };

diff --git a/Autocoders/Python/test/command2/TestCommandComponentImpl.cpp b/Autocoders/Python/test/command2/TestCommandComponentImpl.cpp
@@ -50,7 +50,7 @@ namespace AcTest {
 
   void TestCommandComponentImpl ::
     aport_handler(
-        const NATIVE_INT_TYPE portNum,
+        const FwIndexType portNum,
         I32 arg4,
         F32 arg5,
         U8 arg6

diff --git a/Autocoders/Python/test/command2/TestCommandComponentImpl.hpp b/Autocoders/Python/test/command2/TestCommandComponentImpl.hpp
@@ -53,7 +53,7 @@ namespace AcTest {
       //! Handler implementation for aport
       //!
       void aport_handler(
-          const NATIVE_INT_TYPE portNum, /*!< The port number*/
+          const FwIndexType portNum, /*!< The port number*/
           I32 arg4, /*!< The first argument*/
           F32 arg5, /*!< The second argument*/
           U8 arg6 /*!< The third argument*/

diff --git a/Autocoders/Python/test/command_multi_inst/TestCommand1Impl.cpp b/Autocoders/Python/test/command_multi_inst/TestCommand1Impl.cpp
@@ -23,7 +23,7 @@ void TestCommand1Impl::init(NATIVE_INT_TYPE queueDepth, //!< The queue depth
     Test1ComponentBase::init(queueDepth,instance);
 }
 
-void TestCommand1Impl::aport_handler(NATIVE_INT_TYPE portNum, I32 arg4, F32 arg5, U8 arg6) {
+void TestCommand1Impl::aport_handler(FwIndexType portNum, I32 arg4, F32 arg5, U8 arg6) {
 }
 
 void TestCommand1Impl::TEST_CMD_1_cmdHandler(

diff --git a/Autocoders/Python/test/command_multi_inst/TestCommand1Impl.hpp b/Autocoders/Python/test/command_multi_inst/TestCommand1Impl.hpp
@@ -17,7 +17,7 @@ class TestCommand1Impl: public Cmd::Test1ComponentBase {
         void init(NATIVE_INT_TYPE queueDepth, //!< The queue depth
                 NATIVE_INT_TYPE instance = 0);
     protected:
-        void aport_handler(NATIVE_INT_TYPE portNum, I32 arg4, F32 arg5, U8 arg6);
+        void aport_handler(FwIndexType portNum, I32 arg4, F32 arg5, U8 arg6);
         void TEST_CMD_1_cmdHandler(
                 FwOpcodeType opCode, /*!< The opcode*/
                 U32 cmdSeq, /*!< The command sequence number*/

diff --git a/Autocoders/Python/test/command_multi_inst/TestCommandSourceImpl.cpp b/Autocoders/Python/test/command_multi_inst/TestCommandSourceImpl.cpp
@@ -19,12 +19,12 @@ TestCommandSourceImpl::~TestCommandSourceImpl() {
 }
 
 void TestCommandSourceImpl::cmdStatusPort_handler(
-        NATIVE_INT_TYPE portNum, FwOpcodeType opCode, U32 cmdSeq,
+        FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq,
         const Fw::CmdResponse& response) {
     this->printStatus(response);
 }
 
-void TestCommandSourceImpl::cmdRegPort_handler(NATIVE_INT_TYPE portNum, FwOpcodeType opCode) {
+void TestCommandSourceImpl::cmdRegPort_handler(FwIndexType portNum, FwOpcodeType opCode) {
     printf("Received registration for opcode %d\n",opCode);
 }
 

diff --git a/Autocoders/Python/test/command_multi_inst/TestCommandSourceImpl.hpp b/Autocoders/Python/test/command_multi_inst/TestCommandSourceImpl.hpp
@@ -17,8 +17,8 @@ class TestCommandSourceImpl: public Cmd::CommandTesterComponentBase {
         void init();
         void test_TEST_CMD_1(I32 arg1, F32 arg2, U8 arg3);
     protected:
-        void cmdStatusPort_handler(NATIVE_INT_TYPE portNum, FwOpcodeType opCode, U32 cmdSeq, const Fw::CmdResponse& response);
-        void cmdRegPort_handler(NATIVE_INT_TYPE portNum, FwOpcodeType opCode);
+        void cmdStatusPort_handler(FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, const Fw::CmdResponse& response);
+        void cmdRegPort_handler(FwIndexType portNum, FwOpcodeType opCode);
     private:
         void printStatus(Fw::CmdResponse response);
 };

diff --git a/Autocoders/Python/test/command_res/Test1ComponentImpl.cpp b/Autocoders/Python/test/command_res/Test1ComponentImpl.cpp
@@ -50,7 +50,7 @@ namespace Cmd {
 
   void Test1ComponentImpl ::
     aport_handler(
-        const NATIVE_INT_TYPE portNum,
+        const FwIndexType portNum,
         I32 arg4,
         F32 arg5,
         U8 arg6

diff --git a/Autocoders/Python/test/command_res/Test1ComponentImpl.hpp b/Autocoders/Python/test/command_res/Test1ComponentImpl.hpp
@@ -53,7 +53,7 @@ namespace Cmd {
       //! Handler implementation for aport
       //!
       void aport_handler(
-          const NATIVE_INT_TYPE portNum, /*!< The port number*/
+          const FwIndexType portNum, /*!< The port number*/
           I32 arg4, /*!< The first argument*/
           F32 arg5, /*!< The second argument*/
           U8 arg6 /*!< The third argument*/

diff --git a/Autocoders/Python/test/command_string/TestCommandImpl.cpp b/Autocoders/Python/test/command_string/TestCommandImpl.cpp
@@ -19,7 +19,7 @@ void TestCommand1Impl::init(NATIVE_INT_TYPE queueDepth) {
 TestCommand1Impl::~TestCommand1Impl() {
 }
 
-void TestCommand1Impl::aport_handler(NATIVE_INT_TYPE portNum, I32 arg4, F32 arg5, U8 arg6) {
+void TestCommand1Impl::aport_handler(FwIndexType portNum, I32 arg4, F32 arg5, U8 arg6) {
 
 }
 

diff --git a/Autocoders/Python/test/command_string/TestCommandImpl.hpp b/Autocoders/Python/test/command_string/TestCommandImpl.hpp
@@ -15,7 +15,7 @@ class TestCommand1Impl: public AcTest::TestCommandComponentBase {
         TestCommand1Impl(const char* compName);
         void init(NATIVE_INT_TYPE queueDepth);
         virtual ~TestCommand1Impl();
-        void aport_handler(NATIVE_INT_TYPE portNum, I32 arg4, F32 arg5, U8 arg6);
+        void aport_handler(FwIndexType portNum, I32 arg4, F32 arg5, U8 arg6);
         void TEST_CMD_1_cmdHandler(FwOpcodeType opCode, U32 cmdSeq, I32 arg1, const Fw::CmdStringArg& arg2, SomeEnum arg3);
 };
 

diff --git a/Autocoders/Python/test/command_string/TestCommandSourceImpl.cpp b/Autocoders/Python/test/command_string/TestCommandSourceImpl.cpp
@@ -17,12 +17,12 @@ TestCommandSourceImpl::~TestCommandSourceImpl() {
 }
 
 void TestCommandSourceImpl::cmdStatusPort_handler(
-        NATIVE_INT_TYPE portNum, FwOpcodeType opCode, U32 cmdSeq,
+        FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq,
         const Fw::CmdResponse& response) {
     this->printStatus(response);
 }
 
-void TestCommandSourceImpl::cmdRegPort_handler(NATIVE_INT_TYPE portNum, FwOpcodeType opCode) {
+void TestCommandSourceImpl::cmdRegPort_handler(FwIndexType portNum, FwOpcodeType opCode) {
     printf("Received registration for opcode %d\n",opCode);
 }
 

diff --git a/Autocoders/Python/test/command_string/TestCommandSourceImpl.hpp b/Autocoders/Python/test/command_string/TestCommandSourceImpl.hpp
@@ -18,8 +18,8 @@ class TestCommandSourceImpl: public Cmd::CommandTesterComponentBase {
         void init();
         void test_TEST_CMD_1(I32 arg1, const Fw::CmdStringArg& arg2, I32 arg3);
     protected:
-        void cmdStatusPort_handler(NATIVE_INT_TYPE portNum, FwOpcodeType opCode, U32 cmdSeq, const Fw::CmdResponse& response);
-        void cmdRegPort_handler(NATIVE_INT_TYPE portNum, FwOpcodeType opCode);
+        void cmdStatusPort_handler(FwIndexType portNum, FwOpcodeType opCode, U32 cmdSeq, const Fw::CmdResponse& response);
+        void cmdRegPort_handler(FwIndexType portNum, FwOpcodeType opCode);
     private:
         void printStatus(const Fw::CmdResponse& response);
 };

diff --git a/Autocoders/Python/test/command_tester/test/ut/main.cpp b/Autocoders/Python/test/command_tester/test/ut/main.cpp
@@ -14,7 +14,7 @@ class ATester : public Cmd::CommandTesterGTestBase {
     }
 
     void from_cmdSendPort_handler(
-              const NATIVE_INT_TYPE portNum, //!< The port number
+              const FwIndexType portNum, //!< The port number
               FwOpcodeType opCode, //!< Command Op Code
               U32 cmdSeq, //!< Command Sequence
               Fw::CmdArgBuffer &args //!< Buffer containing arguments

diff --git a/Autocoders/Python/test/enum1port/DrvTimingSignalPort.hpp b/Autocoders/Python/test/enum1port/DrvTimingSignalPort.hpp
@@ -14,7 +14,7 @@ namespace Drv {
 
     class InputTimingSignalPort : public Fw::InputPortBase {
       public:
-        typedef void (*CompFuncPtr)(Fw::ComponentBase* callComp, NATIVE_INT_TYPE portNum, TimingSignal signal);
+        typedef void (*CompFuncPtr)(Fw::ComponentBase* callComp, FwIndexType portNum, TimingSignal signal);
 
         InputTimingSignalPort();
         void init();

diff --git a/Autocoders/Python/test/enum_xml/Component1Impl.cpp b/Autocoders/Python/test/enum_xml/Component1Impl.cpp
@@ -18,12 +18,12 @@ namespace Example {
         Component1ComponentBase::init(queueDepth);
     }
 
-    void ExampleEnumImpl::ExEnumIn_handler(NATIVE_INT_TYPE portNum, const Example::SubNamespace::Enum1& enum1, const Example::Serial1& serial1) {
+    void ExampleEnumImpl::ExEnumIn_handler(FwIndexType portNum, const Example::SubNamespace::Enum1& enum1, const Example::Serial1& serial1) {
         printf("%s Invoked ExEnumIn_handler(%d, %d, %d, %d, %d);\n", FW_OPTIONAL_NAME(this->getObjName()), portNum, static_cast<FwEnumStoreType>(enum1.e), serial1.getMember1(), serial1.getMember2(), static_cast<FwEnumStoreType>(serial1.getMember3().e));
         this->EnumOut_out(0, enum1, serial1);
     }
 
-    void ExampleEnumImpl::EnumIn_handler(NATIVE_INT_TYPE portNum, const Example::SubNamespace::Enum1& enum1, const Example::Serial1& serial1) {
+    void ExampleEnumImpl::EnumIn_handler(FwIndexType portNum, const Example::SubNamespace::Enum1& enum1, const Example::Serial1& serial1) {
         printf("%s Invoked EnumIn_handler(%d, %d, %d, %d, %d);\n", FW_OPTIONAL_NAME(this->getObjName()), portNum, static_cast<FwEnumStoreType>(enum1.e), serial1.getMember1(), serial1.getMember2(), static_cast<FwEnumStoreType>(serial1.getMember3().e));
     }
 };
diff --git a/Autocoders/Python/test/enum_xml/Component1Impl.hpp b/Autocoders/Python/test/enum_xml/Component1Impl.hpp
@@ -14,8 +14,8 @@ namespace Example {
 		void init(NATIVE_INT_TYPE queueDepth);
 
     private:
-        void ExEnumIn_handler(NATIVE_INT_TYPE portNum, const Example::SubNamespace::Enum1& enum1, const Example::Serial1& serial1);
-        void EnumIn_handler(NATIVE_INT_TYPE portNum, const Example::SubNamespace::Enum1& enum1, const Example::Serial1& serial1);
+        void ExEnumIn_handler(FwIndexType portNum, const Example::SubNamespace::Enum1& enum1, const Example::Serial1& serial1);
+        void EnumIn_handler(FwIndexType portNum, const Example::SubNamespace::Enum1& enum1, const Example::Serial1& serial1);
 	};
 
 };

diff --git a/Autocoders/Python/test/event1/TestLogImpl.cpp b/Autocoders/Python/test/event1/TestLogImpl.cpp
@@ -20,7 +20,7 @@ void TestLogImpl::init() {
 }
 
 
-void TestLogImpl::aport_handler(NATIVE_INT_TYPE portNum, I32 arg4, F32 arg5, U8 arg6) {
+void TestLogImpl::aport_handler(FwIndexType portNum, I32 arg4, F32 arg5, U8 arg6) {
 
 }
 

diff --git a/Autocoders/Python/test/event1/TestLogImpl.hpp b/Autocoders/Python/test/event1/TestLogImpl.hpp
@@ -17,7 +17,7 @@ class TestLogImpl: public Somewhere::TestLogComponentBase {
         void init();
         void sendEvent(I32 arg1, F32 arg2, U8 arg3);
     protected:
-        void aport_handler(NATIVE_INT_TYPE portNum, I32 arg4, F32 arg5, U8 arg6);
+        void aport_handler(FwIndexType portNum, I32 arg4, F32 arg5, U8 arg6);
 };
 
 #endif /* TESTCOMMAND1IMPL_HPP_ */
diff --git a/Autocoders/Python/test/event1/TestLogRecvImpl.cpp b/Autocoders/Python/test/event1/TestLogRecvImpl.cpp
@@ -15,7 +15,7 @@ TestLogRecvImpl::TestLogRecvImpl(const char* name) : LogTextImpl(name)
 TestLogRecvImpl::~TestLogRecvImpl() {
 }
 
-void TestLogRecvImpl::logRecvPort_handler(NATIVE_INT_TYPE portNum, FwEventIdType id, Fw::Time &timeTag, const Fw::LogSeverity& severity, Fw::LogBuffer &args) {
+void TestLogRecvImpl::logRecvPort_handler(FwIndexType portNum, FwEventIdType id, Fw::Time &timeTag, const Fw::LogSeverity& severity, Fw::LogBuffer &args) {
     printf("Received log %d, Time (%d,%d:%d) severity %d\n",id,timeTag.getTimeBase(),timeTag.getSeconds(),timeTag.getUSeconds(),severity.e);
     I32 arg1;
     F32 arg2;

diff --git a/Autocoders/Python/test/event1/TestLogRecvImpl.hpp b/Autocoders/Python/test/event1/TestLogRecvImpl.hpp
@@ -16,7 +16,7 @@ class TestLogRecvImpl: public LogTextImpl {
         virtual ~TestLogRecvImpl();
         void init();
     protected:
-        void logRecvPort_handler(NATIVE_INT_TYPE portNum, FwEventIdType id, Fw::Time &timeTag, const Fw::LogSeverity& severity, Fw::LogBuffer &args);
+        void logRecvPort_handler(FwIndexType portNum, FwEventIdType id, Fw::Time &timeTag, const Fw::LogSeverity& severity, Fw::LogBuffer &args);
     private:
 };
 

diff --git a/Autocoders/Python/test/event_enum/TestLogImpl.cpp b/Autocoders/Python/test/event_enum/TestLogImpl.cpp
@@ -20,7 +20,7 @@ void TestLogImpl::init() {
 }
 
 
-void TestLogImpl::aport_handler(NATIVE_INT_TYPE portNum, I32 arg4, F32 arg5, U8 arg6) {
+void TestLogImpl::aport_handler(FwIndexType portNum, I32 arg4, F32 arg5, U8 arg6) {
 
 }
 

diff --git a/Autocoders/Python/test/event_enum/TestLogImpl.hpp b/Autocoders/Python/test/event_enum/TestLogImpl.hpp
@@ -17,7 +17,7 @@ class TestLogImpl: public Somewhere::TestLogComponentBase {
         void init();
         void sendEvent(I32 arg1, I32 arg2, U8 arg3);
     protected:
-        void aport_handler(NATIVE_INT_TYPE portNum, I32 arg4, F32 arg5, U8 arg6);
+        void aport_handler(FwIndexType portNum, I32 arg4, F32 arg5, U8 arg6);
 };
 
 #endif /* TESTCOMMAND1IMPL_HPP_ */
diff --git a/Autocoders/Python/test/event_enum/TestLogRecvImpl.cpp b/Autocoders/Python/test/event_enum/TestLogRecvImpl.cpp
@@ -15,7 +15,7 @@ TestLogRecvImpl::TestLogRecvImpl(const char* name) : LogTextImpl(name)
 TestLogRecvImpl::~TestLogRecvImpl() {
 }
 
-void TestLogRecvImpl::logRecvPort_handler(NATIVE_INT_TYPE portNum, FwEventIdType id, Fw::Time &timeTag, const Fw::LogSeverity& severity, Fw::LogBuffer &args) {
+void TestLogRecvImpl::logRecvPort_handler(FwIndexType portNum, FwEventIdType id, Fw::Time &timeTag, const Fw::LogSeverity& severity, Fw::LogBuffer &args) {
     printf("Received log %d, Time (%d,%d:%d) severity %d\n",id,timeTag.getTimeBase(),timeTag.getSeconds(),timeTag.getUSeconds(),severity.e);
     I32 arg1;
     I32 arg2;

diff --git a/Autocoders/Python/test/event_enum/TestLogRecvImpl.hpp b/Autocoders/Python/test/event_enum/TestLogRecvImpl.hpp
@@ -16,7 +16,7 @@ class TestLogRecvImpl: public LogTextImpl {
         virtual ~TestLogRecvImpl();
         void init();
     protected:
-        void logRecvPort_handler(NATIVE_INT_TYPE portNum, FwEventIdType id, Fw::Time &timeTag, const Fw::LogSeverity& severity, Fw::LogBuffer &args);
+        void logRecvPort_handler(FwIndexType portNum, FwEventIdType id, Fw::Time &timeTag, const Fw::LogSeverity& severity, Fw::LogBuffer &args);
     private:
 };
 

diff --git a/Autocoders/Python/test/event_multi_inst/TestLogImpl.cpp b/Autocoders/Python/test/event_multi_inst/TestLogImpl.cpp
@@ -20,7 +20,7 @@ void TestLogImpl::init() {
 }
 
 
-void TestLogImpl::aport_handler(NATIVE_INT_TYPE portNum, I32 arg4, F32 arg5, U8 arg6) {
+void TestLogImpl::aport_handler(FwIndexType portNum, I32 arg4, F32 arg5, U8 arg6) {
 
 }
 

diff --git a/Autocoders/Python/test/event_multi_inst/TestLogImpl.hpp b/Autocoders/Python/test/event_multi_inst/TestLogImpl.hpp
@@ -17,7 +17,7 @@ class TestLogImpl: public Somewhere::TestLogComponentBase {
         void init();
         void sendEvent(I32 arg1, F32 arg2, U8 arg3);
     protected:
-        void aport_handler(NATIVE_INT_TYPE portNum, I32 arg4, F32 arg5, U8 arg6);
+        void aport_handler(FwIndexType portNum, I32 arg4, F32 arg5, U8 arg6);
 };
 
 #endif /* TESTCOMMAND1IMPL_HPP_ */
diff --git a/Autocoders/Python/test/event_multi_inst/TestLogRecvImpl.cpp b/Autocoders/Python/test/event_multi_inst/TestLogRecvImpl.cpp
@@ -15,7 +15,7 @@ TestLogRecvImpl::TestLogRecvImpl(const char* name) : LogTextImpl(name)
 TestLogRecvImpl::~TestLogRecvImpl() {
 }
 
-void TestLogRecvImpl::logRecvPort_handler(NATIVE_INT_TYPE portNum, FwEventIdType id, Fw::Time &timeTag, const Fw::LogSeverity& severity, Fw::LogBuffer &args) {
+void TestLogRecvImpl::logRecvPort_handler(FwIndexType portNum, FwEventIdType id, Fw::Time &timeTag, const Fw::LogSeverity& severity, Fw::LogBuffer &args) {
     printf("Received log %d, Time (%d,%d:%d) severity %d\n",id,timeTag.getTimeBase(),timeTag.getSeconds(),timeTag.getUSeconds(),severity.e);
     I32 arg1;
     F32 arg2;

diff --git a/Autocoders/Python/test/event_multi_inst/TestLogRecvImpl.hpp b/Autocoders/Python/test/event_multi_inst/TestLogRecvImpl.hpp
@@ -16,7 +16,7 @@ class TestLogRecvImpl: public LogTextImpl {
         virtual ~TestLogRecvImpl();
         void init();
     protected:
-        void logRecvPort_handler(NATIVE_INT_TYPE portNum, FwEventIdType id, Fw::Time &timeTag, const Fw::LogSeverity& severity, Fw::LogBuffer &args);
+        void logRecvPort_handler(FwIndexType portNum, FwEventIdType id, Fw::Time &timeTag, const Fw::LogSeverity& severity, Fw::LogBuffer &args);
     private:
 };
 

diff --git a/Autocoders/Python/test/event_string/TestLogImpl.cpp b/Autocoders/Python/test/event_string/TestLogImpl.cpp
@@ -20,7 +20,7 @@ void TestLogImpl::init() {
 }
 
 
-void TestLogImpl::aport_handler(NATIVE_INT_TYPE portNum, I32 arg4, F32 arg5, U8 arg6) {
+void TestLogImpl::aport_handler(FwIndexType portNum, I32 arg4, F32 arg5, U8 arg6) {
 
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ void TestCommand1Impl::init(NATIVE_INT_TYPE queueDepth) { @@
     TestCommand1Impl::~TestCommand1Impl() {
     }
-    void TestCommand1Impl::aport_handler(NATIVE_INT_TYPE portNum, I32 arg4, F32 arg5, U8 arg6) {
+    void TestCommand1Impl::aport_handler(FwIndexType portNum, I32 arg4, F32 arg5, U8 arg6) {
     }
@@ Expand Down @@