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

[netwatch.git] / aseg / firstrun.c

diff --git a/aseg/firstrun.c b/aseg/firstrun.c
index 323f1ab751f0f3c825379dbf92104e2af85f4d34..e0e290466f9756895ba013fe8036de1316efd332 100644 (file)
--- a/aseg/firstrun.c
+++ b/aseg/firstrun.c
@@ -8,6 +8,8 @@
 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;
@@ -29,9 +31,16 @@ void __firstrun_start() {
 
        /* Turn on the SMIs we want */
        smi_disable();
+       
        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();
        
        smram_restore_state(smram);