summaryrefslogtreecommitdiff
path: root/kernel/interrupts.c
diff options
context:
space:
mode:
authorMiguel <m.i@gmx.at>2018-09-10 19:08:04 +0200
committerMiguel <m.i@gmx.at>2018-09-10 19:08:04 +0200
commitee2ec6abbcfb6de48a8f5594e05ba0a837216fa8 (patch)
tree6173e5182459529ac5dc3fbb59b30fd37c5ee4ab /kernel/interrupts.c
parent65f5cca027af81e77b3e06da658b6d13f1861a03 (diff)
apic et al.
Diffstat (limited to 'kernel/interrupts.c')
-rw-r--r--kernel/interrupts.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/interrupts.c b/kernel/interrupts.c
index 180658a..9ffd7c6 100644
--- a/kernel/interrupts.c
+++ b/kernel/interrupts.c
@@ -7,6 +7,7 @@
#include "scheduler.h"
#include "asm_x86.h"
#include "smp.h"
+#include "apic.h"
/** The size of our interrupts table */
#define INT_MAX 256 // 0-255
@@ -63,7 +64,7 @@ uint32_t interrupt_handler(uint32_t esp, uint32_t irq)
// TODO: mouse
// test ipi
- apicIPI(2,0x81); // force cpu16 to autoschedule? just test
+ apic_ipi(2,0x81); // force cpu16 to autoschedule? just test
//klog("0x60 in %d",in);
}
@@ -85,7 +86,7 @@ uint32_t interrupt_handler(uint32_t esp, uint32_t irq)
// schedules on APIC timer 0x8C and IPI 0x81
if(irq==INTERRUPT_APIC_TIMER || irq==INTERRUPT_IPI)esp=my_scheduler(esp,-1); // autoschedule
- if(irq!=INTERRUPT_SYSCALL)apicEOI(); // ack all except software syscalls
+ if(irq!=INTERRUPT_SYSCALL)apic_eoi(); // ack all except software syscalls
if(irq==255)kpanic("Spurious/Unknown Interrupt!?"); // default and spurious