From f50815110789a0f8f6e5ca66ffd49b26578791a9 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Mon, 6 Apr 2026 18:43:28 +0200
Subject: kernel: generalize CPU discovery

---
 kernel/kapi/platform.cpp | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 kernel/kapi/platform.cpp

(limited to 'kernel/kapi/platform.cpp')

diff --git a/kernel/kapi/platform.cpp b/kernel/kapi/platform.cpp
new file mode 100644
index 0000000..deb72de
--- /dev/null
+++ b/kernel/kapi/platform.cpp
@@ -0,0 +1,32 @@
+#include "kapi/platform.hpp"
+
+#include "kapi/devices.hpp"
+
+#include "kernel/devices/cpu.hpp"
+
+#include <kstd/memory>
+
+#include <cstdint>
+#include <utility>
+
+namespace kapi::platform
+{
+
+  auto cpu_detected(kapi::devices::bus & bus, std::uint64_t hardware_id, bool is_bsp) -> bool
+  {
+    auto static const core_major = kapi::devices::allocate_major_number();
+    auto static const interrupt_controller_major = kapi::devices::allocate_major_number();
+    auto static core_index = 0uz;
+
+    auto core = kstd::make_unique<kernel::devices::cpu::core>(core_major, core_index, hardware_id, is_bsp);
+    auto lapic = kapi::platform::create_core_interrupt_controller(interrupt_controller_major, core_index, hardware_id);
+
+    core->add_child(std::move(lapic));
+    bus.add_child(std::move(core));
+
+    ++core_index;
+
+    return true;
+  }
+
+}  // namespace kapi::platform
\ No newline at end of file
-- 
cgit v1.2.3


From d5c2e101d62f6b4b69c45c127e7a729d246da566 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Mon, 6 Apr 2026 19:04:16 +0200
Subject: kapi/platform: invert discovery dependencies

---
 kernel/kapi/platform.cpp | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'kernel/kapi/platform.cpp')

diff --git a/kernel/kapi/platform.cpp b/kernel/kapi/platform.cpp
index deb72de..7638cf9 100644
--- a/kernel/kapi/platform.cpp
+++ b/kernel/kapi/platform.cpp
@@ -6,26 +6,21 @@
 
 #include <kstd/memory>
 
+#include <cstddef>
 #include <cstdint>
 #include <utility>
 
 namespace kapi::platform
 {
 
-  auto cpu_detected(kapi::devices::bus & bus, std::uint64_t hardware_id, bool is_bsp) -> bool
+  auto cpu_detected(kapi::devices::bus & bus, std::size_t major, std::size_t minor, std::uint64_t hardware_id,
+                    bool is_bsp, kstd::unique_ptr<devices::device> core_interrupt_controller) -> bool
   {
-    auto static const core_major = kapi::devices::allocate_major_number();
-    auto static const interrupt_controller_major = kapi::devices::allocate_major_number();
-    auto static core_index = 0uz;
+    auto core = kstd::make_unique<kernel::devices::cpu::core>(major, minor, hardware_id, is_bsp);
 
-    auto core = kstd::make_unique<kernel::devices::cpu::core>(core_major, core_index, hardware_id, is_bsp);
-    auto lapic = kapi::platform::create_core_interrupt_controller(interrupt_controller_major, core_index, hardware_id);
-
-    core->add_child(std::move(lapic));
+    core->add_child(std::move(core_interrupt_controller));
     bus.add_child(std::move(core));
 
-    ++core_index;
-
     return true;
   }
 
-- 
cgit v1.2.3