summaryrefslogtreecommitdiff
path: root/kernel/src/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/src/main.c')
-rw-r--r--kernel/src/main.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/kernel/src/main.c b/kernel/src/main.c
index bea4ed2..8a57d45 100644
--- a/kernel/src/main.c
+++ b/kernel/src/main.c
@@ -1,16 +1,22 @@
-#include <stdint.h>
+#include <types.h>
+
#include <multiboot2.h>
#include <graphics.h>
#include <idt.h>
#include <debug.h>
#include <paging.h>
+#include <heap.h>
+#include <keyboard.h>
int kernel_main(mb2_tag_header* multiboot_bootinfo, uint32_t multiboot_magic)
{
init_paging();
+ init_heap(HEAP_START_ADDR, HEAP_SIZE, HEAP_BLOCK_SIZE);
init_idt();
init_fb(multiboot_bootinfo, multiboot_magic);
+ print_int(0x1000);
+
for(;;) {
__asm__ volatile ("hlt;");
}