From 1e4a254674f668839e5de273916024c16814b045 Mon Sep 17 00:00:00 2001
From: Benji Dial <benji6283@gmail.com>
Date: Sun, 13 Sep 2020 03:19:57 -0400
Subject: (basic, not much tested) keyboard, better panic

---
 src/kernel/main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/kernel/main.c')

diff --git a/src/kernel/main.c b/src/kernel/main.c
index d99b595..e2a23e8 100644
--- a/src/kernel/main.c
+++ b/src/kernel/main.c
@@ -13,6 +13,7 @@
 #include "elf.h"
 #include "log.h"
 #include "vga.h"
+#include "kbd.h"
 
 void reset_tree();
 void tree(struct drive *d);
@@ -32,8 +33,6 @@ void main() {
 
   logsz("Portland v0.0.11\n\n");
 
-  //list vesa modes?
-
   pci_init();
 
   u16_dec(n_pci_devices, nbuf);
@@ -137,9 +136,10 @@ void main() {
   logsz(nbuf);
   logsz("k\n\n");
 
-  if (!try_elf_run(drives, "BIN/INIT.ELF"))
-    panic("Failed to load init program.");
+  if (!try_elf_run(drives, "BIN/INIT.ELF", ""))
+    PANIC("Failed to load init program.");
 
+  init_kbd();
   init_idt();
 
   logsz("Switching to init task.\n");
-- 
cgit v1.2.3