From 6e8e022937757b7e3604f77442aab4d156d432ff Mon Sep 17 00:00:00 2001 From: Eric-Paul Ickhorn Date: Tue, 23 Jul 2024 23:57:58 +0200 Subject: [PATCH] Make stage 2 entry (after GDT) call driver setup The driver setup, which in turn calls all the drivers' setup functions wasn't being called until now. Now, it is included and being called. The test text which was used to test some display functions in older revisions is also gone now. --- i386/loader/src-asm/entry.asm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/i386/loader/src-asm/entry.asm b/i386/loader/src-asm/entry.asm index 9f9bc9f..6001da1 100755 --- a/i386/loader/src-asm/entry.asm +++ b/i386/loader/src-asm/entry.asm @@ -46,9 +46,6 @@ stage_2_setup_entry: cli hlt -some_text: - db "This is some text.", 0x00 - ; Utilities ; Memory Management %include "memory/a20.asm" @@ -58,13 +55,18 @@ some_text: bits 32 stage2_true_entry: - mov [dword 0xb8000], byte 'X' - mov [dword 0xb8000 + 1], byte 0x31 + push ebp + mov ebp, esp + call setup_drivers + mov esp, ebp + pop ebp + cli hlt %include "utility/math.asm" %include "utility/memory.asm" +%include "utility/display.asm" ; Driver Manager -; %include "drivers/manager.asm" + %include "drivers/manager.asm"