aboutsummaryrefslogtreecommitdiff
path: root/kernel/kernel.c
diff options
context:
space:
mode:
authorJames Barnett <noreply@jamesbarnett.xyz>2019-05-25 20:11:52 +0100
committerJames Barnett <noreply@jamesbarnett.xyz>2019-05-25 20:11:52 +0100
commit506f1691f1ca7b562d82ab6f2280b87d0e4af84c (patch)
treebdb403c000cd15ab29cbce8b3bcec5077d6f9655 /kernel/kernel.c
parentc1d948ce1973d9be37a43718f548776a0061807b (diff)
downloadtinyOS-506f1691f1ca7b562d82ab6f2280b87d0e4af84c.tar.xz
tinyOS-506f1691f1ca7b562d82ab6f2280b87d0e4af84c.zip
Add keyboard support
Diffstat (limited to 'kernel/kernel.c')
-rw-r--r--kernel/kernel.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c
index fa659dc..ab518e6 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -1,5 +1,7 @@
-#include "./io/vga/text_mode_diplay.h"
+#include "./io/vga/text_mode_display.h"
#include "./io/vga/colours.h"
+#include "./io/keyboard/keyboard_handler.h"
+#include "global_descriptor_table.h"
void run_kern_demo()
{
@@ -92,5 +94,8 @@ void run_kern_demo()
void kernel_entrypoint()
{
+ init_gdt();
+ init_keyboard_handler();
run_kern_demo();
+ while(1);
}