RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 04:47:34 +00:00
Code Issues Activity Actions

Kernel: Rename PCI::DeviceController => PCI::Device

Browse source 
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.
This commit is contained in:
Liav A 2021-08-21 06:58:43 +03:00 • committed by Andreas Kling
parent 7b9c3439ec
commit aacb1f0bf4
30 changed files with 50 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/Bus/VirtIO/VirtIO.cpp
View file

@ -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))

4
Kernel/Bus/VirtIO/VirtIO.h
View file

@ -8,7 +8,7 @@
#include <AK/NonnullOwnPtrVector.h>
#include <Kernel/Bus/PCI/Access.h>
#include <Kernel/Bus/PCI/DeviceController.h>
#include <Kernel/Bus/PCI/Device.h>
#include <Kernel/Bus/VirtIO/VirtIOQueue.h>
#include <Kernel/IO.h>
#include <Kernel/Interrupts/IRQHandler.h>
@ -85,7 +85,7 @@ public:
};
class VirtIODevice
: public PCI::DeviceController
: public PCI::Device
, public IRQHandler {
public:
virtual ~VirtIODevice() override;