X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/68beefa85564e151acd18e12733897a5201fe67e..ea82a4d139d466936e00b5963e8454f2270fc3ff:/aseg-paging/smi.c

diff --git a/aseg-paging/smi.c b/aseg-paging/smi.c
index bd29f64..7f75a85 100644
--- 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 <fb.h>
+#include <output.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();
+	
+	serial_init();
+	
+	if (fb)
+        	fb->getvmode(fb->priv);
 
 	counter++;
-	sprintf(statstr, "NetWatch! %08x %08x", smi_status(), counter);
-	strblit(statstr, 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)