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) --- kernel/devices/CMakeLists.txt | 24 +++---- kernel/devices/include/devices/BlockDevice.hpp | 33 --------- kernel/devices/include/devices/Device.hpp | 22 ------ kernel/devices/include/devices/block_device.hpp | 33 +++++++++ .../devices/storage/RAMDisk/RAMDiskController.hpp | 30 --------- .../devices/storage/RAMDisk/RAMDiskDevice.hpp | 27 -------- .../include/devices/storage/StorageController.hpp | 28 -------- .../include/devices/storage/StorageManagement.hpp | 31 --------- .../storage/ram_disk/ram_disk_controller.hpp | 30 +++++++++ .../devices/storage/ram_disk/ram_disk_device.hpp | 27 ++++++++ .../include/devices/storage/storage_controller.hpp | 28 ++++++++ .../include/devices/storage/storage_management.hpp | 31 +++++++++ kernel/devices/include/devices/temp_device.hpp | 22 ++++++ kernel/devices/src/BlockDevice.cpp | 24 ------- kernel/devices/src/Device.cpp | 21 ------ kernel/devices/src/block_device.cpp | 24 +++++++ .../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 ++++++++++++++++++++++ kernel/devices/src/temp_device.cpp | 21 ++++++ 25 files changed, 440 insertions(+), 440 deletions(-) delete mode 100644 kernel/devices/include/devices/BlockDevice.hpp delete mode 100644 kernel/devices/include/devices/Device.hpp create mode 100644 kernel/devices/include/devices/block_device.hpp delete mode 100644 kernel/devices/include/devices/storage/RAMDisk/RAMDiskController.hpp delete mode 100644 kernel/devices/include/devices/storage/RAMDisk/RAMDiskDevice.hpp delete mode 100644 kernel/devices/include/devices/storage/StorageController.hpp delete mode 100644 kernel/devices/include/devices/storage/StorageManagement.hpp create mode 100644 kernel/devices/include/devices/storage/ram_disk/ram_disk_controller.hpp create mode 100644 kernel/devices/include/devices/storage/ram_disk/ram_disk_device.hpp create mode 100644 kernel/devices/include/devices/storage/storage_controller.hpp create mode 100644 kernel/devices/include/devices/storage/storage_management.hpp create mode 100644 kernel/devices/include/devices/temp_device.hpp delete mode 100644 kernel/devices/src/BlockDevice.cpp delete mode 100644 kernel/devices/src/Device.cpp create mode 100644 kernel/devices/src/block_device.cpp 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 create mode 100644 kernel/devices/src/temp_device.cpp (limited to 'kernel/devices') diff --git a/kernel/devices/CMakeLists.txt b/kernel/devices/CMakeLists.txt index 8022dee..691bb11 100644 --- a/kernel/devices/CMakeLists.txt +++ b/kernel/devices/CMakeLists.txt @@ -2,24 +2,24 @@ add_library("kernel_devices" STATIC) add_library("kernel::devices" ALIAS "kernel_devices") target_sources("kernel_devices" PRIVATE - "src/Device.cpp" - "src/BlockDevice.cpp" - "src/storage/StorageController.cpp" - "src/storage/StorageManagement.cpp" - "src/storage/RAMDisk/RAMDiskController.cpp" - "src/storage/RAMDisk/RAMDiskDevice.cpp" + "src/temp_device.cpp" + "src/block_device.cpp" + "src/storage/storage_controller.cpp" + "src/storage/storage_management.cpp" + "src/storage/ram_disk/ram_disk_controller.cpp" + "src/storage/ram_disk/ram_disk_device.cpp" ) target_sources("kernel_devices" PUBLIC FILE_SET HEADERS BASE_DIRS "include" FILES - "include/devices/Device.hpp" - "include/devices/BlockDevice.hpp" - "include/devices/storage/StorageController.hpp" - "include/devices/storage/StorageManagement.hpp" - "include/devices/storage/RAMDisk/RAMDiskController.hpp" - "include/devices/storage/RAMDisk/RAMDiskDevice.hpp" + "include/devices/temp_device.hpp" + "include/devices/block_device.hpp" + "include/devices/storage/storage_controller.hpp" + "include/devices/storage/storage_management.hpp" + "include/devices/storage/ram_disk/ram_disk_controller.hpp" + "include/devices/storage/ram_disk/ram_disk_device.hpp" ) target_include_directories("kernel_devices" PUBLIC diff --git a/kernel/devices/include/devices/BlockDevice.hpp b/kernel/devices/include/devices/BlockDevice.hpp deleted file mode 100644 index 56e26d0..0000000 --- a/kernel/devices/include/devices/BlockDevice.hpp +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef TEACH_OS_KERNEL_DEVICES_BLOCK_DEVICE_HPP -#define TEACH_OS_KERNEL_DEVICES_BLOCK_DEVICE_HPP - -#include "devices/Device.hpp" - -#include - -namespace devices -{ - struct block_device : device - { - block_device(size_t major, size_t minor, size_t block_size); - virtual ~block_device() = default; - - virtual auto read_block(size_t block_index, void * buffer) const -> void = 0; - virtual auto write_block(size_t block_index, void const * buffer) -> void = 0; - - protected: - struct transfer_info - { - size_t offset; - size_t to_transfer; - size_t remainder; - }; - - virtual auto size() const -> size_t = 0; - auto calculate_transfer(size_t block_index) const -> transfer_info; - - size_t m_block_size; - }; -} // namespace devices - -#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/Device.hpp b/kernel/devices/include/devices/Device.hpp deleted file mode 100644 index 0f93bff..0000000 --- a/kernel/devices/include/devices/Device.hpp +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef TEACH_OS_KERNEL_DEVICES_DEVICE_HPP -#define TEACH_OS_KERNEL_DEVICES_DEVICE_HPP - -#include - -namespace devices -{ - struct device - { - device(size_t major, size_t minor); - virtual ~device() = default; - - auto major() const -> size_t; - auto minor() const -> size_t; - - private: - size_t m_major; - size_t m_minor; - }; -} // namespace devices - -#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/block_device.hpp b/kernel/devices/include/devices/block_device.hpp new file mode 100644 index 0000000..d1e4249 --- /dev/null +++ b/kernel/devices/include/devices/block_device.hpp @@ -0,0 +1,33 @@ +#ifndef TEACH_OS_KERNEL_DEVICES_BLOCK_DEVICE_HPP +#define TEACH_OS_KERNEL_DEVICES_BLOCK_DEVICE_HPP + +#include "devices/temp_device.hpp" + +#include + +namespace devices +{ + struct block_device : device + { + block_device(size_t major, size_t minor, size_t block_size); + virtual ~block_device() = default; + + virtual auto read_block(size_t block_index, void * buffer) const -> void = 0; + virtual auto write_block(size_t block_index, void const * buffer) -> void = 0; + + protected: + struct transfer_info + { + size_t offset; + size_t to_transfer; + size_t remainder; + }; + + virtual auto size() const -> size_t = 0; + auto calculate_transfer(size_t block_index) const -> transfer_info; + + size_t m_block_size; + }; +} // namespace devices + +#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/storage/RAMDisk/RAMDiskController.hpp b/kernel/devices/include/devices/storage/RAMDisk/RAMDiskController.hpp deleted file mode 100644 index 3e6e2bd..0000000 --- a/kernel/devices/include/devices/storage/RAMDisk/RAMDiskController.hpp +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_RAM_DISK_CONTROLLER_HPP -#define TEACH_OS_KERNEL_DEVICES_STORAGE_RAM_DISK_CONTROLLER_HPP - -#include "kapi/boot_module/boot_module_registry.hpp" - -#include "devices/BlockDevice.hpp" -#include "devices/storage/RAMDisk/RAMDiskDevice.hpp" -#include "devices/storage/StorageController.hpp" - -#include -#include - -namespace devices::storage::ram_disk -{ - struct ram_disk_controller : storage_controller - { - explicit ram_disk_controller(kapi::boot_modules::boot_module_registry const * registry); - - auto probe() -> void override; - - auto devices_count() -> size_t override; - auto device_by_major_minor(size_t major, size_t minor) -> block_device * override; - - private: - kapi::boot_modules::boot_module_registry const * m_boot_module_registry; - std::array m_devices{}; // TODO BA-FS26 use kstd::vector when available - }; -} // namespace devices::storage::ram_disk - -#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/storage/RAMDisk/RAMDiskDevice.hpp b/kernel/devices/include/devices/storage/RAMDisk/RAMDiskDevice.hpp deleted file mode 100644 index 5971970..0000000 --- a/kernel/devices/include/devices/storage/RAMDisk/RAMDiskDevice.hpp +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_RAM_DISK_DEVICE_HPP -#define TEACH_OS_KERNEL_DEVICES_STORAGE_RAM_DISK_DEVICE_HPP - -#include "kapi/boot_module/boot_module.hpp" - -#include "devices/BlockDevice.hpp" - -#include - -namespace devices::storage::ram_disk -{ - struct ram_disk_device : block_device - { - ram_disk_device(); // TODO BA-FS26 remove when kstd::vector is available - ram_disk_device(kapi::boot_modules::boot_module const & module, size_t major, size_t minor); - - auto read_block(size_t block_index, void * buffer) const -> void override; - auto write_block(size_t block_index, void const * buffer) -> void override; - - private: - auto size() const -> size_t override; - - kapi::boot_modules::boot_module m_boot_module{}; - }; -} // namespace devices::storage::ram_disk - -#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/storage/StorageController.hpp b/kernel/devices/include/devices/storage/StorageController.hpp deleted file mode 100644 index 50fdb34..0000000 --- a/kernel/devices/include/devices/storage/StorageController.hpp +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_CONTROLLER_HPP -#define TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_CONTROLLER_HPP - -#include "devices/BlockDevice.hpp" - -#include - -namespace devices::storage -{ - struct storage_controller - { - virtual ~storage_controller() = default; - - virtual auto probe() -> void = 0; - - auto set_ids(size_t major, size_t minors_per_dev) -> void; - auto major() const -> size_t; - - virtual auto devices_count() -> size_t = 0; - virtual auto device_by_major_minor(size_t major, size_t minor) -> block_device * = 0; - - protected: - size_t m_major{}; - size_t m_minors_per_device{}; - }; -} // namespace devices::storage - -#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/storage/StorageManagement.hpp b/kernel/devices/include/devices/storage/StorageManagement.hpp deleted file mode 100644 index 226fb28..0000000 --- a/kernel/devices/include/devices/storage/StorageManagement.hpp +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_MANAGEMENT_HPP -#define TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_MANAGEMENT_HPP - -#include "devices/BlockDevice.hpp" -#include "devices/storage/StorageController.hpp" - -#include -#include - -namespace devices::storage -{ - // TODO BA-FS26 add documentation - struct storage_management - { - auto static init() -> void; - - auto static get() -> storage_management &; - - auto add_controller(storage_controller * controller) -> void; - - auto device_by_major_minor(size_t major, size_t minor) -> block_device *; - auto determine_boot_device() -> block_device *; - - private: - storage_management() = default; - - std::array m_controllers{}; // TODO BA-FS26 use kstd::vector when available - }; -} // namespace devices::storage - -#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/storage/ram_disk/ram_disk_controller.hpp b/kernel/devices/include/devices/storage/ram_disk/ram_disk_controller.hpp new file mode 100644 index 0000000..f050ba0 --- /dev/null +++ b/kernel/devices/include/devices/storage/ram_disk/ram_disk_controller.hpp @@ -0,0 +1,30 @@ +#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_RAM_DISK_CONTROLLER_HPP +#define TEACH_OS_KERNEL_DEVICES_STORAGE_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 "devices/storage/storage_controller.hpp" + +#include +#include + +namespace devices::storage::ram_disk +{ + struct ram_disk_controller : storage_controller + { + explicit ram_disk_controller(kapi::boot_modules::boot_module_registry const * registry); + + auto probe() -> void override; + + auto devices_count() -> size_t override; + auto device_by_major_minor(size_t major, size_t minor) -> block_device * override; + + private: + kapi::boot_modules::boot_module_registry const * m_boot_module_registry; + std::array m_devices{}; // TODO BA-FS26 use kstd::vector when available + }; +} // namespace devices::storage::ram_disk + +#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/storage/ram_disk/ram_disk_device.hpp b/kernel/devices/include/devices/storage/ram_disk/ram_disk_device.hpp new file mode 100644 index 0000000..1f0292f --- /dev/null +++ b/kernel/devices/include/devices/storage/ram_disk/ram_disk_device.hpp @@ -0,0 +1,27 @@ +#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_RAM_DISK_DEVICE_HPP +#define TEACH_OS_KERNEL_DEVICES_STORAGE_RAM_DISK_DEVICE_HPP + +#include "kapi/boot_module/boot_module.hpp" + +#include "devices/block_device.hpp" + +#include + +namespace devices::storage::ram_disk +{ + struct ram_disk_device : block_device + { + ram_disk_device(); // TODO BA-FS26 remove when kstd::vector is available + ram_disk_device(kapi::boot_modules::boot_module const & module, size_t major, size_t minor); + + auto read_block(size_t block_index, void * buffer) const -> void override; + auto write_block(size_t block_index, void const * buffer) -> void override; + + private: + auto size() const -> size_t override; + + kapi::boot_modules::boot_module m_boot_module{}; + }; +} // namespace devices::storage::ram_disk + +#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/storage/storage_controller.hpp b/kernel/devices/include/devices/storage/storage_controller.hpp new file mode 100644 index 0000000..0c09815 --- /dev/null +++ b/kernel/devices/include/devices/storage/storage_controller.hpp @@ -0,0 +1,28 @@ +#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_CONTROLLER_HPP +#define TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_CONTROLLER_HPP + +#include "devices/block_device.hpp" + +#include + +namespace devices::storage +{ + struct storage_controller + { + virtual ~storage_controller() = default; + + virtual auto probe() -> void = 0; + + auto set_ids(size_t major, size_t minors_per_dev) -> void; + auto major() const -> size_t; + + virtual auto devices_count() -> size_t = 0; + virtual auto device_by_major_minor(size_t major, size_t minor) -> block_device * = 0; + + protected: + size_t m_major{}; + size_t m_minors_per_device{}; + }; +} // namespace devices::storage + +#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/storage/storage_management.hpp b/kernel/devices/include/devices/storage/storage_management.hpp new file mode 100644 index 0000000..c4f5679 --- /dev/null +++ b/kernel/devices/include/devices/storage/storage_management.hpp @@ -0,0 +1,31 @@ +#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_MANAGEMENT_HPP +#define TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_MANAGEMENT_HPP + +#include "devices/block_device.hpp" +#include "devices/storage/storage_controller.hpp" + +#include +#include + +namespace devices::storage +{ + // TODO BA-FS26 add documentation + struct storage_management + { + auto static init() -> void; + + auto static get() -> storage_management &; + + auto add_controller(storage_controller * controller) -> void; + + auto device_by_major_minor(size_t major, size_t minor) -> block_device *; + auto determine_boot_device() -> block_device *; + + private: + storage_management() = default; + + std::array m_controllers{}; // TODO BA-FS26 use kstd::vector when available + }; +} // namespace devices::storage + +#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/temp_device.hpp b/kernel/devices/include/devices/temp_device.hpp new file mode 100644 index 0000000..0f93bff --- /dev/null +++ b/kernel/devices/include/devices/temp_device.hpp @@ -0,0 +1,22 @@ +#ifndef TEACH_OS_KERNEL_DEVICES_DEVICE_HPP +#define TEACH_OS_KERNEL_DEVICES_DEVICE_HPP + +#include + +namespace devices +{ + struct device + { + device(size_t major, size_t minor); + virtual ~device() = default; + + auto major() const -> size_t; + auto minor() const -> size_t; + + private: + size_t m_major; + size_t m_minor; + }; +} // namespace devices + +#endif \ No newline at end of file diff --git a/kernel/devices/src/BlockDevice.cpp b/kernel/devices/src/BlockDevice.cpp deleted file mode 100644 index edc0109..0000000 --- a/kernel/devices/src/BlockDevice.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include "devices/BlockDevice.hpp" - -#include "devices/Device.hpp" - -#include - -namespace devices -{ - block_device::block_device(size_t major, size_t minor, size_t block_size) - : device(major, minor) - , m_block_size(block_size) - {} - - auto block_device::calculate_transfer(size_t block_index) const -> transfer_info - { - size_t const offset = block_index * m_block_size; - size_t const limit = size(); - - size_t const available = (offset < limit) ? (limit - offset) : 0; - size_t const to_transfer = (available < m_block_size) ? available : m_block_size; - - return {offset, to_transfer, m_block_size - to_transfer}; - } -} // namespace devices \ No newline at end of file diff --git a/kernel/devices/src/Device.cpp b/kernel/devices/src/Device.cpp deleted file mode 100644 index 38fdd48..0000000 --- a/kernel/devices/src/Device.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "devices/Device.hpp" - -#include - -namespace devices -{ - device::device(size_t major, size_t minor) - : m_major(major) - , m_minor(minor) - {} - - auto device::major() const -> size_t - { - return m_major; - } - - auto device::minor() const -> size_t - { - return m_minor; - } -} // namespace devices \ No newline at end of file diff --git a/kernel/devices/src/block_device.cpp b/kernel/devices/src/block_device.cpp new file mode 100644 index 0000000..dd0fd44 --- /dev/null +++ b/kernel/devices/src/block_device.cpp @@ -0,0 +1,24 @@ +#include "devices/block_device.hpp" + +#include "devices/temp_device.hpp" + +#include + +namespace devices +{ + block_device::block_device(size_t major, size_t minor, size_t block_size) + : device(major, minor) + , m_block_size(block_size) + {} + + auto block_device::calculate_transfer(size_t block_index) const -> transfer_info + { + size_t const offset = block_index * m_block_size; + size_t const limit = size(); + + size_t const available = (offset < limit) ? (limit - offset) : 0; + size_t const to_transfer = (available < m_block_size) ? available : m_block_size; + + return {offset, to_transfer, m_block_size - to_transfer}; + } +} // namespace devices \ No newline at end of file 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 diff --git a/kernel/devices/src/temp_device.cpp b/kernel/devices/src/temp_device.cpp new file mode 100644 index 0000000..dae20b5 --- /dev/null +++ b/kernel/devices/src/temp_device.cpp @@ -0,0 +1,21 @@ +#include "devices/temp_device.hpp" + +#include + +namespace devices +{ + device::device(size_t major, size_t minor) + : m_major(major) + , m_minor(minor) + {} + + auto device::major() const -> size_t + { + return m_major; + } + + auto device::minor() const -> size_t + { + return m_minor; + } +} // namespace devices \ No newline at end of file -- cgit v1.2.3