kapi: extract ACPI functionality to libs

7 files changed, 25 insertions, 215 deletions

diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index b9e01eb..74233cb 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -1,9 +1,6 @@
 add_library("kernel_objs" OBJECT
     # Platform-independent KAPI implementation
     "kapi/acpi.cpp"
-    "kapi/acpi/multiple_apic_description_table.cpp"
-    "kapi/acpi/pointers.cpp"
-    "kapi/acpi/system_description_table_header.cpp"
     "kapi/boot_modules.cpp"
     "kapi/cio.cpp"
     "kapi/cpu.cpp"
diff --git a/kernel/include/kernel/acpi/manager.hpp b/kernel/include/kernel/acpi/manager.hpp
index fae59a6..420b44a 100644
--- a/kernel/include/kernel/acpi/manager.hpp
+++ b/kernel/include/kernel/acpi/manager.hpp
@@ -1,12 +1,12 @@
 #ifndef TEACHOS_KERNEL_ACPI_MANAGER_HPP
 #define TEACHOS_KERNEL_ACPI_MANAGER_HPP
 
-#include "kapi/acpi.hpp"
-
 #include <kstd/flat_map>
 #include <kstd/memory>
 #include <kstd/vector>
 
+#include <acpi/acpi.hpp>
+
 #include <string_view>
 
 namespace kernel::acpi
@@ -14,16 +14,16 @@ namespace kernel::acpi
 
   struct manager
   {
-    explicit manager(kapi::acpi::root_system_description_pointer const & sdp);
+    explicit manager(::acpi::rsdp const & sdp);
 
     auto load_tables() -> bool;
 
-    auto get_table(std::string_view signature) -> kstd::observer_ptr<kapi::acpi::system_description_table_header const>;
+    auto get_table(std::string_view signature) -> kstd::observer_ptr<::acpi::sdt const>;
 
   private:
-    kapi::acpi::root_system_description_pointer const * m_sdp{};
-    kapi::acpi::system_description_table_header const * m_rsdt{};
-    kstd::flat_map<std::string_view, kapi::acpi::system_description_table_header const *> m_tables{};
+    ::acpi::rsdp const * m_sdp{};
+    ::acpi::sdt const * m_rsdt{};
+    kstd::flat_map<std::string_view, ::acpi::sdt const *> m_tables{};
     bool m_extended{};
   };
 
diff --git a/kernel/kapi/acpi.cpp b/kernel/kapi/acpi.cpp
index e7c4921..df2bf05 100644
--- a/kernel/kapi/acpi.cpp
+++ b/kernel/kapi/acpi.cpp
@@ -6,12 +6,10 @@
 
 #include <kstd/memory>
 
-#include <algorithm>
+#include <acpi/acpi.hpp>
+
 #include <atomic>
-#include <cstddef>
-#include <cstdint>
 #include <optional>
-#include <span>
 #include <string_view>
 
 namespace kapi::acpi
@@ -22,7 +20,7 @@ namespace kapi::acpi
     auto constinit manager = std::optional<kernel::acpi::manager>{};
   }  // namespace
 
-  auto init(root_system_description_pointer const & sdp) -> bool
+  auto init(::acpi::rsdp const & sdp) -> bool
   {
     auto static constinit initialized = std::atomic_flag{};
     if (initialized.test_and_set())
@@ -34,15 +32,7 @@ namespace kapi::acpi
     return manager->load_tables();
   }
 
-  auto validate_checksum(std::span<std::byte const> data) -> bool
-  {
-    auto sum = std::ranges::fold_left(data, std::uint8_t{}, [](auto acc, auto byte) {
-      return static_cast<std::uint8_t>(acc + static_cast<std::uint8_t>(byte));
-    });
-    return sum == 0;
-  }
-
-  auto get_table(std::string_view signature) -> kstd::observer_ptr<system_description_table_header const>
+  auto get_table(std::string_view signature) -> kstd::observer_ptr<::acpi::sdt const>
   {
     return manager->get_table(signature);
   }
