regression: elf loading

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

diff --git a/lunaix-os/kernel/asm/x86/intr_routines.c b/lunaix-os/kernel/asm/x86/intr_routines.c
index 402ceeaf2648090ef030d6542538d81504f7abb8..97903cffebfdc5c1e3e145485e71825605527e90 100644 (file)
--- a/lunaix-os/kernel/asm/x86/intr_routines.c
+++ b/lunaix-os/kernel/asm/x86/intr_routines.c
@@ -1,4 +1,6 @@
 #include <arch/x86/interrupts.h>
 #include <arch/x86/interrupts.h>

+
+#include <lunaix/isrm.h>

 #include <lunaix/lxconsole.h>
 #include <lunaix/process.h>
 #include <lunaix/sched.h>
 #include <lunaix/lxconsole.h>
 #include <lunaix/process.h>
 #include <lunaix/sched.h>


@@ -15,7 +17,7 @@ LOG_MODULE("INTR")
 extern void
 intr_routine_page_fault(const isr_param* param);
 
 extern void
 intr_routine_page_fault(const isr_param* param);
 

-extern uint32_t debug_resv;
+extern u32_t debug_resv;

 
 void
 __print_panic_msg(const char* msg, const isr_param* param)
 
 void
 __print_panic_msg(const char* msg, const isr_param* param)


@@ -77,7 +79,7 @@ intr_routine_apic_spi(const isr_param* param)
 void
 intr_routine_apic_error(const isr_param* param)
 {
 void
 intr_routine_apic_error(const isr_param* param)
 {

-    uint32_t error_reg = apic_read_reg(APIC_ESR);
+    u32_t error_reg = apic_read_reg(APIC_ESR);

     char buf[32];
     ksprintf(buf, "APIC error, ESR=0x%x", error_reg);
     console_flush();
     char buf[32];
     ksprintf(buf, "APIC error, ESR=0x%x", error_reg);
     console_flush();


@@ -94,16 +96,14 @@ intr_routine_sched(const isr_param* param)
 void
 intr_routine_init()
 {
 void
 intr_routine_init()
 {

-    intr_subscribe(FAULT_DIVISION_ERROR, intr_routine_divide_zero);
-    intr_subscribe(FAULT_GENERAL_PROTECTION, intr_routine_general_protection);
-    intr_subscribe(FAULT_PAGE_FAULT, intr_routine_page_fault);
-    intr_subscribe(FAULT_STACK_SEG_FAULT, intr_routine_page_fault);
-
-    intr_subscribe(LUNAIX_SYS_PANIC, intr_routine_sys_panic);
-    intr_subscribe(LUNAIX_SCHED, intr_routine_sched);
+    isrm_bindiv(FAULT_DIVISION_ERROR, intr_routine_divide_zero);
+    isrm_bindiv(FAULT_GENERAL_PROTECTION, intr_routine_general_protection);
+    isrm_bindiv(FAULT_PAGE_FAULT, intr_routine_page_fault);
+    isrm_bindiv(FAULT_STACK_SEG_FAULT, intr_routine_page_fault);

 
 

-    intr_subscribe(APIC_SPIV_IV, intr_routine_apic_spi);
-    intr_subscribe(APIC_ERROR_IV, intr_routine_apic_error);
+    isrm_bindiv(LUNAIX_SYS_PANIC, intr_routine_sys_panic);
+    isrm_bindiv(LUNAIX_SCHED, intr_routine_sched);

 
 

-    intr_set_fallback_handler(intr_routine_fallback);
+    isrm_bindiv(APIC_SPIV_IV, intr_routine_apic_spi);
+    isrm_bindiv(APIC_ERROR_IV, intr_routine_apic_error);

 }
\ No newline at end of file
 }
\ No newline at end of file