Revert "stuff"
This reverts commit be94ec4d2c1d5e3de08e50a0733bd53c69d1acd8, reversing changes made to 2d9e02db0e580eaf9ccb6a6d2176ee16107a4b0a.
This commit is contained in:
parent
982cd618a6
commit
8fca2de33f
|
@ -161,6 +161,7 @@ _loader64:
|
|||
call tritemporize ; Let time to see
|
||||
|
||||
extern StartKern
|
||||
|
||||
push qword 12
|
||||
push qword 12
|
||||
call StartKern
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -32,7 +32,7 @@ extern Terminal_t VGA_Terminal;
|
|||
//
|
||||
void InitTerms(void)
|
||||
{
|
||||
//KalAssert(!GetStdOut() && !GetStdDbg());
|
||||
KalAssert(!GetStdOut() && !GetStdDbg());
|
||||
|
||||
VGA_Init();
|
||||
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue