From 8d08b3b905d211e989848e1abf3a8ff2535836c8 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Mon, 6 Apr 2026 18:13:21 +0200
Subject: kapi: extract more code to the kernel

---
 kernel/CMakeLists.txt          |  2 ++
 kernel/kapi/devices/bus.cpp    | 65 ++++++++++++++++++++++++++++++++++++++++++
 kernel/kapi/devices/device.cpp | 35 +++++++++++++++++++++++
 3 files changed, 102 insertions(+)
 create mode 100644 kernel/kapi/devices/bus.cpp
 create mode 100644 kernel/kapi/devices/device.cpp

(limited to 'kernel')

diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index 92e2bda..6e081bd 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -5,6 +5,8 @@ add_library("kernel_objs" OBJECT
     "kapi/cio.cpp"
     "kapi/cpu.cpp"
     "kapi/devices.cpp"
+    "kapi/devices/bus.cpp"
+    "kapi/devices/device.cpp"
     "kapi/interrupts.cpp"
     "kapi/memory.cpp"
     "kapi/system.cpp"
diff --git a/kernel/kapi/devices/bus.cpp b/kernel/kapi/devices/bus.cpp
new file mode 100644
index 0000000..68874c4
--- /dev/null
+++ b/kernel/kapi/devices/bus.cpp
@@ -0,0 +1,65 @@
+#include "kapi/devices/bus.hpp"
+
+#include "kapi/devices.hpp"
+#include "kapi/system.hpp"
+
+#include <kstd/memory>
+#include <kstd/print>
+#include <kstd/string>
+#include <kstd/vector>
+
+#include <algorithm>
+#include <cstddef>
+#include <utility>
+
+namespace kapi::devices
+{
+  bus::bus(std::size_t major, std::size_t minor, kstd::string const & name)
+      : device(major, minor, name)
+  {}
+
+  auto bus::init() -> bool
+  {
+    if (m_initialized.test_and_set())
+    {
+      return true;
+    }
+
+    if (!probe())
+    {
+      return false;
+    }
+
+    return std::ranges::fold_left(m_devices, true, [&](bool acc, auto & child) -> bool {
+      kstd::println("[OS:DEV] Initializing child device {}@{}", child->name(), name());
+      return child->init() && acc;
+    });
+  }
+
+  auto bus::add_child(kstd::unique_ptr<device> child) -> void
+  {
+    auto observer = m_observers.emplace_back(child.get());
+    m_devices.push_back(std::move(child));
+    kapi::devices::register_device(*observer);
+
+    if (m_initialized.test())
+    {
+      kstd::println("[OS:DEV] Initializing child device {}@{}", observer->name(), name());
+      if (!observer->init())
+      {
+        kapi::system::panic("[OS:DEV] Failed to initialize child device");
+      }
+    }
+  }
+
+  [[nodiscard]] auto bus::children() const -> kstd::vector<kstd::observer_ptr<device>> const &
+  {
+    return m_observers;
+  }
+
+  auto bus::probe() -> bool
+  {
+    return true;
+  }
+
+}  // namespace kapi::devices
\ No newline at end of file
diff --git a/kernel/kapi/devices/device.cpp b/kernel/kapi/devices/device.cpp
new file mode 100644
index 0000000..9f7a404
--- /dev/null
+++ b/kernel/kapi/devices/device.cpp
@@ -0,0 +1,35 @@
+#include "kapi/devices/device.hpp"
+
+#include <kstd/string>
+
+#include <cstddef>
+
+namespace kapi::devices
+{
+  device::device(size_t major, size_t minor, kstd::string const & name)
+      : m_major(major)
+      , m_minor(minor)
+      , m_name(name)
+  {}
+
+  [[nodiscard]] auto device::major() const -> size_t
+  {
+    return m_major;
+  }
+
+  [[nodiscard]] auto device::minor() const -> size_t
+  {
+    return m_minor;
+  }
+
+  [[nodiscard]] auto device::name() const -> kstd::string const &
+  {
+    return m_name;
+  }
+
+  [[nodiscard]] auto device::is_block_device() const -> bool
+  {
+    return false;
+  }
+
+}  // namespace kapi::devices
\ No newline at end of file
-- 
cgit v1.2.3