X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/7804c2dae30700296c3205aaf7f546f491999bf4..b9f4a7b7475e62dbff22da6dd768222f03889c00:/lunaix-os/arch/i386/exceptions/interrupts.c

diff --git a/lunaix-os/arch/i386/exceptions/interrupts.c b/lunaix-os/arch/i386/exceptions/interrupts.c
index d63628b..c45f961 100644
--- a/lunaix-os/arch/i386/exceptions/interrupts.c
+++ b/lunaix-os/arch/i386/exceptions/interrupts.c
@@ -1,10 +1,8 @@
-#include <arch/i386/interrupts.h>
-#include <arch/i386/tss.h>
+#include <sys/interrupts.h>
+#include <sys/x86_isa.h>
 
-#include <hal/apic.h>
-#include <hal/cpu.h>
-
-#include <arch/exception.h>
+#include <sys/cpu.h>
+#include <hal/intc.h>
 
 #include <lunaix/isrm.h>
 #include <lunaix/mm/page.h>
@@ -14,20 +12,10 @@
 #include <lunaix/syslog.h>
 #include <lunaix/tty/tty.h>
 
-#include "i386_intr.h"
+#include <sys/i386_intr.h>
 
 LOG_MODULE("INTR")
 
-extern x86_page_table* __kernel_ptd;
-
-void
-exception_init()
-{
-    exception_install_handler();
-    isrm_init();
-    intr_routine_init();
-}
-
 void
 intr_handler(isr_param* param)
 {
@@ -49,11 +37,8 @@ intr_handler(isr_param* param)
                  execp->eip);
 
 done:
-    // for all external interrupts except the spurious interrupt
-    //  this is required by Intel Manual Vol.3A, section 10.8.1 & 10.8.5
-    if (execp->vector >= IV_EX && execp->vector != APIC_SPIV_IV) {
-        apic_done_servicing();
-    }
+
+    intc_notify_eoi(0, execp->vector);
 
     return;
 }
\ No newline at end of file