Add LWIP init call

[netwatch.git] / aseg / counter.c

diff --git a/aseg/counter.c b/aseg/counter.c
index 4c53b59b3c65956459d58e8c6669245b8746fae7..ab200c107c8c73e441c7ba9211a72688a80e70b4 100644 (file)
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -3,31 +3,80 @@
 #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 int counter = 0;

+unsigned int lastctr = 0;

 unsigned long pcisave;
 unsigned char vgasave;
 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;
 
 void pci_dump() {
        unsigned long cts;

-       static int curdev = 0;  /* 0 if kbd, 1 if mouse */

                
        cts = inl(0x84C);
        
                
        cts = inl(0x84C);
        

-       outl(0x848, 0x0);

        outl(0x840, 0x0);
        outl(0x840, 0x0);

+       outl(0x848, 0x0);

        switch(cts&0xF0000)
        {
        case 0x20000:
        {
                unsigned char b;
        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) && (b == 0x01))
-                       outb(0xCF9, 0x4);
+               
+               switch (cts & 0xFFFF)
+               {
+               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;
                break;
        }
                *(unsigned char*)0xAFFD0 /* EAX */ = b;
                break;
        }


@@ -44,8 +93,9 @@ void pci_dump() {
                dolog("Unhandled PCI cycle");
        }
        
                dolog("Unhandled PCI cycle");
        }
        

+       outl(0x840, 0x0);
+       outl(0x844, 0x1000);

        outl(0x848, 0x1000);
        outl(0x848, 0x1000);

-       outl(0x840, 0x0100);

 }
 
 void timer_handler(smi_event_t ev)
 }
 
 void timer_handler(smi_event_t ev)


@@ -55,6 +105,14 @@ void timer_handler(smi_event_t ev)
        smi_disable_event(SMI_EVENT_FAST_TIMER);
        smi_enable_event(SMI_EVENT_FAST_TIMER);
        
        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();
        outb(0x80, (ticks++) & 0xFF);
        
        outlog();


@@ -69,9 +127,25 @@ void gbl_rls_handler(smi_event_t ev)
 {
        unsigned long ecx;
        
 {
        unsigned long ecx;
        

-       ecx = *(unsigned char*)0xAFFD4;
-       dologf("ECX was %08x", ecx);
-       *(unsigned long*)0xAFFD4 = 0x2BADD00D;
+       ecx = *(unsigned long*)0xAFFD4;
+
+       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 +154,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 +171,7 @@ void smi_entry(void)
 
        smi_poll();
        
 
        smi_poll();
        

+       pci_bother_all();

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