[ros-diffs] [reactos] 01/01: [BOOTDATA] Add new Setup Debug/Screen boot entries in BootCD/HybridCD/PC98 boot menus. (#3353) CORE-17350

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10a5200e1f9ee79943f70…

commit 10a5200e1f9ee79943f70d2c89419977910aa97e
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Wed Nov 4 00:33:05 2020 +0100
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Thu Dec 30 16:06:49 2021 +0100

    [BOOTDATA] Add new Setup Debug/Screen boot entries in BootCD/HybridCD/PC98 boot menus.
(#3353)
    CORE-17350
    
    Makes testing easier on real hardware (especially for these configs
    where debugging can only be done via screen mode).
    
    Add also an experimental Setup ACPI APIC entry in bootcd.ini for testing
    purposes, along the lines of commit 5ee09256d .
    In the similar LiveCD entry, use instead the /HAL= option.
---
 boot/bootdata/bootcd.ini      | 15 +++++++++++++++
 boot/bootdata/floppy_pc98.ini | 22 +++++++++++++++++-----
 boot/bootdata/hybridcd.ini    | 12 ++++++++++++
 boot/bootdata/livecd.ini      | 11 +++++------
 4 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/boot/bootdata/bootcd.ini b/boot/bootdata/bootcd.ini
index 4f2017c5939..a2ea3d0564c 100644
--- a/boot/bootdata/bootcd.ini
+++ b/boot/bootdata/bootcd.ini
@@ -26,6 +26,21 @@ TimeText=Seconds until highlighted choice will be started
automatically:
 
 [Operating Systems]
 Setup="Setup"
+Setup_Debug="Setup (Debug)"
+Setup_Aacpi="Setup ACPI APIC (Debug)"
+Setup_Screen="Setup (Screen)"
 
 [Setup]
 BootType=ReactOSSetup
+
+[Setup_Debug]
+BootType=ReactOSSetup
+Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /NOGUIBOOT /SIFOPTIONSOVERRIDE
+
+[Setup_Aacpi]
+BootType=ReactOSSetup
+Options=/HAL=halaacpi.dll /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /NOGUIBOOT
/SIFOPTIONSOVERRIDE
+
+[Setup_Screen]
+BootType=ReactOSSetup
+Options=/DEBUG /DEBUGPORT=SCREEN /SIFOPTIONSOVERRIDE
diff --git a/boot/bootdata/floppy_pc98.ini b/boot/bootdata/floppy_pc98.ini
index 3828cee347d..2488bb21482 100644
--- a/boot/bootdata/floppy_pc98.ini
+++ b/boot/bootdata/floppy_pc98.ini
@@ -25,11 +25,27 @@ MinimalUI=Yes
 TimeText=Seconds until highlighted choice will be started automatically:   
 
 [Operating Systems]
+Setup="Setup"
+Setup_Debug="Setup (Debug)"
+Setup_Screen="Setup (Screen)"
 LiveCD="LiveCD"
 LiveCD_Debug="LiveCD (Debug)"
 LiveCD_Screen="LiveCD (Screen)"
 LiveCD_LogFile="LiveCD (Log file)"
-Setup="Setup"
+
+[Setup]
+BootType=ReactOSSetup
+SystemPath=multi(0)disk(0)cdrom(0)\reactos
+
+[Setup_Debug]
+BootType=ReactOSSetup
+SystemPath=multi(0)disk(0)cdrom(0)\reactos
+Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=9600 /NOGUIBOOT /SIFOPTIONSOVERRIDE
+
+[Setup_Screen]
+BootType=ReactOSSetup
+SystemPath=multi(0)disk(0)cdrom(0)\reactos
+Options=/DEBUG /DEBUGPORT=SCREEN /SIFOPTIONSOVERRIDE
 
 [LiveCD]
 BootType=Windows2003
@@ -50,7 +66,3 @@ Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT
 BootType=Windows2003
 SystemPath=multi(0)disk(0)cdrom(0)\reactos
 Options=/DEBUG /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log /SOS /MININT
-
-[Setup]
-BootType=ReactOSSetup
-SystemPath=multi(0)disk(0)cdrom(0)\reactos
diff --git a/boot/bootdata/hybridcd.ini b/boot/bootdata/hybridcd.ini
index 28697d30b36..2da010b70fb 100644
--- a/boot/bootdata/hybridcd.ini
+++ b/boot/bootdata/hybridcd.ini
@@ -26,6 +26,8 @@ TimeText=Seconds until highlighted choice will be started
automatically:
 
 [Operating Systems]
 Setup="Setup"
+Setup_Debug="Setup (Debug)"
+Setup_Screen="Setup (Screen)"
 LiveCD="LiveCD"
 LiveCD_Debug="LiveCD (Debug)"
 LiveCD_Screen="LiveCD (Screen)"
@@ -38,6 +40,16 @@ LiveCD_RamDisk_Screen="LiveCD in RAM (Screen)"
 BootType=ReactOSSetup
 SystemPath=\bootcd
 
+[Setup_Debug]
+BootType=ReactOSSetup
+SystemPath=\bootcd
+Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /NOGUIBOOT /SIFOPTIONSOVERRIDE
+
+[Setup_Screen]
+BootType=ReactOSSetup
+SystemPath=\bootcd
+Options=/DEBUG /DEBUGPORT=SCREEN /SIFOPTIONSOVERRIDE
+
 [LiveCD]
 BootType=Windows2003
 SystemPath=\livecd\reactos
diff --git a/boot/bootdata/livecd.ini b/boot/bootdata/livecd.ini
index e00c49461d4..a69b22731fa 100644
--- a/boot/bootdata/livecd.ini
+++ b/boot/bootdata/livecd.ini
@@ -27,8 +27,8 @@ TimeText=Seconds until highlighted choice will be started
automatically:
 [Operating Systems]
 LiveCD="LiveCD"
 LiveCD_Debug="LiveCD (Debug)"
-LiveCD_VBoxDebug="LiveCD (VBox Debug)"
 LiveCD_Aacpi="LiveCD ACPI APIC (Debug)"
+LiveCD_VBoxDebug="LiveCD (VBox Debug)"
 LiveCD_Screen="LiveCD (Screen)"
 LiveCD_LogFile="LiveCD (Log file)"
 
@@ -42,16 +42,15 @@ BootType=Windows2003
 SystemPath=\reactos
 Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT
 
-[LiveCD_VBoxDebug]
+[LiveCD_Aacpi]
 BootType=Windows2003
 SystemPath=\reactos
-Options=/DEBUG /DEBUGPORT=VBOX /SOS /MININT
+Options=/HAL=halaacpi.dll /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT
 
-[LiveCD_Aacpi]
+[LiveCD_VBoxDebug]
 BootType=Windows2003
 SystemPath=\reactos
-Hal=HALAACPI.DLL
-Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT
+Options=/DEBUG /DEBUGPORT=VBOX /SOS /MININT
 
 [LiveCD_Screen]
 BootType=Windows2003