diff options
Diffstat (limited to 'src/bootloader')
-rw-r--r-- | src/bootloader/cd.asm | 4 | ||||
-rw-r--r-- | src/bootloader/hdd1.asm | 2 | ||||
-rw-r--r-- | src/bootloader/hdd2.asm | 18 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/bootloader/cd.asm b/src/bootloader/cd.asm index 1e83a3a..ec9fc9d 100644 --- a/src/bootloader/cd.asm +++ b/src/bootloader/cd.asm @@ -159,7 +159,7 @@ checkA20: ret welcome db "Melvix", 0x0A, 0x0D, 0x00 -nolba db "BIOS lacks support for LBA addressing.", 0x00 +nolba db "BIOS lacks support for lba addressing.", 0x00 noboot db "Boot directory could not be found.", 0x00 noa20 db "A20 could not be enabled.", 0 loading db "Loading kernel...", 0x0A, 0x0D, 0x00 @@ -169,7 +169,7 @@ nomem db "BIOS does not support memory detection!", 0 memno20 db "BIOS returns memory detection with 24 bytes. This has never been seen!", 0 start: - ; Check if LBA is supported by the BIOS. + ; Check if lba is supported by the BIOS. mov ah, 0x41 mov bx, 0x55AA int 0x13 diff --git a/src/bootloader/hdd1.asm b/src/bootloader/hdd1.asm index c347625..514deca 100644 --- a/src/bootloader/hdd1.asm +++ b/src/bootloader/hdd1.asm @@ -72,7 +72,7 @@ readwholefile: ret welcome db "Melvix", 0x0A, 0x0D, 0x00 -nolba db "BIOS lacks support for LBA addressing.", 0x00 +nolba db "BIOS lacks support for lba addressing.", 0x00 signaturebad db "Bad disk signature.", 0x00 start: diff --git a/src/bootloader/hdd2.asm b/src/bootloader/hdd2.asm index e289c39..3330c96 100644 --- a/src/bootloader/hdd2.asm +++ b/src/bootloader/hdd2.asm @@ -48,17 +48,17 @@ checkA20: popf ret -last_maxlevel db 0 +last_max_level db 0 getrecursive: push edi push esi push ecx mov eax, edi - cmp al, byte [last_maxlevel] - jna .last_maxlevel_updated - mov byte [last_maxlevel], al - .last_maxlevel_updated: + cmp al, byte [last_max_level] + jna .last_max_level_updated + mov byte [last_max_level], al + .last_max_level_updated: mov eax, esi call 0x7c26 @@ -66,19 +66,19 @@ getrecursive: mov eax, dword [esp] sub eax, 10 - cmp byte [last_maxlevel], 1 + cmp byte [last_max_level], 1 jna .check1 mov ebx, 1 shl ebx, 7 sub eax, ebx .check1: - cmp byte [last_maxlevel], 2 + cmp byte [last_max_level], 2 jna .check2 mov ebx, 1 shl ebx, 14 sub eax, ebx .check2: - cmp byte [last_maxlevel], 3 + cmp byte [last_max_level], 3 jna .check3 mov ebx, 1 shl ebx, 21 @@ -102,7 +102,7 @@ getrecursive: mov ecx, [esp] call getrecursive .finish_recursion: - mov byte [last_maxlevel], 0 + mov byte [last_max_level], 0 pop ecx pop esi |