[haiku-commits] haiku.r1alpha4: hrevr1alpha4-44683 - src/system/boot/platform/bios_ia32 data/settings/kernel/drivers

  • From: kallisti5@xxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Tue, 6 Nov 2012 19:27:40 +0100 (CET)

hrevr1alpha4-44683 adds 1 changeset to branch 'r1alpha4'
old head: e1dc5e2a7b3e47c7deff644c4d14f2e8aa29ce17
new head: 98ef5823a9061731f5adb921d46a66bbb0b130cf

----------------------------------------------------------------------------

98ef582: R1A4: Disable kernel serial debugging

                          [ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrevr1alpha4-44683
Commit:      98ef5823a9061731f5adb921d46a66bbb0b130cf
URL:         http://cgit.haiku-os.org/haiku/commit/?id=98ef582
Author:      Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date:        Tue Nov  6 18:27:22 2012 UTC

----------------------------------------------------------------------------

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

----------------------------------------------------------------------------

diff --git a/data/settings/kernel/drivers/kernel 
b/data/settings/kernel/drivers/kernel
index 0c7fd48..b5f854e 100644
--- a/data/settings/kernel/drivers/kernel
+++ b/data/settings/kernel/drivers/kernel
@@ -1,7 +1,7 @@
 #disable_smp true
        # disables multiprocessor support, default is enabled
 
-#serial_debug_output false
+serial_debug_output false
        # disables serial debug output, default is enabled
 
 #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 6af13dd..0afd20b 100644
--- a/src/system/boot/platform/bios_ia32/start.cpp
+++ b/src/system/boot/platform/bios_ia32/start.cpp
@@ -132,7 +132,7 @@ _start(void)
        args.arguments = NULL;
 
        serial_init();
-       serial_enable();
+       //serial_enable();
        interrupts_init();
        console_init();
        cpu_init();
@@ -143,8 +143,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();


Other related posts:

  • » [haiku-commits] haiku.r1alpha4: hrevr1alpha4-44683 - src/system/boot/platform/bios_ia32 data/settings/kernel/drivers - kallisti5