From 9fdcede49151b47edca95e4fc0bb8fdada01b794 Mon Sep 17 00:00:00 2001
From: Andreas Kling <awesomekling@gmail.com>
Date: Tue, 9 Jul 2019 14:18:03 +0200
Subject: [PATCH] Kernel: Move PIC.cpp into Arch/i386/

---
 Kernel/{ => Arch/i386}/PIC.cpp    | 7 ++++---
 Kernel/{ => Arch/i386}/PIC.h      | 0
 Kernel/Devices/KeyboardDevice.cpp | 4 ++--
 Kernel/IRQHandler.cpp             | 2 +-
 Kernel/Makefile                   | 2 +-
 Kernel/i8253.cpp                  | 8 ++++----
 Kernel/init.cpp                   | 2 +-
 7 files changed, 13 insertions(+), 12 deletions(-)
 rename Kernel/{ => Arch/i386}/PIC.cpp (96%)
 rename Kernel/{ => Arch/i386}/PIC.h (100%)

diff --git a/Kernel/PIC.cpp b/Kernel/Arch/i386/PIC.cpp
similarity index 96%
rename from Kernel/PIC.cpp
rename to Kernel/Arch/i386/PIC.cpp
index 124ca24974..ae0d48ff05 100644
--- a/Kernel/PIC.cpp
+++ b/Kernel/Arch/i386/PIC.cpp
@@ -1,8 +1,8 @@
-#include "PIC.h"
-#include "Assertions.h"
-#include "IO.h"
+#include <AK/Assertions.h>
 #include <AK/Types.h>
 #include <Kernel/Arch/i386/CPU.h>
+#include <Kernel/Arch/i386/PIC.h>
+#include <Kernel/IO.h>
 
 // The slave 8259 is connected to the master's IRQ2 line.
 // This is really only to enhance clarity.
@@ -109,3 +109,4 @@ u16 get_irr()
 }
 
 }
+
diff --git a/Kernel/PIC.h b/Kernel/Arch/i386/PIC.h
similarity index 100%
rename from Kernel/PIC.h
rename to Kernel/Arch/i386/PIC.h
diff --git a/Kernel/Devices/KeyboardDevice.cpp b/Kernel/Devices/KeyboardDevice.cpp
index 523de60205..3659c2165b 100644
--- a/Kernel/Devices/KeyboardDevice.cpp
+++ b/Kernel/Devices/KeyboardDevice.cpp
@@ -1,10 +1,10 @@
-#include "IO.h"
-#include "PIC.h"
 #include <AK/Assertions.h>
 #include <AK/Types.h>
 #include <Kernel/Arch/i386/CPU.h>
+#include <Kernel/Arch/i386/PIC.h>
 #include <Kernel/Devices/KeyboardDevice.h>
 #include <Kernel/TTY/VirtualConsole.h>
+#include <Kernel/IO.h>
 
 //#define KEYBOARD_DEBUG
 
diff --git a/Kernel/IRQHandler.cpp b/Kernel/IRQHandler.cpp
index ea2caa4ebf..6477b0330a 100644
--- a/Kernel/IRQHandler.cpp
+++ b/Kernel/IRQHandler.cpp
@@ -1,6 +1,6 @@
 #include "IRQHandler.h"
-#include "PIC.h"
 #include <Kernel/Arch/i386/CPU.h>
+#include <Kernel/Arch/i386/PIC.h>
 
 IRQHandler::IRQHandler(u8 irq)
     : m_irq_number(irq)
diff --git a/Kernel/Makefile b/Kernel/Makefile
index f4923e2b12..129c5d71fe 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -10,7 +10,7 @@ KERNEL_OBJS = \
        i8253.o \
        Devices/KeyboardDevice.o \
        CMOS.o \
-       PIC.o \
+       Arch/i386/PIC.o \
        Syscall.o \
        Devices/IDEDiskDevice.o \
        VM/MemoryManager.o \
diff --git a/Kernel/i8253.cpp b/Kernel/i8253.cpp
index 38a401a7cd..ab91e192be 100644
--- a/Kernel/i8253.cpp
+++ b/Kernel/i8253.cpp
@@ -1,8 +1,8 @@
-#include "i8253.h"
-#include "IO.h"
-#include "PIC.h"
-#include "Scheduler.h"
 #include <Kernel/Arch/i386/CPU.h>
+#include <Kernel/Arch/i386/PIC.h>
+#include <Kernel/i8253.h>
+#include <Kernel/IO.h>
+#include <Kernel/Scheduler.h>
 
 #define IRQ_TIMER 0
 
diff --git a/Kernel/init.cpp b/Kernel/init.cpp
index 48b9b0815a..d0696845ca 100644
--- a/Kernel/init.cpp
+++ b/Kernel/init.cpp
@@ -1,5 +1,4 @@
 #include "KSyms.h"
-#include "PIC.h"
 #include "Process.h"
 #include "RTC.h"
 #include "Scheduler.h"
@@ -7,6 +6,7 @@
 #include "kmalloc.h"
 #include <AK/Types.h>
 #include <Kernel/Arch/i386/CPU.h>
+#include <Kernel/Arch/i386/PIC.h>
 #include <Kernel/Devices/BXVGADevice.h>
 #include <Kernel/Devices/DebugLogDevice.h>
 #include <Kernel/Devices/DiskPartition.h>