Spinlock cleaning

kern/libkern/spinlock.h

@@ -1,60 +1,22 @@
 #ifndef KERNEL_Spinlock_H
 #define KERNEL_Spinlock_H
 
+#include <proc.h>
+#include <stdbool.h>
 #include <stdint.h>
 
-/** Mutual exclusion spin lock */
-struct Spinlock {
-    u32 locked; // Is the lock held?
-
-    // NOTE: Perhaps feature gate this?
-
-    // For debugging:
-    char       *name; // Name of lock.
-    struct Cpu *cpu;  // The cpu holding the lock.
-};
-
-/**
- * Acquire the lock.
- * Loops (spins) until the lock is acquired.
- * Panics if the lock is already held by this cpu.
- */
-void acquire(struct Spinlock *);
-
-/**
- * Check whether this cpu is holding the lock.
- * Interrupts must be off.
- */
-int holding(struct Spinlock *);
-
-/**
- * Initialize Spinlock
- */
-void initlock(struct Spinlock *, char *);
-
-/**
- * Release the lock.
- * Panics if the lock is not held.
- */
-void release(struct Spinlock *);
-
-/**
- * @brief push_off/pop_off are like intr_off()/intr_on() except that they are
- * matched: it takes two pop_off()s to undo two push_off()s.  Also, if
- * interrupts are initially off, then push_off, pop_off leaves them off.
- */
-void push_off(void);
-
-/** @copydoc pop_off */
-void pop_off(void);
-
 typedef struct {
     volatile uint32_t v; // 0 = unlocked, 1 = locked
+    Cpu              *cpu;
 } spinlock_t;
 
+uint32_t push_off(void);
+uint32_t pop_off(void);
+
 void spinlock_init(spinlock_t *l);
 bool spin_trylock(spinlock_t *l);
 void spin_unlock(spinlock_t *l);
+bool spin_is_holding(spinlock_t *l);
 void spin_lock(spinlock_t *l);
 
 #endif