Move dolog to output

[netwatch.git] / aseg / counter.c

diff --git a/aseg/counter.c b/aseg/counter.c
index 2b1d6ead45c953b80326be92bd7d8294a4ff62e4..895974de83cc782df23b855f2005ed70872f498f 100644 (file)
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -2,6 +2,7 @@
 #include <smram.h>
 #include <video_defines.h>
 #include <minilib.h>
 #include <smram.h>
 #include <video_defines.h>
 #include <minilib.h>

+#include <smi.h>

 
 char thestr[512];
 
 
 char thestr[512];
 


@@ -19,21 +20,18 @@ void pci_dump() {
        cts = inl(0x84C);
        
        outl(0x848, 0x0);
        cts = inl(0x84C);
        
        outl(0x848, 0x0);

-       
+       outl(0x840, 0x0);

        switch(cts&0xF0000)
        {
        case 0x20000:
        {
                unsigned char b;
        switch(cts&0xF0000)
        {
        case 0x20000:
        {
                unsigned char b;

-               strcpy(s, "READxxxxxxxxxxxxxxxx");
-               tohex(s+4, cts);

                b = inb(cts & 0xFFFF);
                b = inb(cts & 0xFFFF);

-               tohex(s+12, 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 ((cts & 0xFFFF) == 0x64)
                        curdev = (b & 0x20) ? 1 : 0;
                if ((curdev == 0) && ((cts & 0xFFFF) == 0x60) && (b == 0x01))
                        outb(0xCF9, 0x4);

-               dolog(s);

                *(unsigned char*)0xAFFD0 /* EAX */ = b;
                break;
        }
                *(unsigned char*)0xAFFD0 /* EAX */ = b;
                break;
        }


@@ -52,67 +50,41 @@ void pci_dump() {
        default:
                dolog("Unhandled PCI cycle");
        }
        default:
                dolog("Unhandled PCI cycle");
        }

+       
+       outl(0x848, 0x1000);
+       outl(0x840, 0x0100);

 }
 
 }
 

-void __start (void)
+void smi_entry(void)

 {
 {

-       static int first = 1;
-       

        pcisave = inl(0xCF8);
        vgasave = inb(0x3D4);
        
        pcisave = inl(0xCF8);
        vgasave = inb(0x3D4);
        

-       if (first)
-       {
-               first = 0;
-               dolog("NetWatch running...");
-       }
-

        counter++;
        outb(0x80, (counter & 0xFF));
        
        counter++;
        outb(0x80, (counter & 0xFF));
        

-       strcpy(thestr, "15-412! xxxxxxxx xxxxxxxx");
-       tohex(thestr + 8, inl(0x0834));
-       tohex(thestr + 17, counter);
+       sprintf(thestr, "15-412! %08x %08x", smi_status(), counter);

        strblit(thestr, 0, 0);
        
        strblit(thestr, 0, 0);
        

-       if (inl(0x834) & 0x20)
-               dolog("Warning: unhandled APM access");

        if (inl(0x834) & 0x1000)
        {
                if (inl(0x844) & 0x1000)        /* devact_sts */
                {
                        pci_dump();
        if (inl(0x834) & 0x1000)
        {
                if (inl(0x844) & 0x1000)        /* devact_sts */
                {
                        pci_dump();

-                       outl(0x848, 0x1000);
-                       outl(0x844, 0x1000);
+                       outl(0x844, 0x1000);    /* ack it */

                }
        }
                }
        }

-       if (inl(0x834) & 0x4000)
-               dolog("Long periodic timer");

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

-               dolog("Caught device monitor trap");

                pci_dump();
                outl(0x840, 0x1100);
                outl(0x840, 0x0100);
        }
                pci_dump();
                outl(0x840, 0x1100);
                outl(0x840, 0x0100);
        }

-       if (inl(0x834) & ~(0x4160))
-       {
-               char s[40];
-               strcpy(s, "Unknown: xxxxxxxx");
-               tohex(s + 9, inl(0x834) & ~(0x140));
-               dolog(s);
-       }
-

 
 

+       smi_poll();

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

-       
-       outl(0x848, 0x1000);
-       outl(0x834, /*0x40*/0xFFFF);    // ack the periodic IRQ
-       outb(0x830, (inb(0x830) | 0x2) & ~0x40);
-       outb(0x830, inb(0x830) | 0x40);
-       

 }
 
 }