Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-05-29 15:57:59 +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
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
3 changed files with 42 additions and 42 deletions
Show Stats 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(DrvExtHdr);
UNUSED(IsElf); UNUSED(IsElf);
Memory::MemMgr *MemMgr = new Memory::MemMgr; Memory::MemMgr *mem = new Memory::MemMgr(nullptr, TaskManager->GetCurrentProcess()->memDirectory);
Fex *fex = (Fex *)MemMgr->RequestPages(TO_PAGES(Size)); Fex *fex = (Fex *)mem->RequestPages(TO_PAGES(Size));
memcpy(fex, (void *)DriverAddress, Size); memcpy(fex, (void *)DriverAddress, Size);
FexExtended *fexExtended = (FexExtended *)((uintptr_t)fex + EXTENDED_SECTION_ADDRESS); FexExtended *fexExtended = (FexExtended *)((uintptr_t)fex + EXTENDED_SECTION_ADDRESS);
debug("Driver allocated at %#lx-%#lx", fex, (uintptr_t)fex + Size); 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]); result[8], result[9], result[10], result[11], result[12], result[13], result[14], result[15]);
kfree(result); kfree(result);
#endif #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) if (CallDriverEntryPoint(fex, KAPI) != DriverCode::OK)
{ {
delete MemMgr; delete mem;
return DriverCode::DRIVER_RETURNED_ERROR; return DriverCode::DRIVER_RETURNED_ERROR;
} }
debug("Starting driver %s (offset: %#lx)", fexExtended->Driver.Name, fex); 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) switch (fexExtended->Driver.Type)
{ {
@ -52,13 +52,13 @@ namespace Driver
int CallbackRet = ((int (*)(KernelCallback *))((uintptr_t)fexExtended->Driver.Callback + (uintptr_t)fex))(KCallback); int CallbackRet = ((int (*)(KernelCallback *))((uintptr_t)fexExtended->Driver.Callback + (uintptr_t)fex))(KCallback);
if (CallbackRet == DriverReturnCode::NOT_IMPLEMENTED) if (CallbackRet == DriverReturnCode::NOT_IMPLEMENTED)
{ {
delete MemMgr; delete mem;
error("Driver %s is not implemented", fexExtended->Driver.Name); error("Driver %s is not implemented", fexExtended->Driver.Name);
break; break;
} }
else if (CallbackRet != DriverReturnCode::OK) else if (CallbackRet != DriverReturnCode::OK)
{ {
delete MemMgr; delete mem;
error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet); error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet);
break; break;
} }
@ -68,7 +68,7 @@ namespace Driver
DriverFile *DrvFile = new DriverFile; DriverFile *DrvFile = new DriverFile;
DrvFile->DriverUID = this->DriverUIDs - 1; DrvFile->DriverUID = this->DriverUIDs - 1;
DrvFile->Address = (void *)fex; DrvFile->Address = (void *)fex;
DrvFile->MemTrk = MemMgr; DrvFile->MemTrk = mem;
DrvFile->InterruptHook[0] = nullptr; DrvFile->InterruptHook[0] = nullptr;
Drivers.push_back(DrvFile); Drivers.push_back(DrvFile);
break; break;
@ -76,7 +76,7 @@ namespace Driver
default: default:
{ {
warn("Unknown driver type: %d", fexExtended->Driver.Type); warn("Unknown driver type: %d", fexExtended->Driver.Type);
delete MemMgr; delete mem;
break; break;
} }
} }

36
Core/Driver/DriverLoading/BindInterrupt.cpp
View File

