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 8330bc263f1bb37b88bf56ff05b25ef7ecbad6d9..25b3791e7415f73af0d632d3702e020ced94a9a3 100644 (file)
--- a/lunaix-os/kernel/asm/x86/interrupts.c
+++ b/lunaix-os/kernel/asm/x86/interrupts.c
@@ -1,83 +1,46 @@
 #include <arch/x86/interrupts.h>
+#include <arch/x86/tss.h>
+
 #include <hal/apic.h>
 #include <hal/cpu.h>
-#include <lunaix/syslog.h>
-#include <lunaix/tty/tty.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/mm/page.h>
-
-LOG_MODULE("intr")
-
-static int_subscriber subscribers[256];
-
-static int_subscriber fallback = (int_subscriber) 0;
-
-void
-intr_subscribe(const uint8_t vector, int_subscriber subscriber) {
-    subscribers[vector] = subscriber;
-}
-
-void
-intr_unsubscribe(const uint8_t vector, int_subscriber subscriber) {
-    if (subscribers[vector] == subscriber) {
-        subscribers[vector] = (int_subscriber) 0;
-    }
-}
+#include <lunaix/syslog.h>
+#include <lunaix/tty/tty.h>
 
-void
-intr_set_fallback_handler(int_subscriber subscribers) {
-    fallback = subscribers;
-}
+LOG_MODULE("INTR")
 
 extern x86_page_table* __kernel_ptd;
 
 void
 intr_handler(isr_param* param)
 {
-    // if (param->vector == LUNAIX_SYS_CALL) {
-    //     kprintf(KDEBUG "%p", param->registers.esp);
-    // }
     __current->intr_ctx = *param;
 
-    cpu_lcr3(__kernel_ptd);
+    isr_param* lparam = &__current->intr_ctx;
 
-    isr_param *lparam = &__current->intr_ctx;
-    
     if (lparam->vector <= 255) {
-        int_subscriber subscriber = subscribers[lparam->vector];
-        if (subscriber) {
-            subscriber(lparam);
-            goto done;
-        }
-    }
-
-    if (fallback) {
-        fallback(lparam);
+        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);
+                 lparam->vector,
+                 lparam->err_code,
+                 lparam->cs,
+                 lparam->eip);
 
 done:
-
-    // if (__current->state != PROC_RUNNING) {
-    //     schedule();
-    // }
-
     // 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 >= EX_INTERRUPT_BEGIN && lparam->vector != APIC_SPIV_IV) {
+    if (lparam->vector >= IV_EX && lparam->vector != APIC_SPIV_IV) {
         apic_done_servicing();
     }
 
-    cpu_lcr3(__current->page_table);
-
-    *param = __current->intr_ctx;
-
     return;
 }
\ No newline at end of file