Integrate the KBC trap into smi.h.

[netwatch.git] / aseg / firstrun.c

diff --git a/aseg/firstrun.c b/aseg/firstrun.c
index 9589a13432cf30db6a88e3d6780032d15fa2da33..ec09a8218ecb07a2748f16b085b1b41ced594f08 100644 (file)
--- a/aseg/firstrun.c
+++ b/aseg/firstrun.c
@@ -7,6 +7,9 @@
 
 extern int _bss, _bssend;
 
+extern void timer_handler(smi_event_t ev);
+extern void kbc_handler(smi_event_t ev);
+
 void __firstrun_start() {
        unsigned char *bp;
        smram_state_t smram;
@@ -26,8 +29,14 @@ void __firstrun_start() {
        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();
        
        smram_restore_state(smram);