[ros-diffs] [hbelusca] 73645: [BOOTDATA][FREELDR] - By default, boot the livecd without the kernel debugger enabled, but... - ... augment the FreeLdr "Debugging Mode" option with serial+screen debug ports, so ...

Author: hbelusca
Date: Tue Jan 31 19:36:15 2017
New Revision: 73645

URL: http://svn.reactos.org/svn/reactos?rev=73645&view=rev
Log:
[BOOTDATA][FREELDR]
- By default, boot the livecd without the kernel debugger enabled, but...
- ... augment the FreeLdr "Debugging Mode" option with serial+screen debug ports, so that, if someone wants to run ReactOS with the kernel debugger on real hardware, without serial port, (s)he still can do it and see the debug output.
I do that, until FreeLdr can support run-time editing boot options of existing boot menu entries.

Modified:
    branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/hybridcd.ini
    branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/freeldr/freeldr/options.c

Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/hybridcd.ini
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reactos...
==============================================================================
--- branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/hybridcd.ini	[iso-8859-1] (original)
+++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/hybridcd.ini	[iso-8859-1] Tue Jan 31 19:36:15 2017
@@ -33,12 +33,12 @@
 [LiveCD]
 BootType=Windows2003
 SystemPath=\reactos
-Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT
+Options=/MININT

[LiveCD_RamDisk]
 BootType=Windows2003
 SystemPath=ramdisk(0)\reactos
-Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT /RDPATH=livecd.iso /RDEXPORTASCD
+Options=/MININT /RDPATH=livecd.iso /RDEXPORTASCD

[HddBoot]
 BootType=Drive

Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/freeldr/freeldr/options.c
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reactos...
==============================================================================
--- branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/freeldr/freeldr/options.c	[iso-8859-1] (original)
+++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/freeldr/freeldr/options.c	[iso-8859-1] Tue Jan 31 19:36:15 2017
@@ -277,5 +277,9 @@
         strcat(BootOptions, " /BASEVIDEO");

if (DebuggingMode)
+#if 0
         strcat(BootOptions, " /DEBUG");
+#else
+        strcat(BootOptions, " /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /DEBUGPORT=SCREEN /SOS");
+#endif
 }