summaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
Diffstat (limited to 'boot')
-rw-r--r--boot/mbr.asm5
-rw-r--r--boot/vesa_setup_16.asm2
2 files changed, 5 insertions, 2 deletions
diff --git a/boot/mbr.asm b/boot/mbr.asm
index 4dd82d1..96fc788 100644
--- a/boot/mbr.asm
+++ b/boot/mbr.asm
@@ -49,6 +49,7 @@ MEMMAP_OFFSET equ 0x7c00+0x400
VESA_MODES equ 0x8300
VESA_MODE_INFO equ 0x8400
VESA_MODE_SELECT equ 0x4114
+;VESA_MODE_SELECT equ 0x0
jmp boot_16 ;start boot process
@@ -62,7 +63,7 @@ VESA_CHECK1:
VESA_CHECK2:
db " V2",0
VESA_CHECK3:
- db " V2",0
+ db " V3",0
CHECK_A20:
db " A20",0
@@ -117,7 +118,7 @@ boot_16:
a20check:
- mov bx, STR_VERSION
+ mov bx, CHECK_A20
call print_string
call check_a20
diff --git a/boot/vesa_setup_16.asm b/boot/vesa_setup_16.asm
index 4f276b5..7180252 100644
--- a/boot/vesa_setup_16.asm
+++ b/boot/vesa_setup_16.asm
@@ -17,6 +17,7 @@ VesaSetup:
vesa_ok:
;
+
;VESA: get vesa info on mode of interest
mov ax,0 ; set target address in es:di (0:offset)
mov es,ax
@@ -32,6 +33,7 @@ VesaSetup:
jmp vesa_err2
vesa_ok2:
+
;VESA: finally switch to the mode of choice!
mov ax,0x4f02 ;vesa function: Set Mode
mov bx,VESA_MODE_SELECT