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

diff --git a/aseg/counter.c b/aseg/counter.c
index 0ab5d4c..ab200c1 100644
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -10,18 +10,29 @@
 #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 */
-	static int takeover = 0;
 		
 	cts = inl(0x84C);
 	
-	outl(0x848, 0x0);
 	outl(0x840, 0x0);
+	outl(0x848, 0x0);
 	switch(cts&0xF0000)
 	{
 	case 0x20000:
@@ -35,7 +46,8 @@ void pci_dump() {
 			b = inb(0x64);
 			if (kbd_has_injected_scancode())
 			{
-				takeover = 1;
+				dologf("OS wants to know; we have data");
+				lastctr = counter;
 				b |= 0x01;
 				b &= ~0x20;	/* no mouse for you! */
 				curdev = 0;
@@ -44,16 +56,23 @@ void pci_dump() {
 			*(unsigned char*)0xAFFD0 /* EAX */ = b;
 			break;
 		case 0x60:
-			if (takeover)
+			if (kbd_has_injected_scancode())
 			{
 				b = kbd_get_injected_scancode();
-				takeover = 0;
+				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;
 		}
@@ -74,8 +93,9 @@ void pci_dump() {
 		dolog("Unhandled PCI cycle");
 	}
 	
+	outl(0x840, 0x0);
+	outl(0x844, 0x1000);
 	outl(0x848, 0x1000);
-	outl(0x840, 0x0100);
 }
 
 void timer_handler(smi_event_t ev)
@@ -85,6 +105,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();