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

Kernel/Storage: Rename the method hba_region => default_hba_region

Browse source 
Also, make sure we unmap it after the init process.
This commit is contained in:
Liav A 2021-05-29 00:50:56 +03:00 • committed by Andreas Kling
parent 4cf6963a1c
commit 5c1073a62d
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/Storage/AHCIController.cpp
View file

@ -82,7 +82,7 @@ volatile AHCI::HBA& AHCIController::hba() const
AHCIController::AHCIController(PCI::Address address) AHCIController::AHCIController(PCI::Address address)
: StorageController() : StorageController()
, PCI::DeviceController(address) , PCI::DeviceController(address)
, m_hba_region(hba_region()) , m_hba_region(default_hba_region())
, m_capabilities(capabilities()) , m_capabilities(capabilities())
{ {
initialize(); initialize();
@ -125,7 +125,7 @@ AHCI::HBADefinedCapabilities AHCIController::capabilities() const
}; };
} }
NonnullOwnPtr<Region> AHCIController::hba_region() const NonnullOwnPtr<Region> AHCIController::default_hba_region() const
{ {
auto region = MM.allocate_kernel_region(PhysicalAddress(PCI::get_BAR5(pci_address())).page_base(), page_round_up(sizeof(AHCI::HBA)), "AHCI HBA", Region::Access::Read | Region::Access::Write); auto region = MM.allocate_kernel_region(PhysicalAddress(PCI::get_BAR5(pci_address())).page_base(), page_round_up(sizeof(AHCI::HBA)), "AHCI HBA", Region::Access::Read | Region::Access::Write);
return region.release_nonnull(); return region.release_nonnull();

2
Kernel/Storage/AHCIController.h
View file

@ -48,7 +48,7 @@ private:
RefPtr<StorageDevice> device_by_port(u32 index) const; RefPtr<StorageDevice> device_by_port(u32 index) const;
volatile AHCI::PortRegisters& port(size_t port_number) const; volatile AHCI::PortRegisters& port(size_t port_number) const;
NonnullOwnPtr<Region> hba_region() const; UNMAP_AFTER_INIT NonnullOwnPtr<Region> default_hba_region() const;
volatile AHCI::HBA& hba() const; volatile AHCI::HBA& hba() const;
NonnullOwnPtr<Region> m_hba_region; NonnullOwnPtr<Region> m_hba_region;