@ -17,8 +17,8 @@ namespace Driver
DriverCode Driver::DriverLoadBindInterrupt(void *DrvExtHdr, uintptr_t DriverAddress, size_t Size, bool IsElf) DriverCode Driver::DriverLoadBindInterrupt(void *DrvExtHdr, uintptr_t DriverAddress, size_t Size, bool IsElf)
{ {
UNUSED(IsElf); UNUSED(IsElf);
Memory::MemMgr *MemMgr = new Memory::MemMgr; Memory::MemMgr *mem = new Memory::MemMgr(nullptr, TaskManager->GetCurrentProcess()->memDirectory);
Fex *fex = (Fex *)MemMgr->RequestPages(TO_PAGES(Size)); Fex *fex = (Fex *)mem->RequestPages(TO_PAGES(Size));
memcpy(fex, (void *)DriverAddress, Size); memcpy(fex, (void *)DriverAddress, Size);
FexExtended *fexExtended = (FexExtended *)((uintptr_t)fex + EXTENDED_SECTION_ADDRESS); FexExtended *fexExtended = (FexExtended *)((uintptr_t)fex + EXTENDED_SECTION_ADDRESS);
debug("Driver allocated at %#lx-%#lx", fex, (uintptr_t)fex + Size); debug("Driver allocated at %#lx-%#lx", fex, (uintptr_t)fex + Size);
@ -29,16 +29,16 @@ namespace Driver
result[8], result[9], result[10], result[11], result[12], result[13], result[14], result[15]); result[8], result[9], result[10], result[11], result[12], result[13], result[14], result[15]);
kfree(result); kfree(result);
#endif #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) if (CallDriverEntryPoint(fex, KAPI) != DriverCode::OK)
{ {
delete MemMgr; delete mem;
return DriverCode::DRIVER_RETURNED_ERROR; return DriverCode::DRIVER_RETURNED_ERROR;
} }
debug("Starting driver %s (offset: %#lx)", fexExtended->Driver.Name, fex); 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) switch (fexExtended->Driver.Type)
{ {
@ -48,20 +48,20 @@ namespace Driver
DriverFile *DrvFile = new DriverFile; DriverFile *DrvFile = new DriverFile;
DrvFile->DriverUID = this->DriverUIDs - 1; DrvFile->DriverUID = this->DriverUIDs - 1;
DrvFile->Address = (void *)fex; DrvFile->Address = (void *)fex;
DrvFile->MemTrk = MemMgr; DrvFile->MemTrk = mem;
Drivers.push_back(DrvFile); Drivers.push_back(DrvFile);
break; break;
} }
case FexDriverType::FexDriverType_Display: case FexDriverType::FexDriverType_Display:
{ {
fixme("Display driver: %s", fexExtended->Driver.Name); fixme("Display driver: %s", fexExtended->Driver.Name);
delete MemMgr; delete mem;
break; break;
} }
case FexDriverType::FexDriverType_Network: case FexDriverType::FexDriverType_Network:
{ {
fixme("Network driver: %s", fexExtended->Driver.Name); fixme("Network driver: %s", fexExtended->Driver.Name);
delete MemMgr; delete mem;
break; break;
} }
case FexDriverType::FexDriverType_Storage: case FexDriverType::FexDriverType_Storage:
@ -75,7 +75,7 @@ namespace Driver
} }
fixme("Not implemented"); fixme("Not implemented");
delete MemMgr; delete mem;
break; break;
KCallback->RawPtr = nullptr; KCallback->RawPtr = nullptr;
@ -84,27 +84,27 @@ namespace Driver
if (CallbackRet == DriverReturnCode::NOT_IMPLEMENTED) if (CallbackRet == DriverReturnCode::NOT_IMPLEMENTED)
{ {
error("Driver %s is not implemented", fexExtended->Driver.Name); error("Driver %s is not implemented", fexExtended->Driver.Name);
delete MemMgr; delete mem;
break; break;
} }
else if (CallbackRet != DriverReturnCode::OK) else if (CallbackRet != DriverReturnCode::OK)
{ {
error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet); error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet);
delete MemMgr; delete mem;
break; break;
} }
DriverFile *DrvFile = new DriverFile; DriverFile *DrvFile = new DriverFile;
DrvFile->DriverUID = this->DriverUIDs - 1; DrvFile->DriverUID = this->DriverUIDs - 1;
DrvFile->Address = (void *)fex; DrvFile->Address = (void *)fex;
DrvFile->MemTrk = MemMgr; DrvFile->MemTrk = mem;
Drivers.push_back(DrvFile); Drivers.push_back(DrvFile);
break; break;
} }
case FexDriverType::FexDriverType_FileSystem: case FexDriverType::FexDriverType_FileSystem:
{ {
fixme("Filesystem driver: %s", fexExtended->Driver.Name); fixme("Filesystem driver: %s", fexExtended->Driver.Name);
delete MemMgr; delete mem;
break; break;
} }
case FexDriverType::FexDriverType_Input: case FexDriverType::FexDriverType_Input:
@ -132,14 +132,14 @@ namespace Driver
{ {
error("Driver %s is not implemented", fexExtended->Driver.Name); error("Driver %s is not implemented", fexExtended->Driver.Name);
delete InterruptHook; delete InterruptHook;
delete MemMgr; delete mem;
break; break;
} }
else if (CallbackRet != DriverReturnCode::OK) else if (CallbackRet != DriverReturnCode::OK)
{ {
error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet); error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet);
delete InterruptHook; delete InterruptHook;
delete MemMgr; delete mem;
break; break;
} }
@ -149,7 +149,7 @@ namespace Driver
DriverFile *DrvFile = new DriverFile; DriverFile *DrvFile = new DriverFile;
DrvFile->DriverUID = this->DriverUIDs - 1; DrvFile->DriverUID = this->DriverUIDs - 1;
DrvFile->Address = (void *)fex; DrvFile->Address = (void *)fex;
DrvFile->MemTrk = MemMgr; DrvFile->MemTrk = mem;
DrvFile->InterruptHook[0] = InterruptHook; DrvFile->InterruptHook[0] = InterruptHook;
Drivers.push_back(DrvFile); Drivers.push_back(DrvFile);
break; break;
@ -157,13 +157,13 @@ namespace Driver
case FexDriverType::FexDriverType_Audio: case FexDriverType::FexDriverType_Audio:
{ {
fixme("Audio driver: %s", fexExtended->Driver.Name); fixme("Audio driver: %s", fexExtended->Driver.Name);
delete MemMgr; delete mem;
break; break;
} }
default: default:
{ {
warn("Unknown driver type: %d", fexExtended->Driver.Type); warn("Unknown driver type: %d", fexExtended->Driver.Type);
delete MemMgr; delete mem;
break; break;
} }
} }

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

