From 9b04920f5b8310971b407b6f0626d2623c367646 Mon Sep 17 00:00:00 2001 From: Michal Idziorek Date: Tue, 19 Aug 2014 09:46:20 +0200 Subject: fixed position of memory map (after mbr change!!) --- boot/mbr.asm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'boot') diff --git a/boot/mbr.asm b/boot/mbr.asm index a9c26f7..fd13a76 100644 --- a/boot/mbr.asm +++ b/boot/mbr.asm @@ -25,16 +25,18 @@ KERNEL_OFFSET equ 0x1000 [bits 16] jmp boot_16 ;start boot process +BOOT_DRIVE: + db 0 + ;SOME Global Data, mainly strings STR_VERSION: db "v0.2~",0 + ;STR_PROT: ; db "32-bit PM",0 ;STR_LOADED: ; db "loaded",0 -BOOT_DRIVE: - db 0 ;lets put our temporary GDT (Global Descriptor Table) here %include "boot/GDT.asm" @@ -146,6 +148,7 @@ boot_32_pm: call KERNEL_OFFSET ;jump into our Kernel it +db 'X' db 'X' MEMMAP: -- cgit v1.2.3