X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=KernelLand%2FKernel%2Farch%2Fx86%2Fstart.asm;h=18b9f5f82271dd20d921f59b96854578d6f277ab;hb=c1b33e91984102c1aa9a2ffe19f02c315b481726;hp=26f80422e4b9272264a2d704a0bb6579f0f197d2;hpb=aab5ccdbe1608036091e2fb646d3e851ef6ad44d;p=tpg%2Facess2.git diff --git a/KernelLand/Kernel/arch/x86/start.asm b/KernelLand/Kernel/arch/x86/start.asm index 26f80422..18b9f5f8 100644 --- a/KernelLand/Kernel/arch/x86/start.asm +++ b/KernelLand/Kernel/arch/x86/start.asm @@ -14,15 +14,26 @@ mboot: ; Multiboot macros to make a few lines later more readable MULTIBOOT_PAGE_ALIGN equ 1<<0 MULTIBOOT_MEMORY_INFO equ 1<<1 + MULTIBOOT_REQVIDMODE equ 1<<2 MULTIBOOT_HEADER_MAGIC equ 0x1BADB002 - MULTIBOOT_HEADER_FLAGS equ MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO + MULTIBOOT_HEADER_FLAGS equ MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO | MULTIBOOT_REQVIDMODE MULTIBOOT_CHECKSUM equ -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) ; This is the GRUB Multiboot header. A boot signature dd MULTIBOOT_HEADER_MAGIC dd MULTIBOOT_HEADER_FLAGS dd MULTIBOOT_CHECKSUM + dd mboot; - KERNEL_BASE ;Location of Multiboot Header + dd 0 ; load_addr + dd 0 ; load_end_addr + dd 0 ; bss_end_addr + dd 0 ; entry_addr + + dd 0 ; Mode type (0: LFB) + dd 0 ; Width (no preference) + dd 0 ; Height (no preference) + dd 32 ; Depth (32-bit preferred) ; Multiboot 2 Header ;mboot2: @@ -137,7 +148,7 @@ APStartup: ; Load initial GDT mov ax, 0xFFFF mov ds, ax - lgdt [DWORD ds:lGDTPtr-KERNEL_BASE-0xFFFF0] + lgdt [DWORD ds:lGDTPtr-0xFFFF0] ; Enable PMode in CR0 mov eax, cr0 or al, 1