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

Step 1 : StartPanic is the real problem

This commit is contained in:
Adrien Bourmault 2019-03-11 18:10:54 +01:00
parent fe12e3bca9
commit 2aeaefe7ac
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
boot/loader/loader.asm
View File

@ -126,7 +126,7 @@ lbegin:
x64_K db "Now in x64 long mode", 0x0A, 0x0D, 0x0 x64_K db "Now in x64 long mode", 0x0A, 0x0D, 0x0
GoKernel db "Launching Kernel...", 0 GoKernel db "Launching Kernel...", 0
nokernel db "ERROR 05 : Kernel launching error",0 nokernel db 219, 219, 219, " Error 05 : Kernel returns",0
_loader64: _loader64:
;; Some cleanup ;; Some cleanup
@ -153,9 +153,11 @@ _loader64:
call tritemporize ; Let time to see call tritemporize ; Let time to see
extern StartKern extern StartKern
jmp StartKern call StartKern
;; We must never reach this point ------------------------------------------- ;; ;; We must never reach this point ------------------------------------------- ;;
call tritemporize ; Let time to see
call clear
mov bl, 0x0c mov bl, 0x0c
mov esi, nokernel ; Error 05 mov esi, nokernel ; Error 05
call write call write

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

@ -42,7 +42,9 @@ noreturn void StartKern(void *mbInfo, int mbMagic)
// Kernel terminals // Kernel terminals
InitTerms(); InitTerms();
*vga = 'A' | (0x0F << 8); vga = 0xB8000;
*vga = ('A') | (0x0F << 8);
// We're out // We're out
//StartPanic("Goodbye World :("); //StartPanic("Goodbye World :(");