summaryrefslogtreecommitdiff
path: root/kernel/src/cpu
diff options
context:
space:
mode:
authorAleksa Vuckovic <aleksav013@gmail.com>2022-09-01 23:45:47 +0200
committerAleksa Vuckovic <aleksav013@gmail.com>2022-09-01 23:45:47 +0200
commit11ced165e0df11cc3c889eb0cc402467361c421b (patch)
treeba6456fdae72e0deff0130612f226cd5d94aea17 /kernel/src/cpu
parent9a54c41ad07ec00316bb8fcdeba51c215446d454 (diff)
timer & stdbuff
Diffstat (limited to 'kernel/src/cpu')
-rw-r--r--kernel/src/cpu/irq.c2
-rw-r--r--kernel/src/cpu/pic.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/kernel/src/cpu/irq.c b/kernel/src/cpu/irq.c
index dd87b61..096860a 100644
--- a/kernel/src/cpu/irq.c
+++ b/kernel/src/cpu/irq.c
@@ -4,6 +4,7 @@
#include <pic.h>
#include <io.h>
#include <keyboard.h>
+#include <timer.h>
#include <paging.h>
#include <libk/stdio.h>
@@ -214,6 +215,7 @@ void isr31_handler(void)
void irq0_handler(void)
{
+ timer_handler();
outb(PIC1_COMMAND, PIC_EOI);
}
diff --git a/kernel/src/cpu/pic.c b/kernel/src/cpu/pic.c
index 801556d..ceb6e11 100644
--- a/kernel/src/cpu/pic.c
+++ b/kernel/src/cpu/pic.c
@@ -19,6 +19,6 @@ void remap_pic(void)
outb(PIC2_DATA, ICW4_8086);
// mask interrupts
- outb(PIC1_DATA, 0xfd);
+ outb(PIC1_DATA, 0xfc);
outb(PIC2_DATA, 0xff);
}