summaryrefslogtreecommitdiff
path: root/boot/stage2.asm
diff options
context:
space:
mode:
Diffstat (limited to 'boot/stage2.asm')
-rw-r--r--boot/stage2.asm32
1 files changed, 20 insertions, 12 deletions
diff --git a/boot/stage2.asm b/boot/stage2.asm
index 27f9832..de2497e 100644
--- a/boot/stage2.asm
+++ b/boot/stage2.asm
@@ -55,16 +55,13 @@ BOOT_DRIVE:
STR_VERSION:
db "Fool Loader Stage 2 v0.5",0
-VESA_CHECK1:
- db "1",0
-VESA_CHECK2:
- db "2",0
-VESA_CHECK3:
- db "3",0
-CHECK_A20:
- db "A",0
STR_LOAD
db "Loading Kernel...",0
+STR_BOOT
+ db "Boot Drive: ",0
+MEMMAP_INFO:
+ db "Getting Memory Map from BIOS.",0
+
;
;;lets put our temporary GDT (Global Descriptor Table) here
;;kernel should move this away
@@ -90,27 +87,38 @@ STR_LOAD
boot_16:
+ mov [BOOT_DRIVE],dl
; pr info
mov bx, STR_VERSION
call print_string
call print_nextline
-; remember BOOT_DRIVE again
- mov [BOOT_DRIVE],dl
+ mov bx, STR_BOOT
+ call print_string
+ mov al,dl
+ call print_hex_byte
+ call print_nextline
-; Load the KERNEL Image
+ ;show bootdrive
+
+ ; Load the KERNEL Image
mov bx, STR_LOAD
call print_string
call print_nextline
call disk_load_16
-
+
+ ; memmap message
+ mov bx,MEMMAP_INFO
+ call print_string
+ call print_nextline
;get memory map from bios before we enter 32 bit protected mode
mov ax,0 ; set target address in es:di (0:offset)
mov es,ax
mov di,MEMMAP_OFFSET
call BiosGetMemoryMap ; this will also put the number of entries
; of the memory map at MEMMAP_SIZE_OFFSET
+
call VesaSetup
call switch_to_pm