big renaming

8 files changed, 15 insertions, 13 deletions

diff --git a/kernel/interrupts.c b/kernel/interrupts.c
index 1e209a9..501ccd4 100644
--- a/kernel/interrupts.c
+++ b/kernel/interrupts.c
@@ -1,9 +1,9 @@
 #include "kernel/kernel.h"
-#include "asm/int.h"
-#include "asm/pit.h"
+#include "asm_int.h"
+#include "asm_pit.h"
 #include "driver/mouse.h"
 #include "interrupts.h"
-#include "asm/x86.h"
+#include "asm_x86.h"
 
 /** The size of our interrupts table  */
 #define INT_MAX 255 
diff --git a/kernel/mp.c b/kernel/mp.c
index 5cd58ac..df7549a 100644
--- a/kernel/mp.c
+++ b/kernel/mp.c
@@ -2,7 +2,7 @@
 
 #include <stdbool.h>
 
-#include "asm/x86.h"
+#include "asm_x86.h"
 #include "smp.h"
 
 typedef struct mp_fps_struct
diff --git a/kernel/scheduler.c b/kernel/scheduler.c
index 5316438..1cbd658 100644
--- a/kernel/scheduler.c
+++ b/kernel/scheduler.c
@@ -2,7 +2,7 @@
 #include "kernel.h"
 
 #include "mem.h"
-#include "asm/x86.h"
+#include "asm_x86.h"
 #include "kmalloc.h"
 
 #include "vmem.h"
diff --git a/kernel/smp.c b/kernel/smp.c
index 619463a..894dbe0 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -7,7 +7,7 @@
 #include "smp.h"
 #include "mem.h"
 #include "spinlock.h"
-#include "asm/x86.h"
+#include "asm_x86.h"
 
 #define FOOLOS_APIC_SPUR_INT 0x00f0
 #define FOOLOS_APIC_INT_COMMAND_LOW 0x0300
diff --git a/kernel/spinlock.c b/kernel/spinlock.c
index bbc68c0..03efa6e 100644
--- a/kernel/spinlock.c
+++ b/kernel/spinlock.c
@@ -1,11 +1,9 @@
-
 #include "spinlock.h"
 
 #include "kernel.h"
 
-#include "asm/x86.h"
+#include "asm_x86.h"
 
-// https://gcc.gnu.org/onlinedocs/gcc/_005f_005fatomic-Builtins.html
 
 static volatile uint32_t spinlocks[NUMBER_SPINLOCKS];
 
@@ -16,13 +14,11 @@ void check_spinlocks()
     klog("%d",spinlocks[i]);
 }
 
-/*
 void lock_spin(uint32_t i)
 {
     uint32_t *addr=spinlocks+i;
     while(x86_xchg(addr,1));
 }
-*/
 
 void lock_release(uint32_t i)
 {
diff --git a/kernel/spinlock.h b/kernel/spinlock.h
index df35e3b..8ce2f57 100644
--- a/kernel/spinlock.h
+++ b/kernel/spinlock.h
@@ -1,3 +1,9 @@
+/*
+ * @file
+ *
+ * https://gcc.gnu.org/onlinedocs/gcc/_005f_005fatomic-Builtins.html
+ */
+
 #ifndef SPINLOCK_H
 #define SPINLOCK_H
 
diff --git a/kernel/vmem.c b/kernel/vmem.c
index 542b3a2..1652a9e 100644
--- a/kernel/vmem.c
+++ b/kernel/vmem.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 
 #include "kernel.h"
-#include "asm/x86.h"
+#include "asm_x86.h"
 #include "mem.h"
 #include "vmem.h"
 
diff --git a/kernel/vmem.h b/kernel/vmem.h
index 8e538bb..3bbda2f 100644
--- a/kernel/vmem.h
+++ b/kernel/vmem.h
@@ -28,7 +28,7 @@
  * .......... User Heap (brk())           |
  * 0x08000000 User Code                   |
  *                |
- *                | almost 100 megs  (in kernel alloc/free?)
+ *                | almost 100 megs  (in kernel alloc/free private-cpu and shared)
  *                |
  * 0x02000000 FoolOS TSS Stack TOP (max ~8mb) GROWS DOWN
  *            leave few empty pages under stack as guard.