Put BSS clearing in firstrun

[netwatch.git] / aseg / firstrun.c

diff --git a/aseg/firstrun.c b/aseg/firstrun.c
index ace70c6c0703488adcd3fd632bf7efd0660f28d7..9589a13432cf30db6a88e3d6780032d15fa2da33 100644 (file)
--- a/aseg/firstrun.c
+++ b/aseg/firstrun.c
@@ -1,19 +1,23 @@
 #include <io.h>
 #include <io.h>

+#include <smi.h>
+#include <pci.h>
+#include <reg-82801b.h>
+#include "vga-overlay.h"
+#include <smram.h>
+
+extern int _bss, _bssend;

 
 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;
+       
+       dologf("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));


@@ -22,6 +26,10 @@ 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) | 0x41);
+       outb(0x830, inb(0x830) | ICH2_SMI_EN_SWSMI_TMR_EN);
+       outb(0x848, ICH2_DEVTRAP_EN_KBC_TRP_EN);
+       smi_enable();
+       
+       smram_restore_state(smram);

 }
 
 }