X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/50d89a314a394e5427d0791a08ffc3a3b79b6670..5380145d8d28af491c40a3ac1934c953938418e5:/aseg/counter.c

diff --git a/aseg/counter.c b/aseg/counter.c
index 73003da..055ceec 100644
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -10,39 +10,71 @@
 #include "keyboard.h"
 
 unsigned int counter = 0;
+unsigned int lastctr = 0;
 unsigned long pcisave;
 unsigned char vgasave;
+static int curdev = 0;	/* 0 if kbd, 1 if mouse */
+
+static void cause_kbd_irq()
+{
+	outl(0x844, 0x0);
+	outl(0x848, 0x0);
+	while (inb(0x64) & 0x1)
+		inb(0x60);
+	outb(0x60, 0xee);	/* Cause an IRQ. */
+	while (inb(0x60) != 0xEE)
+		;
+}
 
 void pci_dump() {
 	unsigned long cts;
-	static int curdev = 0;	/* 0 if kbd, 1 if mouse */
 		
 	cts = inl(0x84C);
 	
-	outl(0x848, 0x0);
 	outl(0x840, 0x0);
+	outl(0x848, 0x0);
 	switch(cts&0xF0000)
 	{
 	case 0x20000:
 	{
 		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))
+		
+		switch (cts & 0xFFFF)
 		{
-			/*  This is a keyboard read. */
-			if (b == 0x01) {
-				/* Reset. */
-				outb(0xCF9, 0x4);
-				return;
-			}
-
-			if (kbd_get_injected_scancode()) {
+		case 0x64:
+			/* Read the real hardware and mask in our OBF if need be. */
+			b = inb(0x64);
+			if (kbd_has_injected_scancode())
+			{
+				dologf("OS wants to know; we have data");
+				lastctr = counter;
+				b |= 0x01;
+				b &= ~0x20;	/* no mouse for you! */
+				curdev = 0;
+			} else 
+				curdev = (b & 0x20) ? 1 : 0;
+			*(unsigned char*)0xAFFD0 /* EAX */ = b;
+			break;
+		case 0x60:
+			if (kbd_has_injected_scancode())
+			{
 				b = kbd_get_injected_scancode();
+				lastctr = counter;
+				while (inb(0x64) & 0x1)
+					inb(0x60);
+			} else
+				b = inb(0x60);
+			if ((curdev == 0) && (b == 0x01)) {	/* Escape */
+				outb(0xCF9, 0x4);	/* Reboot */
+				return;
 			}
+			
+			/* If there is more nus to come, generate another IRQ. */
+			if (kbd_has_injected_scancode())
+				cause_kbd_irq();
+			
+			*(unsigned char*)0xAFFD0 /* EAX */ = b;
+			break;
 		}
 
 		*(unsigned char*)0xAFFD0 /* EAX */ = b;
@@ -61,8 +93,8 @@ void pci_dump() {
 		dolog("Unhandled PCI cycle");
 	}
 	
+	outl(0x844, 0x1000);
 	outl(0x848, 0x1000);
-	outl(0x840, 0x0100);
 }
 
 void timer_handler(smi_event_t ev)
@@ -72,6 +104,14 @@ void timer_handler(smi_event_t ev)
 	smi_disable_event(SMI_EVENT_FAST_TIMER);
 	smi_enable_event(SMI_EVENT_FAST_TIMER);
 	
+	if (kbd_has_injected_scancode() && (counter > (lastctr + 2)))
+	{
+		smi_disable_event(SMI_EVENT_DEVTRAP_KBC);
+		dolog("Kicking timer");
+		cause_kbd_irq();
+		smi_enable_event(SMI_EVENT_DEVTRAP_KBC);
+	}
+	
 	outb(0x80, (ticks++) & 0xFF);
 	
 	outlog();