Changeset 11 for trunk/kernel/libk/spinlock.c

Timestamp:

Apr 26, 2017, 2:29:23 PM (7 years ago)

Author:

alain

Message:

Merge all FS related files in one single vfs directory.

File:

• trunk/kernel/libk/spinlock.c (modified) (4 diffs)

trunk/kernel/libk/spinlock.c

@@ -58 +58 @@
                 taken = lock->taken;
 
+        // try to take the lock if not already taken
                 if( taken == 0 )
         {
-            // try to take the lock if not already taken
                     isAtomic = hal_atomic_cas( &lock->taken , 0 , 1 );
         }
@@ -69 +69 @@
     list_add_first( &this->locks_root , &lock->list );
 
-    // enable interrupts if irq_state == NULL
-        if( irq_state ) *irq_state = mode;
-        else            hal_restore_irq( mode );
+    // irq_state must be restored when lock is released 
+    *irq_state = mode;
 }
 
 //////////////////////////////////////////////
 void spinlock_unlock_busy( spinlock_t * lock,
-                           bool_t       restore, 
                            uint32_t     irq_state )
 {
@@ -86 +84 @@
     list_unlink( &lock->list );
  
-        if( restore ) hal_restore_irq( irq_state );
+        hal_restore_irq( irq_state );
 }
    
@@ -126 +124 @@
 }
 
-//////////////////////////////////////////////
-uint32_t spinlock_trylock( spinlock_t * lock )
+/////////////////////////////////////////////
+error_t spinlock_trylock( spinlock_t * lock )
 { 
         uint32_t   mode;