Ass.

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

diff --git a/aseg-paging/smi.c b/aseg-paging/smi.c
index 9bc124eba642396ba246ec8c3dcd063917e9cce1..bc0960f3428221f2da820e15ca38cf3c6dd21fef 100644 (file)
--- a/aseg-paging/smi.c
+++ b/aseg-paging/smi.c
@@ -5,57 +5,60 @@
 #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 "pagetable.h"
-
 unsigned int counter = 0;
-unsigned int lastctr = 0;
 unsigned long pcisave = 0;
 unsigned char vgasave = 0;
 
-void set_cr0(unsigned int);
-
-#define get_cr0() \
-    ({ \
-        register unsigned int _temp__; \
-        asm volatile("mov %%cr0, %0" : "=r" (_temp__)); \
-        _temp__; \
-    })
-
-
-#define set_cr3(value) \
-    { \
-        register unsigned int _temp__ = (value); \
-        asm volatile("mov %0, %%cr3" : : "r" (_temp__)); \
-     }
-#define        CR0_PG  0x80000000
-
-
 void smi_entry(void)
 {
        char statstr[512];
-       outb(0x80, 0x0B);
+
        pcisave = inl(0xCF8);
        vgasave = inb(0x3D4);
-       outb(0x80, 0x1B);
-/*
        pci_unbother_all();
- */
-       counter++;
-       outb(0x80, 0x2B);
-       sprintf(statstr, "15-412! %08x %08x", smi_status(), counter);
-       outb(0x80, 0x3B);
-       strblit(statstr, 0, 0);
-       outb(0x80, 0x4B);
        
        serial_init();
-       dolog("wee!");
        
-       /*
+       if (fb)
+               fb->getvmode(fb->priv);
+
+       counter++;
+       sprintf(statstr, "NetWatch! %08x %08x", smi_status(), counter);
+       strblit(statstr, 0, 0, 0);
+       
+       /* wee! */
+       if (fb && !fb->curmode.text)
+       {
+               output("not text! nope nope nope");
+               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) * 4;
+                                       *(unsigned long *)p2v(a) = 0xFF0000FF;
+                               }
+               }
+       }
+       
        eth_poll();
-       */
        
        if (inl(0x840) & 0x1000)
        {
@@ -68,37 +71,35 @@ void smi_entry(void)
 
 
        smi_poll();
-/*     
+       
        pci_bother_all();
- */
        outl(0xCF8, pcisave);
        outb(0x3D4, vgasave);
 }
 
-void timer_handler(smi_event_t ev)
-{
-        static unsigned int ticks = 0;
+extern void timer_handler(smi_event_t ev);
+extern void kbc_handler(smi_event_t ev);
+extern void gbl_rls_handler(smi_event_t ev);
 
-        smi_disable_event(SMI_EVENT_FAST_TIMER);
-        smi_enable_event(SMI_EVENT_FAST_TIMER);
+void __firstrun_stub() {
 
-        outb(0x80, (ticks++) & 0xFF);
+        /* Try really hard to shut up USB_LEGKEY. */
+        pci_write16(0, 31, 2, 0xC0, pci_read16(0, 31, 2, 0xC0));
+        pci_write16(0, 31, 2, 0xC0, 0);
+        pci_write16(0, 31, 4, 0xC0, pci_read16(0, 31, 4, 0xC0));
+        pci_write16(0, 31, 4, 0xC0, 0);
 
-        outlog();
-}
-
-
-void __firstrun_start() {
-       smram_state_t smram;
-       
-       smram = smram_save_state();
-       smram_tseg_set_state(SMRAM_TSEG_OPEN);
-       smi_disable();
-       outb(0x80, 0x41);
+        /* Turn on the SMIs we want */
+        smi_disable();
 
         smi_register_handler(SMI_EVENT_FAST_TIMER, timer_handler);
         smi_enable_event(SMI_EVENT_FAST_TIMER);
 
+        smi_register_handler(SMI_EVENT_DEVTRAP_KBC, kbc_handler);
+        smi_enable_event(SMI_EVENT_DEVTRAP_KBC);
+
+        smi_register_handler(SMI_EVENT_GBL_RLS, gbl_rls_handler);
+        smi_enable_event(SMI_EVENT_GBL_RLS);
+
         smi_enable();
 }
-