From 2aeaefe7acf17c7ae9b0e95647b7ccd743069f3f Mon Sep 17 00:00:00 2001
From: Adrien Bourmault <neox@os-k.eu>
Date: Mon, 11 Mar 2019 18:10:54 +0100
Subject: [PATCH] Step 1 : StartPanic is the real problem

---
 boot/loader/loader.asm    | 6 ++++--
 kaleid/kernel/init/init.c | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/boot/loader/loader.asm b/boot/loader/loader.asm
index 13278b3..33236e0 100644
--- a/boot/loader/loader.asm
+++ b/boot/loader/loader.asm
@@ -126,7 +126,7 @@ lbegin:
 
 x64_K           db "Now in x64 long mode", 0x0A, 0x0D, 0x0
 GoKernel        db "Launching Kernel...", 0
-nokernel        db "ERROR 05 : Kernel launching error",0
+nokernel        db 219, 219, 219, " Error 05 : Kernel returns",0
 
 _loader64:
     ;; Some cleanup
@@ -153,9 +153,11 @@ _loader64:
     call tritemporize                   ; Let time to see
 
     extern StartKern
-    jmp StartKern
+    call StartKern
 
 ;; We must never reach this point ------------------------------------------- ;;
+    call tritemporize                   ; Let time to see
+    call clear
     mov bl, 0x0c
     mov esi, nokernel                   ; Error 05
     call write
diff --git a/kaleid/kernel/init/init.c b/kaleid/kernel/init/init.c
index 3caa32d..ce72856 100644
--- a/kaleid/kernel/init/init.c
+++ b/kaleid/kernel/init/init.c
@@ -42,9 +42,11 @@ noreturn void StartKern(void *mbInfo, int mbMagic)
     // Kernel terminals
     InitTerms();
 
-    *vga = 'A' | (0x0F << 8);
+    vga = 0xB8000;
+
+    *vga = ('A') | (0x0F << 8);
 
     // We're out
-    //  StartPanic("Goodbye World :(");
+    //StartPanic("Goodbye World :(");
 }