move device into kapi

5 files changed, 11 insertions, 11 deletions

diff --git a/kernel/src/filesystem/devfs/filesystem.cpp b/kernel/src/filesystem/devfs/filesystem.cpp
index 94c9b05..9043ac5 100644
--- a/kernel/src/filesystem/devfs/filesystem.cpp
+++ b/kernel/src/filesystem/devfs/filesystem.cpp
@@ -1,6 +1,6 @@
 #include "kernel/filesystem/devfs/filesystem.hpp"
 
-#include "kernel/devices/device.hpp"
+#include "kapi/devices/device.hpp"
 #include "kernel/devices/storage/management.hpp"
 #include "kernel/filesystem/devfs/inode.hpp"
 #include "kernel/filesystem/device_inode.hpp"
@@ -13,7 +13,7 @@
 
 namespace kernel::filesystem::devfs
 {
-  auto filesystem::mount(kstd::shared_ptr<devices::device> const &) -> int
+  auto filesystem::mount(kstd::shared_ptr<kapi::devices::device> const &) -> int
   {
     m_root_inode = kstd::make_shared<inode>();
     build_device_inode_table();
diff --git a/kernel/src/filesystem/device_inode.cpp b/kernel/src/filesystem/device_inode.cpp
index d574d8f..af8cecc 100644
--- a/kernel/src/filesystem/device_inode.cpp
+++ b/kernel/src/filesystem/device_inode.cpp
@@ -3,7 +3,7 @@
 #include "kapi/system.hpp"
 
 #include "kernel/devices/block_device_utils.hpp"
-#include "kernel/devices/device.hpp"
+#include "kapi/devices/device.hpp"
 #include "kernel/filesystem/inode.hpp"
 
 #include <kstd/cstring>
@@ -14,7 +14,7 @@
 
 namespace kernel::filesystem
 {
-  device_inode::device_inode(kstd::shared_ptr<devices::device> const & device)
+  device_inode::device_inode(kstd::shared_ptr<kapi::devices::device> const & device)
       : inode(inode_kind::device)
       , m_device(device)
   {
@@ -48,7 +48,7 @@ namespace kernel::filesystem
     }
   }
 
-  auto device_inode::device() const -> kstd::shared_ptr<devices::device> const &
+  auto device_inode::device() const -> kstd::shared_ptr<kapi::devices::device> const &
   {
     return m_device;
   }
diff --git a/kernel/src/filesystem/ext2/filesystem.cpp b/kernel/src/filesystem/ext2/filesystem.cpp
index d951158..eb9edc4 100644
--- a/kernel/src/filesystem/ext2/filesystem.cpp
+++ b/kernel/src/filesystem/ext2/filesystem.cpp
@@ -1,7 +1,7 @@
 #include "kernel/filesystem/ext2/filesystem.hpp"
 
 #include "kernel/devices/block_device_utils.hpp"
-#include "kernel/devices/device.hpp"
+#include "kapi/devices/device.hpp"
 #include "kernel/filesystem/ext2/inode.hpp"
 #include "kernel/filesystem/ext2/superblock.hpp"
 #include "kernel/filesystem/filesystem.hpp"
@@ -45,7 +45,7 @@ namespace kernel::filesystem::ext2
     // }
   }  // namespace
 
-  auto filesystem::mount(kstd::shared_ptr<devices::device> const & device) -> int
+  auto filesystem::mount(kstd::shared_ptr<kapi::devices::device> const & device) -> int
   {
     kernel::filesystem::filesystem::mount(device);  // TODO BA-FS26 error handling?
     // TODO BA-FS26 load proper root inode from ext2 metadata
diff --git a/kernel/src/filesystem/filesystem.cpp b/kernel/src/filesystem/filesystem.cpp
index c891d00..0ac9cf8 100644
--- a/kernel/src/filesystem/filesystem.cpp
+++ b/kernel/src/filesystem/filesystem.cpp
@@ -1,13 +1,13 @@
 #include "kernel/filesystem/filesystem.hpp"
 
-#include "kernel/devices/device.hpp"
+#include "kapi/devices/device.hpp"
 #include "kernel/filesystem/inode.hpp"
 
 #include <kstd/memory>
 
 namespace kernel::filesystem
 {
-  auto filesystem::mount(kstd::shared_ptr<devices::device> const & device) -> int
+  auto filesystem::mount(kstd::shared_ptr<kapi::devices::device> const & device) -> int
   {
     if (!device)
     {
diff --git a/kernel/src/filesystem/rootfs/filesystem.cpp b/kernel/src/filesystem/rootfs/filesystem.cpp
index 0133612..37bf588 100644
--- a/kernel/src/filesystem/rootfs/filesystem.cpp
+++ b/kernel/src/filesystem/rootfs/filesystem.cpp
@@ -1,6 +1,6 @@
 #include "kernel/filesystem/rootfs/filesystem.hpp"
 
-#include "kernel/devices/device.hpp"
+#include "kapi/devices/device.hpp"
 #include "kernel/filesystem/inode.hpp"
 #include "kernel/filesystem/rootfs/inode.hpp"
 
@@ -10,7 +10,7 @@
 
 namespace kernel::filesystem::rootfs
 {
-  auto filesystem::mount(kstd::shared_ptr<devices::device> const &) -> int
+  auto filesystem::mount(kstd::shared_ptr<kapi::devices::device> const &) -> int
   {
     auto rfs_inode = kstd::make_shared<inode>();
     rfs_inode->add_child("dev");