X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/91a6abf7a700b750c4a9ba1f4c801a41f0bdd4b1..644af6b41a9ecbefecb70ec4cca307974e1300c4:/aseg/counter.c

diff --git a/aseg/counter.c b/aseg/counter.c
index 2b1d6ea..5c88850 100644
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -2,38 +2,33 @@
 #include <smram.h>
 #include <video_defines.h>
 #include <minilib.h>
-
-char thestr[512];
-
+#include <smi.h>
 #include "vga-overlay.h"
+#include "packet.h"
 
 unsigned int counter = 0;
 unsigned long pcisave;
 unsigned char vgasave;
 
 void pci_dump() {
-	char s[40];
 	unsigned long cts;
 	static int curdev = 0;	/* 0 if kbd, 1 if mouse */
 		
 	cts = inl(0x84C);
 	
 	outl(0x848, 0x0);
-	
+	outl(0x840, 0x0);
 	switch(cts&0xF0000)
 	{
 	case 0x20000:
 	{
 		unsigned char b;
-		strcpy(s, "READxxxxxxxxxxxxxxxx");
-		tohex(s+4, cts);
 		b = inb(cts & 0xFFFF);
-		tohex(s+12, b);
+		dologf("READ: %08x (%02x)", cts, b);
 		if ((cts & 0xFFFF) == 0x64)
 			curdev = (b & 0x20) ? 1 : 0;
 		if ((curdev == 0) && ((cts & 0xFFFF) == 0x60) && (b == 0x01))
 			outb(0xCF9, 0x4);
-		dolog(s);
 		*(unsigned char*)0xAFFD0 /* EAX */ = b;
 		break;
 	}
@@ -41,78 +36,83 @@ void pci_dump() {
 	{
 		unsigned char b;
 		
-		strcpy(s, "WRITxxxxxxxxxxxxxxxx");
 		b = *(unsigned char*)0xAFFD0 /* EAX */;
-		tohex(s+4, cts);
-		tohex(s+12, b);
-		dolog(s);
+		dologf("WRITE: %08x (%02x)", cts, b);
 		outb(cts & 0xFFFF, b);
 		break;
 	}
 	default:
 		dolog("Unhandled PCI cycle");
 	}
+	
+	outl(0x848, 0x1000);
+	outl(0x840, 0x0100);
 }
 
-void __start (void)
+void timer_handler(smi_event_t ev)
 {
-	static int first = 1;
+	static unsigned int ticks = 0;
 	
-	pcisave = inl(0xCF8);
-	vgasave = inb(0x3D4);
+	smi_disable_event(SMI_EVENT_FAST_TIMER);
+	smi_enable_event(SMI_EVENT_FAST_TIMER);
+	
+	outb(0x80, (ticks++) & 0xFF);
+	
+	outlog();
+}
+
+void kbc_handler(smi_event_t ev)
+{
+	pci_dump();
+}
+
+void gbl_rls_handler(smi_event_t ev)
+{
+	unsigned long ecx;
 	
-	if (first)
+	ecx = *(unsigned long*)0xAFFD4;
+
+	packet_t * packet = check_packet(ecx);
+	if (!packet)
 	{
-		first = 0;
-		dolog("NetWatch running...");
+		dologf("WARN: bad packet at %08x", ecx);
+		return;
 	}
 
+	dologf("Got packet: type %08x", packet->type);
+
+	if (packet->type == 42) {
+		dump_log((char *)packet->data);
+		*(unsigned long*)0xAFFD4 = 42;
+	} else {
+		*(unsigned long*)0xAFFD4 = 0x2BADD00D;
+	}
+}
+
+void smi_entry(void)
+{
+	char statstr[512];
+	
+	pcisave = inl(0xCF8);
+	vgasave = inb(0x3D4);
+	
 	counter++;
-	outb(0x80, (counter & 0xFF));
+	sprintf(statstr, "15-412! %08x %08x", smi_status(), counter);
+	strblit(statstr, 0, 0);
 	
-	strcpy(thestr, "15-412! xxxxxxxx xxxxxxxx");
-	tohex(thestr + 8, inl(0x0834));
-	tohex(thestr + 17, counter);
-	strblit(thestr, 0, 0);
+	extern void do_bother();
+	do_bother();
 	
-	if (inl(0x834) & 0x20)
-		dolog("Warning: unhandled APM access");
-	if (inl(0x834) & 0x1000)
-	{
-		if (inl(0x844) & 0x1000)	/* devact_sts */
-		{
-			pci_dump();
-			outl(0x848, 0x1000);
-			outl(0x844, 0x1000);
-		}
-	}
-	if (inl(0x834) & 0x4000)
-		dolog("Long periodic timer");
 	if (inl(0x840) & 0x1000)
 	{
-		dolog("Caught device monitor trap");
 		pci_dump();
 		outl(0x840, 0x1100);
 		outl(0x840, 0x0100);
 	}
-	if (inl(0x834) & ~(0x4160))
-	{
-		char s[40];
-		strcpy(s, "Unknown: xxxxxxxx");
-		tohex(s + 9, inl(0x834) & ~(0x140));
-		dolog(s);
-	}
-
 
-	outlog();
+	smi_poll();
 	
 	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);
-	
 }