https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c36050972478df0bad86bd...
commit c36050972478df0bad86bd48cfa7cbf9f83f556a Author: Stanislav Motylkov x86corez@gmail.com AuthorDate: Fri Oct 4 20:42:16 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO hermes.belusca-maito@reactos.org CommitDate: Sat Oct 5 17:42:28 2019 +0200
[HALXBOX][CMAKE] Merge generic module with xbox module for modification --- hal/halx86/CMakeLists.txt | 2 +- hal/halx86/xbox.cmake | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/hal/halx86/CMakeLists.txt b/hal/halx86/CMakeLists.txt index 7ed08815974..b95b69b7723 100644 --- a/hal/halx86/CMakeLists.txt +++ b/hal/halx86/CMakeLists.txt @@ -63,7 +63,7 @@ if(ARCH STREQUAL "i386") add_hal(halacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi up pic) add_hal(halapic SOURCES acpi/halacpi.rc COMPONENTS generic legacy up apic) add_hal(halaacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi up apic) - add_hal(halxbox SOURCES xbox/halxbox.rc COMPONENTS generic up xbox) + add_hal(halxbox SOURCES xbox/halxbox.rc COMPONENTS xbox up)
#add_hal(halmps SOURCES up/halup.rc COMPONENTS generic legacy smp pic) #add_hal(halmacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi smp pic) diff --git a/hal/halx86/xbox.cmake b/hal/halx86/xbox.cmake index d21cb602894..a259df7a57c 100644 --- a/hal/halx86/xbox.cmake +++ b/hal/halx86/xbox.cmake @@ -2,9 +2,24 @@ list(APPEND HAL_XBOX_ASM_SOURCE generic/systimer.S generic/trap.S + generic/v86.S up/pic.S)
list(APPEND HAL_XBOX_SOURCE + generic/beep.c + generic/cmos.c + generic/display.c + generic/dma.c + generic/drive.c + generic/halinit.c + generic/memory.c + generic/misc.c + generic/pic.c + generic/reboot.c + generic/sysinfo.c + generic/usage.c + generic/bios.c + generic/portio.c legacy/bus/bushndlr.c legacy/bus/cmosbus.c legacy/bus/isabus.c