diff options
| author | Felix Morgner <felix.morgner@ost.ch> | 2026-04-06 13:27:22 +0200 |
|---|---|---|
| committer | Felix Morgner <felix.morgner@ost.ch> | 2026-04-06 15:11:47 +0200 |
| commit | 6e54333bcc08ddd8dbcb6aa9c3404001c309ec74 (patch) | |
| tree | 5e62c91f7f46db33d62f2f7c04a26d0a04591b65 | |
| parent | bd585306e31889ee4fce60abb79bc3b3a58e2b84 (diff) | |
| download | teachos-6e54333bcc08ddd8dbcb6aa9c3404001c309ec74.tar.xz teachos-6e54333bcc08ddd8dbcb6aa9c3404001c309ec74.zip | |
kapi: move independent implementation to kernel
| -rw-r--r-- | kapi/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | kapi/include/kapi/acpi.hpp | 2 | ||||
| -rw-r--r-- | kernel/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | kernel/kapi/acpi.cpp (renamed from kapi/src/acpi.cpp) | 0 |
4 files changed, 5 insertions, 6 deletions
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/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/kapi/src/acpi.cpp b/kernel/kapi/acpi.cpp index aa0066d..aa0066d 100644 --- a/kapi/src/acpi.cpp +++ b/kernel/kapi/acpi.cpp |