aboutsummaryrefslogtreecommitdiff
path: root/kernel/main.c
diff options
context:
space:
mode:
authorMarvin Borner2020-08-09 17:27:08 +0200
committerMarvin Borner2020-08-09 17:27:08 +0200
commit544acef0986977ef9d3a05d87bb9f55163b1280a (patch)
tree764d28f454b818c3ac19d59df17ecd914f9d7ecf /kernel/main.c
parent162d024a53e1e31e00ff0b6f47dd4590edebc551 (diff)
Temporary cpu and serial drivers in libc
Diffstat (limited to 'kernel/main.c')
-rw-r--r--kernel/main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/main.c b/kernel/main.c
index 17d6267..85c1103 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -9,16 +9,15 @@
#include <interrupts.h>
#include <keyboard.h>
#include <load.h>
+#include <mem.h>
#include <print.h>
#include <serial.h>
#include <syscall.h>
#include <timer.h>
-u32 HEAP = 0x00200000;
-u32 HEAP_START;
-
void kernel_main(struct vid_info *vid_info)
{
+ HEAP = 0x00200000;
HEAP_START = HEAP; // For malloc function
// Initialize VESA video