Moved debugging into debug.c

+ No clue why I had that stuff in common/main.c

2 files changed, 13 insertions, 7 deletions

diff --git a/include/apos/debug.h b/include/apos/debug.h
index 9aa132f..a9e5d46 100644
--- a/include/apos/debug.h
+++ b/include/apos/debug.h
@@ -3,6 +3,7 @@
 
 #include <apos/attrs.h>
 #include <apos/pmem.h>
+#include <arch/vmem.h>
 
 #ifdef DEBUG
 enum serial_dev {
@@ -10,13 +11,14 @@ enum serial_dev {
 	NS16550A,
 };
 
-struct dbg_info {
-	pm_t dbg_ptr;
-	enum serial_dev dev;
-};
-
 void __fmt(1, 2) dbg(const char *fmt, ...);
+
+void init_dbg(void *fdt);
+
+void setup_dmap_dbg();
+void setup_io_dbg(struct vm_branch *b);
 void setup_dbg(pm_t pt, enum serial_dev dev);
+
 struct dbg_info dbg_from_fdt(void *fdt);
 
 #define COMMON_FORMAT "[%s] %s:%d\n\t"
@@ -32,6 +34,10 @@ struct dbg_info dbg_from_fdt(void *fdt);
 #define dbg_init(...)
 #define dbg_from_fdt(...)
 
+#define init_dbg(...)
+#define setup_dmap_dbg(...)
+#define setup_io_dbg(...)
+
 #define bug(...)
 #define warn(...)
 #define info(...)
diff --git a/include/arch/arch.h b/include/arch/arch.h
index 1933555..f684cf0 100644
--- a/include/arch/arch.h
+++ b/include/arch/arch.h
@@ -1,8 +1,8 @@
 #ifndef APOS_ARCH_H
 #define APOS_ARCH_H
 
-/* functions that an arch has to provide */
+#include <apos/types.h>
 
-void arch_setup(void *fdt);
+stat_t setup_arch(void *fdt);
 
 #endif /* APOS_ARCH_H */