diff --git a/kernel/kapi/acpi/multiple_apic_description_table.cpp b/kernel/kapi/acpi/multiple_apic_description_table.cpp
deleted file mode 100644
index c0360a3..0000000
--- a/kernel/kapi/acpi/multiple_apic_description_table.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-#include "kapi/acpi.hpp"
-#include "kapi/memory.hpp"
-
-#include <cstddef>
-#include <cstdint>
-
-namespace kapi::acpi
-{
-
-  auto multiple_apic_description_table::local_interrupt_controller_address() const noexcept -> memory::physical_address
-  {
-    return memory::physical_address{static_cast<std::uintptr_t>(m_local_interrupt_controller_address)};
-  }
-
-  auto multiple_apic_description_table::flags() const noexcept -> std::uint32_t
-  {
-    return m_flags;
-  }
-
-  auto multiple_apic_description_table_entry::type() const noexcept -> types
-  {
-    return static_cast<types>(m_type);
-  }
-
-  auto multiple_apic_description_table_entry::length() const noexcept -> std::size_t
-  {
-    return m_length;
-  }
-
-  auto processor_local_apic::apic_id() const noexcept -> std::uint8_t
-  {
-    return m_apic_id;
-  }
-
-  auto processor_local_apic::active_flags() const noexcept -> flags
-  {
-    return static_cast<flags>(m_flags);
-  }
-
-  auto processor_local_apic::processor_id() const noexcept -> std::uint32_t
-  {
-    return m_processor_id;
-  }
-
-  auto multiple_apic_description_table::begin() const noexcept -> iterator
-  {
-    auto base = reinterpret_cast<std::byte const *>(this);
-    base += sizeof(multiple_apic_description_table);
-    auto limit = reinterpret_cast<std::byte const *>(this);
-    limit += length().value;
-    return iterator{reinterpret_cast<multiple_apic_description_table_entry const *>(base),
-                    reinterpret_cast<multiple_apic_description_table_entry const *>(limit)};
-  }
-
-  auto multiple_apic_description_table::cbegin() const noexcept -> iterator
-  {
-    return begin();
-  }
-
-  auto multiple_apic_description_table::end() const noexcept -> iterator
-  {
-    return {};
-  }
-
-  auto multiple_apic_description_table::cend() const noexcept -> iterator
-  {
-    return end();
-  }
-
-}  // namespace kapi::acpi
diff --git a/kernel/kapi/acpi/pointers.cpp b/kernel/kapi/acpi/pointers.cpp
deleted file mode 100644
index 63831e9..0000000
--- a/kernel/kapi/acpi/pointers.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "kapi/acpi.hpp"
-#include "kapi/memory.hpp"
-
-#include <kstd/units>
-
-#include <bit>
-#include <cstddef>
-#include <cstdint>
-#include <string_view>
-
-namespace kapi::acpi
-{
-
-  auto root_system_description_pointer::oem_id() const noexcept -> std::string_view
-  {
-    return {m_oem_id.data(), m_oem_id.size()};
-  }
-
-  auto root_system_description_pointer::revision() const noexcept -> std::uint8_t
-  {
-    return m_revision;
-  }
-
-  auto root_system_description_pointer::signature() const noexcept -> std::string_view
-  {
-    return {m_signature.data(), m_signature.size()};
-  }
-
-  auto root_system_description_pointer::table_address() const noexcept -> memory::physical_address
-  {
-    auto raw = std::bit_cast<std::uint32_t>(m_rsdt_address);
-    return memory::physical_address{static_cast<std::uintptr_t>(raw)};
-  }
-
-  auto root_system_description_pointer::validate() const noexcept -> bool
-  {
-    return validate_checksum({reinterpret_cast<std::byte const *>(this), sizeof(root_system_description_pointer)});
-  }
-
-  auto extended_system_description_pointer::length() const noexcept -> kstd::units::bytes
-  {
-    return kstd::units::bytes{m_length};
-  }
-
-  auto extended_system_description_pointer::table_address() const noexcept -> memory::physical_address
-  {
-    return memory::physical_address{std::bit_cast<std::uintptr_t>(m_xsdt_address)};
-  }
-
-  auto extended_system_description_pointer::validate() const noexcept -> bool
-  {
-    return validate_checksum({reinterpret_cast<std::byte const *>(this), m_length});
-  }
-
-}  // namespace kapi::acpi
diff --git a/kernel/kapi/acpi/system_description_table_header.cpp b/kernel/kapi/acpi/system_description_table_header.cpp
deleted file mode 100644
index f688b4d..0000000
--- a/kernel/kapi/acpi/system_description_table_header.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "kapi/acpi.hpp"
-
-#include <kstd/units>
-
-#include <cstdint>
-#include <string_view>
-
-namespace kapi::acpi
-{
-
-  [[nodiscard]] auto system_description_table_header::creator_revision() const noexcept -> std::uint32_t
-  {
-    return m_creator_revision;
-  }
-
-  [[nodiscard]] auto system_description_table_header::creator_id() const noexcept -> std::uint32_t
-  {
-    return m_creator_id;
-  }
-
-  [[nodiscard]] auto system_description_table_header::length() const noexcept -> kstd::units::bytes
-  {
-    return kstd::units::bytes{m_length};
-  }
-
-  [[nodiscard]] auto system_description_table_header::oem_id() const noexcept -> std::string_view
-  {
-    return {m_oem_id.data(), m_oem_id.size()};
-  }
-
-  [[nodiscard]] auto system_description_table_header::oem_revision() const noexcept -> std::uint32_t
-  {
-    return m_oem_revision;
-  }
-
-  [[nodiscard]] auto system_description_table_header::oem_table_id() const noexcept -> std::string_view
-  {
-    return {m_oem_table_id.data(), m_oem_table_id.size()};
-  }
-
-  [[nodiscard]] auto system_description_table_header::revision() const noexcept -> std::uint8_t
-  {
-    return m_revision;
-  }
-
-  [[nodiscard]] auto system_description_table_header::signature() const noexcept -> std::string_view
-  {
-    return {m_signature.data(), m_signature.size()};
-  }
-
-}  // namespace kapi::acpi
diff --git a/kernel/src/acpi/manager.cpp b/kernel/src/acpi/manager.cpp
index 300b85e..501ce92 100644
--- a/kernel/src/acpi/manager.cpp
+++ b/kernel/src/acpi/manager.cpp
@@ -1,12 +1,13 @@
 #include "kernel/acpi/manager.hpp"
 
