aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/kernel.c
diff options
context:
space:
mode:
authorMarvin Borner2019-11-25 22:36:11 +0100
committerMarvin Borner2019-11-25 22:36:11 +0100
commitac441fe297e937a8cd17f968e0644be6f485d573 (patch)
tree8a902c97196cc80994b5cb1e44d6865360c16caa /src/kernel/kernel.c
parentc5f8b04cdea44e5e5e0c208947b1f7ae44703a23 (diff)
Added basic control key support
Diffstat (limited to 'src/kernel/kernel.c')
-rw-r--r--src/kernel/kernel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index b717218..e3c5295 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -29,9 +29,9 @@ void kernel_main()
// Install drivers
asm ("cli");
+ timer_install();
mouse_install();
keyboard_install();
- timer_install();
asm ("sti");
// Get hardware information
@@ -42,7 +42,7 @@ void kernel_main()
uint8_t boot_drive_id = (uint8_t) (*((uint8_t *) 0x9000));
if (boot_drive_id == 0xE0) {
- install_melvix();
+ // install_melvix();
}
// User mode!