Remove some remaining tohex.

[netwatch.git] / aseg / counter.c

diff --git a/aseg/counter.c b/aseg/counter.c
index 8f807aae231f371ab7ed540f2679773d7dc9b4e6..1138e53eb02519b38c093be6cc136b1136292ec0 100644 (file)
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -1,61 +1,85 @@
 #include <io.h>
 #include <io.h>

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

 
 

-char counter = 0;
+unsigned int counter = 0;

 unsigned long pcisave;
 unsigned char vgasave;
 unsigned long pcisave;
 unsigned char vgasave;

-unsigned char thestr[512];

 
 

-void memcpy(char *dst, char *src, int c)
-{
-       while (c--)
-               *(dst++) = *(src++);
-}
-
-void strcpy(char *dst, char *src)
-{
-       while (*src)
-               *(dst++) = *(src++);
-}
-
-unsigned char vgaread(unsigned char idx)
-{
-       outb(0x3D4, idx);
-       inb(0x3D5);
-}
-
-void strblit(char *src)
-{
-       char *destp = (char*)(0xB8000UL | (((unsigned int)vgaread(0xC)) << 9) | (((unsigned int)vgaread(0xD)) << 1));
-       while (*src)
+void pci_dump() {
+       unsigned long cts;
+       static int curdev = 0;  /* 0 if kbd, 1 if mouse */
+               
+       cts = inl(0x84C);
+       
+       outl(0x848, 0x0);
+       outl(0x840, 0x0);
+       switch(cts&0xF0000)
+       {
+       case 0x20000:

        {
        {

-               *(destp++) = *(src++);
-               *(destp++) = 0x1F;
+               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:
+       {
+               unsigned char b;
+               
+               b = *(unsigned char*)0xAFFD0 /* EAX */;
+               dologf("WRITE: %08x (%02x)", cts, b);
+               outb(cts & 0xFFFF, b);
+               break;
+       }
+       default:
+               dolog("Unhandled PCI cycle");
+       }
+       
+       outl(0x848, 0x1000);
+       outl(0x840, 0x0100);

 }
 
 }
 

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

 {
 {

-       unsigned char smramc;
+       char statstr[512];

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

-
+       

        counter++;
        counter++;

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

        
        

-       strcpy(thestr, "15-412!");
+       sprintf(statstr, "15-412! %08x %08x", smi_status(), counter);
+       strblit(statstr, 0, 0);

        
        

-       smramc = pci_read8(0, 0, 0, 0x70);
-       pci_write8(0, 0, 0, 0x70, (smramc & 0xF3) | 0x08);
-       strblit(thestr);
-       pci_write8(0, 0, 0, 0x70, smramc);
+       if (inl(0x834) & 0x1000)
+       {
+               if (inl(0x844) & 0x1000)        /* devact_sts */
+               {
+                       pci_dump();
+                       outl(0x844, 0x1000);    /* ack it */
+               }
+       }
+       if (inl(0x840) & 0x1000)
+       {
+               pci_dump();
+               outl(0x840, 0x1100);
+               outl(0x840, 0x0100);
+       }
+
+       smi_poll();
+       outlog();

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

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

 }
 
 }