lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-05-29 21:19:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

[FREELDR:XBOX:PC98] Fix compilation dependencies and linking (#8512)

Browse Source 
Addendum to commit 9e64fa837d (PR #8510)
CORE-16216, CORE-17977

pcmem.c: Surround more PC-specific routines in `!SARCH_XBOX || !SARCH_PC98`,
so that they aren't compiled for XBOX or PC98.

pcat.cmake: Inform that pcmem.c is used by pc98mem.c
This commit is contained in:
Hermès Bélusca-Maïto
2025-12-19 16:44:01 +01:00
parent cf901f3b78
commit bdf1b0ca5d
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
boot/freeldr/freeldr/arch/i386/pc/pcmem.c
View File

@@ -37,7 +37,9 @@ DBG_DEFAULT_CHANNEL(MEMORY);
BIOS_MEMORY_MAP PcBiosMemoryMap[MAX_BIOS_DESCRIPTORS];
ULONG PcBiosMapCount;
FREELDR_MEMORY_DESCRIPTOR PcMemoryMap[MAX_BIOS_DESCRIPTORS + 1];
#if !defined(SARCH_XBOX) && !defined(SARCH_PC98)
static FREELDR_MEMORY_DESCRIPTOR PcMemoryMap[MAX_BIOS_DESCRIPTORS + 1];
#endif
ULONG PcMapCount;
ULONG
@@ -48,6 +50,9 @@ AddMemoryDescriptor(
IN PFN_NUMBER PageCount,
IN TYPE_OF_MEMORY MemoryType);
/* FIXME: Abstract things better so we don't need to place define here */
#if !defined(SARCH_XBOX) && !defined(SARCH_PC98)
static
BOOLEAN
GetExtendedMemoryConfiguration(ULONG* pMemoryAtOneMB /* in KB */, ULONG* pMemoryAtSixteenMB /* in 64KB */)
@@ -480,6 +485,8 @@ nextRange:
return PcBiosMapCount;
}
#endif // !SARCH_XBOX && !SARCH_PC98
VOID
ReserveMemory(
PFREELDR_MEMORY_DESCRIPTOR MemoryMap,
@@ -595,6 +602,9 @@ PcMemFinalizeMemoryMap(
return PcMapCount;
}
/* FIXME: Abstract things better so we don't need to place define here */
#if !defined(SARCH_XBOX) && !defined(SARCH_PC98)
PFREELDR_MEMORY_DESCRIPTOR
PcMemGetMemoryMap(ULONG *MemoryMapSize)
{
@@ -661,5 +671,6 @@ PcMemGetMemoryMap(ULONG *MemoryMapSize)
return PcMemoryMap;
}
#endif // !SARCH_XBOX && !SARCH_PC98
/* EOF */

2
boot/freeldr/freeldr/arch/i386/xbox/xboxmem.c
View File

@@ -222,7 +222,7 @@ XboxMultibootMemoryType(ULONG Type)
}
}
FREELDR_MEMORY_DESCRIPTOR XboxMemoryMap[MAX_BIOS_DESCRIPTORS + 1];
static FREELDR_MEMORY_DESCRIPTOR XboxMemoryMap[MAX_BIOS_DESCRIPTORS + 1];
PFREELDR_MEMORY_DESCRIPTOR
XboxMemGetMemoryMap(ULONG *MemoryMapSize)

2
boot/freeldr/freeldr/pcat.cmake
View File

@@ -89,7 +89,7 @@ if(ARCH STREQUAL "i386")
elseif(SARCH STREQUAL "pc98")
list(APPEND PCATLDR_ARC_SOURCE
arch/i386/pc/pcmem.c
arch/i386/pc/pcmem.c # pc98mem.c depends on it
arch/i386/pc98/machpc98.c
arch/i386/pc98/pc98beep.c
arch/i386/pc98/pc98cons.c