From 34537f094b460ba385647aea2dfd050628dd6431 Mon Sep 17 00:00:00 2001
From: Alex Kotov <kotovalexarian@gmail.com>
Date: Sun, 26 Dec 2021 11:20:39 +0500
Subject: [PATCH] Move console driver into separate directory

---
 Makefile.am                             | 2 +-
 README.md                               | 2 +-
 include/Makefile.am                     | 2 +-
 include/kernaux.h                       | 9 +++++----
 include/kernaux/{ => drivers}/console.h | 0
 src/{ => drivers}/console.c             | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)
 rename include/kernaux/{ => drivers}/console.h (100%)
 rename src/{ => drivers}/console.c (95%)

diff --git a/Makefile.am b/Makefile.am
index c818307..350051a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,7 +41,7 @@ TESTS += \
 endif
 
 if WITH_CONSOLE
-libkernaux_a_SOURCES += src/console.c
+libkernaux_a_SOURCES += src/drivers/console.c
 endif
 
 if WITH_ELF
diff --git a/README.md b/README.md
index 911f438..9146aee 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ API
     * [Simple](/examples/assert_simple.c)
     * [Guards](/examples/assert_guards.c)
 * Device drivers (for debugging only)
-  * [Serial console](/include/kernaux/console.h)
+  * [Serial console](/include/kernaux/drivers/console.h)
   * Framebuffer *(planned)*
 * Algorithms
   * [Simple command line parser](/include/kernaux/cmdline.h)
diff --git a/include/Makefile.am b/include/Makefile.am
index d0933e9..9eea338 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -6,7 +6,7 @@ nobase_include_HEADERS = \
 	kernaux/asm/x86_64.h \
 	kernaux/assert.h \
 	kernaux/cmdline.h \
-	kernaux/console.h \
+	kernaux/drivers/console.h \
 	kernaux/itoa.h \
 	kernaux/libc.h \
 	kernaux/multiboot2.h \
diff --git a/include/kernaux.h b/include/kernaux.h
index bd627a5..aede492 100644
--- a/include/kernaux.h
+++ b/include/kernaux.h
@@ -6,15 +6,16 @@
     conflict with actual freestanding or hosted libc.
 */
 
-#include <kernaux/arch/i386.h>
-#include <kernaux/arch/x86_64.h>
-
 #include <kernaux/assert.h>
 #include <kernaux/cmdline.h>
-#include <kernaux/console.h>
 #include <kernaux/elf.h>
 #include <kernaux/itoa.h>
 #include <kernaux/multiboot2.h>
 #include <kernaux/pfa.h>
 #include <kernaux/printf.h>
 #include <kernaux/units.h>
+
+#include <kernaux/arch/i386.h>
+#include <kernaux/arch/x86_64.h>
+
+#include <kernaux/drivers/console.h>
diff --git a/include/kernaux/console.h b/include/kernaux/drivers/console.h
similarity index 100%
rename from include/kernaux/console.h
rename to include/kernaux/drivers/console.h
diff --git a/src/console.c b/src/drivers/console.c
similarity index 95%
rename from src/console.c
rename to src/drivers/console.c
index cff793b..7b524be 100644
--- a/src/console.c
+++ b/src/drivers/console.c
@@ -6,7 +6,7 @@
 #include <kernaux/asm/i386.h>
 #endif
 
-#include <kernaux/console.h>
+#include <kernaux/drivers/console.h>
 #include <kernaux/libc.h>
 #include <kernaux/printf.h>