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/block_device.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/block_device.cpp')
| -rw-r--r-- | kernel/src/devices/block_device.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/src/devices/block_device.cpp b/kernel/src/devices/block_device.cpp index cfe2eb2..c006198 100644 --- a/kernel/src/devices/block_device.cpp +++ b/kernel/src/devices/block_device.cpp @@ -2,7 +2,7 @@ #include "kapi/system.hpp" -#include "kernel/devices/device.hpp" +#include "kapi/devices/device.hpp" #include <kstd/string> @@ -11,7 +11,7 @@ namespace kernel::devices { block_device::block_device(size_t major, size_t minor, kstd::string const & name, size_t block_size) - : device(major, minor, name) + : kapi::devices::device(major, minor, name) , m_block_size(block_size) { if (m_block_size == 0) |