From cd665ec172dadd049e7c1830b070f15b58fb9011 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Tue, 18 Aug 2026 13:51:55 +0200
Subject: kstd: flatten units namespace

---
 kernel/kapi/devices/device.tests.cpp | 4 ++--
 kernel/kapi/filesystem.cpp           | 8 ++++----
 kernel/kapi/memory.cpp               | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kernel/kapi')

diff --git a/kernel/kapi/devices/device.tests.cpp b/kernel/kapi/devices/device.tests.cpp
index 138e1161..0746445c 100644
--- a/kernel/kapi/devices/device.tests.cpp
+++ b/kernel/kapi/devices/device.tests.cpp
@@ -141,7 +141,7 @@ SCENARIO("Devices allow access to their resources", "[kapi][devices]")
 
     WHEN("adding an MMIO resource")
     {
-      auto range = kapi::devices::mmio_range{{}, kstd::units::bytes{100}};
+      auto range = kapi::devices::mmio_range{{}, kstd::bytes{100}};
       device->set_resources({kapi::devices::resource{range}});
 
       AND_WHEN("trying to get the first MMIO resource via the type-safe accessor")
@@ -652,7 +652,7 @@ SCENARIO("Devices allow access to their resources", "[kapi][devices]")
   {
     auto device = kstd::make_shared<kapi::devices::device>("test_device");
 
-    auto range = kapi::devices::mmio_range{{}, kstd::units::bytes{128}};
+    auto range = kapi::devices::mmio_range{{}, kstd::bytes{128}};
     auto port_a = kapi::devices::io_port{0x40, 4};
     auto port_b = kapi::devices::io_port{0x50, 1};
 
diff --git a/kernel/kapi/filesystem.cpp b/kernel/kapi/filesystem.cpp
index d37a4cf7..419c3234 100644
--- a/kernel/kapi/filesystem.cpp
+++ b/kernel/kapi/filesystem.cpp
@@ -43,22 +43,22 @@ namespace kapi::filesystem
         .and_then([=]() { return kernel::filesystem::open_file_table::get().remove_file(file_descriptor); });
   }
 
-  auto read(size_t file_descriptor, std::span<std::byte> buffer) -> kstd::result<kstd::units::bytes>
+  auto read(size_t file_descriptor, std::span<std::byte> buffer) -> kstd::result<kstd::bytes>
   {
     return kernel::filesystem::open_file_table::get().file(file_descriptor).and_then([=](auto descriptor) {
       return descriptor->read(buffer);
     });
   }
 
-  auto write(size_t file_descriptor, std::span<std::byte const> buffer) -> kstd::result<kstd::units::bytes>
+  auto write(size_t file_descriptor, std::span<std::byte const> buffer) -> kstd::result<kstd::bytes>
   {
     return kernel::filesystem::open_file_table::get().file(file_descriptor).and_then([=](auto descriptor) {
       return descriptor->write(buffer);
     });
   }
 
-  auto seek(size_t file_descriptor, kstd::units::bytes offset, seek_direction direction, seek_origin origin)
-      -> kstd::result<kstd::units::bytes>
+  auto seek(size_t file_descriptor, kstd::bytes offset, seek_direction direction, seek_origin origin)
+      -> kstd::result<kstd::bytes>
   {
     return kernel::filesystem::open_file_table::get().file(file_descriptor).and_then([=](auto file) {
       return file->seek(offset, direction, origin);
diff --git a/kernel/kapi/memory.cpp b/kernel/kapi/memory.cpp
index 4cba7238..a0445645 100644
--- a/kernel/kapi/memory.cpp
+++ b/kernel/kapi/memory.cpp
@@ -117,7 +117,7 @@ namespace kapi::memory
   {
     using namespace kstd::units_literals;
 
-    auto const bitmap_bytes = kstd::units::bytes{(frame_count + 7uz) / 8uz};
+    auto const bitmap_bytes = kstd::bytes{(frame_count + 7uz) / 8uz};
     auto const bitmap_pages = (bitmap_bytes + page::size - 1_B) / page::size;
 
     auto const bitmap_frames = allocate_many_frames(bitmap_pages);
-- 
cgit v1.2.3