diff options
Diffstat (limited to 'kernel/kapi')
| -rw-r--r-- | kernel/kapi/cpu.cpp | 19 | ||||
| -rw-r--r-- | kernel/kapi/platform.cpp | 27 |
2 files changed, 19 insertions, 27 deletions
diff --git a/kernel/kapi/cpu.cpp b/kernel/kapi/cpu.cpp index 13de584..d632628 100644 --- a/kernel/kapi/cpu.cpp +++ b/kernel/kapi/cpu.cpp @@ -1,9 +1,17 @@ #include "kapi/cpu.hpp" +#include "kapi/devices.hpp" #include "kapi/system.hpp" +#include "kernel/devices/cpu.hpp" + +#include <kstd/memory> #include <kstd/print> +#include <cstddef> +#include <cstdint> +#include <utility> + namespace kapi::cpu { @@ -32,4 +40,15 @@ namespace kapi::cpu } } + auto core_detected(kapi::devices::bus & bus, std::size_t major, std::size_t minor, std::uint64_t hardware_id, + bool is_bsp, kstd::unique_ptr<devices::device> core_interrupt_controller) -> bool + { + auto core = kstd::make_unique<kernel::devices::cpu::core>(major, minor, hardware_id, is_bsp); + + core->add_child(std::move(core_interrupt_controller)); + bus.add_child(std::move(core)); + + return true; + } + } // namespace kapi::cpu
\ No newline at end of file diff --git a/kernel/kapi/platform.cpp b/kernel/kapi/platform.cpp deleted file mode 100644 index 7638cf9..0000000 --- a/kernel/kapi/platform.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "kapi/platform.hpp" - -#include "kapi/devices.hpp" - -#include "kernel/devices/cpu.hpp" - -#include <kstd/memory> - -#include <cstddef> -#include <cstdint> -#include <utility> - -namespace kapi::platform -{ - - auto cpu_detected(kapi::devices::bus & bus, std::size_t major, std::size_t minor, std::uint64_t hardware_id, - bool is_bsp, kstd::unique_ptr<devices::device> core_interrupt_controller) -> bool - { - auto core = kstd::make_unique<kernel::devices::cpu::core>(major, minor, hardware_id, is_bsp); - - core->add_child(std::move(core_interrupt_controller)); - bus.add_child(std::move(core)); - - return true; - } - -} // namespace kapi::platform
\ No newline at end of file |
