os-k-team/os-k
os-k-team
/
os-k
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Stuff

This commit is contained in:
Adrien Bourmault 2019-03-18 17:49:34 +01:00
parent e7909bcdf7
commit 78e72e6c8a
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kaleid/include/kernel/mm.h
View File

@ -30,7 +30,7 @@
// //
// Returns a pointer to the first entry of the memory map // 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 // Initializes the memory map structure

2
kaleid/kernel/init/init.c
View File

@ -40,8 +40,6 @@ noreturn void StartKern(multiboot_info_t *mbInfo, int mbMagic)
//Memory mapping //Memory mapping
InitMemoryMap(mbInfo); InitMemoryMap(mbInfo);
KernLog("InitMemoryMap : %p, %x\n", GetCurMemMap().addr, GetCurMemMap().length );
// We're out // We're out
KernLog("Yup, we have magic : %x", mbMagic); KernLog("Yup, we have magic : %x", mbMagic);
CrashSystem(); //yay CrashSystem(); //yay

5
kaleid/kernel/mm/map.c
View File

@ -24,14 +24,17 @@
#include <kernel/mm.h> #include <kernel/mm.h>
#include <multiboot/multiboot.h> #include <multiboot/multiboot.h>
#include <kernel/term.h>
void InitMemoryMap(multiboot_info_t *mbInfo) void InitMemoryMap(multiboot_info_t *mbInfo)
{ {
memTab.addr = (void*)mbInfo->mmap_addr; memTab.addr = (void*)mbInfo->mmap_addr;
memTab.length = (int)mbInfo->mmap_length; 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; return (void*)GetCurMemMap().addr;
} }