mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 15:17:36 +00:00
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.
This commit is contained in:
parent
7b9c3439ec
commit
aacb1f0bf4
30 changed files with 50 additions and 54 deletions
|
@ -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())
|
||||
{
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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<IDEController> initialize(PCI::Address address, bool force_pio);
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#include <AK/OwnPtr.h>
|
||||
#include <AK/RefPtr.h>
|
||||
#include <Kernel/Bus/PCI/Access.h>
|
||||
#include <Kernel/Bus/PCI/DeviceController.h>
|
||||
#include <Kernel/Bus/PCI/Device.h>
|
||||
#include <Kernel/Devices/Device.h>
|
||||
#include <Kernel/IO.h>
|
||||
#include <Kernel/Locking/Mutex.h>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue