kapi: extract common bus code

3 files changed, 2 insertions, 63 deletions

diff --git a/kernel/include/kernel/devices/root_bus.hpp b/kernel/include/kernel/devices/root_bus.hpp
index d92914d..660b715 100644
--- a/kernel/include/kernel/devices/root_bus.hpp
+++ b/kernel/include/kernel/devices/root_bus.hpp
@@ -2,13 +2,6 @@
 #define TEACHOS_KERNEL_DEVICES_ROOT_BUS_HPP
 
 #include "kapi/devices/bus.hpp"
-#include "kapi/devices/device.hpp"
-
-#include <kstd/memory>
-#include <kstd/print>
-#include <kstd/vector>
-
-#include <atomic>
 
 namespace kernel::devices
 {
@@ -16,17 +9,6 @@ namespace kernel::devices
   struct root_bus final : kapi::devices::bus
   {
     root_bus();
-
-    auto add_child(kstd::unique_ptr<device> child) -> void override;
-
-    [[nodiscard]] auto children() const -> kstd::vector<kstd::observer_ptr<device>> const & override;
-
-    auto init() -> bool override;
-
-  private:
-    kstd::vector<kstd::unique_ptr<device>> m_children{};
-    kstd::vector<kstd::observer_ptr<device>> m_observers{};
-    std::atomic_flag m_initialized{};
   };
 
 }  // namespace kernel::devices
diff --git a/kernel/kapi/devices.cpp b/kernel/kapi/devices.cpp
index dc19ab4..dbf5e68 100644
--- a/kernel/kapi/devices.cpp
+++ b/kernel/kapi/devices.cpp
@@ -39,7 +39,7 @@ namespace kapi::devices
   {
     if (!root_bus.has_value())
     {
-      kapi::system::panic("[kernel:devices] Root bus not initialized!");
+      kapi::system::panic("[OS:DEV] Root bus not initialized!");
     }
     return *root_bus;
   }
@@ -56,7 +56,7 @@ namespace kapi::devices
 
   auto unregister_device(device &) -> bool
   {
-    kstd::println("[kernel:devices] TODO: implement device deregistration");
+    kstd::println("[OS:DEV] TODO: implement device deregistration");
     return false;
   }
 
diff --git a/kernel/src/devices/root_bus.cpp b/kernel/src/devices/root_bus.cpp
index 75b5b80..d3ba23f 100644
--- a/kernel/src/devices/root_bus.cpp
+++ b/kernel/src/devices/root_bus.cpp
@@ -1,16 +1,6 @@
 #include "kernel/devices/root_bus.hpp"
 
 #include "kapi/devices.hpp"
-#include "kapi/devices/bus.hpp"
-#include "kapi/devices/device.hpp"
-#include "kapi/system.hpp"
-
-#include <kstd/memory>
-#include <kstd/print>
-#include <kstd/vector>
-
-#include <algorithm>
-#include <utility>
 
 namespace kernel::devices
 {
@@ -19,37 +9,4 @@ namespace kernel::devices
       : kapi::devices::bus{kapi::devices::allocate_major_number(), 0, "system"}
   {}
 
-  auto root_bus::add_child(kstd::unique_ptr<device> child) -> void
-  {
-    auto observer = m_observers.emplace_back(child.get());
-    m_children.push_back(std::move(child));
-
-    if (m_initialized.test())
-    {
-      kstd::println("Initializing child device '{}'", observer->name());
-      if (!observer->init())
-      {
-        kapi::system::panic("[kernel:devices] Failed to initialize child device");
-      }
-    }
-  }
-
-  auto root_bus::children() const -> kstd::vector<kstd::observer_ptr<device>> const &
-  {
-    return m_observers;
-  }
-
-  auto root_bus::init() -> bool
-  {
-    if (m_initialized.test_and_set())
-    {
-      kapi::system::panic("[kernel:devices] Root bus already initialized!");
-    }
-
-    return std::ranges::fold_left(m_children, true, [](bool acc, auto & child) -> bool {
-      kstd::println("[kernel:devices] Initializing child device '{}'", child->name());
-      return acc && child->init();
-    });
-  }
-
 }  // namespace kernel::devices
\ No newline at end of file