Browse Source

Kernel: Move TTY-related files into Kernel/TTY/.

Andreas Kling 6 years ago
parent
commit
9fca94269e

+ 2 - 2
Kernel/FileDescriptor.cpp

@@ -5,8 +5,8 @@
 #include "UnixTypes.h"
 #include "UnixTypes.h"
 #include <AK/BufferStream.h>
 #include <AK/BufferStream.h>
 #include "FIFO.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/Socket.h>
 #include <Kernel/Process.h>
 #include <Kernel/Process.h>
 #include <Kernel/BlockDevice.h>
 #include <Kernel/BlockDevice.h>

+ 1 - 1
Kernel/FileSystem/DevPtsFS.cpp

@@ -1,5 +1,5 @@
 #include <Kernel/FileSystem/DevPtsFS.h>
 #include <Kernel/FileSystem/DevPtsFS.h>
-#include <Kernel/SlavePTY.h>
+#include <Kernel/TTY/SlavePTY.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
 #include <AK/StringBuilder.h>
 #include <AK/StringBuilder.h>
 
 

+ 1 - 1
Kernel/KeyboardDevice.cpp

@@ -3,7 +3,7 @@
 #include "IO.h"
 #include "IO.h"
 #include "PIC.h"
 #include "PIC.h"
 #include "KeyboardDevice.h"
 #include "KeyboardDevice.h"
-#include "VirtualConsole.h"
+#include <Kernel/TTY/VirtualConsole.h>
 #include <AK/Assertions.h>
 #include <AK/Assertions.h>
 
 
 //#define KEYBOARD_DEBUG
 //#define KEYBOARD_DEBUG

+ 5 - 5
Kernel/Makefile

@@ -16,11 +16,11 @@ KERNEL_OBJS = \
        IRQHandler.o \
        IRQHandler.o \
        kprintf.o \
        kprintf.o \
        RTC.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 \
        FIFO.o \
        Scheduler.o \
        Scheduler.o \
        DoubleBuffer.o \
        DoubleBuffer.o \

+ 1 - 1
Kernel/Process.cpp

@@ -19,7 +19,7 @@
 #include "FIFO.h"
 #include "FIFO.h"
 #include "KSyms.h"
 #include "KSyms.h"
 #include <Kernel/Socket.h>
 #include <Kernel/Socket.h>
-#include "MasterPTY.h"
+#include <Kernel/TTY/MasterPTY.h>
 #include <Kernel/exec_elf.h>
 #include <Kernel/exec_elf.h>
 #include <AK/StringBuilder.h>
 #include <AK/StringBuilder.h>
 
 

+ 1 - 1
Kernel/Process.h

@@ -1,7 +1,7 @@
 #pragma once
 #pragma once
 
 
 #include "types.h"
 #include "types.h"
-#include "TTY.h"
+#include <Kernel/TTY/TTY.h>
 #include "Syscall.h"
 #include "Syscall.h"
 #include <Kernel/FileSystem/VirtualFileSystem.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
 #include <Kernel/UnixTypes.h>
 #include <Kernel/UnixTypes.h>

+ 0 - 0
Kernel/MasterPTY.cpp → Kernel/TTY/MasterPTY.cpp


+ 0 - 0
Kernel/MasterPTY.h → Kernel/TTY/MasterPTY.h


+ 0 - 0
Kernel/PTYMultiplexer.cpp → Kernel/TTY/PTYMultiplexer.cpp


+ 0 - 0
Kernel/PTYMultiplexer.h → Kernel/TTY/PTYMultiplexer.h


+ 0 - 0
Kernel/SlavePTY.cpp → Kernel/TTY/SlavePTY.cpp


+ 1 - 1
Kernel/SlavePTY.h → Kernel/TTY/SlavePTY.h

@@ -1,6 +1,6 @@
 #pragma once
 #pragma once
 
 
-#include "TTY.h"
+#include <Kernel/TTY/TTY.h>
 
 
 class MasterPTY;
 class MasterPTY;
 
 

+ 1 - 1
Kernel/TTY.cpp → Kernel/TTY/TTY.cpp

@@ -1,4 +1,4 @@
-#include "TTY.h"
+#include <Kernel/TTY/TTY.h>
 #include "Process.h"
 #include "Process.h"
 #include <LibC/errno_numbers.h>
 #include <LibC/errno_numbers.h>
 #include <LibC/signal_numbers.h>
 #include <LibC/signal_numbers.h>

+ 0 - 0
Kernel/TTY.h → Kernel/TTY/TTY.h


+ 0 - 0
Kernel/VirtualConsole.cpp → Kernel/TTY/VirtualConsole.cpp


+ 1 - 1
Kernel/VirtualConsole.h → Kernel/TTY/VirtualConsole.h

@@ -1,6 +1,6 @@
 #pragma once
 #pragma once
 
 
-#include "TTY.h"
+#include <Kernel/TTY/TTY.h>
 #include "KeyboardDevice.h"
 #include "KeyboardDevice.h"
 #include "Console.h"
 #include "Console.h"
 
 

+ 2 - 2
Kernel/init.cpp

@@ -17,10 +17,10 @@
 #include "MemoryManager.h"
 #include "MemoryManager.h"
 #include <Kernel/FileSystem/ProcFS.h>
 #include <Kernel/FileSystem/ProcFS.h>
 #include "RTC.h"
 #include "RTC.h"
-#include "VirtualConsole.h"
+#include <Kernel/TTY/VirtualConsole.h>
 #include "Scheduler.h"
 #include "Scheduler.h"
 #include "PS2MouseDevice.h"
 #include "PS2MouseDevice.h"
-#include "PTYMultiplexer.h"
+#include <Kernel/TTY/PTYMultiplexer.h>
 #include <Kernel/FileSystem/DevPtsFS.h>
 #include <Kernel/FileSystem/DevPtsFS.h>
 #include "BXVGADevice.h"
 #include "BXVGADevice.h"
 #include <Kernel/Net/E1000NetworkAdapter.h>
 #include <Kernel/Net/E1000NetworkAdapter.h>