[MINIOS] Refactor spinlock header for multi-arch support.

I separated the spinlock parts special to the x86 architecture and
moved these to include/x86/arch_spinlock.h. The common code is now in
include/spinlock.h.

Signed-off-by: Dietmar Hahn <dietmar.hahn@fujitsu-siemens.com>

1 files changed, 5 insertions, 33 deletions

diff --git a/extras/mini-os/include/x86/spinlock.h b/extras/mini-os/include/x86/arch_spinlock.h
index 4274cd2869..a181ed3c92 100644
--- a/extras/mini-os/include/x86/spinlock.h
+++ b/extras/mini-os/include/x86/arch_spinlock.h
@@ -1,21 +1,12 @@
-#ifndef __ASM_SPINLOCK_H
-#define __ASM_SPINLOCK_H
 
-#include <lib.h>
-
-/*
- * Your basic SMP spinlocks, allowing only a single CPU anywhere
- */
 
-typedef struct {
-	volatile unsigned int slock;
-} spinlock_t;
+#ifndef __ARCH_ASM_SPINLOCK_H
+#define __ARCH_ASM_SPINLOCK_H
 
-#define SPINLOCK_MAGIC	0xdead4ead
+#include <lib.h>
 
-#define SPIN_LOCK_UNLOCKED (spinlock_t) { 1 }
 
-#define spin_lock_init(x)	do { *(x) = SPIN_LOCK_UNLOCKED; } while(0)
+#define ARCH_SPIN_LOCK_UNLOCKED (spinlock_t) { 1 }
 
 /*
  * Simple spin lock operations.  There are two variants, one clears IRQ's
@@ -24,7 +15,7 @@ typedef struct {
  * We make no fairness assumptions. They have a cost.
  */
 
-#define spin_is_locked(x)	(*(volatile signed char *)(&(x)->slock) <= 0)
+#define arch_spin_is_locked(x)	(*(volatile signed char *)(&(x)->slock) <= 0)
 #define spin_unlock_wait(x)	do { barrier(); } while(spin_is_locked(x))
 
 #define spin_lock_string \
@@ -99,23 +90,4 @@ static inline void _raw_spin_lock_flags (spinlock_t *lock, unsigned long flags)
 		:"=m" (lock->slock) : "r" (flags) : "memory");
 }
 
-#define _spin_trylock(lock)     ({_raw_spin_trylock(lock) ? \
-                                1 : ({ 0;});})
-
-#define _spin_lock(lock)        \
-do {                            \
-        _raw_spin_lock(lock);   \
-} while(0)
-
-#define _spin_unlock(lock)      \
-do {                            \
-        _raw_spin_unlock(lock); \
-} while (0)
-
-
-#define spin_lock(lock)       _spin_lock(lock)
-#define spin_unlock(lock)       _spin_unlock(lock)
-
-#define DEFINE_SPINLOCK(x) spinlock_t x = SPIN_LOCK_UNLOCKED
-
 #endif