ticket locks

4 files changed, 14 insertions, 11 deletions

diff --git a/sys/include/asm.h b/sys/include/asm.h
index 86e6354..0995f88 100644
--- a/sys/include/asm.h
+++ b/sys/include/asm.h
@@ -50,6 +50,7 @@ read_tp(void)
 {
         uint64_t x;
         asm volatile("addi %0, tp, 0" : "=r"(x));
+	return x;
 }
 
 #endif /* _ASM_H */ 
diff --git a/sys/include/fdt.h b/sys/include/fdt.h
index ca1cea0..77c9d6e 100644
--- a/sys/include/fdt.h
+++ b/sys/include/fdt.h
@@ -40,7 +40,7 @@ struct fdt_node_header {
 	char name[];
 };
 
-void    walk_fdt(struct fdt_header *header);
+void    fdt_walk(struct fdt_header *header);
 
 #define FDT_MAGIC	0xd00dfeed	/* 4: version, 4: total size */
 #define FDT_TAGSIZE	sizeof(fdt32_t)
diff --git a/sys/include/mm/kalloc.h b/sys/include/kalloc.h
index 10adbda..10adbda 100644
--- a/sys/include/mm/kalloc.h
+++ b/sys/include/kalloc.h
diff --git a/sys/include/spinlock.h b/sys/include/spinlock.h
index ef81499..82c1585 100644
--- a/sys/include/spinlock.h
+++ b/sys/include/spinlock.h
@@ -1,15 +1,17 @@
-#ifndef _LOCK_H
-#define _LOCK_H
+#ifndef _SPINLOCK_H
+#define _SPINLOCK_H
 
-struct spinlock {
-        int locked;
-	int tp;
-};
+/* fifo ticket lock implementation */ 
 
-void initlock(struct spinlock *);
+typedef struct _spinlock {
+	int ticket;
+	int turn;
+} spinlock_t;
 
-void acquire(struct spinlock *);
+void initlock(spinlock_t *);
 
-void release(struct spinlock *);
+void acquire(spinlock_t *);
 
-#endif /* _LOCK_H */
+void release(spinlock_t *);
+
+#endif /* _SPINLOCK_H */