4 files changed, 85 insertions, 54 deletions
diff --git a/arch/x86_64/CMakeLists.txt b/arch/x86_64/CMakeLists.txt
index 83cae0b..f77eec5 100644
--- a/arch/x86_64/CMakeLists.txt
+++ b/arch/x86_64/CMakeLists.txt
@@ -38,6 +38,7 @@ target_sources("x86_64" PRIVATE
     "src/debug/qemu_output.cpp"
 
     # Devices
+    "src/devices/init.cpp"
     "src/devices/legacy_pit.cpp"
 
     # Memory management
diff --git a/arch/x86_64/include/arch/devices/init.hpp b/arch/x86_64/include/arch/devices/init.hpp
new file mode 100644
index 0000000..c5fbf37
--- /dev/null
+++ b/arch/x86_64/include/arch/devices/init.hpp
@@ -0,0 +1,12 @@
+#ifndef TEACHOS_ARCH_X86_64_DEVICES_INIT_HPP
+#define TEACHOS_ARCH_X86_64_DEVICES_INIT_HPP
+
+namespace arch::devices
+{
+
+  auto init_acpi_devices() -> void;
+  auto init_legacy_devices() -> void;
+
+}  // namespace arch::devices
+
+#endif
+\ No newline at end of file
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
diff --git a/arch/x86_64/src/devices/init.cpp b/arch/x86_64/src/devices/init.cpp
new file mode 100644
index 0000000..1099ad6
--- /dev/null
+++ b/arch/x86_64/src/devices/init.cpp
@@ -0,0 +1,69 @@
+#include "arch/devices/init.hpp"
+
+#include "kapi/acpi.hpp"
+#include "kapi/boot.hpp"
+#include "kapi/devices.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>
+
+namespace arch::devices
+{
+
+  namespace
+  {
+    constexpr auto pit_frequency_in_hz = std::uint32_t{100u};
+  }
+
+  auto init_acpi_devices() -> void
+  {
+    auto const & mbi = kapi::boot::bootstrap_information.mbi;
+    auto system_description_pointer = static_cast<kapi::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.");
+    }
+  }
+
+  auto init_legacy_devices() -> void
+  {
+    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 = kapi::devices::get_root_bus();
+    root_bus.add_child(std::move(isa_bus));
+  }
+
+}  // namespace arch::devices