Kernel: Move PIC.cpp into Arch/i386/

Kernel/PIC.cpp → 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()
 }
 
 }
+

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
 

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)

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 \

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
 

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>