[ros-diffs] [reactos] 01/01: [BOOTDATA] Add SMP Entry (#5859)

[Justin Miller]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0a951f111291e84485aa8…

commit 0a951f111291e84485aa82c74e3066dbbcee05b7
Author:     Justin Miller <justin.miller(a)reactos.org>
AuthorDate: Wed Nov 1 06:43:44 2023 -0700
Commit:     GitHub <noreply(a)github.com>
CommitDate: Wed Nov 1 06:43:44 2023 -0700

    [BOOTDATA] Add SMP Entry (#5859)
    
    [HALX86] Enable SMP Hal for x86
    [BOOTDATA] add livecd and set entrys
---
 boot/bootdata/livecd.ini   |  6 ++++++
 boot/bootdata/txtsetup.sif | 10 +++++-----
 hal/halx86/CMakeLists.txt  |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/boot/bootdata/livecd.ini b/boot/bootdata/livecd.ini
index 0b034df9b1a..5e12037ff44 100644
--- a/boot/bootdata/livecd.ini
+++ b/boot/bootdata/livecd.ini
@@ -9,6 +9,7 @@ MinimalUI=Yes
 [Operating Systems]
 LiveCD="LiveCD"
 LiveCD_Debug="LiveCD (Debug)"
+LiveCD_Macpi="LiveCD ACPI SMP (Debug)"
 LiveCD_Aacpi="LiveCD ACPI APIC (Debug)"
 LiveCD_VBoxDebug="LiveCD (VBox Debug)"
 LiveCD_Screen="LiveCD (Screen)"
@@ -24,6 +25,11 @@ BootType=Windows2003
 SystemPath=\reactos
 Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT
 
+[LiveCD_Macpi]
+BootType=Windows2003
+SystemPath=\reactos
+Options=/HAL=halmacpi.dll /KERNEL=ntkrnlmp.exe /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200
/SOS /MININT
+
 [LiveCD_Aacpi]
 BootType=Windows2003
 SystemPath=\reactos
diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif
index 1c084276ce4..bb2e9d9d892 100644
--- a/boot/bootdata/txtsetup.sif
+++ b/boot/bootdata/txtsetup.sif
@@ -229,7 +229,7 @@ DefaultLanguage  = 00000409
 pci_up = "Standard PC Uniprocessor"
 ;pci_mp = "Standard PC Multiprocessor"
 acpi_up = "ACPI PC Uniprocessor"
-;acpi_mp = "ACPI PC Multiprocessor"
+acpi_mp = "ACPI PC Multiprocessor"
 apic_up = "Standard APIC PC Uniprocessor"
 aacpi_up = "ACPI APIC PC Uniprocessor"
 xbox = "Original Xbox (x86 based)"
@@ -244,7 +244,7 @@ x64_mp = "Standard x64 Multiprocessor"
 pci_up = "PC UP"
 ;pci_mp = "PC MP"
 acpi_up = "ACPI UP"
-;acpi_mp = "ACPI MP"
+acpi_mp = "ACPI MP"
 apic_up = "APIC UP"
 aacpi_up = "AAPIC UP"
 xbox = "Xbox"
@@ -266,9 +266,9 @@ hal.dll      = 1,,,,,,,2,,,,1,2
 ntoskrnl.exe = 1,,,,,,,2,,,,1,2
 halacpi.dll  = 1,,,,,,,2,,,hal.dll,1,2
 
-;[Files.acpi_mp]
-;ntkrnlmp.exe = 1,,,,,,,2,,,ntoskrnl.exe,1,2
-;halacpi.dll  = 1,,,,,,,2,,,hal.dll,1,2
+[Files.acpi_mp]
+ntkrnlmp.exe = 1,,,,,,,2,,,ntoskrnl.exe,1,2
+halmacpi.dll  = 1,,,,,,,2,,,hal.dll,1,2
 
 [Files.apic_up]
 ntoskrnl.exe = 1,,,,,,,2,,,,1,2
diff --git a/hal/halx86/CMakeLists.txt b/hal/halx86/CMakeLists.txt
index dc22b0c9614..193a4ab8ab8 100644
--- a/hal/halx86/CMakeLists.txt
+++ b/hal/halx86/CMakeLists.txt
@@ -66,7 +66,7 @@ if(ARCH STREQUAL "i386")
     add_hal(halxbox SOURCES xbox/halxbox.rc COMPONENTS xbox up)
     add_hal(halpc98 SOURCES pc98/halpc98.rc COMPONENTS pc98 up)
 
-    #add_hal(halmacpi SOURCES smp/halmacpi.rc COMPONENTS generic acpi smp apic)
+    add_hal(halmacpi SOURCES smp/halmacpi.rc COMPONENTS generic acpi smp apic)
     #add_hal(halmp SOURCES mp/halmp.rc COMPONENTS generic legacy smp apic)
 
 elseif(ARCH STREQUAL "amd64")