From ca0c35ad7bb6e178af18f1600a7bc0da944fafb0 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Mon, 17 Aug 2026 18:13:22 +0200 Subject: kapi: de-const read on block and char devices --- kernel/kernel/drivers/pseudo/null.cpp | 2 +- kernel/kernel/drivers/pseudo/zero.cpp | 2 +- kernel/kernel/drivers/storage/ram_disk.cpp | 2 +- kernel/kernel/test_support/devices/block_device.cpp | 3 +-- kernel/kernel/test_support/devices/block_device.hpp | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) (limited to 'kernel') diff --git a/kernel/kernel/drivers/pseudo/null.cpp b/kernel/kernel/drivers/pseudo/null.cpp index 4995cc25..f6ecf5cc 100644 --- a/kernel/kernel/drivers/pseudo/null.cpp +++ b/kernel/kernel/drivers/pseudo/null.cpp @@ -47,7 +47,7 @@ namespace kernel::drivers::pseudo struct null_node final : kapi::filesystem::character_special_file { public: - [[nodiscard]] auto read(std::span) const -> kstd::result override + [[nodiscard]] auto read(std::span) -> kstd::result override { return 0_B; } diff --git a/kernel/kernel/drivers/pseudo/zero.cpp b/kernel/kernel/drivers/pseudo/zero.cpp index 724ff25c..e486a985 100644 --- a/kernel/kernel/drivers/pseudo/zero.cpp +++ b/kernel/kernel/drivers/pseudo/zero.cpp @@ -47,7 +47,7 @@ namespace kernel::drivers::pseudo struct zero_node final : kapi::filesystem::character_special_file { public: - [[nodiscard]] auto read(std::span buffer) const -> kstd::result override + [[nodiscard]] auto read(std::span buffer) -> kstd::result override { std::ranges::fill(buffer, std::byte{0}); return kstd::units::bytes{buffer.size()}; diff --git a/kernel/kernel/drivers/storage/ram_disk.cpp b/kernel/kernel/drivers/storage/ram_disk.cpp index d96e60c0..b1b0d2b3 100644 --- a/kernel/kernel/drivers/storage/ram_disk.cpp +++ b/kernel/kernel/drivers/storage/ram_disk.cpp @@ -54,7 +54,7 @@ namespace kernel::drivers::storage : m_module(module) {} - [[nodiscard]] auto read_block(std::size_t block_index, std::span buffer) const + [[nodiscard]] auto read_block(std::size_t block_index, std::span buffer) -> kstd::result override { auto info = devices::block_device_utils::calculate_transfer(*this, block_index); diff --git a/kernel/kernel/test_support/devices/block_device.cpp b/kernel/kernel/test_support/devices/block_device.cpp index b0db0762..8ac1e23c 100644 --- a/kernel/kernel/test_support/devices/block_device.cpp +++ b/kernel/kernel/test_support/devices/block_device.cpp @@ -25,8 +25,7 @@ namespace kernel::tests::devices data.resize(initial_size.value, 0); } - auto block_device::read_block(size_t block_index, std::span buffer) const - -> kstd::result + auto block_device::read_block(size_t block_index, std::span buffer) -> kstd::result { auto const offset = block_index * block_size(); if (offset.value >= data.size()) diff --git a/kernel/kernel/test_support/devices/block_device.hpp b/kernel/kernel/test_support/devices/block_device.hpp index 9f7f698c..11065109 100644 --- a/kernel/kernel/test_support/devices/block_device.hpp +++ b/kernel/kernel/test_support/devices/block_device.hpp @@ -20,7 +20,7 @@ namespace kernel::tests::devices { block_device(kstd::string const & name, kstd::units::bytes block_size, kstd::units::bytes initial_size = {}); - auto read_block(size_t block_index, std::span buffer) const -> kstd::result override; + auto read_block(size_t block_index, std::span buffer) -> kstd::result override; auto write_block(size_t block_index, std::span buffer) -> kstd::result override; -- cgit v1.2.3