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

Naming convention

Browse Source
This commit is contained in:
Alex
2023-02-06 19:31:40 +02:00
parent 689939ebf6
commit 98b797a95c
3 changed files with 42 additions and 42 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::MemMgr *MemMgr = new Memory::MemMgr;
Fex *fex = (Fex *)MemMgr->RequestPages(TO_PAGES(Size));
Memory::MemMgr *mem = new Memory::MemMgr(nullptr, TaskManager->GetCurrentProcess()->memDirectory);
Fex *fex = (Fex *)mem->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 *)MemMgr->RequestPages(TO_PAGES(sizeof(KernelAPI)));
KernelAPI *KAPI = (KernelAPI *)mem->RequestPages(TO_PAGES(sizeof(KernelAPI)));
if (CallDriverEntryPoint(fex, KAPI) != DriverCode::OK)
{
delete MemMgr;
delete mem;
return DriverCode::DRIVER_RETURNED_ERROR;
}
debug("Starting driver %s (offset: %#lx)", fexExtended->Driver.Name, fex);
KernelCallback *KCallback = (KernelCallback *)MemMgr->RequestPages(TO_PAGES(sizeof(KernelCallback)));
KernelCallback *KCallback = (KernelCallback *)mem->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 MemMgr;
delete mem;
error("Driver %s is not implemented", fexExtended->Driver.Name);
break;
}
else if (CallbackRet != DriverReturnCode::OK)
{
delete MemMgr;
delete mem;
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 = MemMgr;
DrvFile->MemTrk = mem;
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 MemMgr;
delete mem;
break;
}
}