From 5268bf6622463c3d233683fe56ae9977baf8eeaa Mon Sep 17 00:00:00 2001 From: Lukas Oesch Date: Tue, 3 Mar 2026 16:57:02 +0100 Subject: rename files to snake_case (temp_device part1 -> renamed to device later, due to capital-/lower-letter problem) --- .../src/storage/RAMDisk/RAMDiskController.cpp | 48 ------------- .../devices/src/storage/RAMDisk/RAMDiskDevice.cpp | 69 ------------------- kernel/devices/src/storage/StorageController.cpp | 17 ----- kernel/devices/src/storage/StorageManagement.cpp | 78 ---------------------- .../src/storage/ram_disk/ram_disk_controller.cpp | 48 +++++++++++++ .../src/storage/ram_disk/ram_disk_device.cpp | 69 +++++++++++++++++++ kernel/devices/src/storage/storage_controller.cpp | 17 +++++ kernel/devices/src/storage/storage_management.cpp | 78 ++++++++++++++++++++++ 8 files changed, 212 insertions(+), 212 deletions(-) delete mode 100644 kernel/devices/src/storage/RAMDisk/RAMDiskController.cpp delete mode 100644 kernel/devices/src/storage/RAMDisk/RAMDiskDevice.cpp delete mode 100644 kernel/devices/src/storage/StorageController.cpp delete mode 100644 kernel/devices/src/storage/StorageManagement.cpp create mode 100644 kernel/devices/src/storage/ram_disk/ram_disk_controller.cpp create mode 100644 kernel/devices/src/storage/ram_disk/ram_disk_device.cpp create mode 100644 kernel/devices/src/storage/storage_controller.cpp create mode 100644 kernel/devices/src/storage/storage_management.cpp (limited to 'kernel/devices/src/storage') diff --git a/kernel/devices/src/storage/RAMDisk/RAMDiskController.cpp b/kernel/devices/src/storage/RAMDisk/RAMDiskController.cpp deleted file mode 100644 index 5c18dac..0000000 --- a/kernel/devices/src/storage/RAMDisk/RAMDiskController.cpp +++ /dev/null @@ -1,48 +0,0 @@ -#include "devices/storage/RAMDisk/RAMDiskController.hpp" - -#include "kapi/boot_module/boot_module_registry.hpp" - -#include "devices/BlockDevice.hpp" -#include "devices/storage/RAMDisk/RAMDiskDevice.hpp" - -#include - -#include -#include -#include - -namespace devices::storage::ram_disk -{ - ram_disk_controller::ram_disk_controller(kapi::boot_modules::boot_module_registry const * registry) - : m_boot_module_registry(registry) - {} - - auto ram_disk_controller::probe() -> void - { - size_t current_device_index = 0; - - std::ranges::for_each(*m_boot_module_registry, [this, ¤t_device_index](auto const & module) { - auto const minor = current_device_index++ * m_minors_per_device; - - // TODO BA-FS26 use push_back from kstd::vector when available - m_devices.at(0) = ram_disk_device{module, m_major, minor}; - }); - } - - auto ram_disk_controller::device_by_major_minor(size_t major, size_t minor) -> block_device * - { - auto it = std::ranges::find_if( - m_devices, [major, minor](auto const & device) { return device.major() == major && device.minor() == minor; }); - - if (it != m_devices.end()) - { - return &(*it); - } - return nullptr; - } - - auto ram_disk_controller::devices_count() -> size_t - { - return m_devices.size(); - } -} // namespace devices::storage::ram_disk \ No newline at end of file diff --git a/kernel/devices/src/storage/RAMDisk/RAMDiskDevice.cpp b/kernel/devices/src/storage/RAMDisk/RAMDiskDevice.cpp deleted file mode 100644 index f3b8799..0000000 --- a/kernel/devices/src/storage/RAMDisk/RAMDiskDevice.cpp +++ /dev/null @@ -1,69 +0,0 @@ -#include "devices/storage/RAMDisk/RAMDiskDevice.hpp" - -#include "kapi/boot_module/boot_module.hpp" -#include "kapi/system.hpp" - -#include "devices/BlockDevice.hpp" - -#include - -#include - -namespace devices::storage::ram_disk -{ - namespace - { - constexpr size_t RAM_DISK_BLOCK_SIZE = 512uz; // TODO BA-FS26 really correct / good?? - } // namespace - - ram_disk_device::ram_disk_device() // TODO BA-FS26 remove when kstd::vector is available - : block_device(0, 0, RAM_DISK_BLOCK_SIZE) - {} - - ram_disk_device::ram_disk_device(kapi::boot_modules::boot_module const & module, size_t major, size_t minor) - : block_device(major, minor, RAM_DISK_BLOCK_SIZE) - , m_boot_module(module) - {} - - auto ram_disk_device::read_block(size_t block_index, void * buffer) const -> void - { - if (buffer == nullptr) - { - kapi::system::panic("[RAM DISK DEVICE] read_block called with null buffer."); - } - - auto const info = calculate_transfer(block_index); - - if (info.to_transfer > 0) - { - auto const src = static_cast(m_boot_module.start_address) + info.offset; - kstd::libc::memcpy(buffer, src, info.to_transfer); - } - - if (info.remainder > 0) - { - kstd::libc::memset(static_cast(buffer) + info.to_transfer, 0, info.remainder); - } - } - - auto ram_disk_device::write_block(size_t block_index, void const * buffer) -> void - { - if (buffer == nullptr) - { - kapi::system::panic("[RAM DISK DEVICE] write_block called with null buffer."); - } - - auto const info = calculate_transfer(block_index); - - if (info.to_transfer > 0) - { - auto const dest = static_cast(m_boot_module.start_address) + info.offset; - kstd::libc::memcpy(dest, buffer, info.to_transfer); - } - } - - auto ram_disk_device::size() const -> size_t - { - return m_boot_module.size; - } -} // namespace devices::storage::ram_disk \ No newline at end of file diff --git a/kernel/devices/src/storage/StorageController.cpp b/kernel/devices/src/storage/StorageController.cpp deleted file mode 100644 index d11a175..0000000 --- a/kernel/devices/src/storage/StorageController.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "devices/storage/StorageController.hpp" - -#include - -namespace devices::storage -{ - auto storage_controller::set_ids(size_t major, size_t minors_per_dev) -> void - { - m_major = major; - m_minors_per_device = minors_per_dev; - } - - auto storage_controller::major() const -> size_t - { - return m_major; - } -} // namespace devices::storage \ No newline at end of file diff --git a/kernel/devices/src/storage/StorageManagement.cpp b/kernel/devices/src/storage/StorageManagement.cpp deleted file mode 100644 index 1b0d2cc..0000000 --- a/kernel/devices/src/storage/StorageManagement.cpp +++ /dev/null @@ -1,78 +0,0 @@ -#include "devices/storage/StorageManagement.hpp" - -#include "kapi/boot_modules.hpp" -#include "kapi/system.hpp" - -#include "devices/BlockDevice.hpp" -#include "devices/storage/RAMDisk/RAMDiskController.hpp" -#include "devices/storage/StorageController.hpp" - -#include -#include -#include - -namespace devices::storage -{ - 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; - - constinit auto static active_storage_management = std::optional{}; - constinit auto static active_ram_disk_controller = std::optional{}; - } // namespace - - auto storage_management::init() -> void - { - if (active_storage_management) - { - kapi::system::panic("[DEVICES] Storage management has already been initialized."); - } - active_storage_management.emplace(storage_management{}); - - active_ram_disk_controller.emplace(&kapi::boot_modules::get_boot_module_registry()); - active_storage_management->add_controller(&active_ram_disk_controller.value()); - - std::ranges::for_each(active_storage_management->m_controllers, [](auto controller) { controller->probe(); }); - } - - auto storage_management::get() -> storage_management & - { - if (!active_storage_management) - { - kapi::system::panic("[DEVICES] Storage management has not been initialized."); - } - - return *active_storage_management; - } - - auto storage_management::add_controller(storage_controller * controller) -> void - { - controller->set_ids(next_free_major++, MINORS_PER_DEVICE); - m_controllers.at(0) = controller; // TODO BA-FS26 use push_back from kstd:vector - } - - auto storage_management::device_by_major_minor(size_t major, size_t minor) -> block_device * - { - block_device * found = nullptr; - - std::ranges::find_if(m_controllers, [&](auto const controller) { - if (controller != nullptr && controller->major() == major) - { - found = controller->device_by_major_minor(major, minor); - return found != nullptr; - } - return false; - }); - - return found; - } - - auto storage_management::determine_boot_device() -> block_device * - { - // TODO BA-FS26 better way? - return device_by_major_minor(START_MAJOR, 0); - } - -} // namespace devices::storage \ No newline at end of file diff --git a/kernel/devices/src/storage/ram_disk/ram_disk_controller.cpp b/kernel/devices/src/storage/ram_disk/ram_disk_controller.cpp new file mode 100644 index 0000000..09f1c85 --- /dev/null +++ b/kernel/devices/src/storage/ram_disk/ram_disk_controller.cpp @@ -0,0 +1,48 @@ +#include "devices/storage/ram_disk/ram_disk_controller.hpp" + +#include "kapi/boot_module/boot_module_registry.hpp" + +#include "devices/block_device.hpp" +#include "devices/storage/ram_disk/ram_disk_device.hpp" + +#include + +#include +#include +#include + +namespace devices::storage::ram_disk +{ + ram_disk_controller::ram_disk_controller(kapi::boot_modules::boot_module_registry const * registry) + : m_boot_module_registry(registry) + {} + + auto ram_disk_controller::probe() -> void + { + size_t current_device_index = 0; + + std::ranges::for_each(*m_boot_module_registry, [this, ¤t_device_index](auto const & module) { + auto const minor = current_device_index++ * m_minors_per_device; + + // TODO BA-FS26 use push_back from kstd::vector when available + m_devices.at(0) = ram_disk_device{module, m_major, minor}; + }); + } + + auto ram_disk_controller::device_by_major_minor(size_t major, size_t minor) -> block_device * + { + auto it = std::ranges::find_if( + m_devices, [major, minor](auto const & device) { return device.major() == major && device.minor() == minor; }); + + if (it != m_devices.end()) + { + return &(*it); + } + return nullptr; + } + + auto ram_disk_controller::devices_count() -> size_t + { + return m_devices.size(); + } +} // namespace devices::storage::ram_disk \ No newline at end of file diff --git a/kernel/devices/src/storage/ram_disk/ram_disk_device.cpp b/kernel/devices/src/storage/ram_disk/ram_disk_device.cpp new file mode 100644 index 0000000..3bd3967 --- /dev/null +++ b/kernel/devices/src/storage/ram_disk/ram_disk_device.cpp @@ -0,0 +1,69 @@ +#include "devices/storage/ram_disk/ram_disk_device.hpp" + +#include "kapi/boot_module/boot_module.hpp" +#include "kapi/system.hpp" + +#include "devices/block_device.hpp" + +#include + +#include + +namespace devices::storage::ram_disk +{ + namespace + { + constexpr size_t RAM_DISK_BLOCK_SIZE = 512uz; // TODO BA-FS26 really correct / good?? + } // namespace + + ram_disk_device::ram_disk_device() // TODO BA-FS26 remove when kstd::vector is available + : block_device(0, 0, RAM_DISK_BLOCK_SIZE) + {} + + ram_disk_device::ram_disk_device(kapi::boot_modules::boot_module const & module, size_t major, size_t minor) + : block_device(major, minor, RAM_DISK_BLOCK_SIZE) + , m_boot_module(module) + {} + + auto ram_disk_device::read_block(size_t block_index, void * buffer) const -> void + { + if (buffer == nullptr) + { + kapi::system::panic("[RAM DISK DEVICE] read_block called with null buffer."); + } + + auto const info = calculate_transfer(block_index); + + if (info.to_transfer > 0) + { + auto const src = static_cast(m_boot_module.start_address) + info.offset; + kstd::libc::memcpy(buffer, src, info.to_transfer); + } + + if (info.remainder > 0) + { + kstd::libc::memset(static_cast(buffer) + info.to_transfer, 0, info.remainder); + } + } + + auto ram_disk_device::write_block(size_t block_index, void const * buffer) -> void + { + if (buffer == nullptr) + { + kapi::system::panic("[RAM DISK DEVICE] write_block called with null buffer."); + } + + auto const info = calculate_transfer(block_index); + + if (info.to_transfer > 0) + { + auto const dest = static_cast(m_boot_module.start_address) + info.offset; + kstd::libc::memcpy(dest, buffer, info.to_transfer); + } + } + + auto ram_disk_device::size() const -> size_t + { + return m_boot_module.size; + } +} // namespace devices::storage::ram_disk \ No newline at end of file diff --git a/kernel/devices/src/storage/storage_controller.cpp b/kernel/devices/src/storage/storage_controller.cpp new file mode 100644 index 0000000..f95f533 --- /dev/null +++ b/kernel/devices/src/storage/storage_controller.cpp @@ -0,0 +1,17 @@ +#include "devices/storage/storage_controller.hpp" + +#include + +namespace devices::storage +{ + auto storage_controller::set_ids(size_t major, size_t minors_per_dev) -> void + { + m_major = major; + m_minors_per_device = minors_per_dev; + } + + auto storage_controller::major() const -> size_t + { + return m_major; + } +} // namespace devices::storage \ No newline at end of file diff --git a/kernel/devices/src/storage/storage_management.cpp b/kernel/devices/src/storage/storage_management.cpp new file mode 100644 index 0000000..1530d7a --- /dev/null +++ b/kernel/devices/src/storage/storage_management.cpp @@ -0,0 +1,78 @@ +#include "devices/storage/storage_management.hpp" + +#include "kapi/boot_modules.hpp" +#include "kapi/system.hpp" + +#include "devices/block_device.hpp" +#include "devices/storage/ram_disk/ram_disk_controller.hpp" +#include "devices/storage/storage_controller.hpp" + +#include +#include +#include + +namespace devices::storage +{ + 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; + + constinit auto static active_storage_management = std::optional{}; + constinit auto static active_ram_disk_controller = std::optional{}; + } // namespace + + auto storage_management::init() -> void + { + if (active_storage_management) + { + kapi::system::panic("[DEVICES] Storage management has already been initialized."); + } + active_storage_management.emplace(storage_management{}); + + active_ram_disk_controller.emplace(&kapi::boot_modules::get_boot_module_registry()); + active_storage_management->add_controller(&active_ram_disk_controller.value()); + + std::ranges::for_each(active_storage_management->m_controllers, [](auto controller) { controller->probe(); }); + } + + auto storage_management::get() -> storage_management & + { + if (!active_storage_management) + { + kapi::system::panic("[DEVICES] Storage management has not been initialized."); + } + + return *active_storage_management; + } + + auto storage_management::add_controller(storage_controller * controller) -> void + { + controller->set_ids(next_free_major++, MINORS_PER_DEVICE); + m_controllers.at(0) = controller; // TODO BA-FS26 use push_back from kstd:vector + } + + auto storage_management::device_by_major_minor(size_t major, size_t minor) -> block_device * + { + block_device * found = nullptr; + + std::ranges::find_if(m_controllers, [&](auto const controller) { + if (controller != nullptr && controller->major() == major) + { + found = controller->device_by_major_minor(major, minor); + return found != nullptr; + } + return false; + }); + + return found; + } + + auto storage_management::determine_boot_device() -> block_device * + { + // TODO BA-FS26 better way? + return device_by_major_minor(START_MAJOR, 0); + } + +} // namespace devices::storage \ No newline at end of file -- cgit v1.2.3