summaryrefslogtreecommitdiff
path: root/kernel/kernel.c
diff options
context:
space:
mode:
authorFreya Murphy <freya@freyacat.org>2025-04-03 21:32:00 -0400
committerFreya Murphy <freya@freyacat.org>2025-04-03 21:32:00 -0400
commit16b7b4c2c008c976ee5948c97a8337d6224c3be9 (patch)
tree70f8402c3a2650d72fb174a43f8893a6f415546b /kernel/kernel.c
parentfix printf (diff)
downloadcomus-16b7b4c2c008c976ee5948c97a8337d6224c3be9.tar.gz
comus-16b7b4c2c008c976ee5948c97a8337d6224c3be9.tar.bz2
comus-16b7b4c2c008c976ee5948c97a8337d6224c3be9.zip
add 64-bit idt/pic and fix paging
Diffstat (limited to 'kernel/kernel.c')
-rw-r--r--kernel/kernel.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c
index ac0546c..862425a 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -1,8 +1,12 @@
+#include <comus/cpu.h>
#include <comus/memory.h>
+#include <lib.h>
+#include <stdio.h>
void main(void)
{
-
- while (1)
- ;
+ cpu_init();
+ memory_init(NULL);
+ printf("halting...\n");
+ while(1);
}