Merge branch 'master' of /storage/git/netwatch

[netwatch.git] / aseg / counter.c

diff --git a/aseg/counter.c b/aseg/counter.c
index d52316843f1c2f41b4459ff3b33548c251a91d8f..3c22c0545d4e2d96aa798742daebcd456332a453 100644 (file)
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -2,9 +2,7 @@
 #include <smram.h>
 #include <video_defines.h>
 #include <minilib.h>
-
-char thestr[512];
-
+#include <smi.h>
 #include "vga-overlay.h"
 
 unsigned int counter = 0;
@@ -12,7 +10,6 @@ unsigned long pcisave;
 unsigned char vgasave;
 
 void pci_dump() {
-       char s[40];
        unsigned long cts;
        static int curdev = 0;  /* 0 if kbd, 1 if mouse */
                
@@ -25,15 +22,12 @@ void pci_dump() {
        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;
        }
@@ -41,11 +35,8 @@ void pci_dump() {
        {
                unsigned char b;
                
-               strcpy(s, "WRITxxxxxxxxxxxxxxxx");
                b = *(unsigned char*)0xAFFD0 /* EAX */;
-               tohex(s+4, cts);
-               tohex(s+12, b);
-               dolog(s);
+               dologf("WRITE: %08x (%02x)", cts, b);
                outb(cts & 0xFFFF, b);
                break;
        }
@@ -57,63 +48,44 @@ void pci_dump() {
        outl(0x840, 0x0100);
 }
 
-void __start (void)
+void timer_handler(smi_event_t ev)
 {
-       static int first = 1;
+       static unsigned int ticks = 0;
+       
+       smi_disable_event(SMI_EVENT_FAST_TIMER);
+       smi_enable_event(SMI_EVENT_FAST_TIMER);
+       
+       outb(0x80, (ticks++) & 0xFF);
+       
+       outlog();
+}
+
+void kbc_handler(smi_event_t ev)
+{
+       pci_dump();
+}
+
+void smi_entry(void)
+{
+       char statstr[512];
        
        pcisave = inl(0xCF8);
        vgasave = inb(0x3D4);
        
-       if (first)
-       {
-               first = 0;
-               dolog("NetWatch running...");
-       }
-
        counter++;
-       outb(0x80, (counter & 0xFF));
-       
-       strcpy(thestr, "15-412! xxxxxxxx xxxxxxxx");
-       tohex(thestr + 8, inl(0x0834));
-       tohex(thestr + 17, counter);
-       strblit(thestr, 0, 0);
+       sprintf(statstr, "15-412! %08x %08x", smi_status(), counter);
+       strblit(statstr, 0, 0);
        
-       if (inl(0x834) & 0x20)
-               dolog("Warning: unhandled APM access");
-       if (inl(0x834) & 0x1000)
-       {
-               if (inl(0x844) & 0x1000)        /* devact_sts */
-               {
-                       pci_dump();
-                       outl(0x844, 0x1000);    /* ack it */
-               }
-       }
-       if (inl(0x834) & 0x4000)
-               dolog("Long periodic timer");
        if (inl(0x840) & 0x1000)
        {
                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);
-       }
-
 
-       outlog();
+       smi_poll();
        
        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);
-       
 }