diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/kernel.c (renamed from src/kernel.cpp) | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/kernel.cpp b/src/kernel.c index 063fe11..3ee231e 100644 --- a/src/kernel.cpp +++ b/src/kernel.c @@ -4,7 +4,6 @@ // description: kernel entry point //===================================================================== -extern "C" { #include "conf.h" #include "mem.h" #include <keyboard.h> @@ -13,18 +12,17 @@ extern "C" { #include <ps2_controller.h> #include <stdio.h> #include <sys/cpuid.h> -} -#include <uart.hpp> -#include <vga.hpp> +#include <uart.h> +#include <vga.h> FILE *stdin; FILE *stdout; FILE *stderr; -extern "C" void +void kmain() { - stderr = uart_init<COM1>(); + stderr = uart_init(COM1); vmm_map(0xb8000, 0xc03ff000); stdout = vga_init((void *)0xc03ff000); |