new include structure, make parse easier for doxy

20 files changed, 42 insertions, 18 deletions

diff --git a/arch/riscv64/gen/asm-offsets.c b/arch/riscv64/gen/asm-offsets.c
index 9d44ec6..8251500 100644
--- a/arch/riscv64/gen/asm-offsets.c
+++ b/arch/riscv64/gen/asm-offsets.c
@@ -5,7 +5,7 @@
  */
 
 #include <apos/utils.h>
-#include <regs.h>
+#include "../kernel/regs.h"
 
 /* largely based on linux */
 #define DEFINE(sym, val)                                                       \
diff --git a/arch/riscv64/gen/source.mk b/arch/riscv64/gen/source.mk
index 1ec6d07..c1b68f9 100644
--- a/arch/riscv64/gen/source.mk
+++ b/arch/riscv64/gen/source.mk
@@ -1,4 +1,4 @@
-OFFSET_HEADER	:= $(ARCH_SOURCE)/include/gen/asm-offsets.h
+OFFSET_HEADER	:= $(ARCH_SOURCE)/gen/asm-offsets.h
 OFFSET_SOURCE	:= $(ARCH_SOURCE)/gen/asm-offsets.c
 
 $(OFFSET_HEADER): $(OFFSET_SOURCE)
@@ -8,4 +8,4 @@ $(OFFSET_HEADER): $(OFFSET_SOURCE)
 		awk '($$1 == "#->") { print "#define " $$2 " " $$3 }' >> $(OFFSET_HEADER)
 	echo "#endif /* APOS_ASM_OFFSETS_H */" >> $(OFFSET_HEADER)
 
-CLEANUP	+= $(ARCH_SOURCE)/include/gen/*
+CLEANUP	+= $(ARCH_SOURCE)/gen/asm-offsets.h
diff --git a/arch/riscv64/include/arch.h b/arch/riscv64/include/arch.h
new file mode 100644
index 0000000..0930543
--- /dev/null
+++ b/arch/riscv64/include/arch.h
@@ -0,0 +1,8 @@
+#ifndef APOS_RISCV_ARCH_H
+#define APOS_RISCV_ARCH_H
+/**
+ * @file arch.h
+ * riscv64 arch header, currently empty but kept around for forwards
+ * compatibility.
+ */
+#endif /* APOS_RISCV_ARCH_H */
diff --git a/arch/riscv64/include/gen/.gitkeep b/arch/riscv64/include/gen/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/arch/riscv64/include/gen/.gitkeep
+++ /dev/null
diff --git a/arch/riscv64/include/irq.h b/arch/riscv64/include/irq.h
new file mode 100644
index 0000000..95ce62a
--- /dev/null
+++ b/arch/riscv64/include/irq.h
@@ -0,0 +1,8 @@
+#ifndef APOS_RISCV_IRQ_H
+#define APOS_RISCV_IRQ_H
+/**
+ * @file irq.h
+ * riscv64 irq header, currently empty but kept around for forwards
+ * compatibility.
+ */
+#endif /* APOS_RISCV_IRQ_H */
diff --git a/arch/riscv64/include/timer.h b/arch/riscv64/include/timer.h
new file mode 100644
index 0000000..2e468ba
--- /dev/null
+++ b/arch/riscv64/include/timer.h
@@ -0,0 +1,8 @@
+#ifndef APOS_RISCV_TIMER_H
+#define APOS_RISCV_TIMER_H
+/**
+ * @file timer.h
+ * riscv64 timer header, currently empty but kept around for forwards
+ * compatibility.
+ */
+#endif /* APOS_RISCV_TIMER_H */
diff --git a/arch/riscv64/init/init.c b/arch/riscv64/init/init.c
index c76c81c..5fe463a 100644
--- a/arch/riscv64/init/init.c
+++ b/arch/riscv64/init/init.c
@@ -8,8 +8,8 @@
 #include <apos/attrs.h>
 #include <apos/utils.h>
 #include <apos/vmem.h>
-#include <vmem.h>
-#include <csr.h>
+#include <arch/vmem.h>
+#include "../kernel/csr.h"
 
 /* assume 64 bit for now */
 struct vmem *root_branch;
diff --git a/arch/riscv64/include/csr.h b/arch/riscv64/kernel/csr.h
index ade397c..ade397c 100644
--- a/arch/riscv64/include/csr.h
+++ b/arch/riscv64/kernel/csr.h
diff --git a/arch/riscv64/kernel/entry.S b/arch/riscv64/kernel/entry.S
index 7f697b5..ab4ed5c 100644
--- a/arch/riscv64/kernel/entry.S
+++ b/arch/riscv64/kernel/entry.S
@@ -1,5 +1,5 @@
-#include <gen/asm-offsets.h>
-#include <csr.h>
+#include "../gen/asm-offsets.h"
+#include "../kernel/csr.h"
 
 #if __riscv_xlen == 64
 #define sr sd
