refactoring

3 files changed, 5 insertions, 54 deletions

diff --git a/kernel/src/print/panic.c b/kernel/src/panic.c
index 58ffe40..96ad3b9 100644
--- a/kernel/src/print/panic.c
+++ b/kernel/src/panic.c
@@ -3,13 +3,11 @@
 #include <stdlib.h>
 #include <panic.h>
 #include <print.h>
-
-#include "tty/color.h"
-#include "tty/term.h"
+#include <term.h>
 
 __attribute__((noreturn))
 void _panic_impl(char* msg, int line, char* file, ...) {
-	int_disable();
+	arch_disable_int();
 	va_list args;
 	va_start(args, file);
 	term_clear();
@@ -22,6 +20,6 @@ void _panic_impl(char* msg, int line, char* file, ...) {
 	printk("\nin %s at line %d\n", file, line);
     term_flush();
 	while(1) {
-		halt();
-	}
+	    arch_halt();
+    }
 }
diff --git a/kernel/src/print/print.c b/kernel/src/print.c
index 46ec047..12f45de 100644
--- a/kernel/src/print/print.c
+++ b/kernel/src/print.c
@@ -1,10 +1,9 @@
-#include "tty/color.h"
-#include "tty/term.h"
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <print.h>
+#include <term.h>
 
 void printk(const char *restrict format, ...) {
     va_list args;
@@ -82,47 +81,3 @@ void vprintk(const char *restrict format, va_list args) {
 void puts(const char *s) {
 	for(; *s; s++) putchar(*s);
 }
-
-void printl(enum VGAColor color, const char* msg) {
-    term_setbg(VGA_BLACK);
-    term_setfg(VGA_WHITE);
-    putchar('[');
-    term_setfg(color);
-    printk("%s", msg);
-    term_setfg(VGA_WHITE);
-    putchar(']');
-    putchar(' ');
-}
-
-void _debugk_impl(char *format, ...) {
-    uint16_t color = term_save_col();
-    printl(VGA_LIGHT_CYAN, "LOG");
-    va_list args;
-    va_start(args, format);
-    vprintk(format, args);
-    va_end(args);
-    if (!term_newline()) putchar('\n');
-    term_load_col(color);
-} 
-
-void _succek_impl(char *format, ...) {
-    uint16_t color = term_save_col();
-    printl(VGA_LIGHT_GREEN, "OK");
-    va_list args;
-    va_start(args, format);
-    vprintk(format, args);
-    va_end(args);
-    if (!term_newline()) putchar('\n');
-    term_load_col(color);
-}
-
-void _errork_impl(char *format, ...) {
-    uint16_t color = term_save_col();
-    printl(VGA_LIGHT_RED, "ERR");
-    va_list args;
-    va_start(args, format);
-    vprintk(format, args);
-    va_end(args);
-    if (!term_newline()) putchar('\n');
-    term_load_col(color);
-} 
diff --git a/kernel/src/print/time.c b/kernel/src/time.c
index 7f52a98..e949882 100644
--- a/kernel/src/print/time.c
+++ b/kernel/src/time.c
@@ -1,7 +1,5 @@
-#include <stdbool.h>
 #include <string.h>
 #include <time.h>
-#include <stddef.h>
 
 static char* ABB_WEEKDAY[7] = {
     "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"