From aacb1f0bf4c82569c7896930436f3bbd216fed67 Mon Sep 17 00:00:00 2001 From: Liav A Date: Sat, 21 Aug 2021 06:58:43 +0300 Subject: 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/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 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) (limited to 'Kernel/Net') 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); -- cgit v1.2.3