From 17b564936227c0af714d4ece3d70e1ad43c86714 Mon Sep 17 00:00:00 2001 From: Aiken Harris Date: Sat, 13 Dec 2025 20:50:32 +0100 Subject: [PATCH] Make memory type verification helpers accessible to PFN --- xtoskrnl/includes/mm/mmgr.hh | 2 -- xtoskrnl/mm/mmgr.cc | 2 +- xtoskrnl/mm/pfn.cc | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xtoskrnl/includes/mm/mmgr.hh b/xtoskrnl/includes/mm/mmgr.hh index 9a05a9d..8ae98f9 100644 --- a/xtoskrnl/includes/mm/mmgr.hh +++ b/xtoskrnl/includes/mm/mmgr.hh @@ -19,8 +19,6 @@ namespace MM { public: STATIC XTAPI VOID InitializeMemoryManager(VOID); - - private: STATIC XTAPI BOOLEAN VerifyMemoryTypeFree(LOADER_MEMORY_TYPE MemoryType); STATIC XTAPI BOOLEAN VerifyMemoryTypeInvisible(LOADER_MEMORY_TYPE MemoryType); }; diff --git a/xtoskrnl/mm/mmgr.cc b/xtoskrnl/mm/mmgr.cc index 218eab9..4a77196 100644 --- a/xtoskrnl/mm/mmgr.cc +++ b/xtoskrnl/mm/mmgr.cc @@ -22,7 +22,7 @@ VOID MM::Manager::InitializeMemoryManager(VOID) { /* Scan memory descriptors provided by the boot loader */ - ScanMemoryDescriptors(); + MM::Pfn::ScanMemoryDescriptors(); /* Check if there are enough physical pages */ if(NumberOfPhysicalPages < MM_MINIMUM_PHYSICAL_PAGES) diff --git a/xtoskrnl/mm/pfn.cc b/xtoskrnl/mm/pfn.cc index 78f6713..555fc3b 100644 --- a/xtoskrnl/mm/pfn.cc +++ b/xtoskrnl/mm/pfn.cc @@ -39,7 +39,7 @@ MM::Pfn::ScanMemoryDescriptors(VOID) MemoryDescriptor = CONTAIN_RECORD(MemoryMappings, LOADER_MEMORY_DESCRIPTOR, ListEntry); /* Check if memory type is invisible or cached */ - if(VerifyMemoryTypeInvisible(MemoryDescriptor->MemoryType) || + if(MM::Manager::VerifyMemoryTypeInvisible(MemoryDescriptor->MemoryType) || (MemoryDescriptor->MemoryType == LoaderHardwareCachedMemory)) { /* Skip this mapping */ @@ -69,7 +69,7 @@ MM::Pfn::ScanMemoryDescriptors(VOID) } /* Check if memory type should be considered as free */ - if(VerifyMemoryTypeFree(MemoryDescriptor->MemoryType)) + if(MM::Manager::VerifyMemoryTypeFree(MemoryDescriptor->MemoryType)) { /* Check if this descriptor contains more free pages */ if(MemoryDescriptor->PageCount >= FreePages)