Skip to content

Commit d2f1ca9

Browse files
committed
[XBOX] Simplify debugging
- [BOOTDATA] Set Xbox HAL, remove timeout, use KdSerial with FIRSTCHANCE - [SETUPLIB] Remove timeout, use KdSerial with FIRSTCHANCE
1 parent 4e21983 commit d2f1ca9

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

base/setup/lib/bootsup.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ CreateFreeLoaderReactOSEntries(
8181
/* ReactOS_Debug */
8282
// BootEntry->BootEntryKey = MAKESTRKEY(L"ReactOS_Debug");
8383
BootEntry->FriendlyName = L"\"ReactOS (Debug)\"";
84-
Options->OsLoadOptions = L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS";
84+
Options->OsLoadOptions = L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FIRSTCHANCE";
8585
AddBootStoreEntry(BootStoreHandle, BootEntry, MAKESTRKEY(L"ReactOS_Debug"));
8686

8787
#ifdef _WINKD_
@@ -96,7 +96,7 @@ CreateFreeLoaderReactOSEntries(
9696
/* ReactOS_KdSerial */
9797
// BootEntry->BootEntryKey = MAKESTRKEY(L"ReactOS_KdSerial");
9898
BootEntry->FriendlyName = L"\"ReactOS (RosDbg)\"";
99-
Options->OsLoadOptions = L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /KDSERIAL";
99+
Options->OsLoadOptions = L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /KDSERIAL /FIRSTCHANCE";
100100
AddBootStoreEntry(BootStoreHandle, BootEntry, MAKESTRKEY(L"ReactOS_KdSerial"));
101101
#endif
102102

@@ -138,7 +138,7 @@ CreateFreeLoaderReactOSEntries(
138138
#endif
139139
{
140140
#if DBG
141-
BootOptions.NextBootEntryKey = MAKESTRKEY(L"ReactOS_Debug");
141+
BootOptions.NextBootEntryKey = MAKESTRKEY(L"ReactOS_KdSerial");
142142
#else
143143
BootOptions.NextBootEntryKey = MAKESTRKEY(L"ReactOS");
144144
#endif
@@ -155,7 +155,7 @@ CreateFreeLoaderReactOSEntries(
155155
else
156156
{
157157
/* Timeout=10 */
158-
BootOptions.Timeout = 10;
158+
BootOptions.Timeout = 1;
159159
}
160160
#endif
161161

boot/bootdata/livecd.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[FREELOADER]
22
DefaultOS=LiveCD_Debug
3-
TimeOut=5
3+
TimeOut=1
44

55
[Display]
66
TitleText=ReactOS LiveCD
@@ -18,12 +18,12 @@ LiveCD_LogFile="LiveCD (Log file)"
1818
[LiveCD]
1919
BootType=Windows2003
2020
SystemPath=\reactos
21-
Options=/FASTDETECT /MININT
21+
Options=/FASTDETECT /MININT /HAL=halxbox.dll
2222

2323
[LiveCD_Debug]
2424
BootType=Windows2003
2525
SystemPath=\reactos
26-
Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT
26+
Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT /KDSERIAL /FIRSTCHANCE /HAL=halxbox.dll
2727

2828
[LiveCD_Macpi]
2929
BootType=Windows2003
@@ -43,7 +43,7 @@ Options=/DEBUG /DEBUGPORT=VBOX /SOS /FASTDETECT /MININT
4343
[LiveCD_Screen]
4444
BootType=Windows2003
4545
SystemPath=\reactos
46-
Options=/DEBUG /DEBUGPORT=SCREEN /SOS /FASTDETECT /MININT
46+
Options=/DEBUG /DEBUGPORT=SCREEN /SOS /FASTDETECT /MININT /FIRSTCHANCE /HAL=halxbox.dll
4747

4848
[LiveCD_LogFile]
4949
BootType=Windows2003

boot/bootdata/txtsetup.sif

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ Cabinet=reactos.cab
214214

215215
[SetupData]
216216
DefaultPath = \ReactOS
217-
SetupDebugOptions = "/DEBUG /KDSERIAL /DEBUGPORT=COM1 /FIRSTCHANCE"
217+
SetupDebugOptions = "/DEBUG /KDSERIAL /DEBUGPORT=COM1 /FIRSTCHANCE /HAL=halxbox.dll"
218218
;SetupDebugOptions = "/DEBUG /SOS /DEBUGPORT=SCREEN"
219219
OsLoadOptions = "/FASTDETECT /NOGUIBOOT /NODEBUG"
220220

0 commit comments

Comments
 (0)