From b84c4c9d8c90f3d3fd5a60de282278912fad2f04 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Thu, 2 Apr 2026 13:59:27 +0200
Subject: x86_64/devices: implement ISA bus stub

---
 arch/x86_64/src/bus/isa.cpp | 56 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 arch/x86_64/src/bus/isa.cpp

(limited to 'arch/x86_64/src/bus/isa.cpp')

diff --git a/arch/x86_64/src/bus/isa.cpp b/arch/x86_64/src/bus/isa.cpp
new file mode 100644
index 0000000..3fe4f6f
--- /dev/null
+++ b/arch/x86_64/src/bus/isa.cpp
@@ -0,0 +1,56 @@
+#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
+{
+
+  isa::isa()
+      : 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


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/src/bus/isa.cpp | 44 --------------------------------------------
 1 file changed, 44 deletions(-)

(limited to 'arch/x86_64/src/bus/isa.cpp')

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


From 21489576381d827871e7cdf060929c5d7f3d4e9f Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Thu, 2 Apr 2026 15:49:14 +0200
Subject: devices: don't automatically allocate major numbers in ctors

---
 arch/x86_64/src/bus/isa.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'arch/x86_64/src/bus/isa.cpp')

diff --git a/arch/x86_64/src/bus/isa.cpp b/arch/x86_64/src/bus/isa.cpp
index 2ad4d21..ff4ad71 100644
--- a/arch/x86_64/src/bus/isa.cpp
+++ b/arch/x86_64/src/bus/isa.cpp
@@ -2,11 +2,13 @@
 
 #include "kapi/devices.hpp"
 
+#include <cstddef>
+
 namespace arch::bus
 {
 
-  isa::isa()
-      : kapi::devices::bus(kapi::devices::allocate_major_number(), 0, "isa")
+  isa::isa(std::size_t major)
+      : kapi::devices::bus{major, 0, "isa"}
   {}
 
 }  // namespace arch::bus
\ No newline at end of file
-- 
cgit v1.2.3