https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74eda39118d9a266a92ba79ca033e39f1f6b5005
commit 74eda39118d9a266a92ba79ca033e39f1f6b5005 Author: Dmitry Borisov <[email protected]> AuthorDate: Mon Mar 2 01:41:47 2020 +0600 Commit: GitHub <[email protected]> CommitDate: Sun Mar 1 20:41:47 2020 +0100 [FREELDR] Move the PC VESA and hardware detection libraries into the PC directory (#2355) Because it contains platform-specific code. --- boot/freeldr/freeldr/CMakeLists.txt | 10 ++++++---- boot/freeldr/freeldr/arch/i386/pc/machpc.c | 2 +- boot/freeldr/freeldr/arch/i386/{hardware.c => pc/pchw.c} | 0 boot/freeldr/freeldr/arch/i386/{i386vid.c => pc/pcvesa.c} | 0 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index dd8bc31703e..725419c37fe 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -114,14 +114,12 @@ if(ARCH STREQUAL "i386") arch/i386/halstub.c arch/i386/ntoskrnl.c arch/i386/drivemap.c - arch/i386/hardware.c arch/i386/hwacpi.c arch/i386/hwapm.c arch/i386/hwdisk.c arch/i386/hwpci.c arch/i386/i386bug.c arch/i386/i386idt.c - arch/i386/i386vid.c disk/scsiport.c) if(SARCH STREQUAL "xbox") @@ -130,7 +128,9 @@ if(ARCH STREQUAL "i386") arch/i386/pc/machpc.c # machxbox.c depends on it arch/i386/pc/pcbeep.c # machxbox.c depends on it arch/i386/pc/pcdisk.c # hwdisk.c depends on it + arch/i386/pc/pchw.c # Many files depends on it arch/i386/pc/pcmem.c # hwacpi.c/xboxmem.c depends on it + arch/i386/pc/pcvesa.c # machpc.c depends on it arch/i386/xbox/machxbox.c arch/i386/xbox/xboxcons.c arch/i386/xbox/xboxdisk.c @@ -145,8 +145,10 @@ if(ARCH STREQUAL "i386") arch/i386/pc/pcbeep.c arch/i386/pc/pccons.c arch/i386/pc/pcdisk.c + arch/i386/pc/pchw.c arch/i386/pc/pcmem.c arch/i386/pc/pcrtc.c + arch/i386/pc/pcvesa.c arch/i386/pc/pcvideo.c) endif() @@ -164,19 +166,19 @@ elseif(ARCH STREQUAL "amd64") lib/fs/pxe.c arch/i386/ntoskrnl.c arch/i386/drivemap.c - arch/i386/hardware.c arch/i386/hwacpi.c arch/i386/hwapm.c arch/i386/hwdisk.c arch/i386/hwpci.c arch/i386/i386bug.c - arch/i386/i386vid.c arch/i386/pc/machpc.c arch/i386/pc/pcbeep.c arch/i386/pc/pccons.c arch/i386/pc/pcdisk.c + arch/i386/pc/pchw.c arch/i386/pc/pcmem.c arch/i386/pc/pcrtc.c + arch/i386/pc/pcvesa.c arch/i386/pc/pcvideo.c) elseif(ARCH STREQUAL "arm") diff --git a/boot/freeldr/freeldr/arch/i386/pc/machpc.c b/boot/freeldr/freeldr/arch/i386/pc/machpc.c index d4259de92aa..d5b629f4600 100644 --- a/boot/freeldr/freeldr/arch/i386/pc/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/pc/machpc.c @@ -1236,7 +1236,7 @@ DetectPS2Mouse(PCONFIGURATION_COMPONENT_DATA BusKey) } -// Implemented in i386vid.c, returns the VESA version +// Implemented in pcvesa.c, returns the VESA version USHORT BiosIsVesaSupported(VOID); BOOLEAN BiosIsVesaDdcSupported(VOID); BOOLEAN BiosVesaReadEdid(VOID); diff --git a/boot/freeldr/freeldr/arch/i386/hardware.c b/boot/freeldr/freeldr/arch/i386/pc/pchw.c similarity index 100% rename from boot/freeldr/freeldr/arch/i386/hardware.c rename to boot/freeldr/freeldr/arch/i386/pc/pchw.c diff --git a/boot/freeldr/freeldr/arch/i386/i386vid.c b/boot/freeldr/freeldr/arch/i386/pc/pcvesa.c similarity index 100% rename from boot/freeldr/freeldr/arch/i386/i386vid.c rename to boot/freeldr/freeldr/arch/i386/pc/pcvesa.c
