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

diff --git a/aseg/counter.c b/aseg/counter.c
index b6bdcf4..104d809 100644
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -1,62 +1,61 @@
 #include <io.h>
+#include <smram.h>
+#include <video_defines.h>
+#include <minilib.h>
+
+char thestr[512];
+
+#include "vga-overlay.h"
 
 unsigned int counter = 0;
 unsigned long pcisave;
 unsigned char vgasave;
-unsigned char thestr[512];
-unsigned char logents[4][41] = {0};
 
-unsigned char vgaread(unsigned char idx)
-{
-	outb(0x3D4, idx);
-	inb(0x3D5);
-}
-
-void strblit(char *src, int r, int c)
-{
-	char *destp = (char*)(0xB8000UL | (((unsigned int)vgaread(0xC)) << 9) | (((unsigned int)vgaread(0xD)) << 1)) + r*80*2 + c*2;
-	unsigned char smramc;
+void pci_dump() {
+	char s[40];
+	unsigned long cts;
+	static int curdev = 0;	/* 0 if kbd, 1 if mouse */
+		
+	cts = inl(0x84C);
 	
-	smramc = pci_read8(0, 0, 0, 0x70);
-	pci_write8(0, 0, 0, 0x70, (smramc & 0xF3) | 0x08);
-	while (*src)
+	outl(0x848, 0x0);
+	outl(0x840, 0x0);
+	switch(cts&0xF0000)
+	{
+	case 0x20000:
 	{
-		*(destp++) = *(src++);
-		*(destp++) = 0x1F;
+		unsigned char b;
+		b = inb(cts & 0xFFFF);
+		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);
+		*(unsigned char*)0xAFFD0 /* EAX */ = b;
+		break;
+	}
+	case 0x30000:
+	{
+		unsigned char b;
+		
+		strcpy(s, "WRITxxxxxxxxxxxxxxxx");
+		b = *(unsigned char*)0xAFFD0 /* EAX */;
+		tohex(s+4, cts);
+		tohex(s+12, b);
+		dolog(s);
+		outb(cts & 0xFFFF, b);
+		break;
+	}
+	default:
+		dolog("Unhandled PCI cycle");
 	}
-	pci_write8(0, 0, 0, 0x70, smramc);
-}
-
-void outlog()
-{
-	int y, x;
-	unsigned char smramc;
-	unsigned char *basep = (char*)(0xB8000UL | (((unsigned int)vgaread(0xC)) << 9) | (((unsigned int)vgaread(0xD)) << 1));
-	
-	smramc = pci_read8(0, 0, 0, 0x70);
-	pci_write8(0, 0, 0, 0x70, (smramc & 0xF3) | 0x08);
-	for (y = 0; y < 4; y++)
-		for (x = 40; x < 80; x++)
-		{
-			basep[y*80*2+x*2] = ' ';
-			basep[y*80*2+x*2+1] = 0x1F;
-		}
-	pci_write8(0, 0, 0, 0x70, smramc);
-	
-	for (y = 0; y < 4; y++)
-		strblit(logents[y], y, 40);
 	
-}
-
-void dolog(char *s)
-{
-	memmove(logents[0], logents[1], sizeof(logents[0])*3);
-	strcpy(logents[3], s);
+	outl(0x848, 0x1000);
+	outl(0x840, 0x0100);
 }
 
 void __start (void)
 {
-	unsigned char smramc;
 	static int first = 1;
 	
 	pcisave = inl(0xCF8);
@@ -82,60 +81,21 @@ void __start (void)
 	{
 		if (inl(0x844) & 0x1000)	/* devact_sts */
 		{
-			unsigned char s[40];
-			unsigned long cts;
-			static int curdev = 0;	/* 0 if kbd, 1 if mouse */
-			
-			cts = inl(0x84C);
-			
-			outl(0x848, 0x0);
-			
-			switch(cts&0xF0000)
-			{
-			case 0x20000:
-			{
-				unsigned char b;
-				strcpy(s, "READxxxxxxxxxxxxxxxx");
-				tohex(s+4, cts);
-				b = inb(cts & 0xFFFF);
-				tohex(s+12, 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;
-			}
-			case 0x30000:
-			{
-				unsigned char b;
-				
-				strcpy(s, "WRITxxxxxxxxxxxxxxxx");
-				b = *(unsigned char*)0xAFFD0 /* EAX */;
-				tohex(s+4, cts);
-				tohex(s+12, b);
-				dolog(s);
-				outb(cts & 0xFFFF, b);
-				break;
-			}
-			default:
-				dolog("Unhandled PCI cycle");
-			}
-			outl(0x848, 0x1000);
-			outl(0x844, 0x1000);
+			pci_dump();
+			outl(0x844, 0x1000);	/* ack it */
 		}
 	}
 	if (inl(0x834) & 0x4000)
 		dolog("Long periodic timer");
-	if (inl(0x834) & ~(0x4160))
+	if (inl(0x840) & 0x1000)
 	{
-		unsigned char s[40];
-		strcpy(s, "Unknown: xxxxxxxx");
-		tohex(s + 9, inl(0x834) & ~(0x140));
-		dolog(s);
+		pci_dump();
+		outl(0x840, 0x1100);
+		outl(0x840, 0x0100);
 	}
-	
+	if (inl(0x834) & ~(0x4160))
+		dologf("Unknown: %08x", inl(0x834) & ~(0x140));
+
 	outlog();
 	
 	outl(0xCF8, pcisave);