I r retard; should be unsigned long

[netwatch.git] / aseg / counter.c

diff --git a/aseg/counter.c b/aseg/counter.c
index b6bdcf411c1acb255d50656c1676b1a1f6b8a1b9..88915dcfabae8e3f00c0e2c180563576aabf9e5c 100644 (file)
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -1,150 +1,100 @@
 #include <io.h>
 #include <io.h>

+#include <smram.h>
+#include <video_defines.h>
+#include <minilib.h>
+#include <smi.h>
+#include "vga-overlay.h"

 
 unsigned int counter = 0;
 unsigned long pcisave;
 unsigned char vgasave;
 
 unsigned int counter = 0;
 unsigned long pcisave;
 unsigned char vgasave;

-unsigned char thestr[512];
-unsigned char logents[4][41] = {0};

 
 

-unsigned char vgaread(unsigned char idx)
-{
-       outb(0x3D4, idx);
-       inb(0x3D5);
-}
-
-void strblit(char *src, int r, int c)
-{
-       char *destp = (char*)(0xB8000UL | (((unsigned int)vgaread(0xC)) << 9) | (((unsigned int)vgaread(0xD)) << 1)) + r*80*2 + c*2;
-       unsigned char smramc;
+void pci_dump() {
+       unsigned long cts;
+       static int curdev = 0;  /* 0 if kbd, 1 if mouse */
+               
+       cts = inl(0x84C);

        
        

-       smramc = pci_read8(0, 0, 0, 0x70);
-       pci_write8(0, 0, 0, 0x70, (smramc & 0xF3) | 0x08);
-       while (*src)
+       outl(0x848, 0x0);
+       outl(0x840, 0x0);
+       switch(cts&0xF0000)
+       {
+       case 0x20000:
+       {
+               unsigned char b;
+               b = inb(cts & 0xFFFF);
+               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);
+               *(unsigned char*)0xAFFD0 /* EAX */ = b;
+               break;
+       }
+       case 0x30000:

        {
        {

-               *(destp++) = *(src++);
-               *(destp++) = 0x1F;
+               unsigned char b;
+               
+               b = *(unsigned char*)0xAFFD0 /* EAX */;
+               dologf("WRITE: %08x (%02x)", cts, b);
+               outb(cts & 0xFFFF, b);
+               break;

        }
        }

-       pci_write8(0, 0, 0, 0x70, smramc);
+       default:
+               dolog("Unhandled PCI cycle");
+       }
+       
+       outl(0x848, 0x1000);
+       outl(0x840, 0x0100);

 }
 
 }
 

-void outlog()
+void timer_handler(smi_event_t ev)

 {
 {

-       int y, x;
-       unsigned char smramc;
-       unsigned char *basep = (char*)(0xB8000UL | (((unsigned int)vgaread(0xC)) << 9) | (((unsigned int)vgaread(0xD)) << 1));
+       static unsigned int ticks = 0;

        
        

-       smramc = pci_read8(0, 0, 0, 0x70);
-       pci_write8(0, 0, 0, 0x70, (smramc & 0xF3) | 0x08);
-       for (y = 0; y < 4; y++)
-               for (x = 40; x < 80; x++)
-               {
-                       basep[y*80*2+x*2] = ' ';
-                       basep[y*80*2+x*2+1] = 0x1F;
-               }
-       pci_write8(0, 0, 0, 0x70, smramc);
+       smi_disable_event(SMI_EVENT_FAST_TIMER);
+       smi_enable_event(SMI_EVENT_FAST_TIMER);

        
        

-       for (y = 0; y < 4; y++)
-               strblit(logents[y], y, 40);
+       outb(0x80, (ticks++) & 0xFF);

        
        

+       outlog();

 }
 
 }
 

-void dolog(char *s)
+void kbc_handler(smi_event_t ev)

 {
 {

-       memmove(logents[0], logents[1], sizeof(logents[0])*3);
-       strcpy(logents[3], s);
+       pci_dump();

 }
 
 }
 

-void __start (void)
+void gbl_rls_handler(smi_event_t ev)

 {
 {

-       unsigned char smramc;
-       static int first = 1;
+       unsigned long ecx;
+       
+       ecx = *(unsigned long*)0xAFFD4;
+       dologf("ECX was %08x", ecx);
+       *(unsigned long*)0xAFFD4 = 0x2BADD00D;
+}
+
+void smi_entry(void)
+{
+       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));
+       sprintf(statstr, "15-412! %08x %08x", smi_status(), counter);
+       strblit(statstr, 0, 0);

        
        

-       strcpy(thestr, "15-412! xxxxxxxx xxxxxxxx");
-       tohex(thestr + 8, inl(0x0834));
-       tohex(thestr + 17, counter);
-       strblit(thestr, 0, 0);
-       
-       if (inl(0x834) & 0x20)
-               dolog("Warning: unhandled APM access");
-       if (inl(0x834) & 0x1000)
-       {
-               if (inl(0x844) & 0x1000)        /* devact_sts */
-               {
-                       unsigned char s[40];
-                       unsigned long cts;
-                       static int curdev = 0;  /* 0 if kbd, 1 if mouse */
-                       
-                       cts = inl(0x84C);
-                       
-                       outl(0x848, 0x0);
-                       
-                       switch(cts&0xF0000)
-                       {
-                       case 0x20000:
-                       {
-                               unsigned char b;
-                               strcpy(s, "READxxxxxxxxxxxxxxxx");
-                               tohex(s+4, cts);
-                               b = inb(cts & 0xFFFF);
-                               tohex(s+12, 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;
-                       }
-                       case 0x30000:
-                       {
-                               unsigned char b;
-                               
-                               strcpy(s, "WRITxxxxxxxxxxxxxxxx");
-                               b = *(unsigned char*)0xAFFD0 /* EAX */;
-                               tohex(s+4, cts);
-                               tohex(s+12, b);
-                               dolog(s);
-                               outb(cts & 0xFFFF, b);
-                               break;
-                       }
-                       default:
-                               dolog("Unhandled PCI cycle");
-                       }
-                       outl(0x848, 0x1000);
-                       outl(0x844, 0x1000);
-               }
-       }
-       if (inl(0x834) & 0x4000)
-               dolog("Long periodic timer");
-       if (inl(0x834) & ~(0x4160))
+       if (inl(0x840) & 0x1000)

        {
        {

-               unsigned char s[40];
-               strcpy(s, "Unknown: xxxxxxxx");
-               tohex(s + 9, inl(0x834) & ~(0x140));
-               dolog(s);
+               pci_dump();
+               outl(0x840, 0x1100);
+               outl(0x840, 0x0100);

        }
        }

-       
-       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);
-       

 }
 
 }