From 5a0d2097feadfe9042f8aa5312e3a1f8370557b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 22 Oct 2010 19:19:03 +0000 Subject: [PATCH] - DisplayAlert() already waits for a mouse click. - Implement dprintf() with DisplayAlert() for now. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39050 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/boot/platform/amiga_m68k/debug.cpp | 35 +++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/src/system/boot/platform/amiga_m68k/debug.cpp b/src/system/boot/platform/amiga_m68k/debug.cpp index 0f4a93f25d..fddd1dbd31 100644 --- a/src/system/boot/platform/amiga_m68k/debug.cpp +++ b/src/system/boot/platform/amiga_m68k/debug.cpp @@ -51,8 +51,8 @@ panic(const char *format, ...) DisplayAlert(DEADEND_ALERT, &alert, 40); - clear_key_buffer(); - wait_for_key(); + //clear_key_buffer(); + //wait_for_key(); platform_exit(); } @@ -60,17 +60,40 @@ panic(const char *format, ...) void dprintf(const char *format, ...) { - char buffer[512]; + static struct AlertMessage { + uint16 column1; + uint8 line1; + char message[14]; + uint8 cont; + uint16 column2; + uint8 line2; + char buffer[512]; + uint8 end; + + } _PACKED alert = { + 10, 12, + "KERN: ", + 1, + 10, 22, + "", + 0 + }; + + char *buffer = alert.buffer; va_list list; + //platform_switch_to_text_mode(); + + memset(buffer, 0, 512); + va_start(list, format); - vsnprintf(buffer, sizeof(buffer), format, list); + vsnprintf(buffer, 512, format, list); va_end(list); -// Bconput(DEV_AUX, buffer); + DisplayAlert(RECOVERY_ALERT, &alert, 40); //if (platform_boot_options() & BOOT_OPTION_DEBUG_OUTPUT) -// Bconput(DEV_CONSOLE, buffer); + // Bconput(DEV_CONSOLE, buffer); }