From cd665ec172dadd049e7c1830b070f15b58fb9011 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Tue, 18 Aug 2026 13:51:55 +0200 Subject: kstd: flatten units namespace --- libs/acpi/acpi/common/table_header.cpp | 4 ++-- libs/acpi/acpi/common/table_header.hpp | 2 +- libs/acpi/acpi/pointers.cpp | 4 ++-- libs/acpi/acpi/pointers.hpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libs/acpi') diff --git a/libs/acpi/acpi/common/table_header.cpp b/libs/acpi/acpi/common/table_header.cpp index ebceca1d..cf2e7c23 100644 --- a/libs/acpi/acpi/common/table_header.cpp +++ b/libs/acpi/acpi/common/table_header.cpp @@ -52,7 +52,7 @@ namespace acpi return std::string_view{base + offset, size}; } - auto table_header::length() const noexcept -> kstd::units::bytes + auto table_header::length() const noexcept -> kstd::bytes { using type = decltype(common_table_header_data::length); @@ -64,7 +64,7 @@ namespace acpi kstd::libc::memcpy(&raw_value, data.data(), size); - return kstd::units::bytes{raw_value}; + return kstd::bytes{raw_value}; } auto table_header::oem_id() const noexcept -> std::string_view diff --git a/libs/acpi/acpi/common/table_header.hpp b/libs/acpi/acpi/common/table_header.hpp index 8e1d7c59..18e1dfdf 100644 --- a/libs/acpi/acpi/common/table_header.hpp +++ b/libs/acpi/acpi/common/table_header.hpp @@ -30,7 +30,7 @@ namespace acpi [[nodiscard]] auto creator_id() const noexcept -> std::string_view; //! Get the length of the entire table, including this header. - [[nodiscard]] auto length() const noexcept -> kstd::units::bytes; + [[nodiscard]] auto length() const noexcept -> kstd::bytes; //! Get the ID of the OEM. [[nodiscard]] auto oem_id() const noexcept -> std::string_view; diff --git a/libs/acpi/acpi/pointers.cpp b/libs/acpi/acpi/pointers.cpp index 0393292c..85329bf2 100644 --- a/libs/acpi/acpi/pointers.cpp +++ b/libs/acpi/acpi/pointers.cpp @@ -38,9 +38,9 @@ namespace acpi return signature() == "RSD PTR " && validate_checksum({reinterpret_cast(this), sizeof(rsdp)}); } - auto xsdp::length() const noexcept -> kstd::units::bytes + auto xsdp::length() const noexcept -> kstd::bytes { - return kstd::units::bytes{m_length}; + return kstd::bytes{m_length}; } auto xsdp::table_address() const noexcept -> std::uintptr_t diff --git a/libs/acpi/acpi/pointers.hpp b/libs/acpi/acpi/pointers.hpp index 310447f5..761d8748 100644 --- a/libs/acpi/acpi/pointers.hpp +++ b/libs/acpi/acpi/pointers.hpp @@ -50,7 +50,7 @@ namespace acpi struct [[gnu::packed]] xsdp : rsdp { //! Get the length of the data contained in this pointer. - [[nodiscard]] auto length() const noexcept -> kstd::units::bytes; + [[nodiscard]] auto length() const noexcept -> kstd::bytes; //! Get the physical address of the pointed-to Extended System Description Table. [[nodiscard]] auto table_address() const noexcept -> std::uintptr_t; -- cgit v1.2.3