From c89af16e5448fcf43a6e57ccc7b4a67ddff26fc5 Mon Sep 17 00:00:00 2001 From: Baptiste Wicht Date: Sat, 26 Oct 2013 12:48:18 +0200 Subject: [PATCH] Cleanup --- src/bootloader/bootloader.asm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/bootloader/bootloader.asm b/src/bootloader/bootloader.asm index 27365985..f5fa5e2b 100644 --- a/src/bootloader/bootloader.asm +++ b/src/bootloader/bootloader.asm @@ -53,8 +53,10 @@ rm_start: mov si, load_kernel call print_line_16 - BASE equ 0x100 ; 0x0100:0x0 = 0x1000 - sectors equ 0x20 ; sectors to read + ; Loading the assembly kernel from floppy + + ASM_KERNEL_BASE equ 0x100 ; 0x0100:0x0 = 0x1000 + sectors equ 0x20 ; sectors to read ; Reset disk drive xor ax, ax @@ -64,7 +66,7 @@ rm_start: jc reset_failed - mov ax, BASE + mov ax, ASM_KERNEL_BASE mov es, ax xor bx, bx @@ -81,7 +83,9 @@ rm_start: cmp al, sectors jne read_failed - jmp dword BASE:0x0 + ; Run the assembly kernel + + jmp dword ASM_KERNEL_BASE:0x0 reset_failed: mov si, reset_failed_msg