From e357c065183fd9888a61ffaeb12903f5e4f029b8 Mon Sep 17 00:00:00 2001 From: Michael D Starch Date: Mon, 23 Sep 2024 17:36:41 -0700 Subject: [PATCH] Refactors AC queue codegen to be inline with OSAL queue refactor --- .../ComponentCppWriter.scala | 18 +-- .../ComponentCppWriterUtils.scala | 16 +- .../TestWriter/ComponentTestImplWriter.scala | 2 +- ...veAsyncProductPortsOnlyComponentAc.ref.cpp | 22 +-- ...veAsyncProductPortsOnlyComponentAc.ref.hpp | 2 +- .../ActiveAsyncProductsComponentAc.ref.cpp | 54 +++---- .../ActiveAsyncProductsComponentAc.ref.hpp | 2 +- .../base/ActiveCommandsComponentAc.ref.cpp | 82 +++++----- .../base/ActiveCommandsComponentAc.ref.hpp | 2 +- .../base/ActiveEventsComponentAc.ref.cpp | 48 +++--- .../base/ActiveEventsComponentAc.ref.hpp | 2 +- .../base/ActiveGetProductsComponentAc.ref.cpp | 48 +++--- .../base/ActiveGetProductsComponentAc.ref.hpp | 2 +- .../ActiveGuardedProductsComponentAc.ref.cpp | 48 +++--- .../ActiveGuardedProductsComponentAc.ref.hpp | 2 +- .../ActiveNoArgsPortsOnlyComponentAc.ref.cpp | 22 +-- .../ActiveNoArgsPortsOnlyComponentAc.ref.hpp | 2 +- .../base/ActiveOverflowComponentAc.ref.cpp | 82 +++++----- .../base/ActiveOverflowComponentAc.ref.hpp | 2 +- .../base/ActiveParamsComponentAc.ref.cpp | 48 +++--- .../base/ActiveParamsComponentAc.ref.hpp | 2 +- .../base/ActiveSerialComponentAc.ref.cpp | 146 ++++++++--------- .../base/ActiveSerialComponentAc.ref.hpp | 2 +- .../ActiveStateMachinesComponentAc.ref.cpp | 56 +++---- .../ActiveStateMachinesComponentAc.ref.hpp | 2 +- .../ActiveSyncProductsComponentAc.ref.cpp | 48 +++--- .../ActiveSyncProductsComponentAc.ref.hpp | 2 +- .../base/ActiveTelemetryComponentAc.ref.cpp | 48 +++--- .../base/ActiveTelemetryComponentAc.ref.hpp | 2 +- .../base/ActiveTestComponentAc.ref.cpp | 128 +++++++-------- .../base/ActiveTestComponentAc.ref.hpp | 2 +- ...edAsyncProductPortsOnlyComponentAc.ref.cpp | 24 +-- ...edAsyncProductPortsOnlyComponentAc.ref.hpp | 2 +- .../QueuedAsyncProductsComponentAc.ref.cpp | 54 +++---- .../QueuedAsyncProductsComponentAc.ref.hpp | 2 +- .../base/QueuedCommandsComponentAc.ref.cpp | 84 +++++----- .../base/QueuedCommandsComponentAc.ref.hpp | 2 +- .../base/QueuedEventsComponentAc.ref.cpp | 50 +++--- .../base/QueuedEventsComponentAc.ref.hpp | 2 +- .../base/QueuedGetProductsComponentAc.ref.cpp | 48 +++--- .../base/QueuedGetProductsComponentAc.ref.hpp | 2 +- .../QueuedGuardedProductsComponentAc.ref.cpp | 48 +++--- .../QueuedGuardedProductsComponentAc.ref.hpp | 2 +- .../QueuedNoArgsPortsOnlyComponentAc.ref.cpp | 24 +-- .../QueuedNoArgsPortsOnlyComponentAc.ref.hpp | 2 +- .../base/QueuedOverflowComponentAc.ref.cpp | 84 +++++----- .../base/QueuedOverflowComponentAc.ref.hpp | 2 +- .../base/QueuedParamsComponentAc.ref.cpp | 50 +++--- .../base/QueuedParamsComponentAc.ref.hpp | 2 +- .../base/QueuedSerialComponentAc.ref.cpp | 148 +++++++++--------- .../base/QueuedSerialComponentAc.ref.hpp | 2 +- .../QueuedSyncProductsComponentAc.ref.cpp | 48 +++--- .../QueuedSyncProductsComponentAc.ref.hpp | 2 +- .../base/QueuedTelemetryComponentAc.ref.cpp | 50 +++--- .../base/QueuedTelemetryComponentAc.ref.hpp | 2 +- .../base/QueuedTestComponentAc.ref.cpp | 130 +++++++-------- .../base/QueuedTestComponentAc.ref.hpp | 2 +- .../ActiveAsyncProductPortsOnlyTester.ref.hpp | 2 +- .../ActiveAsyncProductsTester.ref.hpp | 2 +- .../test-impl/ActiveCommandsTester.ref.hpp | 2 +- .../test-impl/ActiveEventsTester.ref.hpp | 2 +- .../test-impl/ActiveGetProductsTester.ref.hpp | 2 +- .../ActiveGuardedProductsTester.ref.hpp | 2 +- .../ActiveNoArgsPortsOnlyTester.ref.hpp | 2 +- .../test-impl/ActiveParamsTester.ref.hpp | 2 +- .../test-impl/ActiveSerialTester.ref.hpp | 2 +- .../ActiveSyncProductsTester.ref.hpp | 2 +- .../test-impl/ActiveTelemetryTester.ref.hpp | 2 +- .../test-impl/ActiveTestTester.ref.hpp | 2 +- .../test-impl/QueuedCommandsTester.ref.hpp | 2 +- .../test-impl/QueuedEventsTester.ref.hpp | 2 +- .../test-impl/QueuedGetProductsTester.ref.hpp | 2 +- .../QueuedGuardedProductsTester.ref.hpp | 2 +- .../test-impl/QueuedParamsTester.ref.hpp | 2 +- .../test-impl/QueuedSerialTester.ref.hpp | 2 +- .../QueuedSyncProductsTester.ref.hpp | 2 +- .../test-impl/QueuedTelemetryTester.ref.hpp | 2 +- .../test-impl/QueuedTestTester.ref.hpp | 2 +- 78 files changed, 927 insertions(+), 927 deletions(-) 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 02a7c0daf..aa53628cd 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala @@ -431,19 +431,19 @@ case class ComponentCppWriter ( | static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) |); | - |Os::Queue::QueueStatus qStat = this->createQueue(queueDepth, this->m_msgSize); + |Os::Queue::Status qStat = this->createQueue(queueDepth, this->m_msgSize); |""" ) else lines( - """|Os::Queue::QueueStatus qStat = this->createQueue( + """|Os::Queue::Status qStat = this->createQueue( | queueDepth, - | ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + | static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) |); |""" ), lines( """|FW_ASSERT( - | Os::Queue::QUEUE_OK == qStat, + | Os::Queue::Status::OP_OK == qStat, | static_cast(qStat) |); |""" @@ -745,7 +745,7 @@ case class ComponentCppWriter ( else { val assertMsgStatus = lines( """|FW_ASSERT( - | msgStatus == Os::Queue::QUEUE_OK, + | msgStatus == Os::Queue::OP_OK, | static_cast(msgStatus) |); |""" @@ -777,15 +777,15 @@ case class ComponentCppWriter ( lines( s"""|FwQueuePriorityType priority = 0; | - |Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + |Os::Queue::Status msgStatus = this->m_queue.receive( | msg, - | priority, - | Os::Queue::QUEUE_${if data.kind == Ast.ComponentKind.Queued then "NON" else ""}BLOCKING + | Os::Queue::${if data.kind == Ast.ComponentKind.Queued then "NON" else ""}BLOCKING, + | priority |); |""".stripMargin ), if data.kind == Ast.ComponentKind.Queued then wrapInIfElse( - "Os::Queue::QUEUE_NO_MORE_MSGS == msgStatus", + "Os::Queue::Status::EMPTY == msgStatus", lines("return Fw::QueuedComponentBase::MSG_DISPATCH_EMPTY;"), assertMsgStatus ) 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 9dcbd5306..86539d89b 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriterUtils.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriterUtils.scala @@ -331,7 +331,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("FwQueueSizeType"), + CppDoc.Type("FwSizeType"), "queueDepth", Some("The queue depth") ) @@ -624,8 +624,8 @@ abstract class ComponentCppWriterUtils( arguments: List[CppDoc.Function.Param] ): List[Line] = { val queueBlocking = queueFull match { - case Ast.QueueFull.Block => "QUEUE_BLOCKING" - case _ => "QUEUE_NONBLOCKING" + case Ast.QueueFull.Block => "BLOCKING" + case _ => "NONBLOCKING" } val priorityNum = priority match { case Some(num) => num @@ -636,20 +636,20 @@ abstract class ComponentCppWriterUtils( List( lines( s"""|// Send message - |Os::Queue::QueueBlocking _block = Os::Queue::$queueBlocking; - |Os::Queue::QueueStatus qStatus = this->m_queue.send($bufferName, $priorityNum, _block); + |Os::Queue::BlockingType _block = Os::Queue::$queueBlocking; + |Os::Queue::Status qStatus = this->m_queue.send($bufferName, $priorityNum, _block); |""" ), queueFull match { case Ast.QueueFull.Drop => lines( - """|if (qStatus == Os::Queue::QUEUE_FULL) { + """|if (qStatus == Os::Queue::Status::FULL) { | this->incNumMsgDropped(); | return; |} |""" ) case Ast.QueueFull.Hook => lines( - s"""|if (qStatus == Os::Queue::QUEUE_FULL) { + s"""|if (qStatus == Os::Queue::Status::FULL) { | this->${inputOverflowHookName(name, messageType)}(${arguments.map(_.name).mkString(", ")}); | return; |} @@ -659,7 +659,7 @@ abstract class ComponentCppWriterUtils( }, lines( """|FW_ASSERT( - | qStatus == Os::Queue::QUEUE_OK, + | qStatus == Os::Queue::OP_OK, | static_cast(qStatus) |); |""" 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 d82f42be4..1e4233eca 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 @@ -93,7 +93,7 @@ case class ComponentTestImplWriter( lines( s"""| |// Queue depth supplied to the component instance under test - |static const FwQueueSizeType $queueDepthConstantName = 10; + |static const FwSizeType $queueDepthConstantName = 10; |""" ) ) 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 27cf61e28..a134a556e 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 @@ -64,7 +64,7 @@ namespace { void ActiveAsyncProductPortsOnlyComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwEnumStoreType instance ) { @@ -133,12 +133,12 @@ void ActiveAsyncProductPortsOnlyComponentBase :: #endif } - Os::Queue::QueueStatus qStat = this->createQueue( + Os::Queue::Status qStat = this->createQueue( queueDepth, - ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -363,11 +363,11 @@ void ActiveAsyncProductPortsOnlyComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -439,13 +439,13 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveAsyncProductPortsOnlyComponentB ComponentIpcSerializableBuffer msg; FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_BLOCKING + Os::Queue::BLOCKING, + priority ); FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); 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 20d8fe946..9efd91a2b 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,7 +55,7 @@ class ActiveAsyncProductPortsOnlyComponentBase : //! Initialize ActiveAsyncProductPortsOnlyComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwEnumStoreType instance = 0 //!< The instance number ); 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 2ec9d01e9..2775298f5 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 @@ -295,7 +295,7 @@ Fw::SerializeStatus ActiveAsyncProductsComponentBase::DpContainer :: void ActiveAsyncProductsComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwEnumStoreType instance ) { @@ -930,12 +930,12 @@ void ActiveAsyncProductsComponentBase :: #endif } - Os::Queue::QueueStatus qStat = this->createQueue( + Os::Queue::Status qStat = this->createQueue( queueDepth, - ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -1940,11 +1940,11 @@ void ActiveAsyncProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1986,11 +1986,11 @@ void ActiveAsyncProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2165,11 +2165,11 @@ void ActiveAsyncProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2272,11 +2272,11 @@ void ActiveAsyncProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2379,11 +2379,11 @@ void ActiveAsyncProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2486,16 +2486,16 @@ void ActiveAsyncProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2931,13 +2931,13 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveAsyncProductsComponentBase :: ComponentIpcSerializableBuffer msg; FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_BLOCKING + Os::Queue::BLOCKING, + priority ); FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); 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 267e7519b..cf670f1f1 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 @@ -244,7 +244,7 @@ class ActiveAsyncProductsComponentBase : //! Initialize ActiveAsyncProductsComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwEnumStoreType instance = 0 //!< The instance number ); 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 c306f7ec2..f4378fb39 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 @@ -77,7 +77,7 @@ namespace { void ActiveCommandsComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwEnumStoreType instance ) { @@ -650,12 +650,12 @@ void ActiveCommandsComponentBase :: #endif } - Os::Queue::QueueStatus qStat = this->createQueue( + Os::Queue::Status qStat = this->createQueue( queueDepth, - ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -1600,11 +1600,11 @@ void ActiveCommandsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1779,11 +1779,11 @@ void ActiveCommandsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1886,11 +1886,11 @@ void ActiveCommandsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1993,11 +1993,11 @@ void ActiveCommandsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2100,16 +2100,16 @@ void ActiveCommandsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3109,11 +3109,11 @@ void ActiveCommandsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3168,11 +3168,11 @@ void ActiveCommandsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3227,11 +3227,11 @@ void ActiveCommandsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 20, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 20, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3286,16 +3286,16 @@ void ActiveCommandsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3350,16 +3350,16 @@ void ActiveCommandsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 30, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 30, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3473,13 +3473,13 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveCommandsComponentBase :: ComponentIpcSerializableBuffer msg; FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_BLOCKING + Os::Queue::BLOCKING, + priority ); FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); 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 d6b1f7357..e35a97646 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,7 +124,7 @@ class ActiveCommandsComponentBase : //! Initialize ActiveCommandsComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwEnumStoreType instance = 0 //!< The instance number ); 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 79f0abaf2..4c894bf30 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 @@ -72,7 +72,7 @@ namespace { void ActiveEventsComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwEnumStoreType instance ) { @@ -645,12 +645,12 @@ void ActiveEventsComponentBase :: #endif } - Os::Queue::QueueStatus qStat = this->createQueue( + Os::Queue::Status qStat = this->createQueue( queueDepth, - ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -1519,11 +1519,11 @@ void ActiveEventsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1698,11 +1698,11 @@ void ActiveEventsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1805,11 +1805,11 @@ void ActiveEventsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1912,11 +1912,11 @@ void ActiveEventsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2019,16 +2019,16 @@ void ActiveEventsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3028,13 +3028,13 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveEventsComponentBase :: ComponentIpcSerializableBuffer msg; FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_BLOCKING + Os::Queue::BLOCKING, + priority ); FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); 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 20e2540a6..183e3185b 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,7 +121,7 @@ class ActiveEventsComponentBase : //! Initialize ActiveEventsComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwEnumStoreType instance = 0 //!< The instance number ); 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 d81c6bc8a..a18be9441 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 @@ -293,7 +293,7 @@ Fw::SerializeStatus ActiveGetProductsComponentBase::DpContainer :: void ActiveGetProductsComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwEnumStoreType instance ) { @@ -904,12 +904,12 @@ void ActiveGetProductsComponentBase :: #endif } - Os::Queue::QueueStatus qStat = this->createQueue( + Os::Queue::Status qStat = this->createQueue( queueDepth, - ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -1852,11 +1852,11 @@ void ActiveGetProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2031,11 +2031,11 @@ void ActiveGetProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2138,11 +2138,11 @@ void ActiveGetProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2245,11 +2245,11 @@ void ActiveGetProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2352,16 +2352,16 @@ void ActiveGetProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2780,13 +2780,13 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveGetProductsComponentBase :: ComponentIpcSerializableBuffer msg; FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_BLOCKING + Os::Queue::BLOCKING, + priority ); FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); 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 c659fca59..abeb3e696 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 @@ -242,7 +242,7 @@ class ActiveGetProductsComponentBase : //! Initialize ActiveGetProductsComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwEnumStoreType instance = 0 //!< The instance number ); 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 9d2bb0948..a0fb09e7d 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 @@ -293,7 +293,7 @@ Fw::SerializeStatus ActiveGuardedProductsComponentBase::DpContainer :: void ActiveGuardedProductsComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwEnumStoreType instance ) { @@ -928,12 +928,12 @@ void ActiveGuardedProductsComponentBase :: #endif } - Os::Queue::QueueStatus qStat = this->createQueue( + Os::Queue::Status qStat = this->createQueue( queueDepth, - ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -1942,11 +1942,11 @@ void ActiveGuardedProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2121,11 +2121,11 @@ void ActiveGuardedProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2228,11 +2228,11 @@ void ActiveGuardedProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2335,11 +2335,11 @@ void ActiveGuardedProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2442,16 +2442,16 @@ void ActiveGuardedProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2868,13 +2868,13 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveGuardedProductsComponentBase :: ComponentIpcSerializableBuffer msg; FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_BLOCKING + Os::Queue::BLOCKING, + priority ); FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); 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 70942b11a..ea017940f 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 @@ -244,7 +244,7 @@ class ActiveGuardedProductsComponentBase : //! Initialize ActiveGuardedProductsComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwEnumStoreType instance = 0 //!< The instance number ); 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 47d565673..d6e5f0cfc 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 @@ -57,7 +57,7 @@ namespace { void ActiveNoArgsPortsOnlyComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwEnumStoreType instance ) { @@ -198,12 +198,12 @@ void ActiveNoArgsPortsOnlyComponentBase :: #endif } - Os::Queue::QueueStatus qStat = this->createQueue( + Os::Queue::Status qStat = this->createQueue( queueDepth, - ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -434,11 +434,11 @@ void ActiveNoArgsPortsOnlyComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -569,13 +569,13 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveNoArgsPortsOnlyComponentBase :: ComponentIpcSerializableBuffer msg; FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_BLOCKING + Os::Queue::BLOCKING, + priority ); FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); 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 2863ccdc9..1de04a8a8 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,7 +58,7 @@ class ActiveNoArgsPortsOnlyComponentBase : //! Initialize ActiveNoArgsPortsOnlyComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwEnumStoreType instance = 0 //!< The instance number ); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveOverflowComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveOverflowComponentAc.ref.cpp index db1afd613..8e9896035 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveOverflowComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveOverflowComponentAc.ref.cpp @@ -77,7 +77,7 @@ namespace { void ActiveOverflowComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwSizeType msgSize, FwEnumStoreType instance ) @@ -415,9 +415,9 @@ void ActiveOverflowComponentBase :: static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); - Os::Queue::QueueStatus qStat = this->createQueue(queueDepth, this->m_msgSize); + Os::Queue::Status qStat = this->createQueue(queueDepth, this->m_msgSize); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -1050,16 +1050,16 @@ void ActiveOverflowComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->productRecvInHook_overflowHook(portNum, id, buffer, status); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1168,11 +1168,11 @@ void ActiveOverflowComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1275,11 +1275,11 @@ void ActiveOverflowComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1382,16 +1382,16 @@ void ActiveOverflowComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1494,16 +1494,16 @@ void ActiveOverflowComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->hookAsync_overflowHook(portNum, u32, f32, b, str1, e, a, s); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1555,16 +1555,16 @@ void ActiveOverflowComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msgSerBuff, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msgSerBuff, 0, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->serialAsyncHook_overflowHook(portNum, buffer); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1706,16 +1706,16 @@ void ActiveOverflowComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->internalHookDrop_overflowHook(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1791,16 +1791,16 @@ void ActiveOverflowComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->CMD_HOOK_cmdOverflowHook(opCode, cmdSeq); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1855,16 +1855,16 @@ void ActiveOverflowComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 30, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 30, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->CMD_PARAMS_PRIORITY_HOOK_cmdOverflowHook(opCode, cmdSeq); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1927,13 +1927,13 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveOverflowComponentBase :: Fw::ExternalSerializeBuffer msg(msgBuff,this->m_msgSize); FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_BLOCKING + Os::Queue::BLOCKING, + priority ); FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveOverflowComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveOverflowComponentAc.ref.hpp index 0eaea68f1..f2242c5dd 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveOverflowComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveOverflowComponentAc.ref.hpp @@ -98,7 +98,7 @@ class ActiveOverflowComponentBase : //! Initialize ActiveOverflowComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwSizeType msgSize, //!< The message size FwEnumStoreType instance = 0 //!< The instance number ); 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 714e7cdf1..622901503 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 @@ -72,7 +72,7 @@ namespace { void ActiveParamsComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwEnumStoreType instance ) { @@ -645,12 +645,12 @@ void ActiveParamsComponentBase :: #endif } - Os::Queue::QueueStatus qStat = this->createQueue( + Os::Queue::Status qStat = this->createQueue( queueDepth, - ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -1755,11 +1755,11 @@ void ActiveParamsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1934,11 +1934,11 @@ void ActiveParamsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2041,11 +2041,11 @@ void ActiveParamsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2148,11 +2148,11 @@ void ActiveParamsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2255,16 +2255,16 @@ void ActiveParamsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2712,13 +2712,13 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveParamsComponentBase :: ComponentIpcSerializableBuffer msg; FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_BLOCKING + Os::Queue::BLOCKING, + priority ); FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); 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 2ae1415fd..b2b3a13e0 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,7 +131,7 @@ class ActiveParamsComponentBase : //! Initialize ActiveParamsComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwEnumStoreType instance = 0 //!< The instance number ); 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 900c8c1ac..af01be269 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 @@ -110,7 +110,7 @@ namespace { void ActiveSerialComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwSizeType msgSize, FwEnumStoreType instance ) @@ -855,9 +855,9 @@ void ActiveSerialComponentBase :: static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); - Os::Queue::QueueStatus qStat = this->createQueue(queueDepth, this->m_msgSize); + Os::Queue::Status qStat = this->createQueue(queueDepth, this->m_msgSize); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -2198,11 +2198,11 @@ void ActiveSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2377,11 +2377,11 @@ void ActiveSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2484,11 +2484,11 @@ void ActiveSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2591,11 +2591,11 @@ void ActiveSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2698,16 +2698,16 @@ void ActiveSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2903,11 +2903,11 @@ void ActiveSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msgSerBuff, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msgSerBuff, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2953,11 +2953,11 @@ void ActiveSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msgSerBuff, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msgSerBuff, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3003,11 +3003,11 @@ void ActiveSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msgSerBuff, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msgSerBuff, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3053,16 +3053,16 @@ void ActiveSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msgSerBuff, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msgSerBuff, 5, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3357,11 +3357,11 @@ void ActiveSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3393,11 +3393,11 @@ void ActiveSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3445,11 +3445,11 @@ void ActiveSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3475,16 +3475,16 @@ void ActiveSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3525,11 +3525,11 @@ void ActiveSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3561,16 +3561,16 @@ void ActiveSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 20, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 20, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -4274,11 +4274,11 @@ void ActiveSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -4333,11 +4333,11 @@ void ActiveSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -4392,11 +4392,11 @@ void ActiveSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 20, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 20, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -4451,16 +4451,16 @@ void ActiveSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -4515,16 +4515,16 @@ void ActiveSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 30, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 30, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -5775,13 +5775,13 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveSerialComponentBase :: Fw::ExternalSerializeBuffer msg(msgBuff,this->m_msgSize); FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_BLOCKING + Os::Queue::BLOCKING, + priority ); FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); 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 cf68a38bf..0472d926d 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,7 +204,7 @@ class ActiveSerialComponentBase : //! Initialize ActiveSerialComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwSizeType msgSize, //!< The message size FwEnumStoreType instance = 0 //!< The instance number ); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveStateMachinesComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveStateMachinesComponentAc.ref.cpp index be092675a..7340dd5eb 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveStateMachinesComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveStateMachinesComponentAc.ref.cpp @@ -69,7 +69,7 @@ namespace M { void ActiveStateMachinesComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwEnumStoreType instance ) { @@ -83,12 +83,12 @@ namespace M { m_stateMachine_sm5.init(STATE_MACHINE_SM5); m_stateMachine_sm6.init(STATE_MACHINE_SM6); - Os::Queue::QueueStatus qStat = this->createQueue( + Os::Queue::Status qStat = this->createQueue( queueDepth, - ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -163,11 +163,11 @@ namespace M { ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 1, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 1, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -215,11 +215,11 @@ namespace M { ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 2, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 2, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -267,16 +267,16 @@ namespace M { ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 3, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 3, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -324,11 +324,11 @@ namespace M { ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 4, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 4, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -376,16 +376,16 @@ namespace M { ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->sm5_stateMachineOverflowHook(signal, data); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -433,11 +433,11 @@ namespace M { ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -452,13 +452,13 @@ namespace M { ComponentIpcSerializableBuffer msg; FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_BLOCKING + Os::Queue::BLOCKING, + priority ); FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveStateMachinesComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveStateMachinesComponentAc.ref.hpp index 7e3fb1bac..52fecf7b6 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveStateMachinesComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveStateMachinesComponentAc.ref.hpp @@ -55,7 +55,7 @@ namespace M { //! Initialize ActiveStateMachinesComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwEnumStoreType instance = 0 //!< The instance number ); 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 8d26f17ee..347b568bd 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 @@ -293,7 +293,7 @@ Fw::SerializeStatus ActiveSyncProductsComponentBase::DpContainer :: void ActiveSyncProductsComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwEnumStoreType instance ) { @@ -928,12 +928,12 @@ void ActiveSyncProductsComponentBase :: #endif } - Os::Queue::QueueStatus qStat = this->createQueue( + Os::Queue::Status qStat = this->createQueue( queueDepth, - ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -1936,11 +1936,11 @@ void ActiveSyncProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2115,11 +2115,11 @@ void ActiveSyncProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2222,11 +2222,11 @@ void ActiveSyncProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2329,11 +2329,11 @@ void ActiveSyncProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2436,16 +2436,16 @@ void ActiveSyncProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2862,13 +2862,13 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveSyncProductsComponentBase :: ComponentIpcSerializableBuffer msg; FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_BLOCKING + Os::Queue::BLOCKING, + priority ); FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); 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 73f73df55..103151fb1 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 @@ -244,7 +244,7 @@ class ActiveSyncProductsComponentBase : //! Initialize ActiveSyncProductsComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwEnumStoreType instance = 0 //!< The instance number ); 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 981e76f65..8246021e5 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 @@ -72,7 +72,7 @@ namespace { void ActiveTelemetryComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwEnumStoreType instance ) { @@ -645,12 +645,12 @@ void ActiveTelemetryComponentBase :: #endif } - Os::Queue::QueueStatus qStat = this->createQueue( + Os::Queue::Status qStat = this->createQueue( queueDepth, - ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -1522,11 +1522,11 @@ void ActiveTelemetryComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1701,11 +1701,11 @@ void ActiveTelemetryComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1808,11 +1808,11 @@ void ActiveTelemetryComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1915,11 +1915,11 @@ void ActiveTelemetryComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2022,16 +2022,16 @@ void ActiveTelemetryComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2775,13 +2775,13 @@ Fw::QueuedComponentBase::MsgDispatchStatus ActiveTelemetryComponentBase :: ComponentIpcSerializableBuffer msg; FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_BLOCKING + Os::Queue::BLOCKING, + priority ); FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); 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 0996addf8..86951a612 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,7 +118,7 @@ class ActiveTelemetryComponentBase : //! Initialize ActiveTelemetryComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwEnumStoreType instance = 0 //!< The instance number ); 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 09135aa21..c8d2fb0f5 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 @@ -331,7 +331,7 @@ namespace M { void ActiveTestComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwEnumStoreType instance ) { @@ -966,12 +966,12 @@ namespace M { #endif } - Os::Queue::QueueStatus qStat = this->createQueue( + Os::Queue::Status qStat = this->createQueue( queueDepth, - ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -2293,11 +2293,11 @@ namespace M { ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2339,11 +2339,11 @@ namespace M { ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2518,11 +2518,11 @@ namespace M { ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2625,11 +2625,11 @@ namespace M { ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2732,11 +2732,11 @@ namespace M { ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2839,16 +2839,16 @@ namespace M { ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3237,11 +3237,11 @@ namespace M { ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3273,11 +3273,11 @@ namespace M { ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3325,11 +3325,11 @@ namespace M { ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3355,16 +3355,16 @@ namespace M { ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3405,11 +3405,11 @@ namespace M { ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3441,16 +3441,16 @@ namespace M { ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 20, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 20, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -4154,11 +4154,11 @@ namespace M { ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -4213,11 +4213,11 @@ namespace M { ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -4272,11 +4272,11 @@ namespace M { ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 20, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 20, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -4331,16 +4331,16 @@ namespace M { ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -4395,16 +4395,16 @@ namespace M { ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 30, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 30, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -5686,13 +5686,13 @@ namespace M { ComponentIpcSerializableBuffer msg; FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_BLOCKING + Os::Queue::BLOCKING, + priority ); FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); 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 063c5222c..60993beb5 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 @@ -331,7 +331,7 @@ namespace M { //! Initialize ActiveTestComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwEnumStoreType instance = 0 //!< The instance number ); 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 bdc874b36..f31b85619 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 @@ -64,7 +64,7 @@ namespace { void QueuedAsyncProductPortsOnlyComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwEnumStoreType instance ) { @@ -133,12 +133,12 @@ void QueuedAsyncProductPortsOnlyComponentBase :: #endif } - Os::Queue::QueueStatus qStat = this->createQueue( + Os::Queue::Status qStat = this->createQueue( queueDepth, - ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -363,11 +363,11 @@ void QueuedAsyncProductPortsOnlyComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -439,17 +439,17 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedAsyncProductPortsOnlyComponentB ComponentIpcSerializableBuffer msg; FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_NONBLOCKING + Os::Queue::NONBLOCKING, + priority ); - if (Os::Queue::QUEUE_NO_MORE_MSGS == msgStatus) { + if (Os::Queue::Status::EMPTY == msgStatus) { return Fw::QueuedComponentBase::MSG_DISPATCH_EMPTY; } else { FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); } 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 32facb995..fa553bfb0 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,7 +55,7 @@ class QueuedAsyncProductPortsOnlyComponentBase : //! Initialize QueuedAsyncProductPortsOnlyComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwEnumStoreType instance = 0 //!< The instance number ); 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 425637e0f..fa43fba20 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 @@ -295,7 +295,7 @@ Fw::SerializeStatus QueuedAsyncProductsComponentBase::DpContainer :: void QueuedAsyncProductsComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwEnumStoreType instance ) { @@ -930,12 +930,12 @@ void QueuedAsyncProductsComponentBase :: #endif } - Os::Queue::QueueStatus qStat = this->createQueue( + Os::Queue::Status qStat = this->createQueue( queueDepth, - ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -1940,11 +1940,11 @@ void QueuedAsyncProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1986,11 +1986,11 @@ void QueuedAsyncProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2165,11 +2165,11 @@ void QueuedAsyncProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2272,11 +2272,11 @@ void QueuedAsyncProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2379,11 +2379,11 @@ void QueuedAsyncProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2486,16 +2486,16 @@ void QueuedAsyncProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2931,13 +2931,13 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedAsyncProductsComponentBase :: ComponentIpcSerializableBuffer msg; FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_BLOCKING + Os::Queue::BLOCKING, + priority ); FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); 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 05fc97622..5738dbe84 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 @@ -244,7 +244,7 @@ class QueuedAsyncProductsComponentBase : //! Initialize QueuedAsyncProductsComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwEnumStoreType instance = 0 //!< The instance number ); 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 ccf0e0eba..edaf470c3 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 @@ -77,7 +77,7 @@ namespace { void QueuedCommandsComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwEnumStoreType instance ) { @@ -650,12 +650,12 @@ void QueuedCommandsComponentBase :: #endif } - Os::Queue::QueueStatus qStat = this->createQueue( + Os::Queue::Status qStat = this->createQueue( queueDepth, - ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -1600,11 +1600,11 @@ void QueuedCommandsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1779,11 +1779,11 @@ void QueuedCommandsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1886,11 +1886,11 @@ void QueuedCommandsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1993,11 +1993,11 @@ void QueuedCommandsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2100,16 +2100,16 @@ void QueuedCommandsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3109,11 +3109,11 @@ void QueuedCommandsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3168,11 +3168,11 @@ void QueuedCommandsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3227,11 +3227,11 @@ void QueuedCommandsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 20, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 20, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3286,16 +3286,16 @@ void QueuedCommandsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3350,16 +3350,16 @@ void QueuedCommandsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 30, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 30, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3473,17 +3473,17 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedCommandsComponentBase :: ComponentIpcSerializableBuffer msg; FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_NONBLOCKING + Os::Queue::NONBLOCKING, + priority ); - if (Os::Queue::QUEUE_NO_MORE_MSGS == msgStatus) { + if (Os::Queue::Status::EMPTY == msgStatus) { return Fw::QueuedComponentBase::MSG_DISPATCH_EMPTY; } else { FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); } 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 a23a21a70..0487c5fe8 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,7 +124,7 @@ class QueuedCommandsComponentBase : //! Initialize QueuedCommandsComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwEnumStoreType instance = 0 //!< The instance number ); 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 d13deaf35..c228a7bab 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 @@ -72,7 +72,7 @@ namespace { void QueuedEventsComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwEnumStoreType instance ) { @@ -645,12 +645,12 @@ void QueuedEventsComponentBase :: #endif } - Os::Queue::QueueStatus qStat = this->createQueue( + Os::Queue::Status qStat = this->createQueue( queueDepth, - ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -1519,11 +1519,11 @@ void QueuedEventsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1698,11 +1698,11 @@ void QueuedEventsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1805,11 +1805,11 @@ void QueuedEventsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1912,11 +1912,11 @@ void QueuedEventsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2019,16 +2019,16 @@ void QueuedEventsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3028,17 +3028,17 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedEventsComponentBase :: ComponentIpcSerializableBuffer msg; FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_NONBLOCKING + Os::Queue::NONBLOCKING, + priority ); - if (Os::Queue::QUEUE_NO_MORE_MSGS == msgStatus) { + if (Os::Queue::Status::EMPTY == msgStatus) { return Fw::QueuedComponentBase::MSG_DISPATCH_EMPTY; } else { FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); } 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 1921c40e5..484df5217 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,7 +121,7 @@ class QueuedEventsComponentBase : //! Initialize QueuedEventsComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwEnumStoreType instance = 0 //!< The instance number ); 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 eaf3f4a54..c34f97834 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 @@ -293,7 +293,7 @@ Fw::SerializeStatus QueuedGetProductsComponentBase::DpContainer :: void QueuedGetProductsComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwEnumStoreType instance ) { @@ -904,12 +904,12 @@ void QueuedGetProductsComponentBase :: #endif } - Os::Queue::QueueStatus qStat = this->createQueue( + Os::Queue::Status qStat = this->createQueue( queueDepth, - ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -1852,11 +1852,11 @@ void QueuedGetProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2031,11 +2031,11 @@ void QueuedGetProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2138,11 +2138,11 @@ void QueuedGetProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2245,11 +2245,11 @@ void QueuedGetProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2352,16 +2352,16 @@ void QueuedGetProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2780,13 +2780,13 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedGetProductsComponentBase :: ComponentIpcSerializableBuffer msg; FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_BLOCKING + Os::Queue::BLOCKING, + priority ); FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); 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 bd1bc7254..eff431928 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 @@ -242,7 +242,7 @@ class QueuedGetProductsComponentBase : //! Initialize QueuedGetProductsComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwEnumStoreType instance = 0 //!< The instance number ); 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 693c41bb1..bb5006e55 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 @@ -293,7 +293,7 @@ Fw::SerializeStatus QueuedGuardedProductsComponentBase::DpContainer :: void QueuedGuardedProductsComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwEnumStoreType instance ) { @@ -928,12 +928,12 @@ void QueuedGuardedProductsComponentBase :: #endif } - Os::Queue::QueueStatus qStat = this->createQueue( + Os::Queue::Status qStat = this->createQueue( queueDepth, - ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -1942,11 +1942,11 @@ void QueuedGuardedProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2121,11 +2121,11 @@ void QueuedGuardedProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2228,11 +2228,11 @@ void QueuedGuardedProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2335,11 +2335,11 @@ void QueuedGuardedProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2442,16 +2442,16 @@ void QueuedGuardedProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2868,13 +2868,13 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedGuardedProductsComponentBase :: ComponentIpcSerializableBuffer msg; FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_BLOCKING + Os::Queue::BLOCKING, + priority ); FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); 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 532dad701..ff789907c 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 @@ -244,7 +244,7 @@ class QueuedGuardedProductsComponentBase : //! Initialize QueuedGuardedProductsComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwEnumStoreType instance = 0 //!< The instance number ); 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 ad6f11c44..f6bfc4011 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 @@ -57,7 +57,7 @@ namespace { void QueuedNoArgsPortsOnlyComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwEnumStoreType instance ) { @@ -198,12 +198,12 @@ void QueuedNoArgsPortsOnlyComponentBase :: #endif } - Os::Queue::QueueStatus qStat = this->createQueue( + Os::Queue::Status qStat = this->createQueue( queueDepth, - ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -434,11 +434,11 @@ void QueuedNoArgsPortsOnlyComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -569,17 +569,17 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedNoArgsPortsOnlyComponentBase :: ComponentIpcSerializableBuffer msg; FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_NONBLOCKING + Os::Queue::NONBLOCKING, + priority ); - if (Os::Queue::QUEUE_NO_MORE_MSGS == msgStatus) { + if (Os::Queue::Status::EMPTY == msgStatus) { return Fw::QueuedComponentBase::MSG_DISPATCH_EMPTY; } else { FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); } 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 31990940f..1a6f01d41 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,7 +58,7 @@ class QueuedNoArgsPortsOnlyComponentBase : //! Initialize QueuedNoArgsPortsOnlyComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwEnumStoreType instance = 0 //!< The instance number ); diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedOverflowComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedOverflowComponentAc.ref.cpp index 8030a1068..3538e91b4 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedOverflowComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedOverflowComponentAc.ref.cpp @@ -77,7 +77,7 @@ namespace { void QueuedOverflowComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwSizeType msgSize, FwEnumStoreType instance ) @@ -415,9 +415,9 @@ void QueuedOverflowComponentBase :: static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); - Os::Queue::QueueStatus qStat = this->createQueue(queueDepth, this->m_msgSize); + Os::Queue::Status qStat = this->createQueue(queueDepth, this->m_msgSize); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -1050,16 +1050,16 @@ void QueuedOverflowComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->productRecvInHook_overflowHook(portNum, id, buffer, status); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1168,11 +1168,11 @@ void QueuedOverflowComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1275,11 +1275,11 @@ void QueuedOverflowComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1382,16 +1382,16 @@ void QueuedOverflowComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1494,16 +1494,16 @@ void QueuedOverflowComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->hookAsync_overflowHook(portNum, u32, f32, b, str1, e, a, s); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1555,16 +1555,16 @@ void QueuedOverflowComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msgSerBuff, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msgSerBuff, 0, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->serialAsyncHook_overflowHook(portNum, buffer); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1706,16 +1706,16 @@ void QueuedOverflowComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->internalHookDrop_overflowHook(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1791,16 +1791,16 @@ void QueuedOverflowComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->CMD_HOOK_cmdOverflowHook(opCode, cmdSeq); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1855,16 +1855,16 @@ void QueuedOverflowComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 30, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 30, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->CMD_PARAMS_PRIORITY_HOOK_cmdOverflowHook(opCode, cmdSeq); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1927,17 +1927,17 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedOverflowComponentBase :: Fw::ExternalSerializeBuffer msg(msgBuff,this->m_msgSize); FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_NONBLOCKING + Os::Queue::NONBLOCKING, + priority ); - if (Os::Queue::QUEUE_NO_MORE_MSGS == msgStatus) { + if (Os::Queue::Status::EMPTY == msgStatus) { return Fw::QueuedComponentBase::MSG_DISPATCH_EMPTY; } else { FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedOverflowComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedOverflowComponentAc.ref.hpp index cc4ff55ac..19e7acf90 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedOverflowComponentAc.ref.hpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedOverflowComponentAc.ref.hpp @@ -98,7 +98,7 @@ class QueuedOverflowComponentBase : //! Initialize QueuedOverflowComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwSizeType msgSize, //!< The message size FwEnumStoreType instance = 0 //!< The instance number ); 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 8d95d3741..23315e739 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 @@ -72,7 +72,7 @@ namespace { void QueuedParamsComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwEnumStoreType instance ) { @@ -645,12 +645,12 @@ void QueuedParamsComponentBase :: #endif } - Os::Queue::QueueStatus qStat = this->createQueue( + Os::Queue::Status qStat = this->createQueue( queueDepth, - ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -1755,11 +1755,11 @@ void QueuedParamsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1934,11 +1934,11 @@ void QueuedParamsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2041,11 +2041,11 @@ void QueuedParamsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2148,11 +2148,11 @@ void QueuedParamsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2255,16 +2255,16 @@ void QueuedParamsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2712,17 +2712,17 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedParamsComponentBase :: ComponentIpcSerializableBuffer msg; FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_NONBLOCKING + Os::Queue::NONBLOCKING, + priority ); - if (Os::Queue::QUEUE_NO_MORE_MSGS == msgStatus) { + if (Os::Queue::Status::EMPTY == msgStatus) { return Fw::QueuedComponentBase::MSG_DISPATCH_EMPTY; } else { FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); } 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 2f71bab97..20195a6a3 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,7 +131,7 @@ class QueuedParamsComponentBase : //! Initialize QueuedParamsComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwEnumStoreType instance = 0 //!< The instance number ); 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 373b59030..1c33a595b 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 @@ -110,7 +110,7 @@ namespace { void QueuedSerialComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwSizeType msgSize, FwEnumStoreType instance ) @@ -855,9 +855,9 @@ void QueuedSerialComponentBase :: static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); - Os::Queue::QueueStatus qStat = this->createQueue(queueDepth, this->m_msgSize); + Os::Queue::Status qStat = this->createQueue(queueDepth, this->m_msgSize); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -2198,11 +2198,11 @@ void QueuedSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2377,11 +2377,11 @@ void QueuedSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2484,11 +2484,11 @@ void QueuedSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2591,11 +2591,11 @@ void QueuedSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2698,16 +2698,16 @@ void QueuedSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2903,11 +2903,11 @@ void QueuedSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msgSerBuff, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msgSerBuff, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2953,11 +2953,11 @@ void QueuedSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msgSerBuff, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msgSerBuff, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3003,11 +3003,11 @@ void QueuedSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msgSerBuff, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msgSerBuff, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3053,16 +3053,16 @@ void QueuedSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msgSerBuff, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msgSerBuff, 5, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3357,11 +3357,11 @@ void QueuedSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3393,11 +3393,11 @@ void QueuedSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3445,11 +3445,11 @@ void QueuedSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3475,16 +3475,16 @@ void QueuedSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3525,11 +3525,11 @@ void QueuedSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3561,16 +3561,16 @@ void QueuedSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 20, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 20, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -4274,11 +4274,11 @@ void QueuedSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -4333,11 +4333,11 @@ void QueuedSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -4392,11 +4392,11 @@ void QueuedSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 20, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 20, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -4451,16 +4451,16 @@ void QueuedSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -4515,16 +4515,16 @@ void QueuedSerialComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 30, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 30, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -5775,17 +5775,17 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedSerialComponentBase :: Fw::ExternalSerializeBuffer msg(msgBuff,this->m_msgSize); FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_NONBLOCKING + Os::Queue::NONBLOCKING, + priority ); - if (Os::Queue::QUEUE_NO_MORE_MSGS == msgStatus) { + if (Os::Queue::Status::EMPTY == msgStatus) { return Fw::QueuedComponentBase::MSG_DISPATCH_EMPTY; } else { FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); } 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 d782ca91e..db3529261 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,7 +204,7 @@ class QueuedSerialComponentBase : //! Initialize QueuedSerialComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwSizeType msgSize, //!< The message size FwEnumStoreType instance = 0 //!< The instance number ); 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 209717ec2..19cda65cc 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 @@ -293,7 +293,7 @@ Fw::SerializeStatus QueuedSyncProductsComponentBase::DpContainer :: void QueuedSyncProductsComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwEnumStoreType instance ) { @@ -928,12 +928,12 @@ void QueuedSyncProductsComponentBase :: #endif } - Os::Queue::QueueStatus qStat = this->createQueue( + Os::Queue::Status qStat = this->createQueue( queueDepth, - ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -1936,11 +1936,11 @@ void QueuedSyncProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2115,11 +2115,11 @@ void QueuedSyncProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2222,11 +2222,11 @@ void QueuedSyncProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2329,11 +2329,11 @@ void QueuedSyncProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2436,16 +2436,16 @@ void QueuedSyncProductsComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2862,13 +2862,13 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedSyncProductsComponentBase :: ComponentIpcSerializableBuffer msg; FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_BLOCKING + Os::Queue::BLOCKING, + priority ); FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); 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 6ba5b4c15..6b23730e8 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 @@ -244,7 +244,7 @@ class QueuedSyncProductsComponentBase : //! Initialize QueuedSyncProductsComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwEnumStoreType instance = 0 //!< The instance number ); 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 bd9f78a28..80174aff2 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 @@ -72,7 +72,7 @@ namespace { void QueuedTelemetryComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwEnumStoreType instance ) { @@ -645,12 +645,12 @@ void QueuedTelemetryComponentBase :: #endif } - Os::Queue::QueueStatus qStat = this->createQueue( + Os::Queue::Status qStat = this->createQueue( queueDepth, - ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -1522,11 +1522,11 @@ void QueuedTelemetryComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1701,11 +1701,11 @@ void QueuedTelemetryComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1808,11 +1808,11 @@ void QueuedTelemetryComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -1915,11 +1915,11 @@ void QueuedTelemetryComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2022,16 +2022,16 @@ void QueuedTelemetryComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2775,17 +2775,17 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedTelemetryComponentBase :: ComponentIpcSerializableBuffer msg; FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_NONBLOCKING + Os::Queue::NONBLOCKING, + priority ); - if (Os::Queue::QUEUE_NO_MORE_MSGS == msgStatus) { + if (Os::Queue::Status::EMPTY == msgStatus) { return Fw::QueuedComponentBase::MSG_DISPATCH_EMPTY; } else { FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); } 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 58c67b6e8..711b9c533 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,7 +118,7 @@ class QueuedTelemetryComponentBase : //! Initialize QueuedTelemetryComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwEnumStoreType instance = 0 //!< The instance number ); 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 1e0a567ac..605a5bdc2 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 @@ -329,7 +329,7 @@ Fw::SerializeStatus QueuedTestComponentBase::DpContainer :: void QueuedTestComponentBase :: init( - FwQueueSizeType queueDepth, + FwSizeType queueDepth, FwEnumStoreType instance ) { @@ -964,12 +964,12 @@ void QueuedTestComponentBase :: #endif } - Os::Queue::QueueStatus qStat = this->createQueue( + Os::Queue::Status qStat = this->createQueue( queueDepth, - ComponentIpcSerializableBuffer::SERIALIZATION_SIZE + static_cast(ComponentIpcSerializableBuffer::SERIALIZATION_SIZE) ); FW_ASSERT( - Os::Queue::QUEUE_OK == qStat, + Os::Queue::Status::OP_OK == qStat, static_cast(qStat) ); } @@ -2291,11 +2291,11 @@ void QueuedTestComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2337,11 +2337,11 @@ void QueuedTestComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2516,11 +2516,11 @@ void QueuedTestComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2623,11 +2623,11 @@ void QueuedTestComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2730,11 +2730,11 @@ void QueuedTestComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_BLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::BLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -2837,16 +2837,16 @@ void QueuedTestComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3235,11 +3235,11 @@ void QueuedTestComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3271,11 +3271,11 @@ void QueuedTestComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3323,11 +3323,11 @@ void QueuedTestComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 5, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 5, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3353,16 +3353,16 @@ void QueuedTestComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3403,11 +3403,11 @@ void QueuedTestComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -3439,16 +3439,16 @@ void QueuedTestComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 20, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 20, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -4152,11 +4152,11 @@ void QueuedTestComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -4211,11 +4211,11 @@ void QueuedTestComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 10, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 10, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -4270,11 +4270,11 @@ void QueuedTestComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 20, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 20, _block); FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -4329,16 +4329,16 @@ void QueuedTestComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 0, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 0, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -4393,16 +4393,16 @@ void QueuedTestComponentBase :: ); // Send message - Os::Queue::QueueBlocking _block = Os::Queue::QUEUE_NONBLOCKING; - Os::Queue::QueueStatus qStatus = this->m_queue.send(msg, 30, _block); + Os::Queue::BlockingType _block = Os::Queue::NONBLOCKING; + Os::Queue::Status qStatus = this->m_queue.send(msg, 30, _block); - if (qStatus == Os::Queue::QUEUE_FULL) { + if (qStatus == Os::Queue::Status::FULL) { this->incNumMsgDropped(); return; } FW_ASSERT( - qStatus == Os::Queue::QUEUE_OK, + qStatus == Os::Queue::OP_OK, static_cast(qStatus) ); } @@ -5684,17 +5684,17 @@ Fw::QueuedComponentBase::MsgDispatchStatus QueuedTestComponentBase :: ComponentIpcSerializableBuffer msg; FwQueuePriorityType priority = 0; - Os::Queue::QueueStatus msgStatus = this->m_queue.receive( + Os::Queue::Status msgStatus = this->m_queue.receive( msg, - priority, - Os::Queue::QUEUE_NONBLOCKING + Os::Queue::NONBLOCKING, + priority ); - if (Os::Queue::QUEUE_NO_MORE_MSGS == msgStatus) { + if (Os::Queue::Status::EMPTY == msgStatus) { return Fw::QueuedComponentBase::MSG_DISPATCH_EMPTY; } else { FW_ASSERT( - msgStatus == Os::Queue::QUEUE_OK, + msgStatus == Os::Queue::OP_OK, static_cast(msgStatus) ); } 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 725d3fadd..997ce3e34 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 @@ -329,7 +329,7 @@ class QueuedTestComponentBase : //! Initialize QueuedTestComponentBase object void init( - FwQueueSizeType queueDepth, //!< The queue depth + FwSizeType queueDepth, //!< The queue depth FwEnumStoreType instance = 0 //!< The instance number ); 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 e6b3973e8..6863e5377 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 @@ -27,7 +27,7 @@ class ActiveAsyncProductPortsOnlyTester : static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: 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 cd679ded5..22caf3b48 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 @@ -27,7 +27,7 @@ class ActiveAsyncProductsTester : static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: 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 4680dcbba..de79145a3 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 @@ -27,7 +27,7 @@ class ActiveCommandsTester : static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: 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 92e203059..f20b507fc 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 @@ -27,7 +27,7 @@ class ActiveEventsTester : static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: 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 16869c9a2..8493b8a10 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 @@ -27,7 +27,7 @@ class ActiveGetProductsTester : static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: 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 edad7018b..1a8ece5d2 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 @@ -27,7 +27,7 @@ class ActiveGuardedProductsTester : static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: 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 576c1073a..a4ae084ad 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 @@ -27,7 +27,7 @@ class ActiveNoArgsPortsOnlyTester : static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: 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 b9c6897e9..0925e7888 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 @@ -27,7 +27,7 @@ class ActiveParamsTester : static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: 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 13612d0a8..66a2ae412 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 @@ -27,7 +27,7 @@ class ActiveSerialTester : static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: 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 033717441..b6a0212ea 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 @@ -27,7 +27,7 @@ class ActiveSyncProductsTester : static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: 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 8634c1455..60f5e2cb5 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 @@ -27,7 +27,7 @@ class ActiveTelemetryTester : static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: 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 2bce104a5..81346b3d9 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 @@ -29,7 +29,7 @@ namespace M { static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: 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 d5108d14e..86e93ee9f 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 @@ -27,7 +27,7 @@ class QueuedCommandsTester : static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: 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 2537908c5..ac95303ff 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 @@ -27,7 +27,7 @@ class QueuedEventsTester : static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: 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 553e5b2cd..0b1663d03 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 @@ -27,7 +27,7 @@ class QueuedGetProductsTester : static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: 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 677e0b46c..9b9cecd6b 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 @@ -27,7 +27,7 @@ class QueuedGuardedProductsTester : static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: 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 5f5fab354..9bae2d034 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 @@ -27,7 +27,7 @@ class QueuedParamsTester : static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: 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 2e294b27c..f61eb9cb9 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 @@ -27,7 +27,7 @@ class QueuedSerialTester : static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: 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 76cbddd92..5e2615093 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 @@ -27,7 +27,7 @@ class QueuedSyncProductsTester : static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: 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 711405be5..f52332038 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 @@ -27,7 +27,7 @@ class QueuedTelemetryTester : static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: 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 dfb577e22..d63181f5b 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 @@ -27,7 +27,7 @@ class QueuedTestTester : static const FwEnumStoreType TEST_INSTANCE_ID = 0; // Queue depth supplied to the component instance under test - static const FwQueueSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; + static const FwSizeType TEST_INSTANCE_QUEUE_DEPTH = 10; public: