Merge pull request #151 in PROCESSOR-SDK/osal from review-PRSDK-4917 to master

* commit '4175362b3fcc3e98e6126ada3fc24827a7a073b7':
  PRSDK-4917: eliminate infinite wait for SemaphoreP_NO_WAIT

1 files changed, 10 insertions, 5 deletions

diff --git a/src/nonos/SemaphoreP_nonos.c b/src/nonos/SemaphoreP_nonos.c
index 0e0e044..b03effa 100644
--- a/src/nonos/SemaphoreP_nonos.c
+++ b/src/nonos/SemaphoreP_nonos.c
@@ -217,14 +217,19 @@ SemaphoreP_Status SemaphoreP_pend(SemaphoreP_Handle handle, uint32_t timeout)
         else
         {
             HwiP_restore(key);
-            if (semTimeout)
+            if (semTimeout == SemaphoreP_NO_WAIT)
+            {
+                ret_val = (SemaphoreP_TIMEOUT);
+                break;
+            }
+            else if  (semTimeout == SemaphoreP_WAIT_FOREVER)
+            {
+               /* Wait forever */
+            }
+            else /* Timed wait */
             {
                 Osal_delay(1);
                 semTimeout--;
-                if (semTimeout == 0)
-                {
-                    ret_val = (SemaphoreP_TIMEOUT);
-                }
             }
         }
     }