Changeset 132ab5d1 in mainline for kernel/generic/src/synch/mutex.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

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

kernel/generic/src/synch/mutex.c

@@ -37 +37 @@
 
 #include <assert.h>
+#include <errno.h>
 #include <synch/mutex.h>
 #include <synch/semaphore.h>
@@ -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);