Merge branch 'master' into iso-9660

[lunaix-os.git] / lunaix-os / kernel / asm / x86 / interrupts.c

diff --git a/lunaix-os/kernel/asm/x86/interrupts.c b/lunaix-os/kernel/asm/x86/interrupts.c
index 39682a38a2c850e8df3b1e4a7dee6da55eec347c..25b3791e7415f73af0d632d3702e020ced94a9a3 100644 (file)
--- a/lunaix-os/kernel/asm/x86/interrupts.c
+++ b/lunaix-os/kernel/asm/x86/interrupts.c
@@ -1,17 +1,46 @@
 #include <arch/x86/interrupts.h>
-#include <libc/stdio.h>
-
-void isr0 (isr_param* param) {
-    tty_clear();
-    printf("[PANIC] Exception (%d) CS=0x%X, EIP=0x%X", param->vector, param->cs, param->eip);
-}
-
-void 
-interrupt_handler(isr_param* param) {
-    switch (param->vector)
-    {
-        case 0:
-            isr0(param);
-            break;
+#include <arch/x86/tss.h>
+
+#include <hal/apic.h>
+#include <hal/cpu.h>
+
+#include <lunaix/isrm.h>
+#include <lunaix/mm/page.h>
+#include <lunaix/mm/vmm.h>
+#include <lunaix/process.h>
+#include <lunaix/sched.h>
+#include <lunaix/syslog.h>
+#include <lunaix/tty/tty.h>
+
+LOG_MODULE("INTR")
+
+extern x86_page_table* __kernel_ptd;
+
+void
+intr_handler(isr_param* param)
+{
+    __current->intr_ctx = *param;
+
+    isr_param* lparam = &__current->intr_ctx;
+
+    if (lparam->vector <= 255) {
+        isr_cb subscriber = isrm_get(lparam->vector);
+        subscriber(param);
+        goto done;
     }
+
+    kprint_panic("INT %u: (%x) [%p: %p] Unknown",
+                 lparam->vector,
+                 lparam->err_code,
+                 lparam->cs,
+                 lparam->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 (lparam->vector >= IV_EX && lparam->vector != APIC_SPIV_IV) {
+        apic_done_servicing();
+    }
+
+    return;
 }
\ No newline at end of file