# Pastebin bhrRLDrE diff --git a/src/system/boot/platform/bios_ia32/Jamfile b/src/system/boot/platform/bios_ia32/Jamfile index 36ee83318e..651faaf974 100644 --- a/src/system/boot/platform/bios_ia32/Jamfile +++ b/src/system/boot/platform/bios_ia32/Jamfile @@ -51,6 +51,7 @@ for platform in [ MultiBootSubDirSetup bios_ia32 ] { : : boot_platform_generic_bios_ia32.a + boot_video_text_console_bios_ia32.a ; } } diff --git a/src/system/boot/platform/bios_ia32/start.cpp b/src/system/boot/platform/bios_ia32/start.cpp index 7477853bd0..f9894a1bc0 100644 --- a/src/system/boot/platform/bios_ia32/start.cpp +++ b/src/system/boot/platform/bios_ia32/start.cpp @@ -65,11 +65,14 @@ call_ctors(void) extern "C" uint32 platform_boot_options(void) { + return BOOT_OPTION_DEBUG_OUTPUT | BOOT_OPTION_MENU; +#if 0 #if 0 if (!gKernelArgs.fb.enabled) sBootOptions |= check_for_boot_keys(); #endif return sBootOptions; +#endif } diff --git a/src/system/boot/platform/bios_ia32/video.cpp b/src/system/boot/platform/bios_ia32/video.cpp index 30b5b69088..8f3b3557b6 100644 --- a/src/system/boot/platform/bios_ia32/video.cpp +++ b/src/system/boot/platform/bios_ia32/video.cpp @@ -29,6 +29,10 @@ #include #include +#if 1 /* video console */ +extern ConsoleNode* gConsoleNode; +#endif + #define TRACE_VIDEO #ifdef TRACE_VIDEO @@ -838,9 +842,11 @@ platform_set_palette(const uint8 *palette) extern "C" void platform_switch_to_logo(void) { +#if 0 /* video console */ // in debug mode, we'll never show the logo if ((platform_boot_options() & BOOT_OPTION_DEBUG_OUTPUT) != 0) return; +#endif addr_t lastBase = gKernelArgs.frame_buffer.physical_buffer.start; size_t lastSize = gKernelArgs.frame_buffer.physical_buffer.size; @@ -995,6 +1001,16 @@ platform_init_video(void) } sMode = sDefaultMode; + +#if 1 /* video console */ + platform_switch_to_logo(); + gConsoleNode = video_text_console_init(sFrameBuffer); + + // enable stdio functionality + stdin = (FILE *)gConsoleNode; + stdout = stderr = (FILE *)gConsoleNode; +#endif + return B_OK; } diff --git a/src/system/boot/platform/pxe_ia32/Jamfile b/src/system/boot/platform/pxe_ia32/Jamfile index bb6a9b5351..7f04d6d90e 100644 --- a/src/system/boot/platform/pxe_ia32/Jamfile +++ b/src/system/boot/platform/pxe_ia32/Jamfile @@ -61,6 +61,7 @@ for platform in [ MultiBootSubDirSetup pxe_ia32 ] { : : boot_platform_generic_pxe_ia32.a + boot_video_text_console_pxe_ia32.a ;