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

[netwatch.git] / aseg / firstrun.c

diff --git a/aseg/firstrun.c b/aseg/firstrun.c
index ca892ea0b3dd9b487973e157cd7426b475dc1c6b..d45bc813336b88bdf28a153c90e1a6b3569fee65 100644 (file)
--- a/aseg/firstrun.c
+++ b/aseg/firstrun.c
@@ -1,21 +1,29 @@
 #include <io.h>
 #include <smi.h>
 #include <pci.h>
 #include <io.h>
 #include <smi.h>
 #include <pci.h>

+#include <reg-82801b.h>
+#include <output.h>
+#include "vga-overlay.h"
+#include <smram.h>
+#include "3c905.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() {
 
 void __firstrun_start() {

-/*
-       puts("Current USB state is: ");
-       puthex(pci_read16(0, 31, 2, 0xC0));
-       puts(" ");
-       puthex(pci_read16(0, 31, 4, 0xC0));
-       puts("\n");
-       puts("Current SMI state is: ");
-       puthex(inl(0x830));
-       puts("\n");
-       puts("Current SMRAMC state is: ");
-       puthex(pci_read8(0, 0, 0, 0x70));
-       puts("\n");
-*/
+       unsigned char *bp;
+       smram_state_t smram;
+       
+       smram = smram_save_state();
+       smram_tseg_set_state(SMRAM_TSEG_OPEN);
+       
+       for (bp = (void *)&_bss; (void *)bp < (void *)&_bssend; bp++)
+               *bp = 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));


@@ -24,7 +32,21 @@ void __firstrun_start() {
        pci_write16(0, 31, 4, 0xC0, 0);
 
        /* Turn on the SMIs we want */
        pci_write16(0, 31, 4, 0xC0, 0);
 
        /* Turn on the SMIs we want */

-       outb(0x830, inb(0x830) | 0x40);
+       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();
        smi_enable();

+       
+       smram_restore_state(smram);

 }
 
 }