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

Timestamp:

2010-05-21T07:50:04Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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 mainline changes (rev. 451)

File:

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

kernel/generic/src/synch/mutex.c

@@ -33 +33 @@
 /**
  * @file
- * @brief       Mutexes.
+ * @brief Mutexes.
  */
- 
+
 #include <synch/mutex.h>
 #include <synch/semaphore.h>
 #include <synch/synch.h>
 #include <debug.h>
+#include <arch.h>
 
 /** Initialize mutex.
  *
- * @param mtx           Mutex.
- * @param type          Type of the mutex.
+ * @param mtx  Mutex.
+ * @param type Type of the mutex.
  */
 void mutex_initialize(mutex_t *mtx, mutex_type_t type)
@@ -56 +57 @@
  * Timeout mode and non-blocking mode can be requested.
  *
- * @param mtx           Mutex.
- * @param usec          Timeout in microseconds.
- * @param flags         Specify mode of operation.
+ * @param mtx   Mutex.
+ * @param usec  Timeout in microseconds.
+ * @param flags Specify mode of operation.
  *
  * For exact description of possible combinations of
  * usec and flags, see comment for waitq_sleep_timeout().
  *
- * @return              See comment for waitq_sleep_timeout().
+ * @return See comment for waitq_sleep_timeout().
+ *
  */
 int _mutex_lock_timeout(mutex_t *mtx, uint32_t usec, int flags)
@@ -69 +71 @@
         int rc;
 
-        if (mtx->type == MUTEX_PASSIVE) {
+        if ((mtx->type == MUTEX_PASSIVE) && (THREAD)) {
                 rc = _semaphore_down_timeout(&mtx->sem, usec, flags);
         } else {
-                ASSERT(mtx->type == MUTEX_ACTIVE);
+                ASSERT((mtx->type == MUTEX_ACTIVE) || (!THREAD));
                 ASSERT(usec == SYNCH_NO_TIMEOUT);
                 ASSERT(!(flags & SYNCH_FLAGS_INTERRUPTIBLE));
+                
                 do {
                         rc = semaphore_trydown(&mtx->sem);
@@ -86 +89 @@
 /** Release mutex.
  *
- * @param mtx           Mutex.
+ * @param mtx Mutex.
  */
 void mutex_unlock(mutex_t *mtx)