Merge nyus.joshuawise.com:/storage/git/netwatch

[netwatch.git] / aseg / firstrun.c

diff --git a/aseg/firstrun.c b/aseg/firstrun.c
index 9589a13432cf30db6a88e3d6780032d15fa2da33..d3cd16f4a69957b88e6ff8831e82259c95689a95 100644 (file)
--- a/aseg/firstrun.c
+++ b/aseg/firstrun.c
@@ -2,11 +2,17 @@
 #include <smi.h>
 #include <pci.h>
 #include <reg-82801b.h>
+#include <output.h>
 #include "vga-overlay.h"
 #include <smram.h>
+#include "../net/net.h"
 
 extern int _bss, _bssend;
 
+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);
+
 void __firstrun_start() {
        unsigned char *bp;
        smram_state_t smram;
@@ -17,7 +23,9 @@ void __firstrun_start() {
        for (bp = (void *)&_bss; (void *)bp < (void *)&_bssend; bp++)
                *bp = 0;
        
-       dologf("NetWatch running");
+       vga_flush_imm(0);
+       
+       outputf("NetWatch running");
 
        /* Try really hard to shut up USB_LEGKEY. */
        pci_write16(0, 31, 2, 0xC0, pci_read16(0, 31, 2, 0xC0));
@@ -26,10 +34,23 @@ void __firstrun_start() {
        pci_write16(0, 31, 4, 0xC0, 0);
 
        /* Turn on the SMIs we want */
-       outb(0x830, inb(0x830) | ICH2_SMI_EN_SWSMI_TMR_EN);
-       outb(0x848, ICH2_DEVTRAP_EN_KBC_TRP_EN);
+       smi_disable();
+       
+       eth_init();
+       
+       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();
        
+       vga_flush_imm(1);
+       
        smram_restore_state(smram);
 }