From 579115f904e5287ad0bd8d15038b6d707a72523f Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Fri, 5 Jun 2020 21:36:50 +0200
Subject: [PATCH] adapting host osal

---
 osal/host/Clock.cpp            |  4 ++--
 osal/host/Mutex.cpp            | 10 +++++-----
 osal/host/Mutex.h              |  2 +-
 osal/host/QueueFactory.cpp     |  2 +-
 osal/host/SemaphoreFactory.cpp |  4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/osal/host/Clock.cpp b/osal/host/Clock.cpp
index 78bbc58a..57f2572b 100644
--- a/osal/host/Clock.cpp
+++ b/osal/host/Clock.cpp
@@ -186,7 +186,7 @@ ReturnValue_t Clock::setLeapSeconds(const uint16_t leapSeconds_) {
 	if(checkOrCreateClockMutex()!=HasReturnvaluesIF::RETURN_OK){
 		return HasReturnvaluesIF::RETURN_FAILED;
 	}
-	ReturnValue_t result = timeMutex->lockMutex(MutexIF::NO_TIMEOUT);
+	ReturnValue_t result = timeMutex->lockMutex(MutexIF::BLOCKING);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
@@ -201,7 +201,7 @@ ReturnValue_t Clock::getLeapSeconds(uint16_t* leapSeconds_) {
 	if(timeMutex == nullptr){
 		return HasReturnvaluesIF::RETURN_FAILED;
 	}
-	ReturnValue_t result = timeMutex->lockMutex(MutexIF::NO_TIMEOUT);
+	ReturnValue_t result = timeMutex->lockMutex(MutexIF::BLOCKING);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
 	}
diff --git a/osal/host/Mutex.cpp b/osal/host/Mutex.cpp
index 0e6e652d..03948c4c 100644
--- a/osal/host/Mutex.cpp
+++ b/osal/host/Mutex.cpp
@@ -1,22 +1,22 @@
 #include <framework/osal/host/Mutex.h>
 #include <framework/serviceinterface/ServiceInterfaceStream.h>
 
-const uint32_t MutexIF::NO_TIMEOUT = 0;
-const uint32_t MutexIF::MAX_TIMEOUT = 0xffffffff;
+const uint32_t MutexIF::POLLING = 0;
+const uint32_t MutexIF::BLOCKING = 0xffffffff;
 
 ReturnValue_t Mutex::lockMutex(uint32_t timeoutMs) {
-	if(timeoutMs == MutexIF::MAX_TIMEOUT) {
+	if(timeoutMs == MutexIF::BLOCKING) {
 		mutex.lock();
 		locked = true;
 		return HasReturnvaluesIF::RETURN_OK;
 	}
-	else if(timeoutMs == MutexIF::NO_TIMEOUT) {
+	else if(timeoutMs == MutexIF::POLLING) {
 		if(mutex.try_lock()) {
 			locked = true;
 			return HasReturnvaluesIF::RETURN_OK;
 		}
 	}
-	else if(timeoutMs > MutexIF::NO_TIMEOUT){
+	else if(timeoutMs > MutexIF::POLLING){
 		auto chronoMs = std::chrono::milliseconds(timeoutMs);
 		if(mutex.try_lock_for(chronoMs)) {
 			locked = true;
diff --git a/osal/host/Mutex.h b/osal/host/Mutex.h
index dce2a9dc..d882c457 100644
--- a/osal/host/Mutex.h
+++ b/osal/host/Mutex.h
@@ -16,7 +16,7 @@
 class Mutex : public MutexIF {
 public:
 	Mutex() = default;
-	ReturnValue_t lockMutex(uint32_t timeoutMs = MutexIF::MAX_TIMEOUT) override;
+	ReturnValue_t lockMutex(uint32_t timeoutMs = MutexIF::BLOCKING) override;
 	ReturnValue_t unlockMutex() override;
 
 	std::timed_mutex* getMutexHandle();
diff --git a/osal/host/QueueFactory.cpp b/osal/host/QueueFactory.cpp
index 691249c3..60274c84 100644
--- a/osal/host/QueueFactory.cpp
+++ b/osal/host/QueueFactory.cpp
@@ -27,7 +27,7 @@ QueueFactory::QueueFactory() {
 QueueFactory::~QueueFactory() {
 }
 
-MessageQueueIF* QueueFactory::createMessageQueue(size_t messageDepth,
+MessageQueueIF* QueueFactory::createMessageQueue(uint32_t messageDepth,
 		size_t maxMessageSize) {
 	// A thread-safe queue can be implemented  by using a combination
 	// of std::queue and std::mutex. This uses dynamic memory allocation
diff --git a/osal/host/SemaphoreFactory.cpp b/osal/host/SemaphoreFactory.cpp
index 3719a883..8712d866 100644
--- a/osal/host/SemaphoreFactory.cpp
+++ b/osal/host/SemaphoreFactory.cpp
@@ -3,8 +3,8 @@
 #include <framework/osal/linux/CountingSemaphore.h>
 #include <framework/serviceinterface/ServiceInterfaceStream.h>
 
-const uint32_t SemaphoreIF::NO_TIMEOUT = 0;
-const uint32_t SemaphoreIF::MAX_TIMEOUT = 0xFFFFFFFF;
+const uint32_t SemaphoreIF::POLLING = 0;
+const uint32_t SemaphoreIF::BLOCKING = 0xFFFFFFFF;
 
 SemaphoreFactory* SemaphoreFactory::factoryInstance = nullptr;