diff options
author | Marvin Borner | 2019-09-24 22:34:20 +0200 |
---|---|---|
committer | Marvin Borner | 2019-09-24 22:34:20 +0200 |
commit | 64ec44ba4575686849ba2597cf8bc9054af3d376 (patch) | |
tree | 059da7b1187ae31ff8979c1c936037dd990a0cd4 /src/kernel/boot.asm | |
parent | d1d3820c6b306758cf90a269b0466febff6c808e (diff) |
Added working VESA driver
Note to myself: Use Real/Protected mode correctly :)
Diffstat (limited to 'src/kernel/boot.asm')
-rw-r--r-- | src/kernel/boot.asm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/kernel/boot.asm b/src/kernel/boot.asm index 116fa32..c0b3735 100644 --- a/src/kernel/boot.asm +++ b/src/kernel/boot.asm @@ -2,8 +2,6 @@ global start start: mov esp, _sys_stack ; Points stack to stack area - extern init_graphics - call init_graphics jmp stublet ; Align with 4 Bytes @@ -36,8 +34,6 @@ stublet: call kernel_main jmp $ -%include "src/kernel/graphics/vesa.asm" - %include "src/kernel/gdt/gdt.asm" %include "src/kernel/interrupts/idt.asm" @@ -46,6 +42,8 @@ stublet: %include "src/kernel/interrupts/irq.asm" +%include "src/kernel/interact.asm" + ; Store the stack SECTION .bss resb 8192 ; Reserve 8KiB |