packet receive code; keyboard injection

[netwatch.git] / aseg / counter.c

diff --git a/aseg/counter.c b/aseg/counter.c
index 88915dcfabae8e3f00c0e2c180563576aabf9e5c..73003da26c6890024b2e32d28266a194d51ec693 100644 (file)
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -3,7 +3,11 @@
 #include <video_defines.h>
 #include <minilib.h>
 #include <smi.h>
 #include <video_defines.h>
 #include <minilib.h>
 #include <smi.h>

+#include <pci-bother.h>
+#include "../net/net.h"

 #include "vga-overlay.h"
 #include "vga-overlay.h"

+#include "packet.h"
+#include "keyboard.h"

 
 unsigned int counter = 0;
 unsigned long pcisave;
 
 unsigned int counter = 0;
 unsigned long pcisave;


@@ -23,11 +27,24 @@ void pci_dump() {
        {
                unsigned char b;
                b = inb(cts & 0xFFFF);
        {
                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 ((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;
        }
                *(unsigned char*)0xAFFD0 /* EAX */ = b;
                break;
        }


@@ -70,8 +87,24 @@ void gbl_rls_handler(smi_event_t ev)
        unsigned long ecx;
        
        ecx = *(unsigned long*)0xAFFD4;
        unsigned long ecx;
        
        ecx = *(unsigned long*)0xAFFD4;

-       dologf("ECX was %08x", ecx);
-       *(unsigned long*)0xAFFD4 = 0x2BADD00D;
+
+       packet_t * packet = check_packet(ecx);
+       if (!packet)
+       {
+               dologf("WARN: bad packet at %08x", ecx);
+               return;
+       }
+
+       dologf("Got packet: type %08x", packet->type);
+
+       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;
+       }

 }
 
 void smi_entry(void)
 }
 
 void smi_entry(void)


@@ -80,11 +113,14 @@ void smi_entry(void)
        
        pcisave = inl(0xCF8);
        vgasave = inb(0x3D4);
        
        pcisave = inl(0xCF8);
        vgasave = inb(0x3D4);

+       pci_unbother_all();

        
        counter++;
        sprintf(statstr, "15-412! %08x %08x", smi_status(), counter);
        strblit(statstr, 0, 0);
        
        
        counter++;
        sprintf(statstr, "15-412! %08x %08x", smi_status(), counter);
        strblit(statstr, 0, 0);
        

+       eth_poll();
+       

        if (inl(0x840) & 0x1000)
        {
                pci_dump();
        if (inl(0x840) & 0x1000)
        {
                pci_dump();


@@ -94,6 +130,7 @@ void smi_entry(void)
 
        smi_poll();
        
 
        smi_poll();
        

+       pci_bother_all();

        outl(0xCF8, pcisave);
        outb(0x3D4, vgasave);
 }
        outl(0xCF8, pcisave);
        outb(0x3D4, vgasave);
 }