From 71396c5cd460890c52e348687e6e7c864e2dfeed Mon Sep 17 00:00:00 2001
From: Aleksa Vuckovic <aleksav013@gmail.com>
Date: Sun, 7 Aug 2022 16:39:28 +0200
Subject: types.h; libk and heap begining

---
 kernel/src/main.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'kernel/src/main.c')

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;");
 	}
-- 
cgit v1.2.3