Fix rtos implementation

Signed-off-by: Cervenka Dusan <[email protected]>

Author: Hadatko

erpc_c/port/erpc_threading.h

@@ -140,7 +140,7 @@ class Thread
     /*!
      * @brief This function puts thread to sleep.
      *
-     * @param[in] usecs Time for sleeping.
+     * @param[in] usecs Time for sleeping in [us].
      */
     static void sleep(uint32_t usecs);
 
@@ -477,12 +477,12 @@ class Semaphore
     /*!
      * @brief This function get semaphore.
      *
-     * @param[in] timeout Time how long can wait for getting semaphore.
+     * @param[in] usecs Time how long can wait for getting semaphore in [us].
      *
      * @retval true When semaphore got successfully.
      * @retval false When mutex didn't get.
      */
-    bool get(uint32_t timeout = kWaitForever);
+    bool get(uint32_t usecs = kWaitForever);
 
     /*!
      * @brief This function returns semaphore count number.

erpc_c/port/erpc_threading_freertos.cpp

@@ -264,24 +264,33 @@ void Semaphore::putFromISR(void)
     portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
 }
 
-bool Semaphore::get(uint32_t timeout)
+bool Semaphore::get(uint32_t usecs)
 {
-#if configUSE_16_BIT_TICKS
-    if (timeout == kWaitForever)
-    {
-        timeout = portMAX_DELAY;
-    }
-    else if (timeout > (portMAX_DELAY - 1))
+    if (usecs != kWaitForever)
     {
-        timeout = portMAX_DELAY - 1;
+        if (usecs > 0U)
+        {
+            usecs /= 1000U * portTICK_PERIOD_MS;
+            if (usecs == 0U)
+            {
+                usecs = 1U;
+            }
+#if configUSE_16_BIT_TICKS
+            else if (usecs > (portMAX_DELAY - 1))
+            {
+                usecs = portMAX_DELAY - 1;
+            }
+#endif
+        }
     }
+#if configUSE_16_BIT_TICKS
     else
     {
-        /* Misra condition */
+        usecs = portMAX_DELAY;
     }
 #endif
 
-    return (pdTRUE == xSemaphoreTake(m_sem, timeout));
+    return (pdTRUE == xSemaphoreTake(m_sem, (TickType_t)usecs));
 }
 
 int Semaphore::getCount(void) const

erpc_c/port/erpc_threading_mbed.cpp

@@ -218,9 +218,21 @@ void Semaphore::put(void)
     m_sem->release();
 }
 
-bool Semaphore::get(uint32_t timeout)
+bool Semaphore::get(uint32_t usecs)
 {
-    m_count = m_sem->wait(timeout);
+    if (usecs != kWaitForever)
+    {
+        if (usecs > 0U)
+        {
+            usecs /= 1000U;
+            if (usecs == 0U)
+            {
+                usecs = 1U;
+            }
+        }
+    }
+
+    m_count = m_sem->wait(usecs);
     return (m_count < 0);
 }
 

erpc_c/port/erpc_threading_threadx.cpp

@@ -256,9 +256,21 @@ void Semaphore::put(void)
     tx_semaphore_put(&m_sem);
 }
 
-bool Semaphore::get(uint32_t timeout)
+bool Semaphore::get(uint32_t usecs)
 {
-    UINT status = tx_semaphore_get(&m_sem, timeout);
+    if (usecs != kWaitForever)
+    {
+        if (usecs > 0U)
+        {
+            usecs /= 1000U;
+            if (usecs == 0U)
+            {
+                usecs = 1U;
+            }
+        }
+    }
+
+    UINT status = tx_semaphore_get(&m_sem, usecs);
     return (status == TX_SUCCESS);
 }
 

erpc_c/port/erpc_threading_win32.cpp

@@ -194,9 +194,21 @@ void Semaphore::put(void)
     m_mutex.unlock();
 }
 
-bool Semaphore::get(uint32_t timeout)
+bool Semaphore::get(uint32_t usecs)
 {
-    DWORD ret = WaitForSingleObject(m_sem, timeout);
+    if (usecs != kWaitForever)
+    {
+        if (usecs > 0U)
+        {
+            usecs /= 1000U;
+            if (usecs == 0U)
+            {
+                usecs = 1U;
+            }
+        }
+    }
+
+    DWORD ret = WaitForSingleObject(m_sem, usecs);
     m_mutex.lock();
     --m_count;
     m_mutex.unlock();

erpc_c/port/erpc_threading_zephyr.cpp

@@ -130,9 +130,21 @@ void Semaphore::put(void)
     k_sem_give(&m_sem);
 }
 
-bool Semaphore::get(uint32_t timeout)
+bool Semaphore::get(uint32_t usecs)
 {
-    return (k_sem_take(&m_sem, timeout / 1000) == 0);
+    if (usecs != kWaitForever)
+    {
+        if (usecs > 0U)
+        {
+            usecs /= 1000U;
+            if (usecs == 0U)
+            {
+                usecs = 1U;
+            }
+        }
+    }
+
+    return (k_sem_take(&m_sem, usecs) == 0);
 }
 
 int Semaphore::getCount(void) const