aboutsummaryrefslogtreecommitdiff
path: root/src/kernel.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel.c')
-rw-r--r--src/kernel.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/kernel.c b/src/kernel.c
index a315f3b..b8432a8 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -4,14 +4,14 @@
// description: kernel entry point
//=====================================================================
+#include "conf.h"
#include "devices/keyboard.h"
#include "devices/mouse.h"
#include "devices/pic.h"
#include "devices/ps2_controller.h"
-#include "devices/uart_16550.h"
+#include "devices/uart.h"
#include "devices/vga.h"
#include "mem.h"
-#include <conf.h>
#include <stdio.h>
#include <sys/cpuid.h>
@@ -50,7 +50,5 @@ void kmain() {
if (*c == 0) printf("c is 0\r\n");
*/
- // asm volatile("int $0x80");
-
while (1) {}
}