fixed merge

[netwatch.git] / aseg-paging / smi.c

diff --git a/aseg-paging/smi.c b/aseg-paging/smi.c
index eada78df797f1e81514c0977649bf13c5bfc5e25..f2b574fabe4347b3e33ffa9c7bb7b752276e5724 100644 (file)
--- a/aseg-paging/smi.c
+++ b/aseg-paging/smi.c
@@ -5,6 +5,8 @@
 #include <smi.h>
 #include <pci-bother.h>
 #include <serial.h>
 #include <smi.h>
 #include <pci-bother.h>
 #include <serial.h>

+#include <fb.h>
+#include <output.h>

 #include "../net/net.h"
 #include "vga-overlay.h"
 
 #include "../net/net.h"
 #include "vga-overlay.h"
 


@@ -15,27 +17,47 @@ unsigned char vgasave = 0;
 void smi_entry(void)
 {
        char statstr[512];
 void smi_entry(void)
 {
        char statstr[512];

-       outb(0x80, 0x0B);
+

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

-       outb(0x80, 0x1B);
-/*

        pci_unbother_all();
        pci_unbother_all();

- */
+       
+       serial_init();
+       
+       if (fb)
+               fb->getvmode(fb->priv);
+

        counter++;
        counter++;

-       outb(0x80, 0x2B);

        sprintf(statstr, "NetWatch! %08x %08x", smi_status(), counter);
        sprintf(statstr, "NetWatch! %08x %08x", smi_status(), counter);

-       outb(0x80, 0x3B);
-       strblit(statstr, 0, 0);
-       outb(0x80, 0x4B);
+       strblit(statstr, 0, 0, 0);

        
        

-       serial_init();
-/*     dolog("wee!");
- */
+       /* wee! */
+       if (fb && !fb->curmode.text)
+       {
+               int ass[][2] = {
+                             {1,0},       {4,0},{5,0},{6,0}, {8,0},{9,0},{10,0},
+                       {0,1},      {2,1}, {4,1},             {8,1},
+                       {0,2},{1,2},{2,2}, {4,2},{5,2},{6,2}, {8,2},{9,2},{10,2},
+                       {0,3},      {2,3},             {6,3},             {10,3},
+                       {0,4},      {2,4}, {4,4},{5,4},{6,4}, {8,4},{9,4},{10,4},
+                       {-1,-1}
+               };
+               int p;
+               for (p = 0; ass[p][0] != -1; p++)
+               {
+                       int x, y;
+                       for (y = 0; y < 8; y++)
+                               for (x = 0; x < 8; x++)
+                               {
+                                       unsigned long *a =
+                                               (unsigned long*) fb->fbaddr +
+                                               ((y+ass[p][1]*8) * fb->curmode.xres + ass[p][0]*8 + x);
+                                        *a = 0xFF0000FF;
+                               }
+               }
+       }

        
        

-       /*

        eth_poll();
        eth_poll();

-       */

        
        if (inl(0x840) & 0x1000)
        {
        
        if (inl(0x840) & 0x1000)
        {


@@ -48,9 +70,8 @@ void smi_entry(void)
 
 
        smi_poll();
 
 
        smi_poll();

-/*     
+       

        pci_bother_all();
        pci_bother_all();

- */

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