diff options
author | Marvin Borner | 2019-11-05 22:26:27 +0100 |
---|---|---|
committer | Marvin Borner | 2019-11-05 22:26:27 +0100 |
commit | b8b094e45ecaa7876e02e5ada246ae13e57dfe07 (patch) | |
tree | 99a32122bbea261602299cb2e85fcf45926c66c3 /src/kernel/kernel.c | |
parent | 2180357ff5edbd4c85e125ea5c45d9b2a2026944 (diff) |
Added basic PS/2 mouse support
Diffstat (limited to 'src/kernel/kernel.c')
-rw-r--r-- | src/kernel/kernel.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index 9be7914..c2ab13e 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -24,11 +24,13 @@ void kernel_main(struct multiboot *mboot_ptr) { idt_install(); isrs_install(); irq_install(); + set_optimal_resolution(); // Install drivers - asm volatile ("sti"); - set_optimal_resolution(); + asm volatile ("cli"); + mouse_install(); keyboard_install(); + asm volatile ("sti"); // Get hardware information get_smbios(); @@ -42,11 +44,13 @@ void kernel_main(struct multiboot *mboot_ptr) { initrd_test(); // User mode! + /* COMMENTED FOR DEVELOPMENT OF KERNEL info("Switching to user mode..."); syscalls_install(); switch_to_user(); panic("This should NOT happen!"); + */ // asm volatile ("div %0" :: "r"(0)); // Exception testing x/0 loop: |