https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f395f87bb35fbc66c920a…
commit f395f87bb35fbc66c920abf2ea6acb9be9dd49fa
Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Thu Nov 28 21:11:24 2024 +0100
Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Sat Dec 14 23:31:48 2024 +0100
[NTOS:MM] MiScanMemoryDescriptors(): Use the MiIsMemoryTypeInvisible() and
MiIsMemoryTypeFree() helpers.
---
ntoskrnl/mm/ARM3/mminit.c | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/ntoskrnl/mm/ARM3/mminit.c b/ntoskrnl/mm/ARM3/mminit.c
index bd5ab3caa88..30e17c6edff 100644
--- a/ntoskrnl/mm/ARM3/mminit.c
+++ b/ntoskrnl/mm/ARM3/mminit.c
@@ -421,20 +421,14 @@ MiScanMemoryDescriptors(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
/* Count this descriptor */
MiNumberDescriptors++;
- /* Check if this is invisible memory */
- if ((Descriptor->MemoryType == LoaderFirmwarePermanent) ||
- (Descriptor->MemoryType == LoaderSpecialMemory) ||
- (Descriptor->MemoryType == LoaderHALCachedMemory) ||
- (Descriptor->MemoryType == LoaderBBTMemory))
- {
- /* Skip this descriptor */
+ /* If this is invisible memory, skip this descriptor */
+ if (MiIsMemoryTypeInvisible(Descriptor->MemoryType))
continue;
- }
- /* Check if this is bad memory */
+ /* Check if this isn't bad memory */
if (Descriptor->MemoryType != LoaderBad)
{
- /* Count this in the total of pages */
+ /* Count it in the physical pages */
MmNumberOfPhysicalPages += (PFN_COUNT)Descriptor->PageCount;
}
@@ -454,12 +448,9 @@ MiScanMemoryDescriptors(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
}
/* Check if this is free memory */
- if ((Descriptor->MemoryType == LoaderFree) ||
- (Descriptor->MemoryType == LoaderLoadedProgram) ||
- (Descriptor->MemoryType == LoaderFirmwareTemporary) ||
- (Descriptor->MemoryType == LoaderOsloaderStack))
+ if (MiIsMemoryTypeFree(Descriptor->MemoryType))
{
- /* Count it too free pages */
+ /* Count it in the free pages */
MiNumberOfFreePages += Descriptor->PageCount;
/* Check if this is the largest memory descriptor */