X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/05b7549a0f980efa33265a091a5174a78851ce05..e8e64a4f1d76aaeac3defa13243505cccd25c078:/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 4ffc86f..862ef05 100644
--- a/lunaix-os/includes/arch/x86/interrupts.h
+++ b/lunaix-os/includes/arch/x86/interrupts.h
@@ -1,50 +1,28 @@
 #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
-// APIC related
-#define APIC_ERROR_IV                   200
-#define APIC_LINT0_IV                   201
-#define APIC_TIMER_IV                   202
-#define APIC_SPIV_IV                    203
-
-#define RTC_TIMER_IV                    210
-
-
-#define PC_AT_IRQ_RTC                   8
-#define PC_AT_IRQ_KBD_BUF_FULL          1
+#include "vectors.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;
@@ -57,89 +35,45 @@ typedef struct {
 typedef void (*int_subscriber)(isr_param*);
 
 #pragma region ISR_DECLARATION
-void
-_asm_isr0();
-
-void
-_asm_isr1();
-
-void
-_asm_isr2();
 
-void
-_asm_isr3();
-
-void
-_asm_isr4();
-
-void
-_asm_isr5();
-
-void
-_asm_isr6();
-
-void
-_asm_isr7();
-
-void
-_asm_isr8();
-
-void
-_asm_isr9();
-
-void
-_asm_isr10();
-
-void
-_asm_isr11();
-
-void
-_asm_isr12();
-
-void
-_asm_isr13();
-
-void
-_asm_isr14();
-
-void
-_asm_isr15();
-
-void
-_asm_isr16();
-
-void
-_asm_isr17();
-
-void
-_asm_isr18();
-
-void
-_asm_isr19();
-
-void
-_asm_isr20();
-
-void
-_asm_isr21();
-
-void
-_asm_isr32();
-
-void
-_asm_isr200();
-
-void
-_asm_isr201();
-
-void
-_asm_isr202();
-
-void
-_asm_isr203();
-
-void
-_asm_isr210();
+#define ISR(iv) void _asm_isr##iv();
+
+ISR(0)
+ISR(1)
+ISR(2)
+ISR(3)
+ISR(4)
+ISR(5)
+ISR(6)
+ISR(7)
+ISR(8)
+ISR(9)
+ISR(10)
+ISR(11)
+ISR(12)
+ISR(13)
+ISR(14)
+ISR(15)
+ISR(16)
+ISR(17)
+ISR(18)
+ISR(19)
+ISR(20)
+ISR(21)
+
+ISR(32)
+ISR(33)
+
+ISR(201)
+ISR(202)
+
+ISR(210)
+
+ISR(250)
+ISR(251)
+ISR(252)
+ISR(253)
+ISR(254)
 
 #pragma endregion
 
@@ -149,8 +83,7 @@ intr_subscribe(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);