RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 18:27:35 +00:00
Code Issues Activity Actions

Kernel/AHCI: Don't use UNMAP_AFTER_INIT in header files

Browse source 
Instead, declare such methods and functions in the code itself.
This commit is contained in:
Liav A 2022-04-01 20:52:37 +03:00 • committed by Idan Horowitz
parent d771ca3278
commit 9416dede54
6 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Kernel/Storage/ATA/AHCIController.cpp
View file

@ -16,7 +16,7 @@
namespace Kernel {
NonnullRefPtr<AHCIController> AHCIController::initialize(PCI::DeviceIdentifier const& pci_device_identifier)
UNMAP_AFTER_INIT NonnullRefPtr<AHCIController> AHCIController::initialize(PCI::DeviceIdentifier const& pci_device_identifier)
{
auto controller = adopt_ref_if_nonnull(new (nothrow) AHCIController(pci_device_identifier)).release_nonnull();
controller->initialize_hba(pci_device_identifier);
@ -86,7 +86,7 @@ volatile AHCI::HBA& AHCIController::hba() const
return static_cast<volatile AHCI::HBA&>(*(volatile AHCI::HBA*)(m_hba_region->vaddr().as_ptr()));
}
AHCIController::AHCIController(PCI::DeviceIdentifier const& pci_device_identifier)
UNMAP_AFTER_INIT AHCIController::AHCIController(PCI::DeviceIdentifier const& pci_device_identifier)
: ATAController()
, PCI::Device(pci_device_identifier.address())
, m_hba_region(default_hba_region())
@ -131,14 +131,14 @@ AHCI::HBADefinedCapabilities AHCIController::capabilities() const
};
}
NonnullOwnPtr<Memory::Region> AHCIController::default_hba_region() const
UNMAP_AFTER_INIT NonnullOwnPtr<Memory::Region> AHCIController::default_hba_region() const
{
return MM.allocate_kernel_region(PhysicalAddress(PCI::get_BAR5(pci_address())).page_base(), Memory::page_round_up(sizeof(AHCI::HBA)).release_value_but_fixme_should_propagate_errors(), "AHCI HBA", Memory::Region::Access::ReadWrite).release_value();
}
AHCIController::~AHCIController() = default;
void AHCIController::initialize_hba(PCI::DeviceIdentifier const& pci_device_identifier)
UNMAP_AFTER_INIT void AHCIController::initialize_hba(PCI::DeviceIdentifier const& pci_device_identifier)
{
if (!reset()) {
dmesgln("{}: AHCI controller reset failed", pci_address());