From 5836c7df10d48b9c3241f2fbdb9ea3a37313a6fd Mon Sep 17 00:00:00 2001
From: dzwdz
Date: Mon, 9 Aug 2021 21:11:16 +0200
Subject: move all the tty stuff to a tty directory

---
 src/kernel/arch/i386/boot.c    |  2 +-
 src/kernel/arch/i386/log.c     |  6 ------
 src/kernel/arch/i386/tty.c     | 33 ---------------------------------
 src/kernel/arch/i386/tty.h     |  6 ------
 src/kernel/arch/i386/tty/log.c |  6 ++++++
 src/kernel/arch/i386/tty/vga.c | 33 +++++++++++++++++++++++++++++++++
 src/kernel/arch/i386/tty/vga.h |  6 ++++++
 7 files changed, 46 insertions(+), 46 deletions(-)
 delete mode 100644 src/kernel/arch/i386/log.c
 delete mode 100644 src/kernel/arch/i386/tty.c
 delete mode 100644 src/kernel/arch/i386/tty.h
 create mode 100644 src/kernel/arch/i386/tty/log.c
 create mode 100644 src/kernel/arch/i386/tty/vga.c
 create mode 100644 src/kernel/arch/i386/tty/vga.h

(limited to 'src')

diff --git a/src/kernel/arch/i386/boot.c b/src/kernel/arch/i386/boot.c
index 2bb18be..e782246 100644
--- a/src/kernel/arch/i386/boot.c
+++ b/src/kernel/arch/i386/boot.c
@@ -3,7 +3,7 @@
 #include <kernel/arch/i386/interrupts/idt.h>
 #include <kernel/arch/i386/multiboot.h>
 #include <kernel/arch/i386/sysenter.h>
-#include <kernel/arch/i386/tty.h>
+#include <kernel/arch/i386/tty/vga.h>
 #include <kernel/main.h>
 #include <kernel/panic.h>
 
diff --git a/src/kernel/arch/i386/log.c b/src/kernel/arch/i386/log.c
deleted file mode 100644
index 84f8b04..0000000
--- a/src/kernel/arch/i386/log.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <kernel/arch/i386/tty.h>
-#include <kernel/arch/log.h>
-
-void log_write(const char *buf, size_t len) {
-	tty_write(buf, len);
-}
diff --git a/src/kernel/arch/i386/tty.c b/src/kernel/arch/i386/tty.c
deleted file mode 100644
index 822c32c..0000000
--- a/src/kernel/arch/i386/tty.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <kernel/arch/i386/tty.h>
-
-struct vga_cell {
-	unsigned char c;
-	unsigned char style;
-} __attribute__((__packed__));
-
-static const size_t     vga_len = 80 * 25;
-static struct vga_cell *vga     = (void*) 0xB8000;
-static size_t           vga_pos = 0;
-
-static void tty_scroll() {
-	for (size_t i = 0; i < vga_len - 80; i++)
-		vga[i] = vga[i + 80];
-	vga_pos -= 80;
-}
-
-void tty_putchar(char c) {
-	if (vga_pos >= vga_len - 80)
-		tty_scroll();
-	vga[vga_pos++].c = c;
-}
-
-void tty_write(const char *buf, size_t len) {
-	for (size_t i = 0; i < len; i++)
-		tty_putchar(buf[i]);
-}
-
-void tty_clear() {
-	for (size_t i = 0; i < vga_len; i++)
-		vga[i].c = ' ';
-	vga_pos = 0;
-}
diff --git a/src/kernel/arch/i386/tty.h b/src/kernel/arch/i386/tty.h
deleted file mode 100644
index cbb8efc..0000000
--- a/src/kernel/arch/i386/tty.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-#include <stddef.h>
-
-void tty_putchar(char c);
-void tty_write(const char *buf, size_t len);
-void tty_clear();
diff --git a/src/kernel/arch/i386/tty/log.c b/src/kernel/arch/i386/tty/log.c
new file mode 100644
index 0000000..1a2d874
--- /dev/null
+++ b/src/kernel/arch/i386/tty/log.c
@@ -0,0 +1,6 @@
+#include <kernel/arch/i386/tty/vga.h>
+#include <kernel/arch/log.h>
+
+void log_write(const char *buf, size_t len) {
+	tty_write(buf, len);
+}
diff --git a/src/kernel/arch/i386/tty/vga.c b/src/kernel/arch/i386/tty/vga.c
new file mode 100644
index 0000000..db4b47f
--- /dev/null
+++ b/src/kernel/arch/i386/tty/vga.c
@@ -0,0 +1,33 @@
+#include <kernel/arch/i386/tty/vga.h>
+
+struct vga_cell {
+	unsigned char c;
+	unsigned char style;
+} __attribute__((__packed__));
+
+static const size_t     vga_len = 80 * 25;
+static struct vga_cell *vga     = (void*) 0xB8000;
+static size_t           vga_pos = 0;
+
+static void tty_scroll() {
+	for (size_t i = 0; i < vga_len - 80; i++)
+		vga[i] = vga[i + 80];
+	vga_pos -= 80;
+}
+
+void tty_putchar(char c) {
+	if (vga_pos >= vga_len - 80)
+		tty_scroll();
+	vga[vga_pos++].c = c;
+}
+
+void tty_write(const char *buf, size_t len) {
+	for (size_t i = 0; i < len; i++)
+		tty_putchar(buf[i]);
+}
+
+void tty_clear() {
+	for (size_t i = 0; i < vga_len; i++)
+		vga[i].c = ' ';
+	vga_pos = 0;
+}
diff --git a/src/kernel/arch/i386/tty/vga.h b/src/kernel/arch/i386/tty/vga.h
new file mode 100644
index 0000000..cbb8efc
--- /dev/null
+++ b/src/kernel/arch/i386/tty/vga.h
@@ -0,0 +1,6 @@
+#pragma once
+#include <stddef.h>
+
+void tty_putchar(char c);
+void tty_write(const char *buf, size_t len);
+void tty_clear();
-- 
cgit v1.2.3