Skip to content

Commit da66f1e

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 c6b4b04 commit da66f1e

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
@@ -82,7 +82,7 @@ CreateFreeLoaderReactOSEntries(
8282
/* ReactOS_Debug */
8383
// BootEntry->BootEntryKey = MAKESTRKEY(L"ReactOS_Debug");
8484
BootEntry->FriendlyName = L"\"ReactOS (Debug)\"";
85-
Options->OsLoadOptions = L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS";
85+
Options->OsLoadOptions = L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FIRSTCHANCE";
8686
AddBootStoreEntry(BootStoreHandle, BootEntry, MAKESTRKEY(L"ReactOS_Debug"));
8787

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

@@ -139,7 +139,7 @@ CreateFreeLoaderReactOSEntries(
139139
#endif
140140
{
141141
#if DBG
142-
BootOptions.NextBootEntryKey = MAKESTRKEY(L"ReactOS_Debug");
142+
BootOptions.NextBootEntryKey = MAKESTRKEY(L"ReactOS_KdSerial");
143143
#else
144144
BootOptions.NextBootEntryKey = MAKESTRKEY(L"ReactOS");
145145
#endif
@@ -156,7 +156,7 @@ CreateFreeLoaderReactOSEntries(
156156
else
157157
{
158158
/* Timeout=10 */
159-
BootOptions.Timeout = 10;
159+
BootOptions.Timeout = 1;
160160
}
161161
#endif
162162

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)