Merge branch 'device-sys'

[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 55d7e9b9a1e1002773b7d4ce8303c11bc2c24b1c..864c7da58af3df7f09a292feee299df532474e43 100644 (file)
--- a/lunaix-os/kernel/asm/x86/interrupts.c
+++ b/lunaix-os/kernel/asm/x86/interrupts.c
@@ -1,33 +1,37 @@
 #include <arch/x86/interrupts.h>
 #include <arch/x86/interrupts.h>

+#include <arch/x86/tss.h>

 #include <hal/apic.h>
 #include <hal/cpu.h>
 #include <hal/apic.h>
 #include <hal/cpu.h>

-#include <lunaix/syslog.h>
-#include <lunaix/tty/tty.h>
-#include <lunaix/process.h>
-#include <lunaix/sched.h>

 #include <lunaix/mm/page.h>
 #include <lunaix/mm/vmm.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")
 
 static int_subscriber subscribers[256];
 
 
 LOG_MODULE("intr")
 
 static int_subscriber subscribers[256];
 

-static int_subscriber fallback = (int_subscriber) 0;
+static int_subscriber fallback = (int_subscriber)0;

 
 void
 
 void

-intr_subscribe(const uint8_t vector, int_subscriber subscriber) {
+intr_subscribe(const uint8_t vector, int_subscriber subscriber)
+{

     subscribers[vector] = subscriber;
 }
 
 void
     subscribers[vector] = subscriber;
 }
 
 void

-intr_unsubscribe(const uint8_t vector, int_subscriber subscriber) {
+intr_unsubscribe(const uint8_t vector, int_subscriber subscriber)
+{

     if (subscribers[vector] == subscriber) {
     if (subscribers[vector] == subscriber) {

-        subscribers[vector] = (int_subscriber) 0;
+        subscribers[vector] = (int_subscriber)0;

     }
 }
 
 void
     }
 }
 
 void

-intr_set_fallback_handler(int_subscriber subscribers) {
+intr_set_fallback_handler(int_subscriber subscribers)
+{

     fallback = subscribers;
 }
 
     fallback = subscribers;
 }
 


@@ -37,15 +41,9 @@ void
 intr_handler(isr_param* param)
 {
     __current->intr_ctx = *param;
 intr_handler(isr_param* param)
 {
     __current->intr_ctx = *param;

-    
-#ifdef USE_KERNEL_PT
-    cpu_lcr3(__kernel_ptd);

 
 

-    vmm_mount_pd(PD_MOUNT_1, __current->page_table);
-#endif
+    isr_param* lparam = &__current->intr_ctx;

 
 

-    isr_param *lparam = &__current->intr_ctx;
-    

     if (lparam->vector <= 255) {
         int_subscriber subscriber = subscribers[lparam->vector];
         if (subscriber) {
     if (lparam->vector <= 255) {
         int_subscriber subscriber = subscribers[lparam->vector];
         if (subscriber) {


@@ -58,22 +56,20 @@ intr_handler(isr_param* param)
         fallback(lparam);
         goto done;
     }
         fallback(lparam);
         goto done;
     }

-    
+

     kprint_panic("INT %u: (%x) [%p: %p] Unknown",
     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:
     // for all external interrupts except the spurious interrupt
     //  this is required by Intel Manual Vol.3A, section 10.8.1 & 10.8.5
 
 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 >= EX_INTERRUPT_BEGIN && lparam->vector != APIC_SPIV_IV) {
+    if (lparam->vector >= EX_INTERRUPT_BEGIN &&
+        lparam->vector != APIC_SPIV_IV) {

         apic_done_servicing();
     }
 
         apic_done_servicing();
     }
 

-#ifdef USE_KERNEL_PT
-    cpu_lcr3(__current->page_table);
-#endif

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