kamkow1/my-os-project2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle ps2 keyboard, no APIC for now

Browse Source
This commit is contained in:
Kamil Kowalczyk
2025-09-07 14:25:23 +02:00
parent 0cbf308d95
commit 4f3053bc8e
13 changed files with 61 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
kernel/hal/x86_64/intr.c
View File

@ -8,11 +8,11 @@
#include "kprintf.h"
#include "compiler/attr.h"
#include "pic.h"
#include "apic.h"
#include "pit.h"
#include "proc/proc.h"
#include "syscall/syscall.h"
#include "errors.h"
#include "drivers/ps2kb/ps2kb.h"
void hal_intr_disable(void) {
asm volatile("cli");
@ -172,6 +172,13 @@ void hal_syscalldispatch(IntrStackFrame *frame) {
}
}
void intr_eoi(uint8_t irq) {
if (irq >= 8) {
io_out8(PIC2_CMD, PIC_EOI);
}
io_out8(PIC1_CMD, PIC_EOI);
}
void intr_handleintr(IntrStackFrame *frame) {
if (frame->trapnum <= 31) {
kprintf("ERROR %s, 0x%lX\n", exceptions[frame->trapnum], frame->errnum);
@ -183,14 +190,17 @@ void intr_handleintr(IntrStackFrame *frame) {
}
hal_hang();
} else if (frame->trapnum >= 32 && frame->trapnum <= 47) {
if (frame->trapnum == INTR_TIMER) {
io_out8(PIC2_CMD, 0x20);
PIT_TICKS++;
switch (frame->trapnum) {
case INTR_IRQBASE+0:
PIT_TICKS++;
intr_eoi(frame->trapnum - INTR_IRQBASE);
proc_sched((void *)frame);
break;
case INTR_IRQBASE+1:
ps2kb_intr();
intr_eoi(frame->trapnum - INTR_IRQBASE);
break;
}
io_out8(PIC1_CMD, 0x20);
lapic_write(LAPIC_EOI, 0x00);
proc_sched((void *)frame);
} else if (frame->trapnum == 0x80) {
hal_syscalldispatch(frame);
}