correct scan codes

[netwatch.git] / aseg / counter.c

diff --git a/aseg/counter.c b/aseg/counter.c
index eaeec525e7ab11b006ba18c826d0726279791f8c..73003da26c6890024b2e32d28266a194d51ec693 100644 (file)
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -3,9 +3,11 @@
 #include <video_defines.h>
 #include <minilib.h>
 #include <smi.h>
-#include "3c905.h"
+#include <pci-bother.h>
+#include "../net/net.h"
 #include "vga-overlay.h"
 #include "packet.h"
+#include "keyboard.h"
 
 unsigned int counter = 0;
 unsigned long pcisave;
@@ -25,11 +27,24 @@ void pci_dump() {
        {
                unsigned char b;
                b = inb(cts & 0xFFFF);
-               dologf("READ: %08x (%02x)", cts, 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);
+
+               if ((curdev == 0) && ((cts & 0xFFFF) == 0x60))
+               {
+                       /*  This is a keyboard read. */
+                       if (b == 0x01) {
+                               /* Reset. */
+                               outb(0xCF9, 0x4);
+                               return;
+                       }
+
+                       if (kbd_get_injected_scancode()) {
+                               b = kbd_get_injected_scancode();
+                       }
+               }
+
                *(unsigned char*)0xAFFD0 /* EAX */ = b;
                break;
        }
@@ -85,6 +100,8 @@ void gbl_rls_handler(smi_event_t ev)
        if (packet->type == 42) {
                dump_log((char *)packet->data);
                *(unsigned long*)0xAFFD4 = 42;
+       } else if (packet->type == 0xAA) {
+               kbd_inject_key('A');
        } else {
                *(unsigned long*)0xAFFD4 = 0x2BADD00D;
        }
@@ -96,6 +113,7 @@ void smi_entry(void)
        
        pcisave = inl(0xCF8);
        vgasave = inb(0x3D4);
+       pci_unbother_all();
        
        counter++;
        sprintf(statstr, "15-412! %08x %08x", smi_status(), counter);
@@ -112,6 +130,7 @@ void smi_entry(void)
 
        smi_poll();
        
+       pci_bother_all();
        outl(0xCF8, pcisave);
        outb(0x3D4, vgasave);
 }