From 78e72e6c8aa848d0609c410dc0773a80b6f59106 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Mon, 18 Mar 2019 17:49:34 +0100 Subject: [PATCH] Stuff --- kaleid/include/kernel/mm.h | 2 +- kaleid/kernel/init/init.c | 2 -- kaleid/kernel/mm/map.c | 5 ++++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/kaleid/include/kernel/mm.h b/kaleid/include/kernel/mm.h index e7fe5ff..afacf69 100644 --- a/kaleid/include/kernel/mm.h +++ b/kaleid/include/kernel/mm.h @@ -30,7 +30,7 @@ // // Returns a pointer to the first entry of the memory map // -multiboot_memory_map_t *GetMemoryMap(void); +void *GetMemoryMap(void); // // Initializes the memory map structure diff --git a/kaleid/kernel/init/init.c b/kaleid/kernel/init/init.c index 9cdddf1..a7e9541 100644 --- a/kaleid/kernel/init/init.c +++ b/kaleid/kernel/init/init.c @@ -40,8 +40,6 @@ noreturn void StartKern(multiboot_info_t *mbInfo, int mbMagic) //Memory mapping InitMemoryMap(mbInfo); - KernLog("InitMemoryMap : %p, %x\n", GetCurMemMap().addr, GetCurMemMap().length ); - // We're out KernLog("Yup, we have magic : %x", mbMagic); CrashSystem(); //yay diff --git a/kaleid/kernel/mm/map.c b/kaleid/kernel/mm/map.c index c9d05b8..56cbed3 100644 --- a/kaleid/kernel/mm/map.c +++ b/kaleid/kernel/mm/map.c @@ -24,14 +24,17 @@ #include #include +#include void InitMemoryMap(multiboot_info_t *mbInfo) { memTab.addr = (void*)mbInfo->mmap_addr; memTab.length = (int)mbInfo->mmap_length; + + KernLog("[InitMemoryMap] Address: %p, Length: %d\n", GetCurMemMap().addr, GetCurMemMap().length ); } -multiboot_memory_map_t *GetMemoryMap(void) +void *GetMemoryMap(void) { return (void*)GetCurMemMap().addr; }