From aacb1f0bf4c82569c7896930436f3bbd216fed67 Mon Sep 17 00:00:00 2001 From: Liav A Date: Sat, 21 Aug 2021 06:58:43 +0300 Subject: [PATCH] Kernel: Rename PCI::DeviceController => PCI::Device Now that the old PCI::Device was removed, we can complete the PCI changes by making the PCI::DeviceController to be named PCI::Device. Really the entire purpose and the distinction between the two was about interrupts, but since this is no longer a problem, just rename it to simplify things further. --- Kernel/Bus/PCI/Definitions.h | 3 +-- .../PCI/{DeviceController.cpp => Device.cpp} | 20 +++++++++---------- .../Bus/PCI/{DeviceController.h => Device.h} | 6 +++--- Kernel/Bus/USB/UHCI/UHCIController.cpp | 2 +- Kernel/Bus/USB/UHCI/UHCIController.h | 4 ++-- Kernel/Bus/VirtIO/VirtIO.cpp | 2 +- Kernel/Bus/VirtIO/VirtIO.h | 4 ++-- Kernel/CMakeLists.txt | 2 +- Kernel/Devices/PCISerialDevice.h | 2 +- Kernel/Graphics/Bochs/GraphicsAdapter.cpp | 2 +- Kernel/Graphics/Bochs/GraphicsAdapter.h | 5 ++--- Kernel/Graphics/Intel/NativeGraphicsAdapter.h | 2 +- Kernel/Graphics/VGACompatibleAdapter.cpp | 4 ++-- Kernel/Graphics/VGACompatibleAdapter.h | 5 ++--- Kernel/Graphics/VirtIOGPU/GraphicsAdapter.cpp | 2 +- Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h | 3 +-- Kernel/Net/E1000ENetworkAdapter.h | 2 +- Kernel/Net/E1000NetworkAdapter.cpp | 2 +- Kernel/Net/E1000NetworkAdapter.h | 4 ++-- Kernel/Net/NE2000NetworkAdapter.cpp | 2 +- Kernel/Net/NE2000NetworkAdapter.h | 4 ++-- Kernel/Net/RTL8139NetworkAdapter.cpp | 2 +- Kernel/Net/RTL8139NetworkAdapter.h | 4 ++-- Kernel/Net/RTL8168NetworkAdapter.cpp | 2 +- Kernel/Net/RTL8168NetworkAdapter.h | 4 ++-- Kernel/Storage/AHCIController.cpp | 2 +- Kernel/Storage/AHCIController.h | 2 +- Kernel/Storage/IDEController.cpp | 2 +- Kernel/Storage/IDEController.h | 2 +- Kernel/Storage/StorageController.h | 2 +- 30 files changed, 50 insertions(+), 54 deletions(-) rename Kernel/Bus/PCI/{DeviceController.cpp => Device.cpp} (56%) rename Kernel/Bus/PCI/{DeviceController.h => Device.h} (84%) diff --git a/Kernel/Bus/PCI/Definitions.h b/Kernel/Bus/PCI/Definitions.h index f3dd65507d..f37fd0a9d6 100644 --- a/Kernel/Bus/PCI/Definitions.h +++ b/Kernel/Bus/PCI/Definitions.h @@ -255,8 +255,7 @@ class MMIOAccess; class WindowedMMIOAccess; class IOAccess; class MMIOSegment; -class DeviceController; - +class Device; } } diff --git a/Kernel/Bus/PCI/DeviceController.cpp b/Kernel/Bus/PCI/Device.cpp similarity index 56% rename from Kernel/Bus/PCI/DeviceController.cpp rename to Kernel/Bus/PCI/Device.cpp index 8e0705b1e5..739336d014 100644 --- a/Kernel/Bus/PCI/DeviceController.cpp +++ b/Kernel/Bus/PCI/Device.cpp @@ -4,17 +4,17 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include namespace Kernel { namespace PCI { -DeviceController::DeviceController(Address address) +Device::Device(Address address) : m_pci_address(address) { } -bool DeviceController::is_msi_capable() const +bool Device::is_msi_capable() const { for (const auto& capability : PCI::get_physical_id(pci_address()).capabilities()) { if (capability.id() == PCI_CAPABILITY_MSI) @@ -22,7 +22,7 @@ bool DeviceController::is_msi_capable() const } return false; } -bool DeviceController::is_msix_capable() const +bool Device::is_msix_capable() const { for (const auto& capability : PCI::get_physical_id(pci_address()).capabilities()) { if (capability.id() == PCI_CAPABILITY_MSIX) @@ -31,28 +31,28 @@ bool DeviceController::is_msix_capable() const return false; } -void DeviceController::enable_pin_based_interrupts() const +void Device::enable_pin_based_interrupts() const { PCI::enable_interrupt_line(pci_address()); } -void DeviceController::disable_pin_based_interrupts() const +void Device::disable_pin_based_interrupts() const { PCI::disable_interrupt_line(pci_address()); } -void DeviceController::enable_message_signalled_interrupts() +void Device::enable_message_signalled_interrupts() { TODO(); } -void DeviceController::disable_message_signalled_interrupts() +void Device::disable_message_signalled_interrupts() { TODO(); } -void DeviceController::enable_extended_message_signalled_interrupts() +void Device::enable_extended_message_signalled_interrupts() { TODO(); } -void DeviceController::disable_extended_message_signalled_interrupts() +void Device::disable_extended_message_signalled_interrupts() { TODO(); } diff --git a/Kernel/Bus/PCI/DeviceController.h b/Kernel/Bus/PCI/Device.h similarity index 84% rename from Kernel/Bus/PCI/DeviceController.h rename to Kernel/Bus/PCI/Device.h index ced0b67ad1..5d827f1f49 100644 --- a/Kernel/Bus/PCI/DeviceController.h +++ b/Kernel/Bus/PCI/Device.h @@ -10,11 +10,11 @@ #include namespace Kernel { -class PCI::DeviceController { +class PCI::Device { public: Address pci_address() const { return m_pci_address; }; - virtual ~DeviceController() = default; + virtual ~Device() = default; void enable_pin_based_interrupts() const; void disable_pin_based_interrupts() const; @@ -28,7 +28,7 @@ public: void disable_extended_message_signalled_interrupts(); protected: - explicit DeviceController(Address pci_address); + explicit Device(Address pci_address); private: Address m_pci_address; diff --git a/Kernel/Bus/USB/UHCI/UHCIController.cpp b/Kernel/Bus/USB/UHCI/UHCIController.cpp index 5244e1b56f..97f24ac59c 100644 --- a/Kernel/Bus/USB/UHCI/UHCIController.cpp +++ b/Kernel/Bus/USB/UHCI/UHCIController.cpp @@ -92,7 +92,7 @@ KResult UHCIController::initialize() } UNMAP_AFTER_INIT UHCIController::UHCIController(PCI::Address address) - : PCI::DeviceController(address) + : PCI::Device(address) , IRQHandler(PCI::get_interrupt_line(address)) , m_io_base(PCI::get_BAR4(pci_address()) & ~1) { diff --git a/Kernel/Bus/USB/UHCI/UHCIController.h b/Kernel/Bus/USB/UHCI/UHCIController.h index 41c66319ae..6657aa8411 100644 --- a/Kernel/Bus/USB/UHCI/UHCIController.h +++ b/Kernel/Bus/USB/UHCI/UHCIController.h @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include @@ -25,7 +25,7 @@ namespace Kernel::USB { class UHCIController final : public USBController - , public PCI::DeviceController + , public PCI::Device , public IRQHandler { static constexpr u8 MAXIMUM_NUMBER_OF_TDS = 128; // Upper pool limit. This consumes the second page we have allocated diff --git a/Kernel/Bus/VirtIO/VirtIO.cpp b/Kernel/Bus/VirtIO/VirtIO.cpp index 86f60dc601..fa9ac0cc29 100644 --- a/Kernel/Bus/VirtIO/VirtIO.cpp +++ b/Kernel/Bus/VirtIO/VirtIO.cpp @@ -44,7 +44,7 @@ UNMAP_AFTER_INIT void VirtIO::detect() } UNMAP_AFTER_INIT VirtIODevice::VirtIODevice(PCI::Address address, String class_name) - : PCI::DeviceController(address) + : PCI::Device(address) , IRQHandler(PCI::get_interrupt_line(address)) , m_class_name(move(class_name)) , m_io_base(IOAddress(PCI::get_BAR0(pci_address()) & ~1)) diff --git a/Kernel/Bus/VirtIO/VirtIO.h b/Kernel/Bus/VirtIO/VirtIO.h index e79b6dde81..7928cffef1 100644 --- a/Kernel/Bus/VirtIO/VirtIO.h +++ b/Kernel/Bus/VirtIO/VirtIO.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include @@ -85,7 +85,7 @@ public: }; class VirtIODevice - : public PCI::DeviceController + : public PCI::Device , public IRQHandler { public: virtual ~VirtIODevice() override; diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt index ef29a0c76b..adcc59844b 100644 --- a/Kernel/CMakeLists.txt +++ b/Kernel/CMakeLists.txt @@ -25,7 +25,7 @@ set(KERNEL_SOURCES Arch/PC/BIOS.cpp Arch/x86/SmapDisabler.h Bus/PCI/Access.cpp - Bus/PCI/DeviceController.cpp + Bus/PCI/Device.cpp Bus/PCI/IOAccess.cpp Bus/PCI/MMIOAccess.cpp Bus/PCI/Initializer.cpp diff --git a/Kernel/Devices/PCISerialDevice.h b/Kernel/Devices/PCISerialDevice.h index 88dbc74b3f..34beb5942b 100644 --- a/Kernel/Devices/PCISerialDevice.h +++ b/Kernel/Devices/PCISerialDevice.h @@ -6,7 +6,7 @@ #pragma once -#include +#include #include #include #include diff --git a/Kernel/Graphics/Bochs/GraphicsAdapter.cpp b/Kernel/Graphics/Bochs/GraphicsAdapter.cpp index 8876967cba..abf84c7dc3 100644 --- a/Kernel/Graphics/Bochs/GraphicsAdapter.cpp +++ b/Kernel/Graphics/Bochs/GraphicsAdapter.cpp @@ -63,7 +63,7 @@ UNMAP_AFTER_INIT NonnullRefPtr BochsGraphicsAdapter::initi } UNMAP_AFTER_INIT BochsGraphicsAdapter::BochsGraphicsAdapter(PCI::Address pci_address) - : PCI::DeviceController(pci_address) + : PCI::Device(pci_address) , m_mmio_registers(PCI::get_BAR2(pci_address) & 0xfffffff0) , m_registers(Memory::map_typed_writable(m_mmio_registers)) { diff --git a/Kernel/Graphics/Bochs/GraphicsAdapter.h b/Kernel/Graphics/Bochs/GraphicsAdapter.h index 3706a7b537..7eae38116d 100644 --- a/Kernel/Graphics/Bochs/GraphicsAdapter.h +++ b/Kernel/Graphics/Bochs/GraphicsAdapter.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include @@ -21,7 +21,7 @@ class GraphicsManagement; struct BochsDisplayMMIORegisters; class BochsGraphicsAdapter final : public GraphicsDevice - , public PCI::DeviceController { + , public PCI::Device { AK_MAKE_ETERNAL friend class GraphicsManagement; @@ -64,5 +64,4 @@ private: bool m_console_enabled { false }; bool m_io_required { false }; }; - } diff --git a/Kernel/Graphics/Intel/NativeGraphicsAdapter.h b/Kernel/Graphics/Intel/NativeGraphicsAdapter.h index 5e6756e55a..b4a1a85253 100644 --- a/Kernel/Graphics/Intel/NativeGraphicsAdapter.h +++ b/Kernel/Graphics/Intel/NativeGraphicsAdapter.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include diff --git a/Kernel/Graphics/VGACompatibleAdapter.cpp b/Kernel/Graphics/VGACompatibleAdapter.cpp index 22dc7f07ed..e899a8af1c 100644 --- a/Kernel/Graphics/VGACompatibleAdapter.cpp +++ b/Kernel/Graphics/VGACompatibleAdapter.cpp @@ -38,7 +38,7 @@ UNMAP_AFTER_INIT void VGACompatibleAdapter::initialize_framebuffer_devices() } UNMAP_AFTER_INIT VGACompatibleAdapter::VGACompatibleAdapter(PCI::Address address) - : PCI::DeviceController(address) + : PCI::Device(address) { m_framebuffer_console = Graphics::TextModeConsole::initialize(*this); // FIXME: This is a very wrong way to do this... @@ -46,7 +46,7 @@ UNMAP_AFTER_INIT VGACompatibleAdapter::VGACompatibleAdapter(PCI::Address address } UNMAP_AFTER_INIT VGACompatibleAdapter::VGACompatibleAdapter(PCI::Address address, PhysicalAddress framebuffer_address, size_t framebuffer_width, size_t framebuffer_height, size_t framebuffer_pitch) - : PCI::DeviceController(address) + : PCI::Device(address) , m_framebuffer_address(framebuffer_address) , m_framebuffer_width(framebuffer_width) , m_framebuffer_height(framebuffer_height) diff --git a/Kernel/Graphics/VGACompatibleAdapter.h b/Kernel/Graphics/VGACompatibleAdapter.h index 239ab287ed..cbfbd7e580 100644 --- a/Kernel/Graphics/VGACompatibleAdapter.h +++ b/Kernel/Graphics/VGACompatibleAdapter.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include @@ -17,7 +17,7 @@ namespace Kernel { class VGACompatibleAdapter : public GraphicsDevice - , public PCI::DeviceController { + , public PCI::Device { AK_MAKE_ETERNAL public: static NonnullRefPtr initialize_with_preset_resolution(PCI::Address, PhysicalAddress, size_t framebuffer_width, size_t framebuffer_height, size_t framebuffer_pitch); @@ -53,5 +53,4 @@ protected: RefPtr m_framebuffer_device; RefPtr m_framebuffer_console; }; - } diff --git a/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.cpp b/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.cpp index c17aa8e979..6fcecdf973 100644 --- a/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.cpp +++ b/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.cpp @@ -19,7 +19,7 @@ NonnullRefPtr GraphicsAdapter::initialize(PCI::Address base_add } GraphicsAdapter::GraphicsAdapter(PCI::Address base_address) - : PCI::DeviceController(base_address) + : PCI::Device(base_address) { m_gpu_device = adopt_ref(*new GPU(base_address)).leak_ref(); } diff --git a/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h b/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h index ffa67e92ce..56b23d0d27 100644 --- a/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h +++ b/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h @@ -14,7 +14,7 @@ namespace Kernel::Graphics::VirtIOGPU { class GraphicsAdapter final : public GraphicsDevice - , public PCI::DeviceController { + , public PCI::Device { AK_MAKE_ETERNAL public: @@ -40,5 +40,4 @@ private: RefPtr m_gpu_device; bool m_created_framebuffer_devices { false }; }; - } diff --git a/Kernel/Net/E1000ENetworkAdapter.h b/Kernel/Net/E1000ENetworkAdapter.h index d00dc0b300..7c0b017ba0 100644 --- a/Kernel/Net/E1000ENetworkAdapter.h +++ b/Kernel/Net/E1000ENetworkAdapter.h @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Kernel/Net/E1000NetworkAdapter.cpp b/Kernel/Net/E1000NetworkAdapter.cpp index 597835f1fe..97fd44518b 100644 --- a/Kernel/Net/E1000NetworkAdapter.cpp +++ b/Kernel/Net/E1000NetworkAdapter.cpp @@ -220,7 +220,7 @@ UNMAP_AFTER_INIT bool E1000NetworkAdapter::initialize() } UNMAP_AFTER_INIT E1000NetworkAdapter::E1000NetworkAdapter(PCI::Address address, u8 irq) - : PCI::DeviceController(address) + : PCI::Device(address) , IRQHandler(irq) , m_rx_descriptors_region(MM.allocate_contiguous_kernel_region(Memory::page_round_up(sizeof(e1000_rx_desc) * number_of_rx_descriptors + 16), "E1000 RX Descriptors", Memory::Region::Access::ReadWrite)) , m_tx_descriptors_region(MM.allocate_contiguous_kernel_region(Memory::page_round_up(sizeof(e1000_tx_desc) * number_of_tx_descriptors + 16), "E1000 TX Descriptors", Memory::Region::Access::ReadWrite)) diff --git a/Kernel/Net/E1000NetworkAdapter.h b/Kernel/Net/E1000NetworkAdapter.h index 2037e2a293..97b8ea4804 100644 --- a/Kernel/Net/E1000NetworkAdapter.h +++ b/Kernel/Net/E1000NetworkAdapter.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include @@ -17,7 +17,7 @@ namespace Kernel { class E1000NetworkAdapter : public NetworkAdapter - , public PCI::DeviceController + , public PCI::Device , public IRQHandler { public: static RefPtr try_to_initialize(PCI::Address); diff --git a/Kernel/Net/NE2000NetworkAdapter.cpp b/Kernel/Net/NE2000NetworkAdapter.cpp index c942103fb5..c8c3cea0cc 100644 --- a/Kernel/Net/NE2000NetworkAdapter.cpp +++ b/Kernel/Net/NE2000NetworkAdapter.cpp @@ -161,7 +161,7 @@ UNMAP_AFTER_INIT RefPtr NE2000NetworkAdapter::try_to_initi } UNMAP_AFTER_INIT NE2000NetworkAdapter::NE2000NetworkAdapter(PCI::Address address, u8 irq) - : PCI::DeviceController(address) + : PCI::Device(address) , IRQHandler(irq) , m_io_base(PCI::get_BAR0(pci_address()) & ~3) { diff --git a/Kernel/Net/NE2000NetworkAdapter.h b/Kernel/Net/NE2000NetworkAdapter.h index 955e29b738..1918010ae6 100644 --- a/Kernel/Net/NE2000NetworkAdapter.h +++ b/Kernel/Net/NE2000NetworkAdapter.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include @@ -17,7 +17,7 @@ namespace Kernel { class NE2000NetworkAdapter final : public NetworkAdapter - , public PCI::DeviceController + , public PCI::Device , public IRQHandler { public: static RefPtr try_to_initialize(PCI::Address); diff --git a/Kernel/Net/RTL8139NetworkAdapter.cpp b/Kernel/Net/RTL8139NetworkAdapter.cpp index 22596f5928..bf08708ee2 100644 --- a/Kernel/Net/RTL8139NetworkAdapter.cpp +++ b/Kernel/Net/RTL8139NetworkAdapter.cpp @@ -122,7 +122,7 @@ UNMAP_AFTER_INIT RefPtr RTL8139NetworkAdapter::try_to_ini } UNMAP_AFTER_INIT RTL8139NetworkAdapter::RTL8139NetworkAdapter(PCI::Address address, u8 irq) - : PCI::DeviceController(address) + : PCI::Device(address) , IRQHandler(irq) , m_io_base(PCI::get_BAR0(pci_address()) & ~1) , m_rx_buffer(MM.allocate_contiguous_kernel_region(Memory::page_round_up(RX_BUFFER_SIZE + PACKET_SIZE_MAX), "RTL8139 RX", Memory::Region::Access::ReadWrite)) diff --git a/Kernel/Net/RTL8139NetworkAdapter.h b/Kernel/Net/RTL8139NetworkAdapter.h index f04c76dfe5..397cf29d68 100644 --- a/Kernel/Net/RTL8139NetworkAdapter.h +++ b/Kernel/Net/RTL8139NetworkAdapter.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include @@ -19,7 +19,7 @@ namespace Kernel { #define RTL8139_TX_BUFFER_COUNT 4 class RTL8139NetworkAdapter final : public NetworkAdapter - , public PCI::DeviceController + , public PCI::Device , public IRQHandler { public: static RefPtr try_to_initialize(PCI::Address); diff --git a/Kernel/Net/RTL8168NetworkAdapter.cpp b/Kernel/Net/RTL8168NetworkAdapter.cpp index be6edc0538..4416c08f72 100644 --- a/Kernel/Net/RTL8168NetworkAdapter.cpp +++ b/Kernel/Net/RTL8168NetworkAdapter.cpp @@ -192,7 +192,7 @@ UNMAP_AFTER_INIT RefPtr RTL8168NetworkAdapter::try_to_ini } UNMAP_AFTER_INIT RTL8168NetworkAdapter::RTL8168NetworkAdapter(PCI::Address address, u8 irq) - : PCI::DeviceController(address) + : PCI::Device(address) , IRQHandler(irq) , m_io_base(PCI::get_BAR0(pci_address()) & ~1) , m_rx_descriptors_region(MM.allocate_contiguous_kernel_region(Memory::page_round_up(sizeof(TXDescriptor) * (number_of_rx_descriptors + 1)), "RTL8168 RX", Memory::Region::Access::ReadWrite)) diff --git a/Kernel/Net/RTL8168NetworkAdapter.h b/Kernel/Net/RTL8168NetworkAdapter.h index 01cb285a2c..713ca32503 100644 --- a/Kernel/Net/RTL8168NetworkAdapter.h +++ b/Kernel/Net/RTL8168NetworkAdapter.h @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include @@ -19,7 +19,7 @@ namespace Kernel { // RTL8618 / RTL8111 Driver based on https://people.freebsd.org/~wpaul/RealTek/RTL8111B_8168B_Registers_DataSheet_1.0.pdf class RTL8168NetworkAdapter final : public NetworkAdapter - , public PCI::DeviceController + , public PCI::Device , public IRQHandler { public: static RefPtr try_to_initialize(PCI::Address); diff --git a/Kernel/Storage/AHCIController.cpp b/Kernel/Storage/AHCIController.cpp index bf52832900..2bb0a49895 100644 --- a/Kernel/Storage/AHCIController.cpp +++ b/Kernel/Storage/AHCIController.cpp @@ -80,7 +80,7 @@ volatile AHCI::HBA& AHCIController::hba() const AHCIController::AHCIController(PCI::Address address) : StorageController() - , PCI::DeviceController(address) + , PCI::Device(address) , m_hba_region(default_hba_region()) , m_capabilities(capabilities()) { diff --git a/Kernel/Storage/AHCIController.h b/Kernel/Storage/AHCIController.h index a51ad85f38..310203659b 100644 --- a/Kernel/Storage/AHCIController.h +++ b/Kernel/Storage/AHCIController.h @@ -20,7 +20,7 @@ class AsyncBlockDeviceRequest; class AHCIPortHandler; class AHCIPort; class AHCIController final : public StorageController - , public PCI::DeviceController { + , public PCI::Device { friend class AHCIPortHandler; friend class AHCIPort; AK_MAKE_ETERNAL diff --git a/Kernel/Storage/IDEController.cpp b/Kernel/Storage/IDEController.cpp index b0412b14d5..6471996a94 100644 --- a/Kernel/Storage/IDEController.cpp +++ b/Kernel/Storage/IDEController.cpp @@ -52,7 +52,7 @@ void IDEController::complete_current_request(AsyncDeviceRequest::RequestResult) UNMAP_AFTER_INIT IDEController::IDEController(PCI::Address address, bool force_pio) : StorageController() - , PCI::DeviceController(address) + , PCI::Device(address) { PCI::enable_io_space(address); PCI::enable_memory_space(address); diff --git a/Kernel/Storage/IDEController.h b/Kernel/Storage/IDEController.h index cba0c2a0d4..e484bbd667 100644 --- a/Kernel/Storage/IDEController.h +++ b/Kernel/Storage/IDEController.h @@ -18,7 +18,7 @@ namespace Kernel { class AsyncBlockDeviceRequest; class IDEController final : public StorageController - , public PCI::DeviceController { + , public PCI::Device { AK_MAKE_ETERNAL public: static NonnullRefPtr initialize(PCI::Address address, bool force_pio); diff --git a/Kernel/Storage/StorageController.h b/Kernel/Storage/StorageController.h index d07ee67fff..419b6a09cc 100644 --- a/Kernel/Storage/StorageController.h +++ b/Kernel/Storage/StorageController.h @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include