Changeset 132ab5d1 in mainline for kernel/generic/src/synch/spinlock.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/spinlock.c (modified) (3 diffs)

kernel/generic/src/synch/spinlock.c

@@ -153 +153 @@
  *
  */
-int spinlock_trylock(spinlock_t *lock)
+bool spinlock_trylock(spinlock_t *lock)
 {
         preemption_disable();
-        int rc = !test_and_set(&lock->val);
+        bool ret = !test_and_set(&lock->val);
         
         /*
@@ -163 +163 @@
         CS_ENTER_BARRIER();
         
-        if (!rc)
+        if (!ret)
                 preemption_enable();
         
-        return rc;
+        return ret;
 }
 
@@ -257 +257 @@
  *
  */
-int irq_spinlock_trylock(irq_spinlock_t *lock)
+bool irq_spinlock_trylock(irq_spinlock_t *lock)
 {
         ASSERT_IRQ_SPINLOCK(interrupts_disabled(), lock);
-        int rc = spinlock_trylock(&(lock->lock));
-        
-        ASSERT_IRQ_SPINLOCK((!rc) || (!lock->guard), lock);
-        return rc;
+        bool ret = spinlock_trylock(&(lock->lock));
+        
+        ASSERT_IRQ_SPINLOCK((!ret) || (!lock->guard), lock);
+        return ret;
 }