Changeset 220
- Timestamp:
- Jul 17, 2017, 2:14:21 PM (7 years ago)
- Location:
- trunk/hal/x86_64
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/hal/x86_64/core/hal_kentry.S
r203 r220 36 36 .globl hal_exception_entry 37 37 .globl hal_timer_intr 38 .globl ioc_ata_isr 38 39 .globl hal_com1_intr 39 40 .globl hal_keyboard_intr 40 41 .type hal_exception_entry, @function 41 42 .type hal_timer_intr, @function 43 .type ioc_ata_isr, @function 42 44 .type hal_com1_intr, @function 43 45 .type hal_keyboard_intr, @function … … 135 137 movq %rsp,%rdi 136 138 call hal_timer_intr 139 140 movq lapic_va(%rip),%rax 141 movl $0,LAPIC_EOI(%rax) 142 143 INTR_RESTORE_REGS 144 addq $16,%rsp 145 iretq 146 147 ASM_ENTRY(x86_ioapic_ata0) 148 pushq $0 149 pushq $T_ASTFLT 150 INTR_SAVE_REGS 151 152 movq %rsp,%rdi 153 call ioc_ata_isr 137 154 138 155 movq lapic_va(%rip),%rax -
trunk/hal/x86_64/drivers/ioc_ata.c
r215 r220 23 23 #include <dev_ioc.h> 24 24 #include <hal_drivers.h> 25 #include <hal_kentry.h> 25 26 #include <thread.h> 26 27 #include <spinlock.h> … … 175 176 176 177 static void ioc_ata_cmd(xptr_t th_xp); 177 static void ioc_ata_isr(chdev_t *chdev);178 extern void x86_ioapic_ata0(); 178 179 179 180 void ioc_ata_init(chdev_t *chdev) 180 181 { 181 182 chdev->cmd = &ioc_ata_cmd; 182 chdev->isr = & ioc_ata_isr;183 chdev->isr = &x86_ioapic_ata0; 183 184 ata_init(); 184 185 } … … 217 218 } 218 219 219 static void ioc_ata_isr(chdev_t *chdev) 220 { 220 void ioc_ata_isr(hal_cpu_context_t *ctx) 221 { 222 x86_printf("rip = %Z\n", ctx->tf_rip); 223 221 224 x86_panic((char *)__func__); 222 225 }
Note: See TracChangeset
for help on using the changeset viewer.