From 9fca94269ef4c16e984e444a9002ff60a93ce4c9 Mon Sep 17 00:00:00 2001
From: Andreas Kling <awesomekling@gmail.com>
Date: Wed, 3 Apr 2019 12:28:45 +0200
Subject: [PATCH] Kernel: Move TTY-related files into Kernel/TTY/.

---
 Kernel/FileDescriptor.cpp           |  4 ++--
 Kernel/FileSystem/DevPtsFS.cpp      |  2 +-
 Kernel/KeyboardDevice.cpp           |  2 +-
 Kernel/Makefile                     | 10 +++++-----
 Kernel/Process.cpp                  |  2 +-
 Kernel/Process.h                    |  2 +-
 Kernel/{ => TTY}/MasterPTY.cpp      |  0
 Kernel/{ => TTY}/MasterPTY.h        |  0
 Kernel/{ => TTY}/PTYMultiplexer.cpp |  0
 Kernel/{ => TTY}/PTYMultiplexer.h   |  0
 Kernel/{ => TTY}/SlavePTY.cpp       |  0
 Kernel/{ => TTY}/SlavePTY.h         |  2 +-
 Kernel/{ => TTY}/TTY.cpp            |  2 +-
 Kernel/{ => TTY}/TTY.h              |  0
 Kernel/{ => TTY}/VirtualConsole.cpp |  0
 Kernel/{ => TTY}/VirtualConsole.h   |  2 +-
 Kernel/init.cpp                     |  4 ++--
 17 files changed, 16 insertions(+), 16 deletions(-)
 rename Kernel/{ => TTY}/MasterPTY.cpp (100%)
 rename Kernel/{ => TTY}/MasterPTY.h (100%)
 rename Kernel/{ => TTY}/PTYMultiplexer.cpp (100%)
 rename Kernel/{ => TTY}/PTYMultiplexer.h (100%)
 rename Kernel/{ => TTY}/SlavePTY.cpp (100%)
 rename Kernel/{ => TTY}/SlavePTY.h (97%)
 rename Kernel/{ => TTY}/TTY.cpp (99%)
 rename Kernel/{ => TTY}/TTY.h (100%)
 rename Kernel/{ => TTY}/VirtualConsole.cpp (100%)
 rename Kernel/{ => TTY}/VirtualConsole.h (98%)

diff --git a/Kernel/FileDescriptor.cpp b/Kernel/FileDescriptor.cpp
index 78661f1ff2..3f131fe135 100644
--- a/Kernel/FileDescriptor.cpp
+++ b/Kernel/FileDescriptor.cpp
@@ -5,8 +5,8 @@
 #include "UnixTypes.h"
 #include <AK/BufferStream.h>
 #include "FIFO.h"
-#include "TTY.h"
-#include "MasterPTY.h"
+#include <Kernel/TTY/TTY.h>
+#include <Kernel/TTY/MasterPTY.h>
 #include <Kernel/Socket.h>
 #include <Kernel/Process.h>
 #include <Kernel/BlockDevice.h>
diff --git a/Kernel/FileSystem/DevPtsFS.cpp b/Kernel/FileSystem/DevPtsFS.cpp
index f66d846750..8e8fd94637 100644
--- a/Kernel/FileSystem/DevPtsFS.cpp
+++ b/Kernel/FileSystem/DevPtsFS.cpp
@@ -1,5 +1,5 @@
 #include <Kernel/FileSystem/DevPtsFS.h>
-#include <Kernel/SlavePTY.h>
+#include <Kernel/TTY/SlavePTY.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
 #include <AK/StringBuilder.h>
 
diff --git a/Kernel/KeyboardDevice.cpp b/Kernel/KeyboardDevice.cpp
index 456ac98cc2..942cfac6b0 100644
--- a/Kernel/KeyboardDevice.cpp
+++ b/Kernel/KeyboardDevice.cpp
@@ -3,7 +3,7 @@
 #include "IO.h"
 #include "PIC.h"
 #include "KeyboardDevice.h"
-#include "VirtualConsole.h"
+#include <Kernel/TTY/VirtualConsole.h>
 #include <AK/Assertions.h>
 
 //#define KEYBOARD_DEBUG
diff --git a/Kernel/Makefile b/Kernel/Makefile
index dd157bfa3c..d64d65b097 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -16,11 +16,11 @@ KERNEL_OBJS = \
        IRQHandler.o \
        kprintf.o \
        RTC.o \
-       TTY.o \
-       PTYMultiplexer.o \
-       MasterPTY.o \
-       SlavePTY.o \
-       VirtualConsole.o \
+       TTY/TTY.o \
+       TTY/PTYMultiplexer.o \
+       TTY/MasterPTY.o \
+       TTY/SlavePTY.o \
+       TTY/VirtualConsole.o \
        FIFO.o \
        Scheduler.o \
        DoubleBuffer.o \
diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp
index 731a27b353..4dfa5ddf23 100644
--- a/Kernel/Process.cpp
+++ b/Kernel/Process.cpp
@@ -19,7 +19,7 @@
 #include "FIFO.h"
 #include "KSyms.h"
 #include <Kernel/Socket.h>
-#include "MasterPTY.h"
+#include <Kernel/TTY/MasterPTY.h>
 #include <Kernel/exec_elf.h>
 #include <AK/StringBuilder.h>
 
diff --git a/Kernel/Process.h b/Kernel/Process.h
index e7ce808ee3..6fd7391d02 100644
--- a/Kernel/Process.h
+++ b/Kernel/Process.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "types.h"
-#include "TTY.h"
+#include <Kernel/TTY/TTY.h>
 #include "Syscall.h"
 #include <Kernel/FileSystem/VirtualFileSystem.h>
 #include <Kernel/UnixTypes.h>
diff --git a/Kernel/MasterPTY.cpp b/Kernel/TTY/MasterPTY.cpp
similarity index 100%
rename from Kernel/MasterPTY.cpp
rename to Kernel/TTY/MasterPTY.cpp
diff --git a/Kernel/MasterPTY.h b/Kernel/TTY/MasterPTY.h
similarity index 100%
rename from Kernel/MasterPTY.h
rename to Kernel/TTY/MasterPTY.h
diff --git a/Kernel/PTYMultiplexer.cpp b/Kernel/TTY/PTYMultiplexer.cpp
similarity index 100%
rename from Kernel/PTYMultiplexer.cpp
rename to Kernel/TTY/PTYMultiplexer.cpp
diff --git a/Kernel/PTYMultiplexer.h b/Kernel/TTY/PTYMultiplexer.h
similarity index 100%
rename from Kernel/PTYMultiplexer.h
rename to Kernel/TTY/PTYMultiplexer.h
diff --git a/Kernel/SlavePTY.cpp b/Kernel/TTY/SlavePTY.cpp
similarity index 100%
rename from Kernel/SlavePTY.cpp
rename to Kernel/TTY/SlavePTY.cpp
diff --git a/Kernel/SlavePTY.h b/Kernel/TTY/SlavePTY.h
similarity index 97%
rename from Kernel/SlavePTY.h
rename to Kernel/TTY/SlavePTY.h
index fb249ae8f7..95c17b62a1 100644
--- a/Kernel/SlavePTY.h
+++ b/Kernel/TTY/SlavePTY.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "TTY.h"
+#include <Kernel/TTY/TTY.h>
 
 class MasterPTY;
 
diff --git a/Kernel/TTY.cpp b/Kernel/TTY/TTY.cpp
similarity index 99%
rename from Kernel/TTY.cpp
rename to Kernel/TTY/TTY.cpp
index 137213d2e7..ebcb7e196d 100644
--- a/Kernel/TTY.cpp
+++ b/Kernel/TTY/TTY.cpp
@@ -1,4 +1,4 @@
-#include "TTY.h"
+#include <Kernel/TTY/TTY.h>
 #include "Process.h"
 #include <LibC/errno_numbers.h>
 #include <LibC/signal_numbers.h>
diff --git a/Kernel/TTY.h b/Kernel/TTY/TTY.h
similarity index 100%
rename from Kernel/TTY.h
rename to Kernel/TTY/TTY.h
diff --git a/Kernel/VirtualConsole.cpp b/Kernel/TTY/VirtualConsole.cpp
similarity index 100%
rename from Kernel/VirtualConsole.cpp
rename to Kernel/TTY/VirtualConsole.cpp
diff --git a/Kernel/VirtualConsole.h b/Kernel/TTY/VirtualConsole.h
similarity index 98%
rename from Kernel/VirtualConsole.h
rename to Kernel/TTY/VirtualConsole.h
index d2aa8a1be0..3a2f9f0513 100644
--- a/Kernel/VirtualConsole.h
+++ b/Kernel/TTY/VirtualConsole.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "TTY.h"
+#include <Kernel/TTY/TTY.h>
 #include "KeyboardDevice.h"
 #include "Console.h"
 
diff --git a/Kernel/init.cpp b/Kernel/init.cpp
index b5310b0b91..a5c5e53ad2 100644
--- a/Kernel/init.cpp
+++ b/Kernel/init.cpp
@@ -17,10 +17,10 @@
 #include "MemoryManager.h"
 #include <Kernel/FileSystem/ProcFS.h>
 #include "RTC.h"
-#include "VirtualConsole.h"
+#include <Kernel/TTY/VirtualConsole.h>
 #include "Scheduler.h"
 #include "PS2MouseDevice.h"
-#include "PTYMultiplexer.h"
+#include <Kernel/TTY/PTYMultiplexer.h>
 #include <Kernel/FileSystem/DevPtsFS.h>
 #include "BXVGADevice.h"
 #include <Kernel/Net/E1000NetworkAdapter.h>