diff options
| author | Marvin Borner | 2019-09-24 18:41:19 +0200 |
|---|---|---|
| committer | Marvin Borner | 2019-09-24 18:41:19 +0200 |
| commit | 19099791a17c53045e89c6cfb3fafd8efbd19a9d (patch) | |
| tree | 8151781544c14fe600b8729571bfc8ed6a4bdd9a /src/kernel/boot.asm | |
| parent | cd9da0edc6a7838353948a394748a4a16dd47b83 (diff) | |
First successful VESA attempt
Diffstat (limited to 'src/kernel/boot.asm')
| -rw-r--r-- | src/kernel/boot.asm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/kernel/boot.asm b/src/kernel/boot.asm index 98b122c..116fa32 100644 --- a/src/kernel/boot.asm +++ b/src/kernel/boot.asm @@ -1,9 +1,9 @@ +[bits 32] global start start: - [BITS 16] - call search_video_mode - [bits 32] mov esp, _sys_stack ; Points stack to stack area + extern init_graphics + call init_graphics jmp stublet ; Align with 4 Bytes @@ -31,12 +31,13 @@ mboot: dd start ; Endless loop -[bits 32] stublet: extern kernel_main call kernel_main jmp $ +%include "src/kernel/graphics/vesa.asm" + %include "src/kernel/gdt/gdt.asm" %include "src/kernel/interrupts/idt.asm" @@ -45,8 +46,6 @@ stublet: %include "src/kernel/interrupts/irq.asm" -%include "src/kernel/graphics/vesa.asm" - ; Store the stack SECTION .bss resb 8192 ; Reserve 8KiB |