From e197919f35779b6846797000b5c0fe7c8b1deba0 Mon Sep 17 00:00:00 2001
From: Rick Rongen <rickrongen@outlook.com>
Date: Fri, 29 Mar 2024 21:32:21 +0100
Subject: [PATCH] feat: fixups and init moving

---
 yak-kernel/src/rt/boot/limine/limine.c | 5 ++++-
 yak-kernel/src/rt/core/mem/malloc.c    | 4 +++-
 yak-kernel/src/rt/kmain.c              | 2 --
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/yak-kernel/src/rt/boot/limine/limine.c b/yak-kernel/src/rt/boot/limine/limine.c
index 60b285f..acfe8a3 100644
--- a/yak-kernel/src/rt/boot/limine/limine.c
+++ b/yak-kernel/src/rt/boot/limine/limine.c
@@ -9,7 +9,8 @@
 #include <yak/rt/debug/debug.h>
 #include <yak/rt/kmain.h>
 #include <yak/rt/kprint.h>
-#include "yak/rt/core/mem/memmap.h"
+#include <yak/rt/core/mem/memmap.h>
+#include <yak/platform/generic/platform.h>
 
 static struct limine_bootloader_info_request limine_bootloader_info_request = {
         .id = LIMINE_BOOTLOADER_INFO_REQUEST,
@@ -127,6 +128,8 @@ uint8_t limmine_memmap_to_memmap_type(uint64_t type) {
 }
 
 void limine_init() {
+    // limine_init is called from the bootloader, we are responsible for triggering the c-rt init
+    _init();
     if (limine_terminal_request.response != NULL && limine_terminal_request.response->terminal_count >= 1) {
         kprint_register(limine_terminal_kprint);
     }
diff --git a/yak-kernel/src/rt/core/mem/malloc.c b/yak-kernel/src/rt/core/mem/malloc.c
index 08aa0e9..b7626fd 100644
--- a/yak-kernel/src/rt/core/mem/malloc.c
+++ b/yak-kernel/src/rt/core/mem/malloc.c
@@ -3,7 +3,9 @@
 //
 
 #include <yak/rt/core/mem/liballoc.h>
-#include "yak/rt/panic.h"
+#include <yak/rt/panic.h>
+
+// this file connects liballoc to yak
 
 #define PREALLOC_PAGES 16
 #define PAGE_SIZE 4096
diff --git a/yak-kernel/src/rt/kmain.c b/yak-kernel/src/rt/kmain.c
index b2f61f4..276d4bc 100644
--- a/yak-kernel/src/rt/kmain.c
+++ b/yak-kernel/src/rt/kmain.c
@@ -3,8 +3,6 @@
 #include <yak/platform/generic/platform.h>
 
 void kmain() {
-    _init();
-    // kmain is called from one of the bootloader implementations
 
     // perform platform specific initialisation
     platform_init();