Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-07-07 05:19:20 +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

30
Core/Driver/DriverLoading/BindPCI.cpp
View File

@ -32,8 +32,8 @@ namespace Driver
foreach (auto PCIDevice in devices)
{
debug("[%ld] VendorID: %#x; DeviceID: %#x", devices.size(), PCIDevice->VendorID, PCIDevice->DeviceID);
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);
@ -44,16 +44,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", fexExtended->Driver.Name);
KernelCallback *KCallback = (KernelCallback *)Tracker->RequestPages(TO_PAGES(sizeof(KernelCallback)));
KernelCallback *KCallback = (KernelCallback *)MemMgr->RequestPages(TO_PAGES(sizeof(KernelCallback)));
debug("Type: %d; IOBase: %#x; MemoryBase: %#x",
((PCI::PCIHeader0 *)PCIDevice)->BAR0 & 1,
@ -86,13 +86,13 @@ namespace Driver
case FexDriverType::FexDriverType_Generic:
{
fixme("Generic driver: %s", fexExtended->Driver.Name);
delete Tracker;
delete MemMgr;
break;
}
case FexDriverType::FexDriverType_Display:
{
fixme("Display driver: %s", fexExtended->Driver.Name);
delete Tracker;
delete MemMgr;
break;
}
case FexDriverType::FexDriverType_Network:
@ -107,7 +107,7 @@ namespace Driver
if (CallbackRet == DriverReturnCode::NOT_IMPLEMENTED)
{
error("Driver %s does not implement the configuration callback", fexExtended->Driver.Name);
delete Tracker;
delete MemMgr;
delete InterruptHook;
continue;
}
@ -116,7 +116,7 @@ namespace Driver
else
{
error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet);
delete Tracker;
delete MemMgr;
delete InterruptHook;
continue;
}
@ -139,7 +139,7 @@ namespace Driver
if (CallbackRet == DriverReturnCode::NOT_IMPLEMENTED)
{
error("Driver %s does not implement the configuration callback", fexExtended->Driver.Name);
delete Tracker;
delete MemMgr;
continue;
}
else if (CallbackRet == DriverReturnCode::OK)
@ -147,7 +147,7 @@ namespace Driver
else
{
error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet);
delete Tracker;
delete MemMgr;
continue;
}
@ -161,25 +161,25 @@ namespace Driver
case FexDriverType::FexDriverType_FileSystem:
{
fixme("Filesystem driver: %s", fexExtended->Driver.Name);
delete Tracker;
delete MemMgr;
break;
}
case FexDriverType::FexDriverType_Input:
{
fixme("Input driver: %s", fexExtended->Driver.Name);
delete Tracker;
delete MemMgr;
break;
}
case FexDriverType::FexDriverType_Audio:
{
fixme("Audio driver: %s", fexExtended->Driver.Name);
delete Tracker;
delete MemMgr;
break;
}
default:
{
warn("Unknown driver type: %d", fexExtended->Driver.Type);
delete Tracker;
delete MemMgr;
break;
}
}