From f8e47b6b0c0578c52d82c0e243620361b87a4abe Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Thu, 29 Apr 2021 14:36:40 +0200 Subject: Multiboot/Grub progress --- kernel/multiboot.c | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) (limited to 'kernel/multiboot.c') diff --git a/kernel/multiboot.c b/kernel/multiboot.c index eafe4c5..a9a0c75 100644 --- a/kernel/multiboot.c +++ b/kernel/multiboot.c @@ -2,16 +2,46 @@ #include #include +#include #include -static struct multiboot_info *info = NULL; +PROTECTED static struct multiboot_info *info = NULL; -void multiboot_init(u32 magic, u32 addr) +CLEAR void multiboot_init(u32 magic, u32 addr) { assert(magic == MULTIBOOT_MAGIC); info = (void *)addr; if (info->flags & MULTIBOOT_INFO_CMDLINE) { - printf("CMDLINE: '%s'\n", info->cmdline); + // TODO: Do something useful with grub cmdline? + /* printf("CMDLINE: '%s'\n", info->cmdline); */ } } + +CLEAR void multiboot_mmap(void) +{ + assert(info->flags & MULTIBOOT_INFO_MEMORY); + + struct multiboot_mmap_entry *mmap = (void *)info->mmap_addr; + u32 length = info->mmap_length; + u32 count = length / sizeof(*mmap); + + u32 total = 0; + + for (u32 i = 0; i < count; i++) { + /* printf("Memory region 0x%x-0x%x\n", mmap->addr, mmap->addr + mmap->len); */ + if (mmap->type == MULTIBOOT_MEMORY_AVAILABLE) { + total += mmap->len; + physical_set_free(memory_range_around(mmap->addr, mmap->len)); + } else if (mmap->type == MULTIBOOT_MEMORY_BADRAM) { + printf("Defect memory at 0x%x-0x%x\n", mmap->addr, mmap->addr + mmap->len); + physical_set_used(memory_range_around(mmap->addr, mmap->len)); + } else { + physical_set_used(memory_range_around(mmap->addr, mmap->len)); + } + + mmap++; + } + + physical_set_total(total); +} -- cgit v1.2.3