Merge nyus.joshuawise.com:/storage/git/netwatch

[netwatch.git] / aseg / counter.c

diff --git a/aseg/counter.c b/aseg/counter.c
index 85b73eba3c98a10ced98c329cb7ae8bf54cd64d1..eaeec525e7ab11b006ba18c826d0726279791f8c 100644 (file)
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -3,7 +3,9 @@
 #include <video_defines.h>
 #include <minilib.h>
 #include <smi.h>
+#include "3c905.h"
 #include "vga-overlay.h"
+#include "packet.h"
 
 unsigned int counter = 0;
 unsigned long pcisave;
@@ -60,6 +62,34 @@ void timer_handler(smi_event_t ev)
        outlog();
 }
 
+void kbc_handler(smi_event_t ev)
+{
+       pci_dump();
+}
+
+void gbl_rls_handler(smi_event_t ev)
+{
+       unsigned long ecx;
+       
+       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 {
+               *(unsigned long*)0xAFFD4 = 0x2BADD00D;
+       }
+}
+
 void smi_entry(void)
 {
        char statstr[512];
@@ -71,14 +101,8 @@ void smi_entry(void)
        sprintf(statstr, "15-412! %08x %08x", smi_status(), counter);
        strblit(statstr, 0, 0);
        
-       if (inl(0x834) & 0x1000)
-       {
-               if (inl(0x844) & 0x1000)        /* devact_sts */
-               {
-                       pci_dump();
-                       outl(0x844, 0x1000);    /* ack it */
-               }
-       }
+       eth_poll();
+       
        if (inl(0x840) & 0x1000)
        {
                pci_dump();