Changes in kernel/generic/src/synch/mutex.c [b7fd2a0:15d9fe6] 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>
@@ -85 +84 @@
  *
  */
-errno_t _mutex_lock_timeout(mutex_t *mtx, uint32_t usec, unsigned int flags)
+int _mutex_lock_timeout(mutex_t *mtx, uint32_t usec, unsigned int flags)
 {
-        errno_t rc;
+        int rc;
 
         if (mtx->type == MUTEX_PASSIVE && THREAD) {
@@ -96 +95 @@
                 if (mtx->owner == THREAD) {
                         mtx->nesting++;
-                        return EOK;
+                        return ESYNCH_OK_ATOMIC;
                 } else {
                         rc = _semaphore_down_timeout(&mtx->sem, usec, flags);
-                        if (rc == EOK) {
+                        if (SYNCH_OK(rc)) {
                                 mtx->owner = THREAD;
                                 mtx->nesting = 1;
@@ -120 +119 @@
                         }
                         rc = semaphore_trydown(&mtx->sem);
-                } while (rc != EOK && !(flags & SYNCH_FLAGS_NON_BLOCKING));
+                } while (SYNCH_FAILED(rc) &&
+                    !(flags & SYNCH_FLAGS_NON_BLOCKING));
                 if (deadlock_reported)
                         printf("cpu%u: not deadlocked\n", CPU->id);