RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-23 18:35:07 +00:00
Code Issues Activity Actions

Kernel: Move PIC.cpp into Arch/i386/

Browse source
This commit is contained in:
Andreas Kling 2019-07-09 14:18:03 +02:00
parent aa2cfed6b0
commit 9fdcede491
7 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Kernel/PIC.cpp → Kernel/Arch/i386/PIC.cpp
View file

@ -1,8 +1,8 @@
#include "PIC.h" #include <AK/Assertions.h>
#include "Assertions.h"
#include "IO.h"
#include <AK/Types.h> #include <AK/Types.h>
#include <Kernel/Arch/i386/CPU.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. // The slave 8259 is connected to the master's IRQ2 line.
// This is really only to enhance clarity. // This is really only to enhance clarity.
@ -109,3 +109,4 @@ u16 get_irr()
} }
} }

0
Kernel/PIC.h → Kernel/Arch/i386/PIC.h
View file

4
Kernel/Devices/KeyboardDevice.cpp
View file

@ -1,10 +1,10 @@
#include "IO.h"
#include "PIC.h"
#include <AK/Assertions.h> #include <AK/Assertions.h>
#include <AK/Types.h> #include <AK/Types.h>
#include <Kernel/Arch/i386/CPU.h> #include <Kernel/Arch/i386/CPU.h>
#include <Kernel/Arch/i386/PIC.h>
#include <Kernel/Devices/KeyboardDevice.h> #include <Kernel/Devices/KeyboardDevice.h>
#include <Kernel/TTY/VirtualConsole.h> #include <Kernel/TTY/VirtualConsole.h>
#include <Kernel/IO.h>
//#define KEYBOARD_DEBUG //#define KEYBOARD_DEBUG

2
Kernel/IRQHandler.cpp
View file

@ -1,6 +1,6 @@
#include "IRQHandler.h" #include "IRQHandler.h"
#include "PIC.h"
#include <Kernel/Arch/i386/CPU.h> #include <Kernel/Arch/i386/CPU.h>
#include <Kernel/Arch/i386/PIC.h>
IRQHandler::IRQHandler(u8 irq) IRQHandler::IRQHandler(u8 irq)
: m_irq_number(irq) : m_irq_number(irq)

2
Kernel/Makefile
View file

@ -10,7 +10,7 @@ KERNEL_OBJS = \
i8253.o \ i8253.o \
Devices/KeyboardDevice.o \ Devices/KeyboardDevice.o \
CMOS.o \ CMOS.o \
PIC.o \ Arch/i386/PIC.o \
Syscall.o \ Syscall.o \
Devices/IDEDiskDevice.o \ Devices/IDEDiskDevice.o \
VM/MemoryManager.o \ VM/MemoryManager.o \

8
Kernel/i8253.cpp
View file

@ -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/CPU.h>
#include <Kernel/Arch/i386/PIC.h>
#include <Kernel/i8253.h>
#include <Kernel/IO.h>
#include <Kernel/Scheduler.h>
#define IRQ_TIMER 0 #define IRQ_TIMER 0

2
Kernel/init.cpp
View file

@ -1,5 +1,4 @@
#include "KSyms.h" #include "KSyms.h"
#include "PIC.h"
#include "Process.h" #include "Process.h"
#include "RTC.h" #include "RTC.h"
#include "Scheduler.h" #include "Scheduler.h"
@ -7,6 +6,7 @@
#include "kmalloc.h" #include "kmalloc.h"
#include <AK/Types.h> #include <AK/Types.h>
#include <Kernel/Arch/i386/CPU.h> #include <Kernel/Arch/i386/CPU.h>
#include <Kernel/Arch/i386/PIC.h>
#include <Kernel/Devices/BXVGADevice.h> #include <Kernel/Devices/BXVGADevice.h>
#include <Kernel/Devices/DebugLogDevice.h> #include <Kernel/Devices/DebugLogDevice.h>
#include <Kernel/Devices/DiskPartition.h> #include <Kernel/Devices/DiskPartition.h>