os-k-team/os-k
os-k-team
/
os-k
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Revert "stuff" 

This reverts commit be94ec4d2c1d5e3de08e50a0733bd53c69d1acd8, reversing
changes made to 2d9e02db0e580eaf9ccb6a6d2176ee16107a4b0a.
This commit is contained in:
Adrien Bourmault 2019-03-12 17:31:25 +01:00
parent 982cd618a6
commit 8fca2de33f
4 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boot/loader/loader.asm
View File

@ -161,6 +161,7 @@ _loader64:
call tritemporize ; Let time to see call tritemporize ; Let time to see
extern StartKern extern StartKern
push qword 12 push qword 12
push qword 12 push qword 12
call StartKern call StartKern

2
kaleid/kernel/init/init.c
View File

@ -42,8 +42,6 @@ noreturn void StartKern(void *mbInfo, int mbMagic)
// Kernel terminals // Kernel terminals
InitTerms(); InitTerms();
*vga = ('A') | (0x0F << 8);
// We're out // We're out
StartPanic("We had\n *mbInfo : %x\n mbMagic : %x\n\nGoodbye World :(", mbInfo, mbMagic); StartPanic("We had\n *mbInfo : %x\n mbMagic : %x\n\nGoodbye World :(", mbInfo, mbMagic);
} }

2
kaleid/kernel/io/term.c
View File

@ -32,7 +32,7 @@ extern Terminal_t VGA_Terminal;
// //
void InitTerms(void) void InitTerms(void)
{ {
//KalAssert(!GetStdOut() && !GetStdDbg()); KalAssert(!GetStdOut() && !GetStdDbg());
VGA_Init(); VGA_Init();

5
kaleid/kernel/ke/panic.c
View File

@ -50,13 +50,10 @@ noreturn void StartPanic(const char *fmt, ...)
va_list ap; va_list ap;
DisableIRQs(); DisableIRQs();
*vga = ('B') | (0x0F << 8);
if (GetCurProc()) _SetCurProc(NULL); if (GetCurProc()) _SetCurProc(NULL);
if (GetStdOut() == NULL) CrashSystem(); if (GetStdOut() == NULL) CrashSystem();
HaltCPU();
GetStdOut()->ClearTermUnlocked(GetStdOut()); GetStdOut()->ClearTermUnlocked(GetStdOut());
if (fmt == NULL) { if (fmt == NULL) {
@ -75,7 +72,6 @@ noreturn void StartPanic(const char *fmt, ...)
GetStdOut()->PrintOnTermUnlocked(GetStdOut(), "\nPanic!\n\n"); GetStdOut()->PrintOnTermUnlocked(GetStdOut(), "\nPanic!\n\n");
GetStdOut()->PrintOnTermUnlocked(GetStdOut(), GetPanicStr()); GetStdOut()->PrintOnTermUnlocked(GetStdOut(), GetPanicStr());
tritemporize();
HaltCPU(); HaltCPU();
} }
@ -85,7 +81,6 @@ noreturn void StartPanic(const char *fmt, ...)
noreturn void CrashSystem(void) noreturn void CrashSystem(void)
{ {
DisableIRQs(); DisableIRQs();
tritemporize();
HaltCPU(); HaltCPU();
} }