X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/d24901e6cc51d80d30e074eba9fdb3b64d938dc2..efea5b4edd5cc94b4ed0917ebca0efb6bb6a2f82:/aseg/counter.c

diff --git a/aseg/counter.c b/aseg/counter.c
index 104d809..895974d 100644
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -2,6 +2,7 @@
 #include <smram.h>
 #include <video_defines.h>
 #include <minilib.h>
+#include <smi.h>
 
 char thestr[512];
 
@@ -54,29 +55,17 @@ void pci_dump() {
 	outl(0x840, 0x0100);
 }
 
-void __start (void)
+void smi_entry(void)
 {
-	static int first = 1;
-	
 	pcisave = inl(0xCF8);
 	vgasave = inb(0x3D4);
 	
-	if (first)
-	{
-		first = 0;
-		dolog("NetWatch running...");
-	}
-
 	counter++;
 	outb(0x80, (counter & 0xFF));
 	
-	strcpy(thestr, "15-412! xxxxxxxx xxxxxxxx");
-	tohex(thestr + 8, inl(0x0834));
-	tohex(thestr + 17, counter);
+	sprintf(thestr, "15-412! %08x %08x", smi_status(), counter);
 	strblit(thestr, 0, 0);
 	
-	if (inl(0x834) & 0x20)
-		dolog("Warning: unhandled APM access");
 	if (inl(0x834) & 0x1000)
 	{
 		if (inl(0x844) & 0x1000)	/* devact_sts */
@@ -85,26 +74,17 @@ void __start (void)
 			outl(0x844, 0x1000);	/* ack it */
 		}
 	}
-	if (inl(0x834) & 0x4000)
-		dolog("Long periodic timer");
 	if (inl(0x840) & 0x1000)
 	{
 		pci_dump();
 		outl(0x840, 0x1100);
 		outl(0x840, 0x0100);
 	}
-	if (inl(0x834) & ~(0x4160))
-		dologf("Unknown: %08x", inl(0x834) & ~(0x140));
 
+	smi_poll();
 	outlog();
 	
 	outl(0xCF8, pcisave);
 	outb(0x3D4, vgasave);
-	
-	outl(0x848, 0x1000);
-	outl(0x834, /*0x40*/0xFFFF);	// ack the periodic IRQ
-	outb(0x830, (inb(0x830) | 0x2) & ~0x40);
-	outb(0x830, inb(0x830) | 0x40);
-	
 }