aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/src/devices/storage/management.cpp31
-rw-r--r--kernel/src/devices/storage/ram_disk/device.cpp4
2 files changed, 17 insertions, 18 deletions
diff --git a/kernel/src/devices/storage/management.cpp b/kernel/src/devices/storage/management.cpp
index 1f2acba..06efc27 100644
--- a/kernel/src/devices/storage/management.cpp
+++ b/kernel/src/devices/storage/management.cpp
@@ -17,43 +17,42 @@
namespace
{
- constexpr size_t static MINORS_PER_DEVICE = 16;
- constexpr size_t static START_MAJOR = 1;
- constinit size_t static next_free_major = START_MAJOR;
+ constexpr size_t static minors_per_device = 16;
+ constexpr size_t static start_major = 1;
+ constinit size_t static next_free_major = start_major;
- constinit auto static active_storage_management = std::optional<kernel::devices::storage::management>{};
+ constinit auto static storage_management = std::optional<kernel::devices::storage::management>{};
} // namespace
namespace kernel::devices::storage
{
auto management::init() -> void
{
- if (active_storage_management)
+ if (storage_management)
{
kapi::system::panic("[DEVICES] Storage management has already been initialized.");
}
- active_storage_management.emplace(management{});
+ storage_management.emplace(management{});
- auto current_ram_disk_controller =
- kstd::make_shared<ram_disk::controller>(&kapi::boot_modules::get_boot_module_registry());
- active_storage_management->add_controller(current_ram_disk_controller);
+ auto ram_disk_controller = kstd::make_shared<ram_disk::controller>(&kapi::boot_modules::get_boot_module_registry());
+ storage_management->add_controller(ram_disk_controller);
- std::ranges::for_each(active_storage_management->m_controllers, [](auto controller) { controller->probe(); });
+ std::ranges::for_each(storage_management->m_controllers, [](auto controller) { controller->probe(); });
}
auto management::get() -> management &
{
- if (!active_storage_management)
+ if (!storage_management)
{
kapi::system::panic("[DEVICES] Storage management has not been initialized.");
}
- return *active_storage_management;
+ return *storage_management;
}
auto management::add_controller(kstd::shared_ptr<controller> const & controller) -> void
{
- controller->set_ids(next_free_major++, MINORS_PER_DEVICE);
+ controller->set_ids(next_free_major++, minors_per_device);
m_controllers.push_back(controller);
}
@@ -82,7 +81,7 @@ namespace kernel::devices::storage
auto management::determine_boot_device() -> kstd::shared_ptr<kapi::devices::device>
{
- return device_by_major_minor(START_MAJOR, 0);
+ return device_by_major_minor(start_major, 0);
}
} // namespace kernel::devices::storage
@@ -90,7 +89,7 @@ namespace kernel::tests::devices::storage::management
{
auto deinit() -> void
{
- active_storage_management.reset();
- next_free_major = START_MAJOR;
+ storage_management.reset();
+ next_free_major = start_major;
}
} // namespace kernel::tests::devices::storage::management
diff --git a/kernel/src/devices/storage/ram_disk/device.cpp b/kernel/src/devices/storage/ram_disk/device.cpp
index 21b0000..1557204 100644
--- a/kernel/src/devices/storage/ram_disk/device.cpp
+++ b/kernel/src/devices/storage/ram_disk/device.cpp
@@ -14,11 +14,11 @@ namespace kernel::devices::storage::ram_disk
{
namespace
{
- constexpr size_t RAM_DISK_BLOCK_SIZE = 512uz;
+ constexpr size_t ram_disk_block_size = 512uz;
} // namespace
device::device(kapi::boot_modules::boot_module const & module, size_t major, size_t minor)
- : block_device(major, minor, "ram" + kstd::to_string(minor), RAM_DISK_BLOCK_SIZE)
+ : block_device(major, minor, "ram" + kstd::to_string(minor), ram_disk_block_size)
, m_boot_module(module)
{}