-#include "kapi/acpi.hpp"
 #include "kapi/memory.hpp"
 #include "kapi/system.hpp"
 
 #include <kstd/memory>
 #include <kstd/print>
 
+#include <acpi/acpi.hpp>
+
 #include <cstddef>
 #include <cstdint>
 #include <string_view>
@@ -14,7 +15,7 @@
 namespace kernel::acpi
 {
 
-  manager::manager(kapi::acpi::root_system_description_pointer const & sdp)
+  manager::manager(::acpi::rsdp const & sdp)
       : m_sdp{&sdp}
   {
     if (m_sdp->signature() != "RSD PTR ")
@@ -24,14 +25,14 @@ namespace kernel::acpi
 
     if (m_sdp->revision() >= 2)
     {
-      auto const xsdp = static_cast<kapi::acpi::extended_system_description_pointer const *>(m_sdp);
+      auto const xsdp = static_cast<::acpi::xsdp const *>(m_sdp);
       if (!xsdp->validate())
       {
         kapi::system::panic("[OS:ACPI] Invalid XSDP signature!");
       }
-      auto physical_extended_table_address = xsdp->table_address();
+      auto physical_extended_table_address = kapi::memory::physical_address{xsdp->table_address()};
       auto linear_extended_table_address = kapi::memory::hhdm_to_linear(physical_extended_table_address);
-      m_rsdt = static_cast<kapi::acpi::system_description_table_header const *>(linear_extended_table_address);
+      m_rsdt = static_cast<::acpi::sdt const *>(linear_extended_table_address);
       m_extended = true;
     }
     else
@@ -40,23 +41,22 @@ namespace kernel::acpi
       {
         kapi::system::panic("[OS:ACPI] Invalid RSDP checksum!");
       }
-      auto physical_root_table_address = m_sdp->table_address();
+      auto physical_root_table_address = kapi::memory::physical_address{m_sdp->table_address()};
       auto linear_root_table_address = kapi::memory::hhdm_to_linear(physical_root_table_address);
-      m_rsdt = static_cast<kapi::acpi::system_description_table_header const *>(linear_root_table_address);
+      m_rsdt = static_cast<::acpi::sdt const *>(linear_root_table_address);
     }
   }
 
   auto manager::load_tables() -> bool
   {
-    if (!kapi::acpi::validate_checksum({reinterpret_cast<std::byte const *>(m_rsdt), m_rsdt->length().value}))
+    if (!::acpi::validate_checksum({reinterpret_cast<std::byte const *>(m_rsdt), m_rsdt->length().value}))
     {
       kapi::system::panic("[OS:ACPI] Invalid RSDT checksum!");
     }
 
     auto entry_size = m_extended ? sizeof(std::uint64_t) : sizeof(std::uint32_t);
-    auto entry_count = (m_rsdt->length().value - sizeof(kapi::acpi::system_description_table_header)) / entry_size;
-    auto entries_base =
-        reinterpret_cast<std::byte const *>(m_rsdt) + sizeof(kapi::acpi::system_description_table_header);
+    auto entry_count = (m_rsdt->length().value - sizeof(::acpi::sdt)) / entry_size;
+    auto entries_base = reinterpret_cast<std::byte const *>(m_rsdt) + sizeof(::acpi::sdt);
 
     for (std::size_t i = 0; i < entry_count; ++i)
     {
@@ -74,9 +74,9 @@ namespace kernel::acpi
       }
 
       auto linear_table_address = kapi::memory::hhdm_to_linear(physical_table_address);
-      auto table = static_cast<kapi::acpi::system_description_table_header const *>(linear_table_address);
+      auto table = static_cast<::acpi::sdt const *>(linear_table_address);
 
-      if (!kapi::acpi::validate_checksum({reinterpret_cast<std::byte const *>(table), table->length().value}))
+      if (!::acpi::validate_checksum({reinterpret_cast<std::byte const *>(table), table->length().value}))
       {
         kstd::println(kstd::print_sink::stderr, "[OS:ACPI] Invalid table checksum!");
       }
@@ -90,8 +90,7 @@ namespace kernel::acpi
     return !m_tables.empty();
   }
 
-  auto manager::get_table(std::string_view signature)
-      -> kstd::observer_ptr<kapi::acpi::system_description_table_header const>
+  auto manager::get_table(std::string_view signature) -> kstd::observer_ptr<::acpi::sdt const>
   {
     if (m_tables.contains(signature))
     {