diff --git a/arch/riscv64/kernel/irq.c b/arch/riscv64/kernel/irq.c
index eb5dc02..15fa750 100644
--- a/arch/riscv64/kernel/irq.c
+++ b/arch/riscv64/kernel/irq.c
@@ -6,7 +6,7 @@
 #include <apos/attrs.h>
 #include <apos/debug.h>
 #include <arch/irq.h>
-#include <csr.h>
+#include "csr.h"
 
 extern void handle_irq(void);
 
diff --git a/arch/riscv64/kernel/main.c b/arch/riscv64/kernel/main.c
index 2cc1e12..9b321ae 100644
--- a/arch/riscv64/kernel/main.c
+++ b/arch/riscv64/kernel/main.c
@@ -5,7 +5,7 @@
 
 #include <apos/utils.h>
 #include <arch/arch.h>
-#include <csr.h>
+#include "csr.h"
 
 stat_t setup_arch(void *fdt)
 {
diff --git a/arch/riscv64/include/pages.h b/arch/riscv64/kernel/pages.h
index 3f4b632..3f4b632 100644
--- a/arch/riscv64/include/pages.h
+++ b/arch/riscv64/kernel/pages.h
diff --git a/arch/riscv64/kernel/power.c b/arch/riscv64/kernel/power.c
index 061c286..b3a48fd 100644
--- a/arch/riscv64/kernel/power.c
+++ b/arch/riscv64/kernel/power.c
@@ -4,7 +4,7 @@
  */
 
 #include <apos/power.h>
-#include <sbi.h>
+#include "sbi.h"
 
 /* shutdown reason */
 #define SBI_NO_REASON   0
diff --git a/arch/riscv64/kernel/proc.c b/arch/riscv64/kernel/proc.c
index b378a72..bbe9782 100644
--- a/arch/riscv64/kernel/proc.c
+++ b/arch/riscv64/kernel/proc.c
@@ -5,8 +5,8 @@
 
 #include <apos/tcb.h>
 #include <apos/elf.h>
-#include <regs.h>
-#include <csr.h>
+#include "regs.h"
+#include "csr.h"
 
 stat_t jump_to_userspace(struct tcb *t, int argc, char **argv)
 {
diff --git a/arch/riscv64/include/regs.h b/arch/riscv64/kernel/regs.h
index 511934e..511934e 100644
--- a/arch/riscv64/include/regs.h
+++ b/arch/riscv64/kernel/regs.h
diff --git a/arch/riscv64/kernel/sbi.c b/arch/riscv64/kernel/sbi.c
index 6a417d8..5602dd9 100644
--- a/arch/riscv64/kernel/sbi.c
+++ b/arch/riscv64/kernel/sbi.c
@@ -3,7 +3,7 @@
  * riscv64 specific OpenSBI handling.
  */
 
-#include <sbi.h>
+#include "sbi.h"
 
 struct sbiret sbi_ecall(int ext, int fid, unsigned long arg0,
                         unsigned long arg1, unsigned long arg2,
diff --git a/arch/riscv64/include/sbi.h b/arch/riscv64/kernel/sbi.h
index 44eec4f..44eec4f 100644
--- a/arch/riscv64/include/sbi.h
+++ b/arch/riscv64/kernel/sbi.h
diff --git a/arch/riscv64/kernel/timer.c b/arch/riscv64/kernel/timer.c
index 98f8e16..36760c4 100644
--- a/arch/riscv64/kernel/timer.c
+++ b/arch/riscv64/kernel/timer.c
@@ -5,8 +5,8 @@
 
 #include <arch/timer.h>
 #include <libfdt.h>
-#include <csr.h>
-#include <sbi.h>
+#include "csr.h"
+#include "sbi.h"
 
 ticks_t stat_timer(const void *fdt)
 {
diff --git a/arch/riscv64/kernel/vmem.c b/arch/riscv64/kernel/vmem.c
index d7c823b..cd5e4c4 100644
--- a/arch/riscv64/kernel/vmem.c
+++ b/arch/riscv64/kernel/vmem.c
@@ -9,8 +9,8 @@
 #include <apos/mem.h>
 #include <apos/debug.h>
 #include <arch/cpu.h>
-#include <pages.h>
-#include <csr.h>
+#include "pages.h"
+#include "csr.h"
 
 #define pte_ppn(pte)      (((pm_t)(pte)) >> 10)
 #define pte_flags(pte)    (((pm_t)(pte)) & 0xff)
diff --git a/arch/riscv64/source.mk b/arch/riscv64/source.mk
index 879d797..2768e88 100644
--- a/arch/riscv64/source.mk
+++ b/arch/riscv64/source.mk
@@ -21,7 +21,7 @@ run:
 include $(ARCH_SOURCE)/gen/source.mk
 
 # dependecy generation
-$(ARCH_BUILD)/kernel/entry.o: $(ARCH_SOURCE)/include/gen/asm-offsets.h
+$(ARCH_BUILD)/kernel/entry.o: $(ARCH_SOURCE)/gen/asm-offsets.h
 
 # full cleanup
 CLEANUP_CMD	:= $(ARCH_SOURCE)/conf/rmimage.sh