diff --git a/Kernel/Bus/PCI/Initializer.cpp b/Kernel/Arch/x86/PCI/Initializer.cpp similarity index 97% rename from Kernel/Bus/PCI/Initializer.cpp rename to Kernel/Arch/x86/PCI/Initializer.cpp index 2ca868014c..0b7a796e41 100644 --- a/Kernel/Bus/PCI/Initializer.cpp +++ b/Kernel/Arch/x86/PCI/Initializer.cpp @@ -23,7 +23,6 @@ static bool test_pci_io(); UNMAP_AFTER_INIT static PCIAccessLevel detect_optimal_access_type() { -#if ARCH(I386) || ARCH(X86_64) auto boot_determined = kernel_command_line().pci_access_level(); if (!ACPI::is_enabled() || !ACPI::Parser::the()->find_table("MCFG"sv).has_value()) return PCIAccessLevel::IOAddressing; @@ -33,7 +32,6 @@ UNMAP_AFTER_INIT static PCIAccessLevel detect_optimal_access_type() if (!g_pci_access_io_probe_failed) return PCIAccessLevel::IOAddressing; -#endif PANIC("No PCI bus access method detected!"); } @@ -54,13 +52,11 @@ UNMAP_AFTER_INIT void initialize() VERIFY(success); break; } -#if ARCH(I386) || ARCH(X86_64) case PCIAccessLevel::IOAddressing: { auto success = Access::initialize_for_one_pci_domain(); VERIFY(success); break; } -#endif default: VERIFY_NOT_REACHED(); } diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt index f4ddca6cff..82f24f32d2 100644 --- a/Kernel/CMakeLists.txt +++ b/Kernel/CMakeLists.txt @@ -25,7 +25,6 @@ set(KERNEL_SOURCES Bus/PCI/Access.cpp Bus/PCI/API.cpp Bus/PCI/Device.cpp - Bus/PCI/Initializer.cpp Bus/USB/UHCI/UHCIController.cpp Bus/USB/UHCI/UHCIRootHub.cpp Bus/USB/USBConfiguration.cpp @@ -341,6 +340,7 @@ if ("${SERENITY_ARCH}" STREQUAL "i686" OR "${SERENITY_ARCH}" STREQUAL "x86_64") Arch/x86/common/Shutdown.cpp Arch/x86/PCI/Controller/HostBridge.cpp + Arch/x86/PCI/Initializer.cpp ) set(KERNEL_SOURCES