Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-07-05 12:29:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renamed "Tracker" to "MemMgr" because it could be used for shared memory and more useful features

Browse Source
This commit is contained in:
Alex
2022-12-24 01:51:55 +02:00
parent 48ef694d08
commit a9dacd1d21
8 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Core/Driver/DriverLoading/BindInput.cpp
View File

@ -18,8 +18,8 @@ namespace Driver
{
UNUSED(DrvExtHdr);
UNUSED(IsElf);
Memory::Tracker *Tracker = new Memory::Tracker;
Fex *fex = (Fex *)Tracker->RequestPages(TO_PAGES(Size));
Memory::MemMgr *MemMgr = new Memory::MemMgr;
Fex *fex = (Fex *)MemMgr->RequestPages(TO_PAGES(Size));
memcpy(fex, (void *)DriverAddress, Size);
FexExtended *fexExtended = (FexExtended *)((uintptr_t)fex + EXTENDED_SECTION_ADDRESS);
debug("Driver allocated at %#lx-%#lx", fex, (uintptr_t)fex + Size);
@ -30,16 +30,16 @@ namespace Driver
result[8], result[9], result[10], result[11], result[12], result[13], result[14], result[15]);
kfree(result);
#endif
KernelAPI *KAPI = (KernelAPI *)Tracker->RequestPages(TO_PAGES(sizeof(KernelAPI)));
KernelAPI *KAPI = (KernelAPI *)MemMgr->RequestPages(TO_PAGES(sizeof(KernelAPI)));
if (CallDriverEntryPoint(fex, KAPI) != DriverCode::OK)
{
delete Tracker;
delete MemMgr;
return DriverCode::DRIVER_RETURNED_ERROR;
}
debug("Starting driver %s (offset: %#lx)", fexExtended->Driver.Name, fex);
KernelCallback *KCallback = (KernelCallback *)Tracker->RequestPages(TO_PAGES(sizeof(KernelCallback)));
KernelCallback *KCallback = (KernelCallback *)MemMgr->RequestPages(TO_PAGES(sizeof(KernelCallback)));
switch (fexExtended->Driver.Type)
{
@ -52,13 +52,13 @@ namespace Driver
int CallbackRet = ((int (*)(KernelCallback *))((uintptr_t)fexExtended->Driver.Callback + (uintptr_t)fex))(KCallback);
if (CallbackRet == DriverReturnCode::NOT_IMPLEMENTED)
{
delete Tracker;
delete MemMgr;
error("Driver %s does not implement the configuration callback", fexExtended->Driver.Name);
break;
}
else if (CallbackRet != DriverReturnCode::OK)
{
delete Tracker;
delete MemMgr;
error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet);
break;
}
@ -68,7 +68,7 @@ namespace Driver
DriverFile *DrvFile = new DriverFile;
DrvFile->DriverUID = this->DriverUIDs - 1;
DrvFile->Address = (void *)fex;
DrvFile->MemTrk = Tracker;
DrvFile->MemTrk = MemMgr;
DrvFile->InterruptHook[0] = nullptr;
Drivers.push_back(DrvFile);
break;
@ -76,7 +76,7 @@ namespace Driver
default:
{
warn("Unknown driver type: %d", fexExtended->Driver.Type);
delete Tracker;
delete MemMgr;
break;
}
}