summaryrefslogtreecommitdiff
path: root/src/kernel/main.c
diff options
context:
space:
mode:
authordzwdz2021-07-10 17:41:32 +0200
committerdzwdz2021-07-10 17:41:32 +0200
commit1bf5e324005ce7122a195af106cec656960648dc (patch)
tree7a8394a5243ad50d1e8d5574d94908461fe96cc6 /src/kernel/main.c
parent6cbdc62b5cbe34d7355047722d6d483a4d25c7f3 (diff)
a sensible source structure
The idea is that src/kernel/ is only allowed to interface with the hardware using whatever's defined in src/arch/generic.h. I'll probably write a small script for checking this later on. This is a giant commit so I've probably fucked something up. It boots fine on Bochs and QEMU, so at least there's that.
Diffstat (limited to 'src/kernel/main.c')
-rw-r--r--src/kernel/main.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/kernel/main.c b/src/kernel/main.c
index 0193514..aa67d7c 100644
--- a/src/kernel/main.c
+++ b/src/kernel/main.c
@@ -1,22 +1,11 @@
-#include <kernel/gdt.h>
-#include <kernel/idt.h>
+#include <arch/generic.h>
#include <kernel/mem.h>
#include <kernel/panic.h>
#include <kernel/proc.h>
-#include <kernel/tty.h>
-#include <platform/asm.h>
void r3_test();
-void kmain()
-{
- tty_clear();
- tty_const("gdt...");
- gdt_init();
- tty_const("idt...");
- idt_init();
- tty_const("sysenter...");
- sysenter_setup();
+void kmain() {
tty_const("mem...");
mem_init();