[HALXBOX][CMAKE] Merge generic module with xbox module for modification

This commit is contained in:
Stanislav Motylkov 2019-10-04 20:42:16 +03:00 committed by Hermès BÉLUSCA - MAÏTO
parent b6b7bda443
commit c360509724
2 changed files with 16 additions and 1 deletions

View file

@ -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)

View file

@ -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