diff options
| author | marcel.braun <marcel.braun@ost.ch> | 2026-03-17 19:36:20 +0100 |
|---|---|---|
| committer | marcel.braun <marcel.braun@ost.ch> | 2026-03-17 19:36:20 +0100 |
| commit | 3ace886a9e9f044cd48de51f0a15aceb02bfa9b2 (patch) | |
| tree | 1dc00e8802ab8fb60809b1f55ae7baadf9e430e1 /kernel/src/devices | |
| parent | 59504cfd677dd3e9d9ddb0deea4df7614efedb84 (diff) | |
| download | teachos-3ace886a9e9f044cd48de51f0a15aceb02bfa9b2.tar.xz teachos-3ace886a9e9f044cd48de51f0a15aceb02bfa9b2.zip | |
Clean up project folder structure
Diffstat (limited to 'kernel/src/devices')
| -rw-r--r-- | kernel/src/devices/block_device.cpp | 42 | ||||
| -rw-r--r-- | kernel/src/devices/device.cpp | 28 | ||||
| -rw-r--r-- | kernel/src/devices/storage/ram_disk/ram_disk_controller.cpp | 28 | ||||
| -rw-r--r-- | kernel/src/devices/storage/ram_disk/ram_disk_device.cpp | 77 | ||||
| -rw-r--r-- | kernel/src/devices/storage/storage_controller.cpp | 44 | ||||
| -rw-r--r-- | kernel/src/devices/storage/storage_management.cpp | 85 |
6 files changed, 304 insertions, 0 deletions
diff --git a/kernel/src/devices/block_device.cpp b/kernel/src/devices/block_device.cpp new file mode 100644 index 0000000..d12251b --- /dev/null +++ b/kernel/src/devices/block_device.cpp @@ -0,0 +1,42 @@ +#include "kernel/devices/block_device.hpp" + +#include "kapi/system.hpp" + +#include "kernel/devices/device.hpp" + +#include <cstddef> +#include <string_view> + +namespace devices +{ + block_device::block_device(size_t major, size_t minor, std::string_view name, size_t block_size) + : device(major, minor, name) + , m_block_size(block_size) + { + if (m_block_size == 0) + { + kapi::system::panic("[DEVICES] block_device constructed with zero 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}; + } + + auto block_device::block_size() const -> size_t + { + return m_block_size; + } + + auto block_device::capacity() const -> size_t + { + return size(); + } +} // namespace devices
\ No newline at end of file diff --git a/kernel/src/devices/device.cpp b/kernel/src/devices/device.cpp new file mode 100644 index 0000000..29498fa --- /dev/null +++ b/kernel/src/devices/device.cpp @@ -0,0 +1,28 @@ +#include "kernel/devices/device.hpp" + +#include <cstddef> +#include <string_view> + +namespace devices +{ + device::device(size_t major, size_t minor, std::string_view name) + : m_major(major) + , m_minor(minor) + , m_name(name) + {} + + auto device::major() const -> size_t + { + return m_major; + } + + auto device::minor() const -> size_t + { + return m_minor; + } + + auto device::name() const -> std::string_view + { + return m_name; + } +} // namespace devices
\ No newline at end of file diff --git a/kernel/src/devices/storage/ram_disk/ram_disk_controller.cpp b/kernel/src/devices/storage/ram_disk/ram_disk_controller.cpp new file mode 100644 index 0000000..efb6256 --- /dev/null +++ b/kernel/src/devices/storage/ram_disk/ram_disk_controller.cpp @@ -0,0 +1,28 @@ +#include "kernel/devices/storage/ram_disk/ram_disk_controller.hpp" + +#include "kapi/boot_module/boot_module_registry.hpp" + +#include "kernel/devices/storage/ram_disk/ram_disk_device.hpp" + +#include <kstd/memory> +#include <kstd/print> + +#include <algorithm> +#include <cstddef> + +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; + m_devices.push_back(kstd::make_shared<ram_disk_device>(module, m_major, minor)); + }); + } +} // namespace devices::storage::ram_disk
\ No newline at end of file diff --git a/kernel/src/devices/storage/ram_disk/ram_disk_device.cpp b/kernel/src/devices/storage/ram_disk/ram_disk_device.cpp new file mode 100644 index 0000000..650a151 --- /dev/null +++ b/kernel/src/devices/storage/ram_disk/ram_disk_device.cpp @@ -0,0 +1,77 @@ +#include "kernel/devices/storage/ram_disk/ram_disk_device.hpp" + +#include "kapi/boot_module/boot_module.hpp" +#include "kapi/system.hpp" + +#include "kernel/devices/block_device.hpp" + +#include <kstd/cstring> + +#include <array> +#include <cstddef> +#include <string_view> + +namespace devices::storage::ram_disk +{ + namespace + { + constexpr size_t RAM_DISK_BLOCK_SIZE = 512uz; + + // TODO BA-FS26 @Felix + // TODO BA-FS26 currently only names for 9 minor devices + constinit std::array<char, 5> name = {'r', 'a', 'm', '0', '\0'}; + + auto determine_device_name(size_t minor) -> std::string_view + { + name[3] = '0' + minor; + return std::string_view{name}; + } + } // namespace + + ram_disk_device::ram_disk_device(kapi::boot_modules::boot_module const & module, size_t major, size_t minor) + : block_device(major, minor, determine_device_name(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<std::byte const *>(m_boot_module.start_address) + info.offset; + kstd::libc::memcpy(buffer, src, info.to_transfer); + } + + if (info.remainder > 0) + { + kstd::libc::memset(static_cast<std::byte *>(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<std::byte *>(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/src/devices/storage/storage_controller.cpp b/kernel/src/devices/storage/storage_controller.cpp new file mode 100644 index 0000000..e415436 --- /dev/null +++ b/kernel/src/devices/storage/storage_controller.cpp @@ -0,0 +1,44 @@ +#include "kernel/devices/storage/storage_controller.hpp" + +#include "kernel/devices/device.hpp" + +#include <kstd/memory> +#include <kstd/vector> + +#include <algorithm> +#include <cstddef> + +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; + } + + auto storage_controller::device_by_minor(size_t minor) const -> kstd::shared_ptr<devices::device> + { + auto it = std::ranges::find_if(m_devices, [minor](auto const & device) { return device->minor() == minor; }); + + if (it != m_devices.end()) + { + return *it; + } + return nullptr; + } + + auto storage_controller::devices_count() const -> size_t + { + return m_devices.size(); + } + + auto storage_controller::all_devices() const -> kstd::vector<kstd::shared_ptr<devices::device>> const & + { + return m_devices; + } +} // namespace devices::storage
\ No newline at end of file diff --git a/kernel/src/devices/storage/storage_management.cpp b/kernel/src/devices/storage/storage_management.cpp new file mode 100644 index 0000000..56216b0 --- /dev/null +++ b/kernel/src/devices/storage/storage_management.cpp @@ -0,0 +1,85 @@ +#include "kernel/devices/storage/storage_management.hpp" + +#include "kapi/boot_modules.hpp" +#include "kapi/system.hpp" + +#include "kernel/devices/device.hpp" +#include "kernel/devices/storage/ram_disk/ram_disk_controller.hpp" +#include "kernel/devices/storage/storage_controller.hpp" + +#include <kstd/memory> +#include <kstd/vector> + +#include <algorithm> +#include <cstddef> +#include <optional> + +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<storage_management>{}; + } // 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{}); + + auto current_ram_disk_controller = + kstd::make_shared<ram_disk::ram_disk_controller>(&kapi::boot_modules::get_boot_module_registry()); + active_storage_management->add_controller(current_ram_disk_controller); + + 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(kstd::shared_ptr<storage_controller> const & controller) -> void + { + controller->set_ids(next_free_major++, MINORS_PER_DEVICE); + m_controllers.push_back(controller); + } + + auto storage_management::all_controllers() const -> kstd::vector<kstd::shared_ptr<storage_controller>> const & + { + return m_controllers; + } + + auto storage_management::device_by_major_minor(size_t major, size_t minor) -> kstd::shared_ptr<device> + { + kstd::shared_ptr<device> found = nullptr; + + std::ranges::find_if(m_controllers, [&](auto const & controller) { + if (controller != nullptr && controller->major() == major) + { + found = controller->device_by_minor(minor); + return found != nullptr; + } + return false; + }); + + return found; + } + + auto storage_management::determine_boot_device() -> kstd::shared_ptr<device> + { + return device_by_major_minor(START_MAJOR, 0); + } + +} // namespace devices::storage
\ No newline at end of file |