@ -34,8 +34,8 @@ namespace Driver
foreach (auto PCIDevice in devices) foreach (auto PCIDevice in devices)
{ {
debug("[%ld] VendorID: %#x; DeviceID: %#x", devices.size(), PCIDevice->VendorID, PCIDevice->DeviceID); debug("[%ld] VendorID: %#x; DeviceID: %#x", devices.size(), PCIDevice->VendorID, PCIDevice->DeviceID);
Memory::MemMgr *MemMgr = new Memory::MemMgr(); Memory::MemMgr *mem = new Memory::MemMgr(nullptr, TaskManager->GetCurrentProcess()->memDirectory);
Fex *fex = (Fex *)MemMgr->RequestPages(TO_PAGES(Size)); Fex *fex = (Fex *)mem->RequestPages(TO_PAGES(Size));
memcpy(fex, (void *)DriverAddress, Size); memcpy(fex, (void *)DriverAddress, Size);
FexExtended *fexExtended = (FexExtended *)((uintptr_t)fex + EXTENDED_SECTION_ADDRESS); FexExtended *fexExtended = (FexExtended *)((uintptr_t)fex + EXTENDED_SECTION_ADDRESS);
debug("Driver allocated at %#lx-%#lx", fex, (uintptr_t)fex + Size); debug("Driver allocated at %#lx-%#lx", fex, (uintptr_t)fex + Size);
@ -46,16 +46,16 @@ namespace Driver
result[8], result[9], result[10], result[11], result[12], result[13], result[14], result[15]); result[8], result[9], result[10], result[11], result[12], result[13], result[14], result[15]);
kfree(result); kfree(result);
#endif #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) if (CallDriverEntryPoint(fex, KAPI) != DriverCode::OK)
{ {
delete MemMgr; delete mem;
return DriverCode::DRIVER_RETURNED_ERROR; return DriverCode::DRIVER_RETURNED_ERROR;
} }
debug("Starting driver %s", fexExtended->Driver.Name); debug("Starting driver %s", fexExtended->Driver.Name);
KernelCallback *KCallback = (KernelCallback *)MemMgr->RequestPages(TO_PAGES(sizeof(KernelCallback))); KernelCallback *KCallback = (KernelCallback *)mem->RequestPages(TO_PAGES(sizeof(KernelCallback)));
debug("Type: %d; IOBase: %#x; MemoryBase: %#x", debug("Type: %d; IOBase: %#x; MemoryBase: %#x",
((PCI::PCIHeader0 *)PCIDevice)->BAR0 & 1, ((PCI::PCIHeader0 *)PCIDevice)->BAR0 & 1,
@ -88,13 +88,13 @@ namespace Driver
case FexDriverType::FexDriverType_Generic: case FexDriverType::FexDriverType_Generic:
{ {
fixme("Generic driver: %s", fexExtended->Driver.Name); fixme("Generic driver: %s", fexExtended->Driver.Name);
delete MemMgr; delete mem;
break; break;
} }
case FexDriverType::FexDriverType_Display: case FexDriverType::FexDriverType_Display:
{ {
fixme("Display driver: %s", fexExtended->Driver.Name); fixme("Display driver: %s", fexExtended->Driver.Name);
delete MemMgr; delete mem;
break; break;
} }
case FexDriverType::FexDriverType_Network: case FexDriverType::FexDriverType_Network:
@ -109,7 +109,7 @@ namespace Driver
if (CallbackRet == DriverReturnCode::NOT_IMPLEMENTED) if (CallbackRet == DriverReturnCode::NOT_IMPLEMENTED)
{ {
error("Driver %s is not implemented", fexExtended->Driver.Name); error("Driver %s is not implemented", fexExtended->Driver.Name);
delete MemMgr; delete mem;
delete InterruptHook; delete InterruptHook;
continue; continue;
} }
@ -118,7 +118,7 @@ namespace Driver
else else
{ {
error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet); error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet);
delete MemMgr; delete mem;
delete InterruptHook; delete InterruptHook;
continue; continue;
} }
@ -141,7 +141,7 @@ namespace Driver
if (CallbackRet == DriverReturnCode::NOT_IMPLEMENTED) if (CallbackRet == DriverReturnCode::NOT_IMPLEMENTED)
{ {
error("Driver %s is not implemented", fexExtended->Driver.Name); error("Driver %s is not implemented", fexExtended->Driver.Name);
delete MemMgr; delete mem;
continue; continue;
} }
else if (CallbackRet == DriverReturnCode::OK) else if (CallbackRet == DriverReturnCode::OK)
@ -149,7 +149,7 @@ namespace Driver
else else
{ {
error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet); error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet);
delete MemMgr; delete mem;
continue; continue;
} }
@ -163,25 +163,25 @@ namespace Driver
case FexDriverType::FexDriverType_FileSystem: case FexDriverType::FexDriverType_FileSystem:
{ {
fixme("Filesystem driver: %s", fexExtended->Driver.Name); fixme("Filesystem driver: %s", fexExtended->Driver.Name);
delete MemMgr; delete mem;
break; break;
} }
case FexDriverType::FexDriverType_Input: case FexDriverType::FexDriverType_Input:
{ {
fixme("Input driver: %s", fexExtended->Driver.Name); fixme("Input driver: %s", fexExtended->Driver.Name);
delete MemMgr; delete mem;
break; break;
} }
case FexDriverType::FexDriverType_Audio: case FexDriverType::FexDriverType_Audio:
{ {
fixme("Audio driver: %s", fexExtended->Driver.Name); fixme("Audio driver: %s", fexExtended->Driver.Name);
delete MemMgr; delete mem;
break; break;
} }
default: default:
{ {
warn("Unknown driver type: %d", fexExtended->Driver.Type); warn("Unknown driver type: %d", fexExtended->Driver.Type);
delete MemMgr; delete mem;
break; break;
} }
} }