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.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/src/main.c b/kernel/src/main.c
index b562c74..7cc1084 100644
--- a/kernel/src/main.c
+++ b/kernel/src/main.c
@@ -7,17 +7,16 @@
#include <heap.h>
#include <keyboard.h>
#include <libk/stdio.h>
+#include <libk/math.h>
int kernel_main(mb2_tag_header* multiboot_bootinfo, uint32_t multiboot_magic);
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_heap();
init_fb(multiboot_bootinfo, multiboot_magic);
- __asm__ volatile ("movl $4, 0x500000");
-
for(;;) {
__asm__ volatile ("hlt;");
}