From 3dcd14a0570fef3bcc68d7df42fe3ff4cd496f93 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Mon, 6 Apr 2026 14:47:37 +0200
Subject: kapi: hook ACPI initialization up to boot process

---
 arch/x86_64/kapi/devices.cpp | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

(limited to 'arch/x86_64/kapi/devices.cpp')

diff --git a/arch/x86_64/kapi/devices.cpp b/arch/x86_64/kapi/devices.cpp
index b15503d..e1773e7 100644
--- a/arch/x86_64/kapi/devices.cpp
+++ b/arch/x86_64/kapi/devices.cpp
@@ -1,5 +1,9 @@
 #include "kapi/devices.hpp"
 
+#include "kapi/acpi.hpp"
+#include "kapi/boot.hpp"
+
+#include "arch/boot/boot.hpp"
 #include "arch/bus/isa.hpp"
 #include "arch/devices/legacy_pit.hpp"
 
@@ -19,7 +23,33 @@ namespace kapi::devices
 
   auto init_platform_devices() -> void
   {
-    kstd::println("[x86_64:devices] Initializing ISA bus...");
+    auto const & mbi = boot::bootstrap_information.mbi;
+    auto system_description_pointer = static_cast<acpi::root_system_description_pointer const *>(nullptr);
+
+    if (auto const & xsdp = mbi->maybe_acpi_xsdp())
+    {
+      auto data = xsdp->pointer().data();
+      system_description_pointer = reinterpret_cast<kapi::acpi::root_system_description_pointer const *>(data);
+    }
+    else if (auto const & rsdp = mbi->maybe_acpi_rsdp())
+    {
+      auto data = rsdp->pointer().data();
+      system_description_pointer = reinterpret_cast<kapi::acpi::root_system_description_pointer const *>(data);
+    }
+
+    if (system_description_pointer)
+    {
+      if (!kapi::acpi::init(*system_description_pointer))
+      {
+        kstd::println(kstd::print_sink::stderr, "[x86_64:DEV] ACPI initialization failed. No tables loaded.");
+      }
+    }
+    else
+    {
+      kstd::println(kstd::print_sink::stderr, "[x86_64:DEV] No ACPI RSDP found. Most devices will not be available.");
+    }
+
+    kstd::println("[x86_64:DEV] Initializing ISA bus...");
 
     auto isa_major_number = kapi::devices::allocate_major_number();
     auto isa_bus = kstd::make_unique<arch::bus::isa>(isa_major_number);
-- 
cgit v1.2.3


From c18feddd51d1a1398d1245229c5f889dd40554b3 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Mon, 6 Apr 2026 15:54:21 +0200
Subject: x86_64/devices: extract initialization code

---
 arch/x86_64/kapi/devices.cpp | 57 +++-----------------------------------------
 1 file changed, 3 insertions(+), 54 deletions(-)

(limited to 'arch/x86_64/kapi/devices.cpp')

diff --git a/arch/x86_64/kapi/devices.cpp b/arch/x86_64/kapi/devices.cpp
index e1773e7..47c7f8c 100644
--- a/arch/x86_64/kapi/devices.cpp
+++ b/arch/x86_64/kapi/devices.cpp
@@ -1,65 +1,14 @@
 #include "kapi/devices.hpp"
 
-#include "kapi/acpi.hpp"
-#include "kapi/boot.hpp"
-
-#include "arch/boot/boot.hpp"
-#include "arch/bus/isa.hpp"
-#include "arch/devices/legacy_pit.hpp"
-
-#include <kstd/memory>
-#include <kstd/print>
-
-#include <cstdint>
-#include <utility>
+#include "arch/devices/init.hpp"
 
 namespace kapi::devices
 {
 
-  namespace
-  {
-    constexpr auto pit_frequency_in_hz = std::uint32_t{100u};
-  }
-
   auto init_platform_devices() -> void
   {
-    auto const & mbi = boot::bootstrap_information.mbi;
-    auto system_description_pointer = static_cast<acpi::root_system_description_pointer const *>(nullptr);
-
-    if (auto const & xsdp = mbi->maybe_acpi_xsdp())
-    {
-      auto data = xsdp->pointer().data();
-      system_description_pointer = reinterpret_cast<kapi::acpi::root_system_description_pointer const *>(data);
-    }
-    else if (auto const & rsdp = mbi->maybe_acpi_rsdp())
-    {
-      auto data = rsdp->pointer().data();
-      system_description_pointer = reinterpret_cast<kapi::acpi::root_system_description_pointer const *>(data);
-    }
-
-    if (system_description_pointer)
-    {
-      if (!kapi::acpi::init(*system_description_pointer))
-      {
-        kstd::println(kstd::print_sink::stderr, "[x86_64:DEV] ACPI initialization failed. No tables loaded.");
-      }
-    }
-    else
-    {
-      kstd::println(kstd::print_sink::stderr, "[x86_64:DEV] No ACPI RSDP found. Most devices will not be available.");
-    }
-
-    kstd::println("[x86_64:DEV] Initializing ISA bus...");
-
-    auto isa_major_number = kapi::devices::allocate_major_number();
-    auto isa_bus = kstd::make_unique<arch::bus::isa>(isa_major_number);
-
-    auto pit_major_number = kapi::devices::allocate_major_number();
-    auto pit = kstd::make_unique<arch::devices::legacy_pit>(pit_major_number, pit_frequency_in_hz);
-    isa_bus->add_child(std::move(pit));
-
-    auto & root_bus = get_root_bus();
-    root_bus.add_child(std::move(isa_bus));
+    arch::devices::init_acpi_devices();
+    arch::devices::init_legacy_devices();
   }
 
 }  // namespace kapi::devices
\ No newline at end of file
-- 
cgit v1.2.3