mirror of
https://github.com/SerenityOS/serenity
synced 2024-07-23 02:55:15 +00:00
Kernel: Move x86-specific IRQ controller code to Arch/x86 directory
The PIC and APIC code are specific to x86 platforms, so move them out of the general Interrupts directory to Arch/x86/common/Interrupts directory instead.
This commit is contained in:
parent
aeef1c52bc
commit
1b7b360ca1
|
@ -11,9 +11,9 @@
|
|||
#include <AK/OwnPtr.h>
|
||||
#include <AK/Types.h>
|
||||
#include <Kernel/Arch/x86/IRQController.h>
|
||||
#include <Kernel/Arch/x86/common/Interrupts/IOAPIC.h>
|
||||
#include <Kernel/Firmware/ACPI/Definitions.h>
|
||||
#include <Kernel/Interrupts/GenericInterruptHandler.h>
|
||||
#include <Kernel/Interrupts/IOAPIC.h>
|
||||
#include <Kernel/Library/LockRefPtr.h>
|
||||
|
||||
namespace Kernel {
|
||||
|
|
|
@ -9,11 +9,11 @@
|
|||
#include <Kernel/Arch/InterruptDisabler.h>
|
||||
#include <Kernel/Arch/Interrupts.h>
|
||||
#include <Kernel/Arch/x86/InterruptManagement.h>
|
||||
#include <Kernel/Arch/x86/common/Interrupts/APIC.h>
|
||||
#include <Kernel/Arch/x86/common/Interrupts/IOAPIC.h>
|
||||
#include <Kernel/Arch/x86/common/Interrupts/PIC.h>
|
||||
#include <Kernel/CommandLine.h>
|
||||
#include <Kernel/Firmware/MultiProcessor/Parser.h>
|
||||
#include <Kernel/Interrupts/APIC.h>
|
||||
#include <Kernel/Interrupts/IOAPIC.h>
|
||||
#include <Kernel/Interrupts/PIC.h>
|
||||
#include <Kernel/Interrupts/SharedIRQHandler.h>
|
||||
#include <Kernel/Interrupts/SpuriousInterruptHandler.h>
|
||||
#include <Kernel/Memory/TypedMapping.h>
|
||||
|
|
|
@ -9,8 +9,8 @@
|
|||
#include <AK/Types.h>
|
||||
|
||||
#include <Kernel/Arch/Interrupts.h>
|
||||
#include <Kernel/Arch/x86/common/Interrupts/PIC.h>
|
||||
#include <Kernel/Interrupts/GenericInterruptHandler.h>
|
||||
#include <Kernel/Interrupts/PIC.h>
|
||||
#include <Kernel/Interrupts/SharedIRQHandler.h>
|
||||
#include <Kernel/Interrupts/SpuriousInterruptHandler.h>
|
||||
#include <Kernel/Interrupts/UnhandledInterruptHandler.h>
|
||||
|
|
|
@ -11,9 +11,9 @@
|
|||
#include <Kernel/Arch/Delay.h>
|
||||
#include <Kernel/Arch/x86/MSR.h>
|
||||
#include <Kernel/Arch/x86/ProcessorInfo.h>
|
||||
#include <Kernel/Arch/x86/common/Interrupts/APIC.h>
|
||||
#include <Kernel/Debug.h>
|
||||
#include <Kernel/Firmware/ACPI/Parser.h>
|
||||
#include <Kernel/Interrupts/APIC.h>
|
||||
#include <Kernel/Interrupts/SpuriousInterruptHandler.h>
|
||||
#include <Kernel/Memory/AnonymousVMObject.h>
|
||||
#include <Kernel/Memory/MemoryManager.h>
|
|
@ -7,9 +7,9 @@
|
|||
#include <AK/Optional.h>
|
||||
#include <Kernel/Arch/InterruptDisabler.h>
|
||||
#include <Kernel/Arch/x86/InterruptManagement.h>
|
||||
#include <Kernel/Arch/x86/common/Interrupts/APIC.h>
|
||||
#include <Kernel/Arch/x86/common/Interrupts/IOAPIC.h>
|
||||
#include <Kernel/Debug.h>
|
||||
#include <Kernel/Interrupts/APIC.h>
|
||||
#include <Kernel/Interrupts/IOAPIC.h>
|
||||
#include <Kernel/Sections.h>
|
||||
|
||||
#define IOAPIC_REDIRECTION_ENTRY_OFFSET 0x10
|
|
@ -8,8 +8,8 @@
|
|||
#include <AK/Types.h>
|
||||
#include <Kernel/Arch/InterruptDisabler.h>
|
||||
#include <Kernel/Arch/x86/IO.h>
|
||||
#include <Kernel/Arch/x86/common/Interrupts/PIC.h>
|
||||
#include <Kernel/Interrupts/GenericInterruptHandler.h>
|
||||
#include <Kernel/Interrupts/PIC.h>
|
||||
#include <Kernel/Sections.h>
|
||||
|
||||
namespace Kernel {
|
|
@ -12,7 +12,7 @@
|
|||
#include <AK/StringBuilder.h>
|
||||
#include <AK/Types.h>
|
||||
|
||||
#include <Kernel/Interrupts/APIC.h>
|
||||
#include <Kernel/Arch/x86/common/Interrupts/APIC.h>
|
||||
#include <Kernel/Process.h>
|
||||
#include <Kernel/Scheduler.h>
|
||||
#include <Kernel/Sections.h>
|
||||
|
|
|
@ -159,11 +159,8 @@ set(KERNEL_SOURCES
|
|||
Firmware/ACPI/Parser.cpp
|
||||
Firmware/MultiProcessor/Parser.cpp
|
||||
FutexQueue.cpp
|
||||
Interrupts/APIC.cpp
|
||||
Interrupts/GenericInterruptHandler.cpp
|
||||
Interrupts/IOAPIC.cpp
|
||||
Interrupts/IRQHandler.cpp
|
||||
Interrupts/PIC.cpp
|
||||
Interrupts/SharedIRQHandler.cpp
|
||||
Interrupts/SpuriousInterruptHandler.cpp
|
||||
Interrupts/UnhandledInterruptHandler.cpp
|
||||
|
@ -321,6 +318,10 @@ if ("${SERENITY_ARCH}" STREQUAL "i686" OR "${SERENITY_ARCH}" STREQUAL "x86_64")
|
|||
${KERNEL_SOURCES}
|
||||
Arch/Processor.cpp
|
||||
|
||||
Arch/x86/common/Interrupts/APIC.cpp
|
||||
Arch/x86/common/Interrupts/IOAPIC.cpp
|
||||
Arch/x86/common/Interrupts/PIC.cpp
|
||||
|
||||
Arch/x86/common/CMOS.cpp
|
||||
Arch/x86/common/DebugOutput.cpp
|
||||
Arch/x86/common/Delay.cpp
|
||||
|
|
|
@ -7,10 +7,10 @@
|
|||
*/
|
||||
|
||||
#include <AK/StringView.h>
|
||||
#include <Kernel/Arch/x86/common/Interrupts/IOAPIC.h>
|
||||
#include <Kernel/Debug.h>
|
||||
#include <Kernel/Firmware/BIOS.h>
|
||||
#include <Kernel/Firmware/MultiProcessor/Parser.h>
|
||||
#include <Kernel/Interrupts/IOAPIC.h>
|
||||
#include <Kernel/Memory/TypedMapping.h>
|
||||
#include <Kernel/Sections.h>
|
||||
#include <Kernel/StdLib.h>
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
|
||||
#include <Kernel/Arch/InterruptManagement.h>
|
||||
#include <Kernel/Arch/x86/Interrupts.h>
|
||||
#include <Kernel/Interrupts/PIC.h>
|
||||
#include <Kernel/Interrupts/SpuriousInterruptHandler.h>
|
||||
#include <Kernel/Sections.h>
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <Kernel/Interrupts/APIC.h>
|
||||
#include <Kernel/Arch/x86/common/Interrupts/APIC.h>
|
||||
#include <Kernel/Panic.h>
|
||||
#include <Kernel/Sections.h>
|
||||
#include <Kernel/Time/APICTimer.h>
|
||||
|
|
|
@ -8,10 +8,10 @@
|
|||
#include <AK/StdLibExtras.h>
|
||||
#include <AK/Time.h>
|
||||
#include <Kernel/Arch/InterruptDisabler.h>
|
||||
#include <Kernel/Arch/x86/common/Interrupts/APIC.h>
|
||||
#include <Kernel/Arch/x86/common/RTC.h>
|
||||
#include <Kernel/CommandLine.h>
|
||||
#include <Kernel/Firmware/ACPI/Parser.h>
|
||||
#include <Kernel/Interrupts/APIC.h>
|
||||
#include <Kernel/PerformanceManager.h>
|
||||
#include <Kernel/Scheduler.h>
|
||||
#include <Kernel/Sections.h>
|
||||
|
|
|
@ -8,6 +8,8 @@
|
|||
#include <Kernel/Arch/InterruptManagement.h>
|
||||
#include <Kernel/Arch/Processor.h>
|
||||
#include <Kernel/Arch/x86/Hypervisor/VMWareBackdoor.h>
|
||||
#include <Kernel/Arch/x86/common/Interrupts/APIC.h>
|
||||
#include <Kernel/Arch/x86/common/Interrupts/PIC.h>
|
||||
#include <Kernel/BootInfo.h>
|
||||
#include <Kernel/Bus/PCI/Access.h>
|
||||
#include <Kernel/Bus/PCI/Initializer.h>
|
||||
|
@ -37,8 +39,6 @@
|
|||
#include <Kernel/Graphics/Console/VGATextModeConsole.h>
|
||||
#include <Kernel/Graphics/GraphicsManagement.h>
|
||||
#include <Kernel/Heap/kmalloc.h>
|
||||
#include <Kernel/Interrupts/APIC.h>
|
||||
#include <Kernel/Interrupts/PIC.h>
|
||||
#include <Kernel/KSyms.h>
|
||||
#include <Kernel/Memory/MemoryManager.h>
|
||||
#include <Kernel/Multiboot.h>
|
||||
|
|
Loading…
Reference in a new issue