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

diff --git a/aseg/counter.c b/aseg/counter.c
index 2b1d6ea..104d809 100644
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -19,21 +19,18 @@ void pci_dump() {
 	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;
 	}
@@ -52,6 +49,9 @@ void pci_dump() {
 	default:
 		dolog("Unhandled PCI cycle");
 	}
+	
+	outl(0x848, 0x1000);
+	outl(0x840, 0x0100);
 }
 
 void __start (void)
@@ -82,27 +82,19 @@ void __start (void)
 		if (inl(0x844) & 0x1000)	/* devact_sts */
 		{
 			pci_dump();
-			outl(0x848, 0x1000);
-			outl(0x844, 0x1000);
+			outl(0x844, 0x1000);	/* ack it */
 		}
 	}
 	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);
-	}
-
+		dologf("Unknown: %08x", inl(0x834) & ~(0x140));
 
 	outlog();