From 1d763a07224504b645aea2f42699722ad0030cfb Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Fri, 17 Apr 2020 14:31:30 +0200 Subject: OMG I feel very dumb now... I forgot to actually pass the address to the parser! Why tf doesn't GCC tell me that? :D --- src/kernel/multiboot.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'src/kernel/multiboot.c') diff --git a/src/kernel/multiboot.c b/src/kernel/multiboot.c index a8fdc3c..6b402fa 100644 --- a/src/kernel/multiboot.c +++ b/src/kernel/multiboot.c @@ -11,45 +11,58 @@ void multiboot_parse(uint32_t multiboot_address) for (tag = (struct multiboot_tag *)(multiboot_address + 8); tag->type != MULTIBOOT_TAG_TYPE_END; tag = (struct multiboot_tag *)((multiboot_uint8_t *)tag + ((tag->size + 7) & ~7))) { - //log("Tag 0x%x, Size 0x%x", tag->type, tag->size); switch (tag->type) { case MULTIBOOT_TAG_TYPE_CMDLINE: - //info("Command line: %s", ((struct multiboot_tag_string *)tag)->string); + info("Got cmdline"); break; case MULTIBOOT_TAG_TYPE_BOOT_LOADER_NAME: - //info("Bootloader name: %s", ((struct multiboot_tag_string *)tag)->string); + info("Got bootloader name: %s", ((struct multiboot_tag_string *) tag)->string); break; case MULTIBOOT_TAG_TYPE_MODULE: + info("Got modules"); break; case MULTIBOOT_TAG_TYPE_BASIC_MEMINFO: - log("YAY"); + info("Got memory info"); memory_init((struct multiboot_tag_basic_meminfo *)tag); break; case MULTIBOOT_TAG_TYPE_BOOTDEV: + info("Got boot device"); break; case MULTIBOOT_TAG_TYPE_MMAP: + info("Got memory map"); break; case MULTIBOOT_TAG_TYPE_VBE: + info("Got VBE info"); break; case MULTIBOOT_TAG_TYPE_FRAMEBUFFER: + info("Got framebuffer info"); break; case MULTIBOOT_TAG_TYPE_APM: + info("Got APM table"); break; case MULTIBOOT_TAG_TYPE_EFI32: + info("Got EFI32"); break; case MULTIBOOT_TAG_TYPE_ACPI_OLD: + info("Got ACPI table"); break; case MULTIBOOT_TAG_TYPE_ACPI_NEW: + info("Got new ACPI table"); break; case MULTIBOOT_TAG_TYPE_NETWORK: + info("Got network info"); break; case MULTIBOOT_TAG_TYPE_EFI_MMAP: + info("Got EFI memory map"); break; case MULTIBOOT_TAG_TYPE_EFI_BS: + info("Got EFI boot services"); break; case MULTIBOOT_TAG_TYPE_EFI32_IH: + info("Got EFI image handler pointer"); break; case MULTIBOOT_TAG_TYPE_LOAD_BASE_ADDR: + info("Got image load base address"); break; } } -- cgit v1.2.3