merge

[netwatch.git] / aseg / counter.c

diff --git a/aseg/counter.c b/aseg/counter.c
index ccfff7254d9b355430ec336b8c1e2e13364d64e7..d52316843f1c2f41b4459ff3b33548c251a91d8f 100644 (file)
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -3,77 +3,13 @@
 #include <video_defines.h>
 #include <minilib.h>
 
 #include <video_defines.h>
 #include <minilib.h>
 

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

 char thestr[512];
 char thestr[512];

-char logents[4][41] = {{0}};
-
-#define VRAM_BASE              0xA0000UL
-#define TEXT_CONSOLE_OFFSET    0x18000UL 
-
-#define TEXT_CONSOLE_BASE      (VRAM_BASE + TEXT_CONSOLE_OFFSET)

 
 

-#define COLOR                  0x1F
-
-unsigned char vga_read(unsigned char idx)
-{
-       outb(CRTC_IDX_REG, idx);
-       return inb(CRTC_DATA_REG);
-}
-
-char * vga_base()
-{
-       return (char *) (
-               TEXT_CONSOLE_BASE
-               | (((unsigned int) vga_read(CRTC_START_ADDR_LSB_IDX)) << 9)
-               | (((unsigned int) vga_read(CRTC_START_ADDR_MSB_IDX)) << 1)
-       );
-}
-
-void strblit(char *src, int row, int col)
-{
-       char *destp = vga_base() + row * 80 * 2 + col * 2;
-       smram_state_t old_state = smram_save_state();
-
-       smram_aseg_set_state(SMRAM_ASEG_SMMCODE);
-       
-       while (*src)
-       {
-               *(destp++) = *(src++);
-               *(destp++) = COLOR;
-       }
-
-       smram_restore_state(old_state);
-}
+#include "vga-overlay.h"

 
 

-void outlog()
-{
-       int y, x;
-       char *basep = vga_base();
-
-       smram_state_t old_state = smram_save_state();
-
-       smram_aseg_set_state(SMRAM_ASEG_SMMCODE);
-
-       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;
-               }
-
-       smram_restore_state(old_state);
-
-       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);
-}
+unsigned int counter = 0;
+unsigned long pcisave;
+unsigned char vgasave;

 
 void pci_dump() {
        char s[40];
 
 void pci_dump() {
        char s[40];


@@ -83,7 +19,7 @@ void pci_dump() {
        cts = inl(0x84C);
        
        outl(0x848, 0x0);
        cts = inl(0x84C);
        
        outl(0x848, 0x0);

-       
+       outl(0x840, 0x0);

        switch(cts&0xF0000)
        {
        case 0x20000:
        switch(cts&0xF0000)
        {
        case 0x20000:


@@ -116,6 +52,9 @@ void pci_dump() {
        default:
                dolog("Unhandled PCI cycle");
        }
        default:
                dolog("Unhandled PCI cycle");
        }

+       
+       outl(0x848, 0x1000);
+       outl(0x840, 0x0100);

 }
 
 void __start (void)
 }
 
 void __start (void)


@@ -146,15 +85,13 @@ void __start (void)
                if (inl(0x844) & 0x1000)        /* devact_sts */
                {
                        pci_dump();
                if (inl(0x844) & 0x1000)        /* devact_sts */
                {
                        pci_dump();

-                       outl(0x848, 0x1000);
-                       outl(0x844, 0x1000);
+                       outl(0x844, 0x1000);    /* ack it */

                }
        }
        if (inl(0x834) & 0x4000)
                dolog("Long periodic timer");
        if (inl(0x840) & 0x1000)
        {
                }
        }
        if (inl(0x834) & 0x4000)
                dolog("Long periodic timer");
        if (inl(0x840) & 0x1000)
        {

-               dolog("Caught device monitor trap");

                pci_dump();
                outl(0x840, 0x1100);
                outl(0x840, 0x0100);
                pci_dump();
                outl(0x840, 0x1100);
                outl(0x840, 0x0100);