Merge nyus.joshuawise.com:/storage/git/netwatch

[netwatch.git] / aseg-paging / vga-overlay.c

diff --git a/aseg-paging/vga-overlay.c b/aseg-paging/vga-overlay.c
index df446bcd47eb2662cef5d4b689959075a1666c3e..2fe4dc6ed6663474466a0ae31af0131b8ab7269e 100644 (file)
--- a/aseg-paging/vga-overlay.c
+++ b/aseg-paging/vga-overlay.c
@@ -89,6 +89,8 @@ void dolog(const char *s)
        prodptr = (prodptr + 1) % LOGLEN;
        while (*s)
                serial_tx(*(s++));
        prodptr = (prodptr + 1) % LOGLEN;
        while (*s)
                serial_tx(*(s++));

+       serial_tx('\r');
+       serial_tx('\n');

        if (flush_imm)
                outlog();
 }
        if (flush_imm)
                outlog();
 }


@@ -96,6 +98,20 @@ void (*output)(const char *s) = dolog;
 
 void dologf(const char *fmt, ...)
 {
 
 void dologf(const char *fmt, ...)
 {

+       char *s;
+       va_list va;
+       
+       va_start(va, fmt);
+       vsnprintf(logents[prodptr], 40, fmt, va);
+       s = logents[prodptr];
+       while (*s)
+               serial_tx(*(s++));
+       serial_tx('\r');
+       serial_tx('\n');
+       va_end(va);
+       prodptr = (prodptr + 1) % LOGLEN;
+       if (flush_imm)
+               outlog();

 }
 void (*outputf)(const char *s, ...) = dologf;
 
 }
 void (*outputf)(const char *s, ...) = dologf;