Changeset 2e4e706 in mainline for kernel/generic/src

Timestamp:

2010-05-13T08:51:36Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c964521

Parents:

9929742

Message:

cstyle changes (no change in functionality)

Location:

kernel/generic/src

Files:

• preempt/preemption.c (modified) (2 diffs)
• synch/mutex.c (modified) (5 diffs)
• synch/waitq.c (modified) (1 diff)
• time/clock.c (modified) (1 diff)

kernel/generic/src/preempt/preemption.c

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
 
 /**
- * @file        preemption.c
- * @brief       Preemption control.
+ * @file preemption.c
+ * @brief Preemption control.
  */
- 
+
 #include <preemption.h>
 #include <arch.h>
@@ -52 +52 @@
 void preemption_enable(void)
 {
-        ASSERT(THE->preemption_disabled);
+        ASSERT(PREEMPTION_DISABLED);
         memory_barrier();
         THE->preemption_disabled--;

kernel/generic/src/synch/mutex.c

@@ -33 +33 @@
 /**
  * @file
- * @brief       Mutexes.
+ * @brief Mutexes.
  */
- 
+
 #include <synch/mutex.h>
 #include <synch/semaphore.h>
@@ -44 +44 @@
 /** 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)
@@ -57 +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)
@@ -70 +71 @@
         int rc;
 
-        if (mtx->type == MUTEX_PASSIVE && THREAD) {
+        if ((mtx->type == MUTEX_PASSIVE) && (THREAD)) {
                 rc = _semaphore_down_timeout(&mtx->sem, usec, flags);
         } else {
-                ASSERT(mtx->type == MUTEX_ACTIVE || !THREAD);
+                ASSERT((mtx->type == MUTEX_ACTIVE) || (!THREAD));
                 ASSERT(usec == SYNCH_NO_TIMEOUT);
                 ASSERT(!(flags & SYNCH_FLAGS_INTERRUPTIBLE));
+                
                 do {
                         rc = semaphore_trydown(&mtx->sem);
@@ -87 +89 @@
 /** Release mutex.
  *
- * @param mtx           Mutex.
+ * @param mtx Mutex.
  */
 void mutex_unlock(mutex_t *mtx)

kernel/generic/src/synch/waitq.c

@@ -261 +261 @@
         int rc;
 
-        ASSERT(!PREEMPTION_DISABLED || PARAM_NON_BLOCKING(flags, usec));
+        ASSERT((!PREEMPTION_DISABLED) || (PARAM_NON_BLOCKING(flags, usec)));
         
         ipl = waitq_sleep_prepare(wq);

kernel/generic/src/time/clock.c

@@ -195 +195 @@
                 spinlock_unlock(&THREAD->lock);
                 
-                if (!ticks && !PREEMPTION_DISABLED) {
+                if ((!ticks) && (!PREEMPTION_DISABLED)) {
 #ifdef CONFIG_UDEBUG
                         istate_t *istate;