From 66ffd2ad8c793c4eea1527848fe4772e42595718 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Thu, 2 Apr 2026 14:24:52 +0200
Subject: kapi: extract common bus code

---
 arch/x86_64/include/arch/bus/isa.hpp | 15 ------------
 arch/x86_64/src/bus/isa.cpp          | 44 ------------------------------------
 2 files changed, 59 deletions(-)

(limited to 'arch')

diff --git a/arch/x86_64/include/arch/bus/isa.hpp b/arch/x86_64/include/arch/bus/isa.hpp
index 41dda93..bd92b2e 100644
--- a/arch/x86_64/include/arch/bus/isa.hpp
+++ b/arch/x86_64/include/arch/bus/isa.hpp
@@ -2,10 +2,6 @@
 #define TEACHOS_X86_64_BUS_ISA_HPP
 
 #include "kapi/devices/bus.hpp"
-#include "kapi/devices/device.hpp"
-
-#include <kstd/memory>
-#include <kstd/vector>
 
 namespace arch::bus
 {
@@ -13,17 +9,6 @@ namespace arch::bus
   struct isa final : public kapi::devices::bus
   {
     isa();
-
-    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_devices{};
-    kstd::vector<kstd::observer_ptr<device>> m_observers{};
-    bool m_initialized{};
   };
 
 }  // namespace arch::bus
diff --git a/arch/x86_64/src/bus/isa.cpp b/arch/x86_64/src/bus/isa.cpp
index 3fe4f6f..2ad4d21 100644
--- a/arch/x86_64/src/bus/isa.cpp
+++ b/arch/x86_64/src/bus/isa.cpp
@@ -1,15 +1,6 @@
 #include "arch/bus/isa.hpp"
 
 #include "kapi/devices.hpp"
-#include "kapi/devices/device.hpp"
-#include "kapi/system.hpp"
-
-#include <kstd/memory>
-#include <kstd/print>
-#include <kstd/vector>
-
-#include <algorithm>
-#include <utility>
 
 namespace arch::bus
 {
@@ -18,39 +9,4 @@ namespace arch::bus
       : kapi::devices::bus(kapi::devices::allocate_major_number(), 0, "isa")
   {}
 
-  auto isa::add_child(kstd::unique_ptr<device> child) -> void
-  {
-    auto observer = m_observers.emplace_back(child.get());
-    m_devices.push_back(std::move(child));
-
-    if (m_initialized)
-    {
-      kstd::println("[bus:{}} Initializing child device '{}'", name(), observer->name());
-      if (!observer->init())
-      {
-        kapi::system::panic("[x86_64:devices] Failed to initialize child device");
-      }
-    }
-  }
-
-  auto isa::children() const -> kstd::vector<kstd::observer_ptr<device>> const &
-  {
-    return m_observers;
-  }
-
-  auto isa::init() -> bool
-  {
-    if (m_initialized)
-    {
-      kapi::system::panic("[x86_64:devices] ISA bus already initialized!");
-    }
-
-    m_initialized = std::ranges::fold_left(m_devices, true, [](bool acc, auto & child) -> bool {
-      kstd::println("[x86_64:devices] Initializing child device '{}'", child->name());
-      return acc && child->init();
-    });
-
-    return m_initialized;
-  }
-
 }  // namespace arch::bus
\ No newline at end of file
-- 
cgit v1.2.3