From 0bca634f7e70b05239f46f3bd40bb37468d67957 Mon Sep 17 00:00:00 2001 From: Aleksa Vučković Date: Sun, 24 Oct 2021 18:47:28 +0200 Subject: Fixing keyboard, changes to Makefile and string.h, trying to add heap... --- src/kernel.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/kernel.c') diff --git a/src/kernel.c b/src/kernel.c index 0ad3b66..b77bf2c 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -1,13 +1,20 @@ +#include"heap.h" +#include"stdio.h" + void terminal_initialize(void); void init_idt_table(void); void init_keyboard(void); void prompt(void); +void *f(); + void kernel_main(void) { terminal_initialize(); init_idt_table(); init_keyboard(); + k_heapBMInit(&kheap); + prompt(); while(1) __asm__("hlt\n\t"); } -- cgit v1.2.3