boot-132.tar.gz

[apple/boot.git] / i386 / libsaio / console.c

diff --git a/i386/libsaio/console.c b/i386/libsaio/console.c
index 39223736d2a28531ba2a6bca1580e49ef46a54f7..d6bdfacce1a8c07f558ca8968d66c3a4adc4ddd9 100644 (file)
--- a/i386/libsaio/console.c
+++ b/i386/libsaio/console.c
@@ -96,7 +96,7 @@ int getchar()
 int printf(const char * fmt, ...)
 {
     va_list ap;
 int printf(const char * fmt, ...)
 {
     va_list ap;

-    if (bootArgs->graphicsMode != TEXT_MODE) return -1;
+    if (bootArgs->Video.v_display != VGA_TEXT_MODE) return -1;

     va_start(ap, fmt);
     prf(fmt, ap, putchar, 0);
     va_end(ap);
     va_start(ap, fmt);
     prf(fmt, ap, putchar, 0);
     va_end(ap);


@@ -126,8 +126,14 @@ int error(const char * fmt, ...)
     return(0);
 }
 
     return(0);
 }
 

-void stop(const char * msg)
+void stop(const char * fmt, ...)

 {
 {

-    error("\n%s\n", msg);
+    va_list ap;
+
+    printf("\n");
+    va_start(ap, fmt);
+    prf(fmt, ap, putchar, 0);
+    va_end(ap);
+    printf("\n");

     halt();
 }
     halt();
 }