summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Kling <awesomekling@gmail.com>2019-04-03 12:28:45 +0200
committerAndreas Kling <awesomekling@gmail.com>2019-04-03 12:28:45 +0200
commit9fca94269ef4c16e984e444a9002ff60a93ce4c9 (patch)
treed8d3207ccaf2a805eb0dedaa69b4240906a97936
parentf9864940eb394e30f4685ccc712916c6d68d4619 (diff)
downloadserenity-9fca94269ef4c16e984e444a9002ff60a93ce4c9.zip
Kernel: Move TTY-related files into Kernel/TTY/.
-rw-r--r--Kernel/FileDescriptor.cpp4
-rw-r--r--Kernel/FileSystem/DevPtsFS.cpp2
-rw-r--r--Kernel/KeyboardDevice.cpp2
-rw-r--r--Kernel/Makefile10
-rw-r--r--Kernel/Process.cpp2
-rw-r--r--Kernel/Process.h2
-rw-r--r--Kernel/TTY/MasterPTY.cpp (renamed from Kernel/MasterPTY.cpp)0
-rw-r--r--Kernel/TTY/MasterPTY.h (renamed from Kernel/MasterPTY.h)0
-rw-r--r--Kernel/TTY/PTYMultiplexer.cpp (renamed from Kernel/PTYMultiplexer.cpp)0
-rw-r--r--Kernel/TTY/PTYMultiplexer.h (renamed from Kernel/PTYMultiplexer.h)0
-rw-r--r--Kernel/TTY/SlavePTY.cpp (renamed from Kernel/SlavePTY.cpp)0
-rw-r--r--Kernel/TTY/SlavePTY.h (renamed from Kernel/SlavePTY.h)2
-rw-r--r--Kernel/TTY/TTY.cpp (renamed from Kernel/TTY.cpp)2
-rw-r--r--Kernel/TTY/TTY.h (renamed from Kernel/TTY.h)0
-rw-r--r--Kernel/TTY/VirtualConsole.cpp (renamed from Kernel/VirtualConsole.cpp)0
-rw-r--r--Kernel/TTY/VirtualConsole.h (renamed from Kernel/VirtualConsole.h)2
-rw-r--r--Kernel/init.cpp4
17 files changed, 16 insertions, 16 deletions
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
index 9c643183fb..9c643183fb 100644
--- a/Kernel/MasterPTY.cpp
+++ b/Kernel/TTY/MasterPTY.cpp
diff --git a/Kernel/MasterPTY.h b/Kernel/TTY/MasterPTY.h
index e189cd7eef..e189cd7eef 100644
--- a/Kernel/MasterPTY.h
+++ b/Kernel/TTY/MasterPTY.h
diff --git a/Kernel/PTYMultiplexer.cpp b/Kernel/TTY/PTYMultiplexer.cpp
index 35852474df..35852474df 100644
--- a/Kernel/PTYMultiplexer.cpp
+++ b/Kernel/TTY/PTYMultiplexer.cpp
diff --git a/Kernel/PTYMultiplexer.h b/Kernel/TTY/PTYMultiplexer.h
index 05b7c80eb2..05b7c80eb2 100644
--- a/Kernel/PTYMultiplexer.h
+++ b/Kernel/TTY/PTYMultiplexer.h
diff --git a/Kernel/SlavePTY.cpp b/Kernel/TTY/SlavePTY.cpp
index 96f07e151f..96f07e151f 100644
--- a/Kernel/SlavePTY.cpp
+++ b/Kernel/TTY/SlavePTY.cpp
diff --git a/Kernel/SlavePTY.h b/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
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
index b3ae8336b7..b3ae8336b7 100644
--- a/Kernel/TTY.h
+++ b/Kernel/TTY/TTY.h
diff --git a/Kernel/VirtualConsole.cpp b/Kernel/TTY/VirtualConsole.cpp
index acaf14686e..acaf14686e 100644
--- a/Kernel/VirtualConsole.cpp
+++ b/Kernel/TTY/VirtualConsole.cpp
diff --git a/Kernel/VirtualConsole.h b/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>