From 98b797a95ceb5a11cc90b5180d467ff81bf49adf Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 6 Feb 2023 19:31:40 +0200 Subject: [PATCH] Naming convention --- Core/Driver/DriverLoading/BindInput.cpp | 18 +++++------ Core/Driver/DriverLoading/BindInterrupt.cpp | 36 ++++++++++----------- Core/Driver/DriverLoading/BindPCI.cpp | 30 ++++++++--------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Core/Driver/DriverLoading/BindInput.cpp b/Core/Driver/DriverLoading/BindInput.cpp index 7dbdefd..3b108a9 100644 --- a/Core/Driver/DriverLoading/BindInput.cpp +++ b/Core/Driver/DriverLoading/BindInput.cpp @@ -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; } } diff --git a/Core/Driver/DriverLoading/BindInterrupt.cpp b/Core/Driver/DriverLoading/BindInterrupt.cpp index e4af974..8c21ca9 100644 --- a/Core/Driver/DriverLoading/BindInterrupt.cpp +++ b/Core/Driver/DriverLoading/BindInterrupt.cpp @@ -17,8 +17,8 @@ namespace Driver DriverCode Driver::DriverLoadBindInterrupt(void *DrvExtHdr, uintptr_t DriverAddress, size_t Size, bool IsElf) { 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); @@ -29,16 +29,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) { @@ -48,20 +48,20 @@ namespace Driver DriverFile *DrvFile = new DriverFile; DrvFile->DriverUID = this->DriverUIDs - 1; DrvFile->Address = (void *)fex; - DrvFile->MemTrk = MemMgr; + DrvFile->MemTrk = mem; Drivers.push_back(DrvFile); break; } case FexDriverType::FexDriverType_Display: { fixme("Display driver: %s", fexExtended->Driver.Name); - delete MemMgr; + delete mem; break; } case FexDriverType::FexDriverType_Network: { fixme("Network driver: %s", fexExtended->Driver.Name); - delete MemMgr; + delete mem; break; } case FexDriverType::FexDriverType_Storage: @@ -75,7 +75,7 @@ namespace Driver } fixme("Not implemented"); - delete MemMgr; + delete mem; break; KCallback->RawPtr = nullptr; @@ -84,27 +84,27 @@ namespace Driver if (CallbackRet == DriverReturnCode::NOT_IMPLEMENTED) { error("Driver %s is not implemented", fexExtended->Driver.Name); - delete MemMgr; + delete mem; break; } else if (CallbackRet != DriverReturnCode::OK) { error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet); - delete MemMgr; + delete mem; break; } DriverFile *DrvFile = new DriverFile; DrvFile->DriverUID = this->DriverUIDs - 1; DrvFile->Address = (void *)fex; - DrvFile->MemTrk = MemMgr; + DrvFile->MemTrk = mem; Drivers.push_back(DrvFile); break; } case FexDriverType::FexDriverType_FileSystem: { fixme("Filesystem driver: %s", fexExtended->Driver.Name); - delete MemMgr; + delete mem; break; } case FexDriverType::FexDriverType_Input: @@ -132,14 +132,14 @@ namespace Driver { error("Driver %s is not implemented", fexExtended->Driver.Name); delete InterruptHook; - delete MemMgr; + delete mem; break; } else if (CallbackRet != DriverReturnCode::OK) { error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet); delete InterruptHook; - delete MemMgr; + delete mem; break; } @@ -149,7 +149,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] = InterruptHook; Drivers.push_back(DrvFile); break; @@ -157,13 +157,13 @@ namespace Driver case FexDriverType::FexDriverType_Audio: { fixme("Audio driver: %s", fexExtended->Driver.Name); - delete MemMgr; + delete mem; break; } default: { warn("Unknown driver type: %d", fexExtended->Driver.Type); - delete MemMgr; + delete mem; break; } } diff --git a/Core/Driver/DriverLoading/BindPCI.cpp b/Core/Driver/DriverLoading/BindPCI.cpp index 2cd9a5a..b9034fe 100644 --- a/Core/Driver/DriverLoading/BindPCI.cpp +++ b/Core/Driver/DriverLoading/BindPCI.cpp @@ -34,8 +34,8 @@ namespace Driver foreach (auto PCIDevice in devices) { debug("[%ld] VendorID: %#x; DeviceID: %#x", devices.size(), PCIDevice->VendorID, PCIDevice->DeviceID); - 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); @@ -46,16 +46,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", 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", ((PCI::PCIHeader0 *)PCIDevice)->BAR0 & 1, @@ -88,13 +88,13 @@ namespace Driver case FexDriverType::FexDriverType_Generic: { fixme("Generic driver: %s", fexExtended->Driver.Name); - delete MemMgr; + delete mem; break; } case FexDriverType::FexDriverType_Display: { fixme("Display driver: %s", fexExtended->Driver.Name); - delete MemMgr; + delete mem; break; } case FexDriverType::FexDriverType_Network: @@ -109,7 +109,7 @@ namespace Driver if (CallbackRet == DriverReturnCode::NOT_IMPLEMENTED) { error("Driver %s is not implemented", fexExtended->Driver.Name); - delete MemMgr; + delete mem; delete InterruptHook; continue; } @@ -118,7 +118,7 @@ namespace Driver else { error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet); - delete MemMgr; + delete mem; delete InterruptHook; continue; } @@ -141,7 +141,7 @@ namespace Driver if (CallbackRet == DriverReturnCode::NOT_IMPLEMENTED) { error("Driver %s is not implemented", fexExtended->Driver.Name); - delete MemMgr; + delete mem; continue; } else if (CallbackRet == DriverReturnCode::OK) @@ -149,7 +149,7 @@ namespace Driver else { error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet); - delete MemMgr; + delete mem; continue; } @@ -163,25 +163,25 @@ namespace Driver case FexDriverType::FexDriverType_FileSystem: { fixme("Filesystem driver: %s", fexExtended->Driver.Name); - delete MemMgr; + delete mem; break; } case FexDriverType::FexDriverType_Input: { fixme("Input driver: %s", fexExtended->Driver.Name); - delete MemMgr; + delete mem; break; } case FexDriverType::FexDriverType_Audio: { fixme("Audio driver: %s", fexExtended->Driver.Name); - delete MemMgr; + delete mem; break; } default: { warn("Unknown driver type: %d", fexExtended->Driver.Type); - delete MemMgr; + delete mem; break; } }