Suffer from a slight case of v2p-itis

[netwatch.git] / aseg-paging / smi.c

diff --git a/aseg-paging/smi.c b/aseg-paging/smi.c
index 1152723c99bafc9f320705e21950da0756ff14fc..7f75a8539e1acf849d163fba5f8736aac3e14ff4 100644 (file)
--- a/aseg-paging/smi.c
+++ b/aseg-paging/smi.c
@@ -5,6 +5,8 @@
 #include <smi.h>
 #include <pci-bother.h>
 #include <serial.h>
 #include <smi.h>
 #include <pci-bother.h>
 #include <serial.h>

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

 #include "../net/net.h"
 #include "vga-overlay.h"
 
 #include "../net/net.h"
 #include "vga-overlay.h"
 


@@ -19,12 +21,19 @@ void smi_entry(void)
        pcisave = inl(0xCF8);
        vgasave = inb(0x3D4);
        pci_unbother_all();
        pcisave = inl(0xCF8);
        vgasave = inb(0x3D4);
        pci_unbother_all();

+       
+       serial_init();
+       
+       if (fb)
+               fb->getvmode(fb->priv);

 
        counter++;
 
        counter++;

-       sprintf(statstr, "NetWatch! %08x %08x", smi_status(), counter);
-       strblit(statstr, 0, 0, 0);
+       if (!fb || fb->curmode.text)
+       {
+               sprintf(statstr, "NetWatch! %08x %08x", smi_status(), counter);
+               strblit(statstr, 0, 0, 0);
+       }

        
        

-       serial_init();

        eth_poll();
        
        if (inl(0x840) & 0x1000)
        eth_poll();
        
        if (inl(0x840) & 0x1000)