Bother the 3c905 every time we take an IRQ, which makes the bothering 'stick'.

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

diff --git a/aseg/vga-overlay.c b/aseg/vga-overlay.c
index e5414cadaad81a953a7a045be2e6a96e32743c38..7aa8b412c517f73f68f5afeead935b98c5c588cb 100644 (file)
--- a/aseg/vga-overlay.c
+++ b/aseg/vga-overlay.c
@@ -2,6 +2,8 @@
 #include <smram.h>
 #include <video_defines.h>
 #include <minilib.h>
 #include <smram.h>
 #include <video_defines.h>
 #include <minilib.h>

+#include <stdarg.h>
+#include <output.h>

 
 static char logents[4][41] = {{0}};
 
 
 static char logents[4][41] = {{0}};
 


@@ -22,8 +24,8 @@ static char * vga_base()
 {
        return (char *) (
                TEXT_CONSOLE_BASE
 {
        return (char *) (
                TEXT_CONSOLE_BASE

-               | (((unsigned int) vga_read(CRTC_START_ADDR_LSB_IDX)) << 9)
-               | (((unsigned int) vga_read(CRTC_START_ADDR_MSB_IDX)) << 1)
+               + (((unsigned int) vga_read(CRTC_START_ADDR_MSB_IDX)) << 9)
+               + (((unsigned int) vga_read(CRTC_START_ADDR_LSB_IDX)) << 1)

        );
 }
 
        );
 }
 


@@ -33,7 +35,7 @@ void strblit(char *src, int row, int col)
        smram_state_t old_state = smram_save_state();
 
        smram_aseg_set_state(SMRAM_ASEG_SMMCODE);
        smram_state_t old_state = smram_save_state();
 
        smram_aseg_set_state(SMRAM_ASEG_SMMCODE);

-       
+

        while (*src)
        {
                *(destp++) = *(src++);
        while (*src)
        {
                *(destp++) = *(src++);


@@ -60,13 +62,29 @@ void outlog()
                }
 
        smram_restore_state(old_state);
                }
 
        smram_restore_state(old_state);

-
+       

        for (y = 0; y < 4; y++)
                strblit(logents[y], y, 40);
 }
 
        for (y = 0; y < 4; y++)
                strblit(logents[y], y, 40);
 }
 

-void dolog(char *s)
+void dolog(const char *s)

 {
        memmove(logents[0], logents[1], sizeof(logents[0])*3);
        strcpy(logents[3], s);
 }
 {
        memmove(logents[0], logents[1], sizeof(logents[0])*3);
        strcpy(logents[3], s);
 }

+void (*output)(const char *s) = dolog;
+
+void dologf(const char *fmt, ...)
+{
+       va_list va;
+       
+       memmove(logents[0], logents[1], sizeof(logents[0])*3);
+       va_start(va, fmt);
+       vsnprintf(logents[3], 40, fmt, va);
+       va_end(va);
+}
+void (*outputf)(const char *s, ...) = dologf;
+
+void dump_log (char * target) {
+       memcpy(target, logents, sizeof(logents));
+}