Integrate the KBC trap into smi.h.

[netwatch.git] / aseg / counter.c

diff --git a/aseg/counter.c b/aseg/counter.c
index 1138e53eb02519b38c093be6cc136b1136292ec0..3c22c0545d4e2d96aa798742daebcd456332a453 100644 (file)
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -48,6 +48,23 @@ void pci_dump() {
        outl(0x840, 0x0100);
 }
 
+void timer_handler(smi_event_t ev)
+{
+       static unsigned int ticks = 0;
+       
+       smi_disable_event(SMI_EVENT_FAST_TIMER);
+       smi_enable_event(SMI_EVENT_FAST_TIMER);
+       
+       outb(0x80, (ticks++) & 0xFF);
+       
+       outlog();
+}
+
+void kbc_handler(smi_event_t ev)
+{
+       pci_dump();
+}
+
 void smi_entry(void)
 {
        char statstr[512];
@@ -56,19 +73,9 @@ void smi_entry(void)
        vgasave = inb(0x3D4);
        
        counter++;
-       outb(0x80, (counter & 0xFF));
-       
        sprintf(statstr, "15-412! %08x %08x", smi_status(), counter);
        strblit(statstr, 0, 0);
        
-       if (inl(0x834) & 0x1000)
-       {
-               if (inl(0x844) & 0x1000)        /* devact_sts */
-               {
-                       pci_dump();
-                       outl(0x844, 0x1000);    /* ack it */
-               }
-       }
        if (inl(0x840) & 0x1000)
        {
                pci_dump();
@@ -77,7 +84,6 @@ void smi_entry(void)
        }
 
        smi_poll();
-       outlog();
        
        outl(0xCF8, pcisave);
        outb(0x3D4, vgasave);