Implement APIC, RTC, basic ACPI parser and timer support

[lunaix-os.git] / lunaix-os / kernel / asm / x86 / interrupt.S

diff --git a/lunaix-os/kernel/asm/x86/interrupt.S b/lunaix-os/kernel/asm/x86/interrupt.S
index 9d392734efbbd7e7f640e01c7611984ce193e447..11fe3fd505f54af8a0b68e5fbef73483dd41d6c0 100644 (file)
--- a/lunaix-os/kernel/asm/x86/interrupt.S
+++ b/lunaix-os/kernel/asm/x86/interrupt.S
@@ -19,6 +19,12 @@
 
     isr_template LUNAIX_SYS_PANIC
 
 
     isr_template LUNAIX_SYS_PANIC
 

+    isr_template APIC_ERROR_IV
+    isr_template APIC_LINT0_IV
+    isr_template APIC_TIMER_IV
+    isr_template APIC_SPIV_IV
+    isr_template RTC_TIMER_IV
+

     interrupt_wrapper:
         pushl %esp
         pushl %esi
     interrupt_wrapper:
         pushl %esp
         pushl %esi


@@ -34,9 +40,8 @@
         subl $16, %esp
         movl %eax, (%esp)
 
         subl $16, %esp
         movl %eax, (%esp)
 

-        call interrupt_handler
-        popl %eax
-        movl %eax, %esp
+        call intr_handler
+        popl %esp

 
         popl %eax
         popl %ebx
 
         popl %eax
         popl %ebx