[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.
This commit is contained in:
Hermès Bélusca-Maïto 2020-11-04 00:33:05 +01:00
parent 3fcd73634e
commit 10a5200e1f
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
4 changed files with 50 additions and 12 deletions

View file

@ -26,6 +26,21 @@ TimeText=Seconds until highlighted choice will be started automatically:
[Operating Systems] [Operating Systems]
Setup="Setup" Setup="Setup"
Setup_Debug="Setup (Debug)"
Setup_Aacpi="Setup ACPI APIC (Debug)"
Setup_Screen="Setup (Screen)"
[Setup] [Setup]
BootType=ReactOSSetup 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

View file

@ -25,11 +25,27 @@ MinimalUI=Yes
TimeText=Seconds until highlighted choice will be started automatically: TimeText=Seconds until highlighted choice will be started automatically:
[Operating Systems] [Operating Systems]
Setup="Setup"
Setup_Debug="Setup (Debug)"
Setup_Screen="Setup (Screen)"
LiveCD="LiveCD" LiveCD="LiveCD"
LiveCD_Debug="LiveCD (Debug)" LiveCD_Debug="LiveCD (Debug)"
LiveCD_Screen="LiveCD (Screen)" LiveCD_Screen="LiveCD (Screen)"
LiveCD_LogFile="LiveCD (Log file)" 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] [LiveCD]
BootType=Windows2003 BootType=Windows2003
@ -50,7 +66,3 @@ Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT
BootType=Windows2003 BootType=Windows2003
SystemPath=multi(0)disk(0)cdrom(0)\reactos SystemPath=multi(0)disk(0)cdrom(0)\reactos
Options=/DEBUG /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log /SOS /MININT Options=/DEBUG /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log /SOS /MININT
[Setup]
BootType=ReactOSSetup
SystemPath=multi(0)disk(0)cdrom(0)\reactos

View file

@ -26,6 +26,8 @@ TimeText=Seconds until highlighted choice will be started automatically:
[Operating Systems] [Operating Systems]
Setup="Setup" Setup="Setup"
Setup_Debug="Setup (Debug)"
Setup_Screen="Setup (Screen)"
LiveCD="LiveCD" LiveCD="LiveCD"
LiveCD_Debug="LiveCD (Debug)" LiveCD_Debug="LiveCD (Debug)"
LiveCD_Screen="LiveCD (Screen)" LiveCD_Screen="LiveCD (Screen)"
@ -38,6 +40,16 @@ LiveCD_RamDisk_Screen="LiveCD in RAM (Screen)"
BootType=ReactOSSetup BootType=ReactOSSetup
SystemPath=\bootcd 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] [LiveCD]
BootType=Windows2003 BootType=Windows2003
SystemPath=\livecd\reactos SystemPath=\livecd\reactos

View file

@ -27,8 +27,8 @@ TimeText=Seconds until highlighted choice will be started automatically:
[Operating Systems] [Operating Systems]
LiveCD="LiveCD" LiveCD="LiveCD"
LiveCD_Debug="LiveCD (Debug)" LiveCD_Debug="LiveCD (Debug)"
LiveCD_VBoxDebug="LiveCD (VBox Debug)"
LiveCD_Aacpi="LiveCD ACPI APIC (Debug)" LiveCD_Aacpi="LiveCD ACPI APIC (Debug)"
LiveCD_VBoxDebug="LiveCD (VBox Debug)"
LiveCD_Screen="LiveCD (Screen)" LiveCD_Screen="LiveCD (Screen)"
LiveCD_LogFile="LiveCD (Log file)" LiveCD_LogFile="LiveCD (Log file)"
@ -42,17 +42,16 @@ BootType=Windows2003
SystemPath=\reactos SystemPath=\reactos
Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT
[LiveCD_Aacpi]
BootType=Windows2003
SystemPath=\reactos
Options=/HAL=halaacpi.dll /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT
[LiveCD_VBoxDebug] [LiveCD_VBoxDebug]
BootType=Windows2003 BootType=Windows2003
SystemPath=\reactos SystemPath=\reactos
Options=/DEBUG /DEBUGPORT=VBOX /SOS /MININT 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] [LiveCD_Screen]
BootType=Windows2003 BootType=Windows2003
SystemPath=\reactos SystemPath=\reactos