From d262c6b137dc06fd4599d6a66a75ce783cedb498 Mon Sep 17 00:00:00 2001
From: Alex Kotov <kotovalexarian@gmail.com>
Date: Mon, 30 Nov 2020 16:35:58 +0500
Subject: [PATCH] Use <kernaux/console.h>

---
 kernelmq/Makefile  |  1 -
 kernelmq/console.c | 25 -------------------------
 kernelmq/console.h |  9 ---------
 kernelmq/logger.c  | 39 +++++++++++++++++++--------------------
 4 files changed, 19 insertions(+), 55 deletions(-)
 delete mode 100644 kernelmq/console.c
 delete mode 100644 kernelmq/console.h

diff --git a/kernelmq/Makefile b/kernelmq/Makefile
index 1ea8165..b40df11 100644
--- a/kernelmq/Makefile
+++ b/kernelmq/Makefile
@@ -20,7 +20,6 @@ OBJS += info.c.o
 OBJS += process.c.o
 
 # Built-in drivers
-OBJS += console.c.o
 OBJS += pic.c.o
 OBJS += timer.c.o
 
diff --git a/kernelmq/console.c b/kernelmq/console.c
deleted file mode 100644
index efec2dc..0000000
--- a/kernelmq/console.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "console.h"
-
-#include <kernaux/arch/x86.h>
-#include <kernaux/stdlib.h>
-
-void console_print(const char *const s)
-{
-    console_write(s, kernaux_strlen(s));
-}
-
-void console_putc(const char c) {
-    kernaux_arch_x86_outportb(0x3F8, c);
-}
-
-void console_puts(const char *const s)
-{
-    console_print(s);
-    console_putc('\n');
-}
-
-void console_write(const char *const data, const unsigned int size) {
-    for (unsigned int i = 0; i < size; i++) {
-        console_putc(data[i]);
-    }
-}
diff --git a/kernelmq/console.h b/kernelmq/console.h
deleted file mode 100644
index e4f75f5..0000000
--- a/kernelmq/console.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef KERNELMQ_INCLUDED_CONSOLE
-#define KERNELMQ_INCLUDED_CONSOLE 1
-
-void console_print(const char *s);
-void console_putc(char c);
-void console_puts(const char *s);
-void console_write(const char *data, unsigned int size);
-
-#endif
diff --git a/kernelmq/logger.c b/kernelmq/logger.c
index 72279b0..0ce64f4 100644
--- a/kernelmq/logger.c
+++ b/kernelmq/logger.c
@@ -1,7 +1,6 @@
 #include "logger.h"
 
-#include "console.h"
-
+#include <kernaux/console.h>
 #include <kernaux/stdlib.h>
 
 #define LEVELS_COUNT 4
@@ -31,11 +30,11 @@ void logger_log(unsigned char level, const char *const source, const char *forma
     while ((c = *format++) != 0)
     {
         if (c == '\n') {
-            console_putc('\n');
+            kernaux_console_putc('\n');
             print_prefix(level, source);
         }
         else if (c != '%') {
-            console_putc(c);
+            kernaux_console_putc(c);
         }
         else {
             char *p, *p2;
@@ -67,30 +66,30 @@ void logger_log(unsigned char level, const char *const source, const char *forma
 string:
                     for (p2 = p; *p2; p2++);
                     for (; p2 < p + pad; p2++)
-                        console_putc(pad0 ? '0' : ' ');
+                        kernaux_console_putc(pad0 ? '0' : ' ');
                     while (*p)
-                        console_putc(*p++);
+                        kernaux_console_putc(*p++);
                     break;
                 default:
-                    console_putc(*((int *) arg++));
+                    kernaux_console_putc(*((int *) arg++));
                     break;
             }
         }
     }
 
-    console_putc('\n');
+    kernaux_console_putc('\n');
 }
 
 void print_prefix(const unsigned char level, const char *const source)
 {
-    console_putc('[');
-    console_print(level_text[level]);
-    console_putc(']');
-    console_putc(' ');
+    kernaux_console_putc('[');
+    kernaux_console_print(level_text[level]);
+    kernaux_console_putc(']');
+    kernaux_console_putc(' ');
 
     if (source) {
-        console_print(source);
-        console_print(": ");
+        kernaux_console_print(source);
+        kernaux_console_print(": ");
     }
 }
 
@@ -105,11 +104,11 @@ void print(const char *format, ...)
     {
         if (c == '\n') {
             if (*format != 0) {
-                console_putc('\n');
+                kernaux_console_putc('\n');
             }
         }
         else if (c != '%') {
-            console_putc(c);
+            kernaux_console_putc(c);
         }
         else {
             char *p, *p2;
@@ -141,16 +140,16 @@ void print(const char *format, ...)
 string:
                     for (p2 = p; *p2; p2++);
                     for (; p2 < p + pad; p2++)
-                        console_putc(pad0 ? '0' : ' ');
+                        kernaux_console_putc(pad0 ? '0' : ' ');
                     while (*p)
-                        console_putc(*p++);
+                        kernaux_console_putc(*p++);
                     break;
                 default:
-                    console_putc(*((int *) arg++));
+                    kernaux_console_putc(*((int *) arg++));
                     break;
             }
         }
     }
 
-    console_putc('\n');
+    kernaux_console_putc('\n');
 }