diff options
-rw-r--r-- | arch/x86/machine/lapic.c | 6 | ||||
-rw-r--r-- | arch/x86/machine/lapic.h | 6 | ||||
-rw-r--r-- | arch/x86/machine/pic.c | 4 | ||||
-rw-r--r-- | arch/x86/machine/pic.h | 4 | ||||
-rw-r--r-- | arch/x86/machine/trap.c | 10 |
5 files changed, 15 insertions, 15 deletions
diff --git a/arch/x86/machine/lapic.c b/arch/x86/machine/lapic.c index e56155b..994aef6 100644 --- a/arch/x86/machine/lapic.c +++ b/arch/x86/machine/lapic.c @@ -324,7 +324,7 @@ lapic_ipi_broadcast(uint32_t vector) } void -lapic_intr_timer(struct trap_frame *frame) +lapic_timer_intr(struct trap_frame *frame) { (void)frame; @@ -333,7 +333,7 @@ lapic_intr_timer(struct trap_frame *frame) } void -lapic_intr_error(struct trap_frame *frame) +lapic_error_intr(struct trap_frame *frame) { uint32_t esr; @@ -345,7 +345,7 @@ lapic_intr_error(struct trap_frame *frame) } void -lapic_intr_spurious(struct trap_frame *frame) +lapic_spurious_intr(struct trap_frame *frame) { (void)frame; printk("lapic: warning: spurious interrupt\n"); diff --git a/arch/x86/machine/lapic.h b/arch/x86/machine/lapic.h index c8981b0..8c87adc 100644 --- a/arch/x86/machine/lapic.h +++ b/arch/x86/machine/lapic.h @@ -52,8 +52,8 @@ void lapic_ipi_broadcast(uint32_t vector); /* * Interrupt handlers. */ -void lapic_intr_timer(struct trap_frame *frame); -void lapic_intr_error(struct trap_frame *frame); -void lapic_intr_spurious(struct trap_frame *frame); +void lapic_timer_intr(struct trap_frame *frame); +void lapic_error_intr(struct trap_frame *frame); +void lapic_spurious_intr(struct trap_frame *frame); #endif /* _X86_LAPIC_H */ diff --git a/arch/x86/machine/pic.c b/arch/x86/machine/pic.c index 3e5d8bb..e0ed1e3 100644 --- a/arch/x86/machine/pic.c +++ b/arch/x86/machine/pic.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Richard Braun. + * Copyright (c) 2012-2014 Richard Braun. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -89,7 +89,7 @@ pic_read_isr(uint16_t port) } void -pic_intr_spurious(struct trap_frame *frame) +pic_spurious_intr(struct trap_frame *frame) { unsigned long intr; uint8_t isr; diff --git a/arch/x86/machine/pic.h b/arch/x86/machine/pic.h index c4d6b3f..3dc13d4 100644 --- a/arch/x86/machine/pic.h +++ b/arch/x86/machine/pic.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Richard Braun. + * Copyright (c) 2012-2014 Richard Braun. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,6 +28,6 @@ void pic_setup(void); /* * Interrupt handlers. */ -void pic_intr_spurious(struct trap_frame *frame); +void pic_spurious_intr(struct trap_frame *frame); #endif /* _X86_PIC_H */ diff --git a/arch/x86/machine/trap.c b/arch/x86/machine/trap.c index 8e350f0..e028a8f 100644 --- a/arch/x86/machine/trap.c +++ b/arch/x86/machine/trap.c @@ -196,9 +196,9 @@ trap_setup(void) /* Basic PIC support */ trap_install(TRAP_PIC_BASE + 7, TRAP_HF_NOPREEMPT, - trap_isr_pic_int7, pic_intr_spurious); + trap_isr_pic_int7, pic_spurious_intr); trap_install(TRAP_PIC_BASE + 15, TRAP_HF_NOPREEMPT, - trap_isr_pic_int15, pic_intr_spurious); + trap_isr_pic_int15, pic_spurious_intr); /* System defined traps */ trap_install(TRAP_THREAD_SCHEDULE, TRAP_HF_NOPREEMPT, @@ -206,11 +206,11 @@ trap_setup(void) trap_install(TRAP_CPU_HALT, TRAP_HF_NOPREEMPT, trap_isr_cpu_halt, cpu_halt_intr); trap_install(TRAP_LAPIC_TIMER, TRAP_HF_NOPREEMPT, - trap_isr_lapic_timer, lapic_intr_timer); + trap_isr_lapic_timer, lapic_timer_intr); trap_install(TRAP_LAPIC_ERROR, TRAP_HF_NOPREEMPT, - trap_isr_lapic_error, lapic_intr_error); + trap_isr_lapic_error, lapic_error_intr); trap_install(TRAP_LAPIC_SPURIOUS, TRAP_HF_NOPREEMPT, - trap_isr_lapic_spurious, lapic_intr_spurious); + trap_isr_lapic_spurious, lapic_spurious_intr); trap_handler_init(&trap_handlers[TRAP_DEFAULT], TRAP_HF_NOPREEMPT, trap_default); |