aboutsummaryrefslogtreecommitdiff
path: root/kernel/src
diff options
context:
space:
mode:
authormarcel.braun <marcel.braun@ost.ch>2026-03-30 21:22:22 +0200
committermarcel.braun <marcel.braun@ost.ch>2026-03-30 21:22:22 +0200
commit5603c7ec2b07dbc772fe2c20a9e9e176c5465c57 (patch)
tree6eb410e01359f877989fe2b66074635c95949fa4 /kernel/src
parent9058bbed061602cdf41013d5e5d91ce892f63c94 (diff)
downloadteachos-5603c7ec2b07dbc772fe2c20a9e9e176c5465c57.tar.xz
teachos-5603c7ec2b07dbc772fe2c20a9e9e176c5465c57.zip
Move everything in kernel into kernel namespace
Diffstat (limited to 'kernel/src')
-rw-r--r--kernel/src/devices/block_device.cpp4
-rw-r--r--kernel/src/devices/block_device_utils.cpp4
-rw-r--r--kernel/src/devices/device.cpp4
-rw-r--r--kernel/src/devices/storage/ram_disk/ram_disk_controller.cpp4
-rw-r--r--kernel/src/devices/storage/ram_disk/ram_disk_device.cpp4
-rw-r--r--kernel/src/devices/storage/storage_controller.cpp4
-rw-r--r--kernel/src/devices/storage/storage_management.cpp4
-rw-r--r--kernel/src/filesystem/dentry.cpp4
-rw-r--r--kernel/src/filesystem/devfs/devfs_filesystem.cpp4
-rw-r--r--kernel/src/filesystem/devfs/devfs_root_inode.cpp4
-rw-r--r--kernel/src/filesystem/device_inode.cpp4
-rw-r--r--kernel/src/filesystem/ext2/ext2_filesystem.cpp4
-rw-r--r--kernel/src/filesystem/ext2/ext2_inode.cpp4
-rw-r--r--kernel/src/filesystem/file_descriptor_table.cpp4
-rw-r--r--kernel/src/filesystem/filesystem.cpp4
-rw-r--r--kernel/src/filesystem/inode.cpp4
-rw-r--r--kernel/src/filesystem/mount.cpp4
-rw-r--r--kernel/src/filesystem/mount_table.cpp4
-rw-r--r--kernel/src/filesystem/open_file_description.cpp4
-rw-r--r--kernel/src/filesystem/rootfs/rootfs_filesystem.cpp4
-rw-r--r--kernel/src/filesystem/rootfs/rootfs_inode.cpp4
-rw-r--r--kernel/src/filesystem/vfs.cpp4
-rw-r--r--kernel/src/main.cpp28
23 files changed, 58 insertions, 58 deletions
diff --git a/kernel/src/devices/block_device.cpp b/kernel/src/devices/block_device.cpp
index 3402814..cfe2eb2 100644
--- a/kernel/src/devices/block_device.cpp
+++ b/kernel/src/devices/block_device.cpp
@@ -8,7 +8,7 @@
#include <cstddef>
-namespace devices
+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)
@@ -40,4 +40,4 @@ namespace devices
{
return size();
}
-} // namespace devices \ No newline at end of file
+} // namespace kernel::devices \ No newline at end of file
diff --git a/kernel/src/devices/block_device_utils.cpp b/kernel/src/devices/block_device_utils.cpp
index 9d3af1b..5469087 100644
--- a/kernel/src/devices/block_device_utils.cpp
+++ b/kernel/src/devices/block_device_utils.cpp
@@ -12,7 +12,7 @@
#include <algorithm>
#include <cstddef>
-namespace devices::block_device_utils
+namespace kernel::devices::block_device_utils
{
using block_op = void (*)(size_t idx, size_t off, size_t len, size_t done, devices::block_device * device,
@@ -100,4 +100,4 @@ namespace devices::block_device_utils
});
}
-} // namespace devices::block_device_utils \ No newline at end of file
+} // namespace kernel::devices::block_device_utils \ No newline at end of file
diff --git a/kernel/src/devices/device.cpp b/kernel/src/devices/device.cpp
index 287f14b..1e7589e 100644
--- a/kernel/src/devices/device.cpp
+++ b/kernel/src/devices/device.cpp
@@ -4,7 +4,7 @@
#include <cstddef>
-namespace devices
+namespace kernel::devices
{
device::device(size_t major, size_t minor, kstd::string const & name)
: m_major(major)
@@ -26,4 +26,4 @@ namespace devices
{
return m_name;
}
-} // namespace devices \ No newline at end of file
+} // namespace kernel::devices \ No newline at end of file
diff --git a/kernel/src/devices/storage/ram_disk/ram_disk_controller.cpp b/kernel/src/devices/storage/ram_disk/ram_disk_controller.cpp
index f3e9f70..26eb10b 100644
--- a/kernel/src/devices/storage/ram_disk/ram_disk_controller.cpp
+++ b/kernel/src/devices/storage/ram_disk/ram_disk_controller.cpp
@@ -9,7 +9,7 @@
#include <algorithm>
#include <cstddef>
-namespace devices::storage::ram_disk
+namespace kernel::devices::storage::ram_disk
{
ram_disk_controller::ram_disk_controller(kapi::boot_modules::boot_module_registry const * registry)
: m_boot_module_registry(registry)
@@ -24,4 +24,4 @@ namespace devices::storage::ram_disk
m_devices.push_back(kstd::make_shared<ram_disk_device>(module, m_major, minor));
});
}
-} // namespace devices::storage::ram_disk \ No newline at end of file
+} // namespace kernel::devices::storage::ram_disk \ No newline at end of file
diff --git a/kernel/src/devices/storage/ram_disk/ram_disk_device.cpp b/kernel/src/devices/storage/ram_disk/ram_disk_device.cpp
index bf329cb..72e8025 100644
--- a/kernel/src/devices/storage/ram_disk/ram_disk_device.cpp
+++ b/kernel/src/devices/storage/ram_disk/ram_disk_device.cpp
@@ -10,7 +10,7 @@
#include <cstddef>
-namespace devices::storage::ram_disk
+namespace kernel::devices::storage::ram_disk
{
namespace
{
@@ -63,4 +63,4 @@ namespace devices::storage::ram_disk
{
return m_boot_module.size;
}
-} // namespace devices::storage::ram_disk \ No newline at end of file
+} // namespace kernel::devices::storage::ram_disk \ No newline at end of file
diff --git a/kernel/src/devices/storage/storage_controller.cpp b/kernel/src/devices/storage/storage_controller.cpp
index e415436..3d13b66 100644
--- a/kernel/src/devices/storage/storage_controller.cpp
+++ b/kernel/src/devices/storage/storage_controller.cpp
@@ -8,7 +8,7 @@
#include <algorithm>
#include <cstddef>
-namespace devices::storage
+namespace kernel::devices::storage
{
auto storage_controller::set_ids(size_t major, size_t minors_per_dev) -> void
{
@@ -41,4 +41,4 @@ namespace devices::storage
{
return m_devices;
}
-} // namespace devices::storage \ No newline at end of file
+} // namespace kernel::devices::storage \ No newline at end of file
diff --git a/kernel/src/devices/storage/storage_management.cpp b/kernel/src/devices/storage/storage_management.cpp
index 56216b0..2bc57c4 100644
--- a/kernel/src/devices/storage/storage_management.cpp
+++ b/kernel/src/devices/storage/storage_management.cpp
@@ -14,7 +14,7 @@
#include <cstddef>
#include <optional>
-namespace devices::storage
+namespace kernel::devices::storage
{
namespace
{
@@ -82,4 +82,4 @@ namespace devices::storage
return device_by_major_minor(START_MAJOR, 0);
}
-} // namespace devices::storage \ No newline at end of file
+} // namespace kernel::devices::storage \ No newline at end of file
diff --git a/kernel/src/filesystem/dentry.cpp b/kernel/src/filesystem/dentry.cpp
index 76949f2..2f99e91 100644
--- a/kernel/src/filesystem/dentry.cpp
+++ b/kernel/src/filesystem/dentry.cpp
@@ -10,7 +10,7 @@
#include <cstdint>
#include <string_view>
-namespace filesystem
+namespace kernel::filesystem
{
dentry::dentry(kstd::shared_ptr<dentry> const & parent, kstd::shared_ptr<inode> const & node, std::string_view name)
: m_name(name)
@@ -58,4 +58,4 @@ namespace filesystem
{
return (m_flags & static_cast<uint32_t>(flag)) != 0;
}
-} // namespace filesystem \ No newline at end of file
+} // namespace kernel::filesystem \ No newline at end of file
diff --git a/kernel/src/filesystem/devfs/devfs_filesystem.cpp b/kernel/src/filesystem/devfs/devfs_filesystem.cpp
index c4cd81a..df977b8 100644
--- a/kernel/src/filesystem/devfs/devfs_filesystem.cpp
+++ b/kernel/src/filesystem/devfs/devfs_filesystem.cpp
@@ -11,7 +11,7 @@
#include <algorithm>
#include <string_view>
-namespace filesystem::devfs
+namespace kernel::filesystem::devfs
{
auto devfs_filesystem::mount(kstd::shared_ptr<devices::device> const &) -> int
{
@@ -55,4 +55,4 @@ namespace filesystem::devfs
[&](auto const & device) { m_inodes.push_back(kstd::make_shared<device_inode>(device)); });
});
}
-} // namespace filesystem::devfs \ No newline at end of file
+} // namespace kernel::filesystem::devfs \ No newline at end of file
diff --git a/kernel/src/filesystem/devfs/devfs_root_inode.cpp b/kernel/src/filesystem/devfs/devfs_root_inode.cpp
index 53441b0..a7308dc 100644
--- a/kernel/src/filesystem/devfs/devfs_root_inode.cpp
+++ b/kernel/src/filesystem/devfs/devfs_root_inode.cpp
@@ -4,7 +4,7 @@
#include <cstddef>
-namespace filesystem::devfs
+namespace kernel::filesystem::devfs
{
devfs_root_inode::devfs_root_inode()
: inode(inode_kind::directory)
@@ -19,4 +19,4 @@ namespace filesystem::devfs
{
return 0;
}
-} // namespace filesystem::devfs \ No newline at end of file
+} // namespace kernel::filesystem::devfs \ No newline at end of file
diff --git a/kernel/src/filesystem/device_inode.cpp b/kernel/src/filesystem/device_inode.cpp
index da062fc..d574d8f 100644
--- a/kernel/src/filesystem/device_inode.cpp
+++ b/kernel/src/filesystem/device_inode.cpp
@@ -12,7 +12,7 @@
#include <cstddef>
-namespace filesystem
+namespace kernel::filesystem
{
device_inode::device_inode(kstd::shared_ptr<devices::device> const & device)
: inode(inode_kind::device)
@@ -53,4 +53,4 @@ namespace filesystem
return m_device;
}
-} // namespace filesystem \ No newline at end of file
+} // namespace kernel::filesystem \ No newline at end of file
diff --git a/kernel/src/filesystem/ext2/ext2_filesystem.cpp b/kernel/src/filesystem/ext2/ext2_filesystem.cpp
index ea6fe0d..036b80e 100644
--- a/kernel/src/filesystem/ext2/ext2_filesystem.cpp
+++ b/kernel/src/filesystem/ext2/ext2_filesystem.cpp
@@ -13,7 +13,7 @@
#include <cstdint>
#include <string_view>
-namespace filesystem::ext2
+namespace kernel::filesystem::ext2
{
namespace
{
@@ -69,4 +69,4 @@ namespace filesystem::ext2
return kstd::make_shared<ext2_inode>();
}
-} // namespace filesystem::ext2
+} // namespace kernel::filesystem::ext2
diff --git a/kernel/src/filesystem/ext2/ext2_inode.cpp b/kernel/src/filesystem/ext2/ext2_inode.cpp
index 3cc0fb2..142502e 100644
--- a/kernel/src/filesystem/ext2/ext2_inode.cpp
+++ b/kernel/src/filesystem/ext2/ext2_inode.cpp
@@ -4,7 +4,7 @@
#include <cstddef>
-namespace filesystem::ext2
+namespace kernel::filesystem::ext2
{
ext2_inode::ext2_inode()
: inode(inode_kind::regular)
@@ -21,4 +21,4 @@ namespace filesystem::ext2
// TODO BA-FS26 implement
return 0;
}
-} // namespace filesystem::ext2 \ No newline at end of file
+} // namespace kernel::filesystem::ext2 \ No newline at end of file
diff --git a/kernel/src/filesystem/file_descriptor_table.cpp b/kernel/src/filesystem/file_descriptor_table.cpp
index 6eb3845..287aea2 100644
--- a/kernel/src/filesystem/file_descriptor_table.cpp
+++ b/kernel/src/filesystem/file_descriptor_table.cpp
@@ -10,7 +10,7 @@
#include <cstddef>
#include <optional>
-namespace filesystem
+namespace kernel::filesystem
{
namespace
{
@@ -87,4 +87,4 @@ namespace filesystem
m_open_files.at(index) = nullptr;
}
-} // namespace filesystem \ No newline at end of file
+} // namespace kernel::filesystem \ No newline at end of file
diff --git a/kernel/src/filesystem/filesystem.cpp b/kernel/src/filesystem/filesystem.cpp
index 0e33d95..c891d00 100644
--- a/kernel/src/filesystem/filesystem.cpp
+++ b/kernel/src/filesystem/filesystem.cpp
@@ -5,7 +5,7 @@
#include <kstd/memory>
-namespace filesystem
+namespace kernel::filesystem
{
auto filesystem::mount(kstd::shared_ptr<devices::device> const & device) -> int
{
@@ -21,4 +21,4 @@ namespace filesystem
{
return m_root_inode;
}
-} // namespace filesystem \ No newline at end of file
+} // namespace kernel::filesystem \ No newline at end of file
diff --git a/kernel/src/filesystem/inode.cpp b/kernel/src/filesystem/inode.cpp
index de3282f..1cbead8 100644
--- a/kernel/src/filesystem/inode.cpp
+++ b/kernel/src/filesystem/inode.cpp
@@ -1,6 +1,6 @@
#include "kernel/filesystem/inode.hpp"
-namespace filesystem
+namespace kernel::filesystem
{
inode::inode(inode_kind kind)
: m_kind(kind)
@@ -20,4 +20,4 @@ namespace filesystem
{
return m_kind == inode_kind::device;
}
-} // namespace filesystem \ No newline at end of file
+} // namespace kernel::filesystem \ No newline at end of file
diff --git a/kernel/src/filesystem/mount.cpp b/kernel/src/filesystem/mount.cpp
index afc07fa..f9e709c 100644
--- a/kernel/src/filesystem/mount.cpp
+++ b/kernel/src/filesystem/mount.cpp
@@ -10,7 +10,7 @@
#include <string_view>
-namespace filesystem
+namespace kernel::filesystem
{
mount::mount(kstd::shared_ptr<dentry> const & mount_dentry, kstd::shared_ptr<dentry> const & root_dentry,
kstd::shared_ptr<filesystem> const & fs, std::string_view mount_path)
@@ -44,4 +44,4 @@ namespace filesystem
{
return m_mount_path.view();
}
-} // namespace filesystem \ No newline at end of file
+} // namespace kernel::filesystem \ No newline at end of file
diff --git a/kernel/src/filesystem/mount_table.cpp b/kernel/src/filesystem/mount_table.cpp
index b9e57d4..737434e 100644
--- a/kernel/src/filesystem/mount_table.cpp
+++ b/kernel/src/filesystem/mount_table.cpp
@@ -7,7 +7,7 @@
#include <cstddef>
#include <string_view>
-namespace filesystem
+namespace kernel::filesystem
{
void mount_table::add_mount(kstd::shared_ptr<mount> mount)
{
@@ -35,4 +35,4 @@ namespace filesystem
return mount_with_longest_prefix;
}
-} // namespace filesystem \ No newline at end of file
+} // namespace kernel::filesystem \ No newline at end of file
diff --git a/kernel/src/filesystem/open_file_description.cpp b/kernel/src/filesystem/open_file_description.cpp
index 93c38ac..8c04225 100644
--- a/kernel/src/filesystem/open_file_description.cpp
+++ b/kernel/src/filesystem/open_file_description.cpp
@@ -7,7 +7,7 @@
#include <cstddef>
-namespace filesystem
+namespace kernel::filesystem
{
open_file_description::open_file_description(kstd::shared_ptr<inode> const & inode)
: m_inode(inode)
@@ -32,4 +32,4 @@ namespace filesystem
m_offset += written_bytes;
return written_bytes;
}
-} // namespace filesystem \ No newline at end of file
+} // namespace kernel::filesystem \ No newline at end of file
diff --git a/kernel/src/filesystem/rootfs/rootfs_filesystem.cpp b/kernel/src/filesystem/rootfs/rootfs_filesystem.cpp
index 22502aa..804e211 100644
--- a/kernel/src/filesystem/rootfs/rootfs_filesystem.cpp
+++ b/kernel/src/filesystem/rootfs/rootfs_filesystem.cpp
@@ -8,7 +8,7 @@
#include <string_view>
-namespace filesystem::rootfs
+namespace kernel::filesystem::rootfs
{
auto rootfs_filesystem::mount(kstd::shared_ptr<devices::device> const &) -> int
{
@@ -26,4 +26,4 @@ namespace filesystem::rootfs
return rfs_inode->lookup_child(name);
return nullptr;
}
-} // namespace filesystem::rootfs
+} // namespace kernel::filesystem::rootfs
diff --git a/kernel/src/filesystem/rootfs/rootfs_inode.cpp b/kernel/src/filesystem/rootfs/rootfs_inode.cpp
index 9bbfbce..f44f06c 100644
--- a/kernel/src/filesystem/rootfs/rootfs_inode.cpp
+++ b/kernel/src/filesystem/rootfs/rootfs_inode.cpp
@@ -10,7 +10,7 @@
#include <string_view>
#include <utility>
-namespace filesystem::rootfs
+namespace kernel::filesystem::rootfs
{
rootfs_inode::rootfs_inode()
: inode(inode_kind::directory)
@@ -36,4 +36,4 @@ namespace filesystem::rootfs
auto it = std::ranges::find_if(m_children, [&](auto const & pair) { return pair.first == name; });
return (it != m_children.end()) ? it->second : nullptr;
}
-} // namespace filesystem::rootfs
+} // namespace kernel::filesystem::rootfs
diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 7a90531..2dbdb12 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -17,7 +17,7 @@
#include <ranges>
#include <string_view>
-namespace filesystem
+namespace kernel::filesystem
{
namespace
{
@@ -161,4 +161,4 @@ namespace filesystem
return current_dentry;
}
-} // namespace filesystem \ No newline at end of file
+} // namespace kernel::filesystem \ No newline at end of file
diff --git a/kernel/src/main.cpp b/kernel/src/main.cpp
index bb6d57d..2dd9fd9 100644
--- a/kernel/src/main.cpp
+++ b/kernel/src/main.cpp
@@ -24,7 +24,7 @@
auto test_device_names() -> void
{
- auto storage_mgmt = devices::storage::storage_management::get();
+ auto storage_mgmt = kernel::devices::storage::storage_management::get();
std::ranges::for_each(storage_mgmt.all_controllers(), [](auto const & controller) {
std::ranges::for_each(controller->all_devices(),
[](auto const & device) { kstd::println("{}", device->name().view()); });
@@ -34,13 +34,13 @@ auto test_device_names() -> void
auto test_file_description_manually() -> void
{
// setup
- auto fd_table = filesystem::file_descriptor_table::get();
- auto storage_mgmt = devices::storage::storage_management::get();
+ auto fd_table = kernel::filesystem::file_descriptor_table::get();
+ auto storage_mgmt = kernel::devices::storage::storage_management::get();
auto device = storage_mgmt.device_by_major_minor(1, 0);
- auto dev_node = kstd::make_shared<filesystem::device_inode>(device);
+ auto dev_node = kstd::make_shared<kernel::filesystem::device_inode>(device);
- auto ofd = kstd::make_shared<filesystem::open_file_description>(dev_node);
+ auto ofd = kstd::make_shared<kernel::filesystem::open_file_description>(dev_node);
auto fd_index = fd_table.add_file(ofd);
// use: read two bytes and write two again
@@ -66,7 +66,7 @@ auto test_file_description_manually() -> void
fd_table.remove_file(fd_index);
// use: read four bytes again -> two old bytes two new bytes
- auto ofd1 = kstd::make_shared<filesystem::open_file_description>(dev_node);
+ auto ofd1 = kstd::make_shared<kernel::filesystem::open_file_description>(dev_node);
fd_index = fd_table.add_file(ofd1);
auto fd1 = fd_table.get_file(fd_index);
@@ -85,14 +85,14 @@ auto test_device_with_vfs() -> void
{
// TODO BA-FS26
- auto vfs = filesystem::vfs::get();
+ auto vfs = kernel::filesystem::vfs::get();
auto ofd = vfs.open("/dev/ram0");
if (!ofd)
{
kstd::os::panic("test code failed");
}
- auto fd_table = filesystem::file_descriptor_table::get();
+ auto fd_table = kernel::filesystem::file_descriptor_table::get();
auto fd = fd_table.add_file(ofd);
kstd::vector<std::byte> buffer{2};
auto file = fd_table.get_file(fd);
@@ -110,8 +110,8 @@ auto test_file_lookup() -> void
{
// TODO BA-FS26 implement a more complete test with multiple files and directories and mounts etc.
- auto vfs = filesystem::vfs::get();
- auto storage_mgmt = devices::storage::storage_management::get();
+ auto vfs = kernel::filesystem::vfs::get();
+ auto storage_mgmt = kernel::devices::storage::storage_management::get();
auto ofd1 = vfs.open("/a/b/c");
auto ofd2 = vfs.open("/dev/ram0");
@@ -126,7 +126,7 @@ auto test_file_lookup() -> void
kstd::os::panic("test code failed");
}
- auto new_filesystem = kstd::make_shared<filesystem::ext2::ext2_filesystem>();
+ auto new_filesystem = kstd::make_shared<kernel::filesystem::ext2::ext2_filesystem>();
auto device = storage_mgmt.device_by_major_minor(1, 16);
new_filesystem->mount(device);
if (vfs.do_mount("/a/b", new_filesystem) != 0)
@@ -182,13 +182,13 @@ auto main() -> int
kapi::boot_modules::init();
kstd::println("[OS] Boot module registry initialized.");
- devices::storage::storage_management::init();
+ kernel::devices::storage::storage_management::init();
kstd::println("[OS] Storage management initialized.");
- filesystem::file_descriptor_table::init();
+ kernel::filesystem::file_descriptor_table::init();
kstd::println("[OS] Global file descriptor table initialized.");
- filesystem::vfs::init();
+ kernel::filesystem::vfs::init();
kstd::println("[OS] Virtual filesystem initialized.");
run_test_code();