Changes in kernel/generic/src/synch/mutex.c [15d9fe6:b7fd2a0] in mainline

File:

• kernel/generic/src/synch/mutex.c (modified) (4 diffs)

kernel/generic/src/synch/mutex.c

@@ -37 +37 @@
 
 #include <assert.h>
+#include <errno.h>
 #include <synch/mutex.h>
 #include <synch/semaphore.h>
@@ -84 +85 @@
  *
  */
-int _mutex_lock_timeout(mutex_t *mtx, uint32_t usec, unsigned int flags)
+errno_t _mutex_lock_timeout(mutex_t *mtx, uint32_t usec, unsigned int flags)
 {
-        int rc;
+        errno_t rc;
 
         if (mtx->type == MUTEX_PASSIVE && THREAD) {
@@ -95 +96 @@
                 if (mtx->owner == THREAD) {
                         mtx->nesting++;
-                        return ESYNCH_OK_ATOMIC;
+                        return EOK;
                 } else {
                         rc = _semaphore_down_timeout(&mtx->sem, usec, flags);
-                        if (SYNCH_OK(rc)) {
+                        if (rc == EOK) {
                                 mtx->owner = THREAD;
                                 mtx->nesting = 1;
@@ -119 +120 @@
                         }
                         rc = semaphore_trydown(&mtx->sem);
-                } while (SYNCH_FAILED(rc) &&
-                    !(flags & SYNCH_FLAGS_NON_BLOCKING));
+                } while (rc != EOK && !(flags & SYNCH_FLAGS_NON_BLOCKING));
                 if (deadlock_reported)
                         printf("cpu%u: not deadlocked\n", CPU->id);