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

Merging ok !

This commit is contained in:
Adrien Bourmault 2019-03-24 21:24:21 +01:00
parent 8cb110059a
commit a098510b91
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);
// -------------------------------------------------------------------------- //

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

@ -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);

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

@ -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