From 8fca2de33f62599fd87baeb813068f999f526082 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Tue, 12 Mar 2019 17:31:25 +0100 Subject: [PATCH] Revert "stuff" This reverts commit be94ec4d2c1d5e3de08e50a0733bd53c69d1acd8, reversing changes made to 2d9e02db0e580eaf9ccb6a6d2176ee16107a4b0a. --- boot/loader/loader.asm | 1 + kaleid/kernel/init/init.c | 2 -- kaleid/kernel/io/term.c | 2 +- kaleid/kernel/ke/panic.c | 5 ----- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/boot/loader/loader.asm b/boot/loader/loader.asm index 7baa2c6..fffa136 100644 --- a/boot/loader/loader.asm +++ b/boot/loader/loader.asm @@ -161,6 +161,7 @@ _loader64: call tritemporize ; Let time to see extern StartKern + push qword 12 push qword 12 call StartKern diff --git a/kaleid/kernel/init/init.c b/kaleid/kernel/init/init.c index e454774..1d56806 100644 --- a/kaleid/kernel/init/init.c +++ b/kaleid/kernel/init/init.c @@ -42,8 +42,6 @@ noreturn void StartKern(void *mbInfo, int mbMagic) // Kernel terminals InitTerms(); - *vga = ('A') | (0x0F << 8); - // We're out StartPanic("We had\n *mbInfo : %x\n mbMagic : %x\n\nGoodbye World :(", mbInfo, mbMagic); } diff --git a/kaleid/kernel/io/term.c b/kaleid/kernel/io/term.c index fa5da06..5392b23 100644 --- a/kaleid/kernel/io/term.c +++ b/kaleid/kernel/io/term.c @@ -32,7 +32,7 @@ extern Terminal_t VGA_Terminal; // void InitTerms(void) { - //KalAssert(!GetStdOut() && !GetStdDbg()); + KalAssert(!GetStdOut() && !GetStdDbg()); VGA_Init(); diff --git a/kaleid/kernel/ke/panic.c b/kaleid/kernel/ke/panic.c index d946f7e..c799d19 100644 --- a/kaleid/kernel/ke/panic.c +++ b/kaleid/kernel/ke/panic.c @@ -50,13 +50,10 @@ noreturn void StartPanic(const char *fmt, ...) va_list ap; DisableIRQs(); - *vga = ('B') | (0x0F << 8); if (GetCurProc()) _SetCurProc(NULL); if (GetStdOut() == NULL) CrashSystem(); - HaltCPU(); - GetStdOut()->ClearTermUnlocked(GetStdOut()); if (fmt == NULL) { @@ -75,7 +72,6 @@ noreturn void StartPanic(const char *fmt, ...) GetStdOut()->PrintOnTermUnlocked(GetStdOut(), "\nPanic!\n\n"); GetStdOut()->PrintOnTermUnlocked(GetStdOut(), GetPanicStr()); - tritemporize(); HaltCPU(); } @@ -85,7 +81,6 @@ noreturn void StartPanic(const char *fmt, ...) noreturn void CrashSystem(void) { DisableIRQs(); - tritemporize(); HaltCPU(); }