From e633c3c15b89a3ac4b0a3ec717716f2a4be7860c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 22 Aug 2010 00:57:20 +0000 Subject: [PATCH] kernel_ppc: Disable fake serial output for frame buffer Avoid writing to stdout if the frame buffer is enabled. Part of ticket #6105. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38305 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/kernel/arch/ppc/arch_platform.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/system/kernel/arch/ppc/arch_platform.cpp b/src/system/kernel/arch/ppc/arch_platform.cpp index c30bcd2174..2e2d95ffd0 100644 --- a/src/system/kernel/arch/ppc/arch_platform.cpp +++ b/src/system/kernel/arch/ppc/arch_platform.cpp @@ -120,8 +120,10 @@ PPCOpenFirmware::InitSerialDebug(struct kernel_args *kernelArgs) { if (of_getprop(gChosen, "stdin", &fInput, sizeof(int)) == OF_FAILED) return B_ERROR; - if (of_getprop(gChosen, "stdout", &fOutput, sizeof(int)) == OF_FAILED) - return B_ERROR; + if (!kernelArgs->frame_buffer.enabled) { + if (of_getprop(gChosen, "stdout", &fOutput, sizeof(int)) == OF_FAILED) + return B_ERROR; + } return B_OK; } @@ -168,6 +170,9 @@ PPCOpenFirmware::SerialDebugGetChar() void PPCOpenFirmware::SerialDebugPutChar(char c) { + if (fOutput == -1) + return; + if (c == '\n') of_write(fOutput, "\r\n", 2); else