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

Kernel: Remove most String usage from storage_name() API

Browse source 
This change is another minor step towards removing `AK::String` from
the Kernel. Instead of dynamically allocating the storage_name we can
instead allocate it via a KString in the factory for each device, and
then push the device name down into the StorageDevice base class.

We don't have a way of doing `AK::String::formatted(..)` with a KString
at the moment, so cleaning that up will be left for a later day.
This commit is contained in:
Brian Gianforcaro 2021-10-02 16:22:16 -07:00 • committed by Andreas Kling
parent 3a945051fc
commit 70ad18fbcd
8 changed files with 45 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Kernel/Storage/SATADiskDevice.cpp
View file

@ -10,19 +10,26 @@
#include <Kernel/Storage/AHCIController.h>
#include <Kernel/Storage/IDEChannel.h>
#include <Kernel/Storage/SATADiskDevice.h>
#include <Kernel/Storage/StorageManagement.h>
namespace Kernel {
NonnullRefPtr<SATADiskDevice> SATADiskDevice::create(const AHCIController& controller, const AHCIPort& port, size_t sector_size, u64 max_addressable_block)
{
auto device_or_error = DeviceManagement::try_create_device<SATADiskDevice>(controller, port, sector_size, max_addressable_block);
auto minor_device_number = StorageManagement::minor_number();
// FIXME: We need a way of formatting strings with KString.
auto device_name = String::formatted("hd{:c}", 'a' + minor_device_number);
auto device_name_kstring = KString::must_create(device_name.view());
auto device_or_error = DeviceManagement::try_create_device<SATADiskDevice>(controller, port, sector_size, max_addressable_block, minor_device_number, move(device_name_kstring));
// FIXME: Find a way to propagate errors
VERIFY(!device_or_error.is_error());
return device_or_error.release_value();
}
SATADiskDevice::SATADiskDevice(const AHCIController& controller, const AHCIPort& port, size_t sector_size, u64 max_addressable_block)
: StorageDevice(controller, sector_size, max_addressable_block)
SATADiskDevice::SATADiskDevice(const AHCIController& controller, const AHCIPort& port, size_t sector_size, u64 max_addressable_block, int minor_number, NonnullOwnPtr<KString> device_name)
: StorageDevice(controller, StorageManagement::major_number(), minor_number, sector_size, max_addressable_block, move(device_name))
, m_port(port)
{
}
@ -41,9 +48,4 @@ void SATADiskDevice::start_request(AsyncBlockDeviceRequest& request)
m_port.strong_ref()->start_request(request);
}
String SATADiskDevice::storage_name() const
{
return String::formatted("hd{:c}", 'a' + minor());
}
}