drew/acadia
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Use APIC for interrupts rather than PIC.

Browse source 
Still rely on the PIT for now rather than the local APIC timer.
This commit is contained in:
Drew Galbraith 2023-06-07 13:40:36 -07:00
parent 7c9d1075eb
commit add533071b
7 changed files with 160 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

19
zion/interrupt/interrupt.cpp
View file

@ -4,6 +4,7 @@
#include "common/port.h"
#include "debug/debug.h"
#include "interrupt/apic.h"
#include "memory/kernel_heap.h"
#include "scheduler/scheduler.h"
@ -124,10 +125,6 @@ extern "C" void interrupt_page_fault(InterruptFrame* frame) {
panic("PF");
}
#define PIC1_COMMAND 0x20
#define PIC1_DATA 0x21
#define PIC_EOI 0x20
uint64_t cnt = 0;
extern "C" void isr_timer();
extern "C" void interrupt_timer(InterruptFrame*) {
@ -138,20 +135,10 @@ extern "C" void interrupt_timer(InterruptFrame*) {
}
dbgln("timer: %us", cnt * 50 / 1000);
}
outb(PIC1_COMMAND, PIC_EOI);
SignalEOI();
gScheduler->Preempt();
}
void EnablePic() {
outb(PIC1_COMMAND, 0x11);
outb(PIC1_DATA, 0x20); // PIC1 offset.
outb(PIC1_DATA, 0x4);
outb(PIC1_DATA, 0x1);
// Mask all except the timer.
outb(PIC1_DATA, 0xE);
}
void InitIdt() {
gIdt[0] = CreateDescriptor(isr_divide_by_zero);
gIdt[13] = CreateDescriptor(isr_protection_fault);
@ -163,5 +150,5 @@ void InitIdt() {
};
asm volatile("lidt %0" ::"m"(idtp));
EnablePic();
EnableApic();
}