I r retard; should be unsigned long

[netwatch.git] / aseg / counter.c

diff --git a/aseg/counter.c b/aseg/counter.c
index 104d809dbdac0a3d5a6ddbd30d587d5db09ffcdd..88915dcfabae8e3f00c0e2c180563576aabf9e5c 100644 (file)
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -2,9 +2,7 @@
 #include <smram.h>
 #include <video_defines.h>
 #include <minilib.h>
 #include <smram.h>
 #include <video_defines.h>
 #include <minilib.h>

-
-char thestr[512];
-
+#include <smi.h>

 #include "vga-overlay.h"
 
 unsigned int counter = 0;
 #include "vga-overlay.h"
 
 unsigned int counter = 0;


@@ -12,7 +10,6 @@ unsigned long pcisave;
 unsigned char vgasave;
 
 void pci_dump() {
 unsigned char vgasave;
 
 void pci_dump() {

-       char s[40];

        unsigned long cts;
        static int curdev = 0;  /* 0 if kbd, 1 if mouse */
                
        unsigned long cts;
        static int curdev = 0;  /* 0 if kbd, 1 if mouse */
                


@@ -38,11 +35,8 @@ void pci_dump() {
        {
                unsigned char b;
                
        {
                unsigned char b;
                

-               strcpy(s, "WRITxxxxxxxxxxxxxxxx");

                b = *(unsigned char*)0xAFFD0 /* EAX */;
                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;
        }
                outb(cts & 0xFFFF, b);
                break;
        }


@@ -54,57 +48,53 @@ void pci_dump() {
        outl(0x840, 0x0100);
 }
 
        outl(0x840, 0x0100);
 }
 

-void __start (void)
+void timer_handler(smi_event_t ev)
+{
+       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 gbl_rls_handler(smi_event_t ev)
+{
+       unsigned long ecx;
+       
+       ecx = *(unsigned long*)0xAFFD4;
+       dologf("ECX was %08x", ecx);
+       *(unsigned long*)0xAFFD4 = 0x2BADD00D;
+}
+
+void smi_entry(void)

 {
 {

-       static int first = 1;
+       char statstr[512];

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

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

        counter++;
        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(0x840) & 0x1000)
        {
                pci_dump();
                outl(0x840, 0x1100);
                outl(0x840, 0x0100);
        }

-       if (inl(0x834) & ~(0x4160))
-               dologf("Unknown: %08x", inl(0x834) & ~(0x140));

 
 

-       outlog();
+       smi_poll();

        
        outl(0xCF8, pcisave);
        outb(0x3D4, vgasave);
        
        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);
-       

 }
 
 }