diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-08-19 09:46:20 +0200 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-08-19 09:46:20 +0200 |
| commit | 9b04920f5b8310971b407b6f0626d2623c367646 (patch) | |
| tree | 67f14b934865907d37456aff6cba65d9c909895f | |
| parent | 6595b6ed72c5edf1586b9c5a1298827f78457c38 (diff) | |
fixed position of memory map (after mbr change!!)
| -rw-r--r-- | boot/mbr.asm | 7 | ||||
| -rw-r--r-- | kernel/kernel.c | 2 |
2 files changed, 6 insertions, 3 deletions
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" @@ -147,6 +149,7 @@ boot_32_pm: call KERNEL_OFFSET ;jump into our Kernel it db 'X' +db 'X' MEMMAP: diff --git a/kernel/kernel.c b/kernel/kernel.c index 91634ec..c7391e0 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -40,7 +40,7 @@ void kernel_main() scr_put_string_nl(""); // we know that here the bootloader placed the mamory map! - mem_init(0x7c00+0x120); + mem_init(0x7c00+0x140); scr_put_string_nl(""); // we know that here the bootloader placed the mamory map! |