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

[netwatch.git] / aseg / firstrun.c

diff --git a/aseg/firstrun.c b/aseg/firstrun.c
index c6eab7b29edaa736c3ecd75ef38d300d314027cd..ec09a8218ecb07a2748f16b085b1b41ced594f08 100644 (file)
--- a/aseg/firstrun.c
+++ b/aseg/firstrun.c
@@ -3,8 +3,23 @@
 #include <pci.h>
 #include <reg-82801b.h>
 #include "vga-overlay.h"
 #include <pci.h>
 #include <reg-82801b.h>
 #include "vga-overlay.h"

+#include <smram.h>
+
+extern int _bss, _bssend;
+
+extern void timer_handler(smi_event_t ev);
+extern void kbc_handler(smi_event_t ev);

 
 void __firstrun_start() {
 
 void __firstrun_start() {

+       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. */
        dologf("NetWatch running");
 
        /* Try really hard to shut up USB_LEGKEY. */


@@ -14,8 +29,16 @@ 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) | ICH2_SMI_EN_SWSMI_TMR_EN);
-       outb(0x848, ICH2_DEVTRAP_EN_KBC_TRP_EN);
+       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_enable();
        smi_enable();

+       
+       smram_restore_state(smram);

 }
 
 }