diff options
| author | Marcel Braun <marcel.braun@ost.ch> | 2026-03-31 12:40:42 +0200 |
|---|---|---|
| committer | Marcel Braun <marcel.braun@ost.ch> | 2026-03-31 12:40:42 +0200 |
| commit | 022d3e872de9c5a6a52c67f74af13706552330c0 (patch) | |
| tree | d3694b22e1b41cbc3bfd340f8f9db47a6602ec73 /kernel/src/devices/storage/controller.cpp | |
| parent | ffac763323b88809d2f361bc01cdf9bfe0b1d67f (diff) | |
| parent | 9e85f9d1f34d08213a918d9c1b0845c179e323af (diff) | |
| download | teachos-022d3e872de9c5a6a52c67f74af13706552330c0.tar.xz teachos-022d3e872de9c5a6a52c67f74af13706552330c0.zip | |
Merge branch 'move-device-in-kapi' into 'develop-BA-FS26'
move device into kapi
See merge request teachos/kernel!19
Diffstat (limited to 'kernel/src/devices/storage/controller.cpp')
| -rw-r--r-- | kernel/src/devices/storage/controller.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/src/devices/storage/controller.cpp b/kernel/src/devices/storage/controller.cpp index 46c45e4..1bef670 100644 --- a/kernel/src/devices/storage/controller.cpp +++ b/kernel/src/devices/storage/controller.cpp @@ -1,6 +1,6 @@ #include "kernel/devices/storage/controller.hpp" -#include "kernel/devices/device.hpp" +#include "kapi/devices/device.hpp" #include <kstd/memory> #include <kstd/vector> @@ -21,7 +21,7 @@ namespace kernel::devices::storage return m_major; } - auto controller::device_by_minor(size_t minor) const -> kstd::shared_ptr<devices::device> + auto controller::device_by_minor(size_t minor) const -> kstd::shared_ptr<kapi::devices::device> { auto it = std::ranges::find_if(m_devices, [minor](auto const & device) { return device->minor() == minor; }); @@ -37,7 +37,7 @@ namespace kernel::devices::storage return m_devices.size(); } - auto controller::all_devices() const -> kstd::vector<kstd::shared_ptr<devices::device>> const & + auto controller::all_devices() const -> kstd::vector<kstd::shared_ptr<kapi::devices::device>> const & { return m_devices; } |
