Merge branch 'master' of /storage/git/netwatch

[netwatch.git] / aseg / firstrun.c

diff --git a/aseg/firstrun.c b/aseg/firstrun.c
index 323f1ab751f0f3c825379dbf92104e2af85f4d34..d3cd16f4a69957b88e6ff8831e82259c95689a95 100644 (file)
--- a/aseg/firstrun.c
+++ b/aseg/firstrun.c
@@ -2,12 +2,16 @@
 #include <smi.h>
 #include <pci.h>
 #include <reg-82801b.h>
 #include <smi.h>
 #include <pci.h>
 #include <reg-82801b.h>

+#include <output.h>

 #include "vga-overlay.h"
 #include <smram.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 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;
 
 void __firstrun_start() {
        unsigned char *bp;


@@ -19,7 +23,9 @@ void __firstrun_start() {
        for (bp = (void *)&_bss; (void *)bp < (void *)&_bssend; bp++)
                *bp = 0;
        
        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));
 
        /* Try really hard to shut up USB_LEGKEY. */
        pci_write16(0, 31, 2, 0xC0, pci_read16(0, 31, 2, 0xC0));


@@ -29,11 +35,22 @@ void __firstrun_start() {
 
        /* Turn on the SMIs we want */
        smi_disable();
 
        /* Turn on the SMIs we want */
        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_FAST_TIMER, timer_handler);
        smi_enable_event(SMI_EVENT_FAST_TIMER);

-       outb(0x848, ICH2_DEVTRAP_EN_KBC_TRP_EN);
+       
+       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();
        
        smi_enable();
        

+       vga_flush_imm(1);
+       

        smram_restore_state(smram);
 }
 
        smram_restore_state(smram);
 }