Ticket #6105: 0003-OpenFirmware-Prepare-frame-buffer-support.patch

src/system/boot/platform/openfirmware/console.cpp

@@ -8 +8 @@
 #include <string.h>
 #include <platform/openfirmware/openfirmware.h>
 #include <util/kernel_cpp.h>
+#include <boot/stage2.h>
 
 #include "Handle.h"
 #include "console.h"
@@ -69 +70 @@
 {
     const char *string = (const char *)buffer;
 
+    if (gKernelArgs.frame_buffer.enabled)
+        return bufferSize;
+
     // be nice to our audience and replace single "\n" with "\r\n"
 
     while (bufferSize > 0) {

src/system/boot/platform/openfirmware/video.cpp

@@ -4 +4 @@
  */
 
 
+#include <boot/stage2.h>
 #include <boot/platform.h>
 
 
 extern "C" void
 platform_switch_to_logo(void)
 {
+    // in debug mode, we'll never show the logo
+    if ((platform_boot_options() & BOOT_OPTION_DEBUG_OUTPUT) != 0)
+        return;
+
     // ToDo: implement me
 }
 
@@ -17 +22 @@
 extern "C" void
 platform_switch_to_text_mode(void)
 {
-    // ToDo: implement me
+    if (!gKernelArgs.frame_buffer.enabled)
+        return;
+
+    gKernelArgs.frame_buffer.enabled = 0;
 }
 
 
 extern "C" status_t
 platform_init_video(void)
 {
+    gKernelArgs.frame_buffer.enabled = 0;
+
     // ToDo: implement me
     return B_OK;
 }