From e6bec1afcd1c351c13db821a4bb5e899a6c37901 Mon Sep 17 00:00:00 2001
From: Tyler Murphy <=>
Date: Mon, 17 Jul 2023 00:09:26 -0400
Subject: paging

---
 kernel/src/drivers/ps2ctrl.c  | 10 ++--------
 kernel/src/drivers/ps2kb.c    | 10 +++-------
 kernel/src/drivers/ps2mouse.c |  8 ++------
 3 files changed, 7 insertions(+), 21 deletions(-)

(limited to 'kernel/src/drivers')

diff --git a/kernel/src/drivers/ps2ctrl.c b/kernel/src/drivers/ps2ctrl.c
index 527435d..05ef25d 100644
--- a/kernel/src/drivers/ps2ctrl.c
+++ b/kernel/src/drivers/ps2ctrl.c
@@ -48,8 +48,6 @@ void ps2ctrl_set_port2(void) {
 
 void ps2ctrl_init(void) {
 
-    debugk("Loading PS/2 Controller");
-
     is_init = false;
 
     pic_mask(1); // keyboard
@@ -61,8 +59,7 @@ void ps2ctrl_init(void) {
 	ps2ctrl_out_cmd(0xAA);
 	uint8_t response = ps2ctrl_in();
 	if(response != 0x55) {
-		errork("PS/2 controller failed to initialize");
-        return;
+		panic("PS/2 controller failed to initialize");
 	}
 
 	// set config
@@ -80,8 +77,7 @@ void ps2ctrl_init(void) {
 	ps2ctrl_out_cmd(0xA9);
     response = ps2ctrl_in();
     if (response == 0x01) {
-        errork("PS/2 port 2 not supported");
-        return;
+        panic("PS/2 port 2 not supported");
     }
 
 	ps2ctrl_out_cmd(0xA8);
@@ -90,8 +86,6 @@ void ps2ctrl_init(void) {
 
     pic_unmask(1);
     pic_unmask(12);
-
-    succek("Loaded PS/2 Controller");
 }
 
 bool ps2ctrl_is_init(void) {
diff --git a/kernel/src/drivers/ps2kb.c b/kernel/src/drivers/ps2kb.c
index dec0b87..f6fc514 100644
--- a/kernel/src/drivers/ps2kb.c
+++ b/kernel/src/drivers/ps2kb.c
@@ -59,8 +59,6 @@ static bool state_ext = false;
 
 void ps2kb_init(void) {
 
-    debugk("Loading PS/2 Keyboard");
-
 	is_init = false;
 	pic_mask(1);
 
@@ -69,24 +67,22 @@ void ps2kb_init(void) {
 	ps2ctrl_out_data(0xFF);
 	result = ps2ctrl_in();
 	if(result != 0xFA) {
-		errork("Failed to reset PS/2 keyboard: expected 0xFA, got 0x%X\n", result);
+		panic("Failed to reset PS/2 keyboard: expected 0xFA, got 0x%X\n", result);
         return;
 	}
 	result = ps2ctrl_in();
 	if(result != 0xAA) {
-		errork("Failed to reset PS/2 keyboard: expected 0xAA, got 0x%X\n", result);
+		panic("Failed to reset PS/2 keyboard: expected 0xAA, got 0x%X\n", result);
         return;
 	}
 
 	ps2ctrl_out_data(0xF4);
 	result = ps2ctrl_in();
 	if(result != 0xFA) {
-	    errork("Failed to enable PS/2 keyboard: expected 0xFA, got 0x%X\n", result);
+	    panic("Failed to enable PS/2 keyboard: expected 0xFA, got 0x%X\n", result);
         return;
 	}
 
-    succek("PS/2 Keyboard has has been loaded");
-
 	pic_unmask(1);
 	is_init = true;
 }
diff --git a/kernel/src/drivers/ps2mouse.c b/kernel/src/drivers/ps2mouse.c
index 01e10cc..1616cd6 100644
--- a/kernel/src/drivers/ps2mouse.c
+++ b/kernel/src/drivers/ps2mouse.c
@@ -15,8 +15,6 @@ static uint8_t first_b, second_b, third_b;
 
 void ps2mouse_init(void) {
 
-    debugk("Loading PS/2 Mouse");
-
     is_init = false;
     pic_mask(12);
 
@@ -26,12 +24,12 @@ void ps2mouse_init(void) {
     ps2ctrl_out_data(0xFF); 
     result = ps2ctrl_in();
     if (result != 0xFA) {
-        errork("Failed to reset PS/2 mouse: expected 0xFA, got 0x%X", result);
+        panic("Failed to reset PS/2 mouse: expected 0xFA, got 0x%X", result);
         return;
     }
     result = ps2ctrl_in();
     if (result != 0xAA) {
-        errork("Failed to reset PS/2 mouse: expected 0xAA, got 0x%X", result);
+        panic("Failed to reset PS/2 mouse: expected 0xAA, got 0x%X", result);
         return;
     }
 
@@ -40,8 +38,6 @@ void ps2mouse_init(void) {
 
     pic_unmask(12);
     is_init = true;
-    
-    succek("PS/2 Mouse has has been loaded");
 }
 
 static uint8_t packet_num = 0;
-- 
cgit v1.2.3-freya