https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ee09256de7ff0f57d19f704e10b49e1485e2580
commit 5ee09256de7ff0f57d19f704e10b49e1485e2580 Author: Timo Kreuzer <[email protected]> AuthorDate: Thu Jun 3 11:53:07 2021 +0200 Commit: Timo Kreuzer <[email protected]> CommitDate: Thu Jun 17 23:27:44 2021 +0200 [HAL] Add APIC hals to setup and livecd --- boot/bootdata/livecd.ini | 7 +++++++ boot/bootdata/txtsetup.sif | 12 ++++++++++++ hal/halx86/CMakeLists.txt | 1 + hal/halx86/apic/halapic.rc | 5 +++++ 4 files changed, 25 insertions(+) diff --git a/boot/bootdata/livecd.ini b/boot/bootdata/livecd.ini index d4b37b646c9..3c2ddfb9fa1 100644 --- a/boot/bootdata/livecd.ini +++ b/boot/bootdata/livecd.ini @@ -28,6 +28,7 @@ TimeText=Seconds until highlighted choice will be started automatically: LiveCD="LiveCD" LiveCD_Debug="LiveCD (Debug)" LiveCD_VBoxDebug="LiveCD (VBox Debug)" +LiveCD_Aacpi="LiveCD APIC ACPI (Debug)" LiveCD_Screen="LiveCD (Screen)" LiveCD_LogFile="LiveCD (Log file)" @@ -46,6 +47,12 @@ BootType=Windows2003 SystemPath=\reactos Options=/DEBUG /DEBUGPORT=VBOX /SOS /MININT +[LiveCD_Aacpi] +BootType=Windows2003 +SystemPath=\reactos +Hal=HALAACPI.DLL +Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT + [LiveCD_Screen] BootType=Windows2003 SystemPath=\reactos diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 6e2c3f69452..63e0df890cc 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -229,6 +229,8 @@ pci_up = "Standard PC Uniprocessor" ;pci_mp = "Standard PC Multiprocessor" acpi_up = "ACPI PC Uniprocessor" ;acpi_mp = "ACPI PC Multiprocessor" +apic_up = "Standard APIC PC Uniprocessor" +aacpi_up = "ACPI APIC PC Uniprocessor" xbox = "Original Xbox (x86 based)" pc98_up = "NEC PC-98 Uniprocessor" @@ -241,6 +243,8 @@ pci_up = "PC UP" ;pci_mp = "PC MP" acpi_up = "ACPI UP" ;acpi_mp = "ACPI MP" +apic_up = "APIC UP" +aacpi_up = "AAPIC UP" xbox = "Xbox" pc98_up = "NEC PC-98 UP" @@ -263,6 +267,14 @@ halacpi.dll = 1,,,,,,,2,,,hal.dll,1,2 ;ntkrnlmp.exe = 1,,,,,,,2,,,ntoskrnl.exe,1,2 ;halacpi.dll = 1,,,,,,,2,,,hal.dll,1,2 +[Files.apic_up] +ntoskrnl.exe = 1,,,,,,,2,,,,1,2 +halapic.dll = 1,,,,,,,2,,,hal.dll,1,2 + +[Files.aacpi_up] +ntoskrnl.exe = 1,,,,,,,2,,,,1,2 +halaacpi.dll = 1,,,,,,,2,,,hal.dll,1,2 + [Files.xbox] ntoskrnl.exe = 1,,,,,,,2,,,,1,2 halxbox.dll = 1,,,,,,,2,,,hal.dll,1,2 diff --git a/hal/halx86/CMakeLists.txt b/hal/halx86/CMakeLists.txt index 0b1b18be370..5375b354c7f 100644 --- a/hal/halx86/CMakeLists.txt +++ b/hal/halx86/CMakeLists.txt @@ -61,6 +61,7 @@ if(ARCH STREQUAL "i386") add_hal(hal SOURCES pic/halpic.rc COMPONENTS generic legacy up pic) add_hal(halacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi up pic) add_hal(halaacpi SOURCES apic/halaacpi.rc COMPONENTS generic acpi up apic) + add_hal(halapic SOURCES apic/halapic.rc COMPONENTS generic legacy up apic) add_hal(halxbox SOURCES xbox/halxbox.rc COMPONENTS xbox up) add_hal(halpc98 SOURCES pc98/halpc98.rc COMPONENTS pc98 up) diff --git a/hal/halx86/apic/halapic.rc b/hal/halx86/apic/halapic.rc new file mode 100644 index 00000000000..a67e13b9b59 --- /dev/null +++ b/hal/halx86/apic/halapic.rc @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "X86 Uniprocessor Hardware Abstraction Layer" +#define REACTOS_STR_INTERNAL_NAME "halapic" +#define REACTOS_STR_ORIGINAL_FILENAME "halapic.dll" +#include <reactos/version.rc>
