aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoraqua <aqua@iserlohn-fortress.net>2022-11-03 17:45:28 +0200
committeraqua <aqua@iserlohn-fortress.net>2022-11-03 17:45:28 +0200
commitfd4f56e6776873af2693d4ddf1c672c36bd97428 (patch)
treed5482cf2754923ca1a9bfd1a6af669855858d33d /src
parentvga: fix text mode cursor (diff)
downloadkernel-fd4f56e6776873af2693d4ddf1c672c36bd97428.tar.xz
i8042: fix broken self-test
Diffstat (limited to 'src')
-rw-r--r--src/kernel.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/kernel.c b/src/kernel.c
index 5305b12..a9c54fe 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -7,7 +7,7 @@
#include "devices/keyboard.h"
#include "devices/mouse.h"
#include "devices/pic.h"
-#include "devices/ps2_ctrl.h"
+#include "devices/ps2_controller.h"
#include "devices/uart_16550.h"
#include "devices/vga.h"
#include "mem.h"
@@ -30,13 +30,14 @@ void kmain() {
}
pic_init();
- pic_enable();
- printf("interrupts enabled\n");
ps2_ctrl_init();
ps2_keyboard_init();
// mouse_init();
+ pic_enable();
+ printf("interrupts enabled\n");
+
/*
alloc4M();
char *c = (char *)0xc0700000;