From 32edc757b010710685ea87fa873ca7d676258fba Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Thu, 8 Aug 2024 10:57:57 -0400
Subject: [PATCH] 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.
---
 data/settings/kernel/drivers/kernel          | 2 +-
 src/system/boot/platform/bios_ia32/start.cpp | 6 +++---
 src/system/boot/platform/efi/serial.cpp      | 2 ++
 src/system/kernel/main.cpp                   | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/data/settings/kernel/drivers/kernel b/data/settings/kernel/drivers/kernel
index 99aa79e176..200fc65f63 100644
--- a/data/settings/kernel/drivers/kernel
+++ b/data/settings/kernel/drivers/kernel
@@ -28,7 +28,7 @@ load_symbols true
 #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 a651487cad..9aaa01dfbc 100644
--- a/src/system/boot/platform/bios_ia32/start.cpp
+++ b/src/system/boot/platform/bios_ia32/start.cpp
@@ -184,7 +184,7 @@ _start(void)
 	args.arguments = NULL;
 
 	serial_init();
-	serial_enable();
+	//serial_enable();
 	interrupts_init();
 	console_init();
 	cpu_init();
@@ -195,8 +195,8 @@ _start(void)
 	// 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 fc78e602df..b88eb8d942 100644
--- a/src/system/boot/platform/efi/serial.cpp
+++ b/src/system/boot/platform/efi/serial.cpp
@@ -97,9 +97,11 @@ serial_disable(void)
 extern "C" void
 serial_enable(void)
 {
+#if 0
 	sSerialEnabled = true;
 	if ((gUART != NULL) && !gUARTSkipInit)
 		gUART->InitPort(kSerialBaudRate);
+#endif
 }
 
 
diff --git a/src/system/kernel/main.cpp b/src/system/kernel/main.cpp
index d578bba3db..20dfe570c7 100644
--- a/src/system/kernel/main.cpp
+++ b/src/system/kernel/main.cpp
@@ -133,7 +133,7 @@ _start(kernel_args *bootKernelArgs, int currentCPU)
 
 		// 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);