From 9f4c8196cee99c13e970902fb1ac474cfc3413d9 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Tue, 19 Mar 2019 13:59:54 +0100 Subject: [PATCH] stuff --- kaleid/kernel/init/init.c | 4 ++-- kaleid/kernel/init/table.c | 2 +- kaleid/kernel/mm/map.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kaleid/kernel/init/init.c b/kaleid/kernel/init/init.c index 466c6fb..4c0b168 100644 --- a/kaleid/kernel/init/init.c +++ b/kaleid/kernel/init/init.c @@ -33,8 +33,8 @@ // void InitBootInfo(multiboot_info_t *mbi) { - KalAssert(mbi); - + // We need the multiboot structure + KalAlwaysAssert(mbi); extern uint MB_header; //Retrieves the bootloader informations diff --git a/kaleid/kernel/init/table.c b/kaleid/kernel/init/table.c index 10c52de..ebca750 100644 --- a/kaleid/kernel/init/table.c +++ b/kaleid/kernel/init/table.c @@ -27,7 +27,7 @@ int cpuCount = 1; Processor_t cpuTable[NCPUS] = {0}; -BootInfo_t bootTab = {0} +BootInfo_t bootTab = {0}; Terminal_t *StdOut = 0, *StdDbg = 0; volatile char *PanicStr = 0; diff --git a/kaleid/kernel/mm/map.c b/kaleid/kernel/mm/map.c index 6d29346..ef9f2d7 100644 --- a/kaleid/kernel/mm/map.c +++ b/kaleid/kernel/mm/map.c @@ -27,8 +27,8 @@ error_t InitMemoryMap(void) { - ///uint MapIsValid = (GetBootInfo(btldr).grubFlags & MULTIBOOT_INFO_MEM_MAP = MULTIBOOT_INFO_MEM_MAP ? 1 : 0); - KalAlwaysAssert(MapIsValid); + uint mapIsValid = (GetBootInfo(btldr).grubFlags & MULTIBOOT_INFO_MEM_MAP) == MULTIBOOT_INFO_MEM_MAP; + KalAlwaysAssert(0); return EOK; }