Merge branch 'master' into sata-ahci-dev

[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 8a43aa7467c114d5cd6d7a31e32ad66b6256bf03..738214242db8573957dae50312ec285a66c14e80 100644 (file)
--- a/lunaix-os/kernel/asm/x86/interrupt.S
+++ b/lunaix-os/kernel/asm/x86/interrupt.S
@@ -42,7 +42,9 @@
     isr_template APIC_TIMER_IV
     isr_template APIC_SPIV_IV
     isr_template RTC_TIMER_IV
     isr_template APIC_TIMER_IV
     isr_template APIC_SPIV_IV
     isr_template RTC_TIMER_IV

+    

     isr_template PC_KBD_IV
     isr_template PC_KBD_IV

+    isr_template AHCI_HBA_IV

 
     interrupt_wrapper:
         /*
 
     interrupt_wrapper:
         /*


@@ -118,6 +120,7 @@
         movl %eax, %esp
 
 #ifdef __ASM_INTR_DIAGNOSIS
         movl %eax, %esp
 
 #ifdef __ASM_INTR_DIAGNOSIS

+        movl %eax, (debug_resv + 8)

         movl 56(%esp), %eax
         movl %eax, (debug_resv + 4)
 #endif
         movl 56(%esp), %eax
         movl %eax, (debug_resv + 4)
 #endif