Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 09:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[HAL] Add APIC hals to setup and livecd

Browse source
This commit is contained in:
Timo Kreuzer 2021-06-03 11:53:07 +02:00
parent 64e52088d1
commit 5ee09256de
4 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
boot/bootdata/livecd.ini
View file

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

12
boot/bootdata/txtsetup.sif
View file

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

1
hal/halx86/CMakeLists.txt
View file

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

5
hal/halx86/apic/halapic.rc Normal file
View file

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