Skip to content

Commit c360509

Browse files
binarymasterHBelusca
authored andcommitted
[HALXBOX][CMAKE] Merge generic module with xbox module for modification
1 parent b6b7bda commit c360509

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

hal/halx86/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ if(ARCH STREQUAL "i386")
6363
add_hal(halacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi up pic)
6464
add_hal(halapic SOURCES acpi/halacpi.rc COMPONENTS generic legacy up apic)
6565
add_hal(halaacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi up apic)
66-
add_hal(halxbox SOURCES xbox/halxbox.rc COMPONENTS generic up xbox)
66+
add_hal(halxbox SOURCES xbox/halxbox.rc COMPONENTS xbox up)
6767

6868
#add_hal(halmps SOURCES up/halup.rc COMPONENTS generic legacy smp pic)
6969
#add_hal(halmacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi smp pic)

hal/halx86/xbox.cmake

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,24 @@
22
list(APPEND HAL_XBOX_ASM_SOURCE
33
generic/systimer.S
44
generic/trap.S
5+
generic/v86.S
56
up/pic.S)
67

78
list(APPEND HAL_XBOX_SOURCE
9+
generic/beep.c
10+
generic/cmos.c
11+
generic/display.c
12+
generic/dma.c
13+
generic/drive.c
14+
generic/halinit.c
15+
generic/memory.c
16+
generic/misc.c
17+
generic/pic.c
18+
generic/reboot.c
19+
generic/sysinfo.c
20+
generic/usage.c
21+
generic/bios.c
22+
generic/portio.c
823
legacy/bus/bushndlr.c
924
legacy/bus/cmosbus.c
1025
legacy/bus/isabus.c

0 commit comments

Comments
 (0)