⛏️ index : haiku.git

9d0312eb00a75051275accf9967ddc1c64154334 [patch]

df62ecd6b53e4125a26ecc4b9a328764ca26da39

90da87bd88bd9335cb6477cb5f549e2759bf8a96

9d0312eb00a75051275accf9967ddc1c64154334.tar.gz

Disable serial debug output by default.

EFI doesn't have a boot keys mechanism so we just disable the
routine that enables it entirely. Also disable it in early kernel
output before the settings file has been read.

Diff

 src/system/kernel/main.cpp                   | 2 +-
 data/settings/kernel/drivers/kernel          | 2 +-
 src/system/boot/platform/bios_ia32/start.cpp | 6 ++++--
 src/system/boot/platform/efi/serial.cpp      | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/system/kernel/main.cpp b/src/system/kernel/main.cpp
index f4b948c..75e11f7 100644
--- a/src/system/kernel/main.cpp
+++ b/src/system/kernel/main.cpp
@@ -133,7 +133,7 @@

		// setup debug output
		debug_init(&sKernelArgs);
		set_dprintf_enabled(true);
		set_dprintf_enabled(false);
		dprintf("Welcome to kernel debugger output!\n");
		dprintf("Haiku revision: %s, debug level: %d\n", get_haiku_revision(),
			KDEBUG_LEVEL);
diff --git a/data/settings/kernel/drivers/kernel b/data/settings/kernel/drivers/kernel
index 7078cc9..78eb972 100644
--- a/data/settings/kernel/drivers/kernel
+++ b/data/settings/kernel/drivers/kernel
@@ -28,7 +28,7 @@
#emergency_keys false
	# Disables emergency keys (ie. Alt-SysReq+*), enabled by default.

#serial_debug_output false
serial_debug_output false
	# Disables serial debug output, which is enabled by default

#serial_debug_port 1
diff --git a/src/system/boot/platform/bios_ia32/start.cpp b/src/system/boot/platform/bios_ia32/start.cpp
index b5855f4..afa5dd9 100644
--- a/src/system/boot/platform/bios_ia32/start.cpp
+++ b/src/system/boot/platform/bios_ia32/start.cpp
@@ -188,7 +188,7 @@
	args.arguments = NULL;

	serial_init();
	serial_enable();
	//serial_enable();
	interrupts_init();
	console_init();
	cpu_init();
@@ -199,8 +199,8 @@
	// reading the keyboard doesn't seem to work in graphics mode
	// (maybe a bochs problem)
	sBootOptions = check_for_boot_keys();
//	if (sBootOptions & BOOT_OPTION_DEBUG_OUTPUT)
//		serial_enable();
	if (sBootOptions & BOOT_OPTION_DEBUG_OUTPUT)
		serial_enable();

	apm_init();
	acpi_init();
diff --git a/src/system/boot/platform/efi/serial.cpp b/src/system/boot/platform/efi/serial.cpp
index 0fd8d26..8d2c1d1 100644
--- a/src/system/boot/platform/efi/serial.cpp
+++ b/src/system/boot/platform/efi/serial.cpp
@@ -96,9 +96,11 @@
extern "C" void
serial_enable(void)
{
#if 0

	sSerialEnabled = true;
	if ((gUART != NULL) && !gUARTSkipInit)
		gUART->InitPort(kSerialBaudRate);
#endif
}