From a098510b913f18864c7c9494a14ae71331448bbd Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Sun, 24 Mar 2019 21:24:21 +0100 Subject: [PATCH] Merging ok ! --- kaleid/include/kernel/mm.h | 3 +-- kaleid/kernel/init/init.c | 14 +++++++------- kaleid/kernel/mm/map.c | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/kaleid/include/kernel/mm.h b/kaleid/include/kernel/mm.h index cdde29c..a70cdce 100644 --- a/kaleid/include/kernel/mm.h +++ b/kaleid/include/kernel/mm.h @@ -54,7 +54,6 @@ struct MemoryMap_t { MapEntry_t entry[MAX_ENTRIES]; } __attribute__((packed)); -<<<<<<< HEAD // -------------------------------------------------------------------------- // @@ -71,6 +70,6 @@ size_t MmGetAvailZoneSize(void *start); // // Returns the first available memory zone from the start address pointer -void MmGetFirstAvailZone(void *start); +void *MmGetFirstAvailZone(void *start); // -------------------------------------------------------------------------- // diff --git a/kaleid/kernel/init/init.c b/kaleid/kernel/init/init.c index 3edda14..bd07433 100644 --- a/kaleid/kernel/init/init.c +++ b/kaleid/kernel/init/init.c @@ -42,11 +42,11 @@ void BtInitBootInfo(multiboot_info_t *mbi) //Retrieves the bootloader flags to ensure infos are valid BtGetBootInfo(btldr).grubFlags = mbi->flags; - if (GetBootInfo(btldr).grubFlags & MULTIBOOT_INFO_BOOT_LOADER_NAME) { - GetBootInfo(btldr).grubName = (char*)(ullong)(mbi->boot_loader_name); - GetBootInfo(btldr).kernelAddr = (void*)&MB_header; - GetBootInfo(btldr).kernelEndAddr = (void*)&kernelEnd; - GetBootInfo(btldr).valid = 1; + if (BtGetBootInfo(btldr).grubFlags & MULTIBOOT_INFO_BOOT_LOADER_NAME) { + BtGetBootInfo(btldr).grubName = (char*)(ullong)(mbi->boot_loader_name); + BtGetBootInfo(btldr).kernelAddr = (void*)&MB_header; + BtGetBootInfo(btldr).kernelEndAddr = (void*)&kernelEnd; + BtGetBootInfo(btldr).valid = 1; } if (BtGetBootInfo(btldr).grubFlags & MULTIBOOT_INFO_MODS) { BtGetBootInfo(btldr).modulesCount = mbi->mods_count; @@ -138,8 +138,8 @@ noreturn void BtStartKern(multiboot_info_t *mbInfo, int mbMagic) mapBad ); - KernLog("[Init] TEST First zone from %p : %p\n", (void*)0xB8010, GetFirstAvailZone((void*)0xB8010)); - KernLog("[Init] TEST Size of zone : %u Kio\n\n", GetAvailZoneSize(GetFirstAvailZone((void*)0xB8010)) / KB); + KernLog("[Init] TEST First zone from %p : %p\n", (void*)0xB8010, MmGetFirstAvailZone((void*)0xB8010)); + KernLog("[Init] TEST Size of zone : %u Kio\n\n", MmGetAvailZoneSize(MmGetFirstAvailZone((void*)0xB8010)) / KB); diff --git a/kaleid/kernel/mm/map.c b/kaleid/kernel/mm/map.c index ec926a7..320a9b3 100644 --- a/kaleid/kernel/mm/map.c +++ b/kaleid/kernel/mm/map.c @@ -126,7 +126,7 @@ void *MmGetFirstAvailZone(void *start) { // Because the kernel is the kernel if ((ullong)start < (ullong)BtGetBootInfo(btldr).kernelEndAddr) { - return GetFirstAvailZone(BtGetBootInfo(btldr).kernelEndAddr); + return MmGetFirstAvailZone(BtGetBootInfo(btldr).kernelEndAddr); } // Search the zone where the start address is