Merge branch 'sata-ahci-dev'

[lunaix-os.git] / lunaix-os / includes / arch / x86 / interrupts.h

diff --git a/lunaix-os/includes/arch/x86/interrupts.h b/lunaix-os/includes/arch/x86/interrupts.h
index 664d69d29336cd85079c5c5216e0e11eb6c61243..862ef05bc46bbb4d64f0b4b698e577a222e0b343 100644 (file)
--- a/lunaix-os/includes/arch/x86/interrupts.h
+++ b/lunaix-os/includes/arch/x86/interrupts.h
@@ -1,54 +1,28 @@
 #ifndef __LUNAIX_INTERRUPTS_H
 #define __LUNAIX_INTERRUPTS_H
 
 #ifndef __LUNAIX_INTERRUPTS_H
 #define __LUNAIX_INTERRUPTS_H
 

-
-#define FAULT_DIVISION_ERROR            0
-#define FAULT_TRAP_DEBUG_EXCEPTION      1
-#define INT_NMI                         2
-#define TRAP_BREAKPOINT                 3
-#define TRAP_OVERFLOW                   4
-#define FAULT_BOUND_EXCEED              5
-#define FAULT_INVALID_OPCODE            6
-#define FAULT_NO_MATH_PROCESSOR         7
-#define ABORT_DOUBLE_FAULT              8
-#define FAULT_RESERVED_0                9
-#define FAULT_INVALID_TSS               10
-#define FAULT_SEG_NOT_PRESENT           11
-#define FAULT_STACK_SEG_FAULT           12
-#define FAULT_GENERAL_PROTECTION        13
-#define FAULT_PAGE_FAULT                14
-#define FAULT_RESERVED_1                15
-#define FAULT_X87_FAULT                 16
-#define FAULT_ALIGNMENT_CHECK           17
-#define ABORT_MACHINE_CHECK             18
-#define FAULT_SIMD_FP_EXCEPTION         19
-#define FAULT_VIRTUALIZATION_EXCEPTION  20
-#define FAULT_CONTROL_PROTECTION        21
-
-// LunaixOS related
-#define LUNAIX_SYS_PANIC                32
-
-#define EX_INTERRUPT_BEGIN              200
-
-// Keyboard
-#define PC_KBD_IV                       201
-
-#define RTC_TIMER_IV                    210
-
-// 来自APIC的中断有着最高的优先级。
-// APIC related
-#define APIC_ERROR_IV                   250
-#define APIC_LINT0_IV                   251
-#define APIC_SPIV_IV                    252
-#define APIC_TIMER_IV                   253
-
-#define PC_AT_IRQ_RTC                   8
-#define PC_AT_IRQ_KBD                   1
+#include "vectors.h"

 
 #ifndef __ASM__
 #include <hal/cpu.h>
 
 #ifndef __ASM__
 #include <hal/cpu.h>

-typedef struct {
-    gp_regs registers;
+typedef struct
+{
+    struct
+    {
+        reg32 eax;
+        reg32 ebx;
+        reg32 ecx;
+        reg32 edx;
+        reg32 edi;
+        reg32 ebp;
+        reg32 esi;
+        reg32 ds;
+        reg32 es;
+        reg32 fs;
+        reg32 gs;
+        reg32 esp;
+    } registers;
+

     unsigned int vector;
     unsigned int err_code;
     unsigned int eip;
     unsigned int vector;
     unsigned int err_code;
     unsigned int eip;


@@ -88,8 +62,10 @@ ISR(20)
 ISR(21)
 
 ISR(32)
 ISR(21)
 
 ISR(32)

+ISR(33)

 
 ISR(201)
 
 ISR(201)

+ISR(202)

 
 ISR(210)
 
 
 ISR(210)
 


@@ -107,8 +83,7 @@ intr_subscribe(const uint8_t vector, int_subscriber);
 void
 intr_unsubscribe(const uint8_t vector, int_subscriber);
 
 void
 intr_unsubscribe(const uint8_t vector, int_subscriber);
 

-void
-intr_set_fallback_handler(int_subscriber);
+void intr_set_fallback_handler(int_subscriber);

 
 void
 intr_handler(isr_param* param);
 
 void
 intr_handler(isr_param* param);