SMRAM interface changes, and a few misc. header changes.

[netwatch.git] / aseg / counter.c

diff --git a/aseg/counter.c b/aseg/counter.c
index 61f9b6fac9e18ffb1a3ac87bd2d54b87925d83b6..2c82f086316b0209e4476007e681525a7827ac8d 100644 (file)
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -1,21 +1,10 @@
 #include <io.h>
 
 #include <io.h>
 

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

 unsigned long pcisave;
 unsigned char vgasave;
 unsigned char thestr[512];
 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 logents[4][41] = {0};

 
 unsigned char vgaread(unsigned char idx)
 {
 
 unsigned char vgaread(unsigned char idx)
 {


@@ -23,37 +12,88 @@ unsigned char vgaread(unsigned char idx)
        inb(0x3D5);
 }
 
        inb(0x3D5);
 }
 

-void strblit(char *src)
+void strblit(char *src, int r, int c)

 {
 {

-       char *destp = (char*)(0xB8000 | (vgaread(0xC) << 5) | (vgaread(0xD) << 1));
+       char *destp = (char*)(0xB8000UL | (((unsigned int)vgaread(0xC)) << 9) | (((unsigned int)vgaread(0xD)) << 1)) + r*80*2 + c*2;
+       unsigned char smramc;
+       
+       smramc = pci_read8(0, 0, 0, 0x70);
+       pci_write8(0, 0, 0, 0x70, (smramc & 0xF3) | 0x08);

        while (*src)
        {
                *(destp++) = *(src++);
                *(destp++) = 0x1F;
        }
        while (*src)
        {
                *(destp++) = *(src++);
                *(destp++) = 0x1F;
        }

+       pci_write8(0, 0, 0, 0x70, smramc);
+}
+
+void outlog()
+{
+       int y, x;
+       unsigned char smramc;
+       unsigned char *basep = (char*)(0xB8000UL | (((unsigned int)vgaread(0xC)) << 9) | (((unsigned int)vgaread(0xD)) << 1));
+       
+       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);
+       
+       for (y = 0; y < 4; y++)
+               strblit(logents[y], y, 40);
+       
+}
+
+void dolog(char *s)
+{
+       memmove(logents[0], logents[1], sizeof(logents[0])*3);
+       strcpy(logents[3], s);

 }
 
 void __start (void)
 {
        unsigned char smramc;
 }
 
 void __start (void)
 {
        unsigned char smramc;

+       static int first = 1;

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

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

 
        counter++;
 
        counter++;

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

        
        

-       strcpy(thestr, "15-412!");
+       strcpy(thestr, "15-412! xxxxxxxx xxxxxxxx");
+       tohex(thestr + 8, inl(0x0834));
+       tohex(thestr + 17, counter);
+       strblit(thestr, 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) & 0x20)
+               dolog("Warning: unhandled APM access");
+       if (inl(0x834) & 0x4000)
+               dolog("Long periodic timer");
+       if (inl(0x834) & ~(0x4160))
+       {
+               unsigned char s[40];
+               strcpy(s, "Unknown: xxxxxxxx");
+               tohex(s + 9, inl(0x834) & ~(0x140));
+               dolog(s);
+       }
+       
+       outlog();

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

-       outb(0x834, 0x40);      // ack the periodic IRQ
+       outl(0x834, /*0x40*/0xFFFF);    // ack the periodic IRQ

        outb(0x830, (inb(0x830) | 0x2) & ~0x40);
        outb(0x830, inb(0x830) | 0x40);
        
        outb(0x830, (inb(0x830) | 0x2) & ~0x40);
        outb(0x830, inb(0x830) | 0x40);