fix get_PMBASE bug

[netwatch.git] / aseg / counter.c

diff --git a/aseg/counter.c b/aseg/counter.c
index 2b1d6ead45c953b80326be92bd7d8294a4ff62e4..104d809dbdac0a3d5a6ddbd30d587d5db09ffcdd 100644 (file)
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -19,21 +19,18 @@ void pci_dump() {
        cts = inl(0x84C);
        
        outl(0x848, 0x0);
-       
+       outl(0x840, 0x0);
        switch(cts&0xF0000)
        {
        case 0x20000:
        {
                unsigned char b;
-               strcpy(s, "READxxxxxxxxxxxxxxxx");
-               tohex(s+4, cts);
                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);
-               dolog(s);
                *(unsigned char*)0xAFFD0 /* EAX */ = b;
                break;
        }
@@ -52,6 +49,9 @@ void pci_dump() {
        default:
                dolog("Unhandled PCI cycle");
        }
+       
+       outl(0x848, 0x1000);
+       outl(0x840, 0x0100);
 }
 
 void __start (void)
@@ -82,27 +82,19 @@ void __start (void)
                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)
        {
-               dolog("Caught device monitor trap");
                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);
-       }
-
+               dologf("Unknown: %08x", inl(0x834) & ~(0x140));
 
        outlog();