From 6e54333bcc08ddd8dbcb6aa9c3404001c309ec74 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Mon, 6 Apr 2026 13:27:22 +0200
Subject: kapi: move independent implementation to kernel

---
 kapi/CMakeLists.txt        |  8 ++----
 kapi/include/kapi/acpi.hpp |  2 +-
 kapi/src/acpi.cpp          | 68 ----------------------------------------------
 kernel/CMakeLists.txt      |  1 +
 kernel/kapi/acpi.cpp       | 68 ++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 73 insertions(+), 74 deletions(-)
 delete mode 100644 kapi/src/acpi.cpp
 create mode 100644 kernel/kapi/acpi.cpp

diff --git a/kapi/CMakeLists.txt b/kapi/CMakeLists.txt
index eeda158..c9aa23f 100644
--- a/kapi/CMakeLists.txt
+++ b/kapi/CMakeLists.txt
@@ -1,6 +1,4 @@
-add_library("kapi" STATIC
-    "src/acpi.cpp"
-)
+add_library("kapi" INTERFACE)
 add_library("os::kapi" ALIAS "kapi")
 
 file(GLOB_RECURSE KAPI_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "include/**.hpp")
@@ -12,11 +10,11 @@ target_sources("kapi" PUBLIC
     ${KAPI_HEADERS}
 )
 
-target_include_directories("kapi" PUBLIC
+target_include_directories("kapi" INTERFACE
     "include"
 )
 
-target_link_libraries("kapi" PUBLIC
+target_link_libraries("kapi" INTERFACE
     "libs::kstd"
 
     "gcc"
diff --git a/kapi/include/kapi/acpi.hpp b/kapi/include/kapi/acpi.hpp
index 20e5e77..1068921 100644
--- a/kapi/include/kapi/acpi.hpp
+++ b/kapi/include/kapi/acpi.hpp
@@ -12,7 +12,7 @@
 namespace kapi::acpi
 {
 
-  //! @addtogroup kapi-acpi-api-defined
+  //! @addtogroup kapi-acpi-kernel-defined
   //! @{
 
   struct [[gnu::packed]] root_system_description_pointer
diff --git a/kapi/src/acpi.cpp b/kapi/src/acpi.cpp
deleted file mode 100644
index aa0066d..0000000
--- a/kapi/src/acpi.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-#include "kapi/acpi.hpp"
-
-#include "kapi/memory.hpp"
-
-#include <kstd/units>
-
-#include <algorithm>
-#include <bit>
-#include <cstddef>
-#include <cstdint>
-#include <span>
-#include <string_view>
-
-namespace kapi::acpi
-{
-
-  namespace
-  {
-    constexpr auto validate_checksum(std::span<std::byte const> data) -> bool
-    {
-      auto sum = std::ranges::fold_left(
-          data, std::uint8_t{}, [](std::uint8_t acc, auto byte) { return static_cast<std::uint8_t>(byte) + acc; });
-      return sum == 0;
-    }
-  }  // namespace
-
-  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/CMakeLists.txt b/kernel/CMakeLists.txt
index 9868eb9..ab77467 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_library("kernel_objs" OBJECT
     # Platform-independent KAPI implementation
+    "kapi/acpi.cpp"
     "kapi/boot_modules.cpp"
     "kapi/cio.cpp"
     "kapi/cpu.cpp"
diff --git a/kernel/kapi/acpi.cpp b/kernel/kapi/acpi.cpp
new file mode 100644
index 0000000..aa0066d
--- /dev/null
+++ b/kernel/kapi/acpi.cpp
@@ -0,0 +1,68 @@
+#include "kapi/acpi.hpp"
+
+#include "kapi/memory.hpp"
+
+#include <kstd/units>
+
+#include <algorithm>
+#include <bit>
+#include <cstddef>
+#include <cstdint>
+#include <span>
+#include <string_view>
+
+namespace kapi::acpi
+{
+
+  namespace
+  {
+    constexpr auto validate_checksum(std::span<std::byte const> data) -> bool
+    {
+      auto sum = std::ranges::fold_left(
+          data, std::uint8_t{}, [](std::uint8_t acc, auto byte) { return static_cast<std::uint8_t>(byte) + acc; });
+      return sum == 0;
+    }
+  }  // namespace
+
+  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
-- 
cgit v1.2.3