Rename ram_disk and storage files

12 files changed, 59 insertions, 60 deletions

diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index 3dbc0f4..10bfecb 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -20,10 +20,10 @@ add_executable("kernel"
     "src/devices/device.cpp"
     "src/devices/block_device.cpp"
     "src/devices/block_device_utils.cpp"
-    "src/devices/storage/storage_controller.cpp"
-    "src/devices/storage/storage_management.cpp"
-    "src/devices/storage/ram_disk/ram_disk_controller.cpp"
-    "src/devices/storage/ram_disk/ram_disk_device.cpp"
+    "src/devices/storage/controller.cpp"
+    "src/devices/storage/management.cpp"
+    "src/devices/storage/ram_disk/controller.cpp"
+    "src/devices/storage/ram_disk/device.cpp"
     "src/filesystem/devfs/filesystem.cpp"
     "src/filesystem/devfs/inode.cpp"
     "src/filesystem/ext2/filesystem.cpp"
diff --git a/kernel/include/kernel/devices/storage/storage_controller.hpp b/kernel/include/kernel/devices/storage/controller.hpp
index 5639160..e3bfd01 100644
--- a/kernel/include/kernel/devices/storage/storage_controller.hpp
+++ b/kernel/include/kernel/devices/storage/controller.hpp
@@ -1,5 +1,5 @@
-#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_CONTROLLER_HPP
-#define TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_CONTROLLER_HPP
+#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_CONTROLLER_HPP
+#define TEACH_OS_KERNEL_DEVICES_STORAGE_CONTROLLER_HPP
 
 #include "kernel/devices/device.hpp"
 
@@ -16,12 +16,12 @@ namespace kernel::devices::storage
    * A storage controller probes for devices and resolves devices by major/minor
    * numbers.
    */
-  struct storage_controller
+  struct controller
   {
     /**
      * @brief Virtual destructor.
      */
-    virtual ~storage_controller() = default;
+    virtual ~controller() = default;
 
     /**
      * @brief Probe the controller and register discovered devices.
diff --git a/kernel/include/kernel/devices/storage/storage_management.hpp b/kernel/include/kernel/devices/storage/management.hpp
index b6d1318..255d170 100644
--- a/kernel/include/kernel/devices/storage/storage_management.hpp
+++ b/kernel/include/kernel/devices/storage/management.hpp
@@ -1,8 +1,8 @@
-#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_MANAGEMENT_HPP
-#define TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_MANAGEMENT_HPP
+#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_MANAGEMENT_HPP
+#define TEACH_OS_KERNEL_DEVICES_STORAGE_MANAGEMENT_HPP
 
 #include "kernel/devices/device.hpp"
-#include "kernel/devices/storage/storage_controller.hpp"
+#include "kernel/devices/storage/controller.hpp"
 
 #include <kstd/memory>
 #include <kstd/vector>
@@ -17,7 +17,7 @@ namespace kernel::devices::storage
    * Owns registered storage controllers and provides device lookup by
    * major/minor numbers.
    */
-  struct storage_management
+  struct management
   {
     /**
      * @brief Initialize global storage management.
@@ -34,7 +34,7 @@ namespace kernel::devices::storage
      * @return Reference to the active storage manager.
      * @warning Panics if storage management has not been initialized.
      */
-    auto static get() -> storage_management &;
+    auto static get() -> management &;
 
     /**
      * @brief Register a storage controller.
@@ -42,13 +42,13 @@ namespace kernel::devices::storage
      *
      * Assigns controller IDs (major number range and minors per device).
      */
-    auto add_controller(kstd::shared_ptr<storage_controller> const & controller) -> void;
+    auto add_controller(kstd::shared_ptr<controller> const & controller) -> void;
 
     /**
      * @brief Return all registered storage controllers.
      * @return Vector of all registered storage controllers.
      */
-    [[nodiscard]] auto all_controllers() const -> kstd::vector<kstd::shared_ptr<storage_controller>> const &;
+    [[nodiscard]] auto all_controllers() const -> kstd::vector<kstd::shared_ptr<controller>> const &;
 
     /**
      * @brief Find a device by major/minor numbers.
@@ -68,9 +68,9 @@ namespace kernel::devices::storage
     /**
      * @brief Private default constructor for storage management singleton.
      */
-    storage_management() = default;
+    management() = default;
 
-    kstd::vector<kstd::shared_ptr<storage_controller>> m_controllers{};
+    kstd::vector<kstd::shared_ptr<controller>> m_controllers{};
   };
 }  // namespace kernel::devices::storage
 
diff --git a/kernel/include/kernel/devices/storage/ram_disk/ram_disk_controller.hpp b/kernel/include/kernel/devices/storage/ram_disk/controller.hpp
index 40763bf..ad8b29f 100644
--- a/kernel/include/kernel/devices/storage/ram_disk/ram_disk_controller.hpp
+++ b/kernel/include/kernel/devices/storage/ram_disk/controller.hpp
@@ -3,20 +3,20 @@
 
 #include "kapi/boot_module/boot_module_registry.hpp"
 
-#include "kernel/devices/storage/storage_controller.hpp"
+#include "kernel/devices/storage/controller.hpp"
 
 namespace kernel::devices::storage::ram_disk
 {
   /**
    * @brief Storage controller that exposes boot modules as RAM-disk devices.
    */
-  struct ram_disk_controller : storage_controller
+  struct controller : kernel::devices::storage::controller
   {
     /**
      * @brief Create a RAM-disk controller.
      * @param registry Boot module registry as device source.
      */
-    explicit ram_disk_controller(kapi::boot_modules::boot_module_registry const * registry);
+    explicit controller(kapi::boot_modules::boot_module_registry const * registry);
 
     /**
      * @brief Probe boot modules and create RAM-disk devices.
diff --git a/kernel/include/kernel/devices/storage/ram_disk/ram_disk_device.hpp b/kernel/include/kernel/devices/storage/ram_disk/device.hpp
index 75ff50b..0777e86 100644
--- a/kernel/include/kernel/devices/storage/ram_disk/ram_disk_device.hpp
+++ b/kernel/include/kernel/devices/storage/ram_disk/device.hpp
@@ -12,7 +12,7 @@ namespace kernel::devices::storage::ram_disk
   /**
    * @brief Block device for a boot module.
    */
-  struct ram_disk_device : block_device
+  struct device : block_device
   {
     /**
      * @brief Create a RAM disk for the @p module.
@@ -20,7 +20,7 @@ namespace kernel::devices::storage::ram_disk
      * @param major Device major number.
      * @param minor Device minor number.
      */
-    ram_disk_device(kapi::boot_modules::boot_module const & module, size_t major, size_t minor);
+    device(kapi::boot_modules::boot_module const & module, size_t major, size_t minor);
 
     /**
      * @brief Read one logical block into @p buffer.
diff --git a/kernel/src/devices/storage/storage_controller.cpp b/kernel/src/devices/storage/controller.cpp
index 3d13b66..46c45e4 100644
--- a/kernel/src/devices/storage/storage_controller.cpp
+++ b/kernel/src/devices/storage/controller.cpp
@@ -1,4 +1,4 @@
-#include "kernel/devices/storage/storage_controller.hpp"
+#include "kernel/devices/storage/controller.hpp"
 
 #include "kernel/devices/device.hpp"
 
@@ -10,18 +10,18 @@
 
 namespace kernel::devices::storage
 {
-  auto storage_controller::set_ids(size_t major, size_t minors_per_dev) -> void
+  auto controller::set_ids(size_t major, size_t minors_per_dev) -> void
   {
     m_major = major;
     m_minors_per_device = minors_per_dev;
   }
 
-  auto storage_controller::major() const -> size_t
+  auto controller::major() const -> size_t
   {
     return m_major;
   }
 
-  auto storage_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<devices::device>
   {
     auto it = std::ranges::find_if(m_devices, [minor](auto const & device) { return device->minor() == minor; });
 
@@ -32,12 +32,12 @@ namespace kernel::devices::storage
     return nullptr;
   }
 
-  auto storage_controller::devices_count() const -> size_t
+  auto controller::devices_count() const -> size_t
   {
     return m_devices.size();
   }
 
-  auto storage_controller::all_devices() const -> kstd::vector<kstd::shared_ptr<devices::device>> const &
+  auto controller::all_devices() const -> kstd::vector<kstd::shared_ptr<devices::device>> const &
   {
     return m_devices;
   }
diff --git a/kernel/src/devices/storage/storage_management.cpp b/kernel/src/devices/storage/management.cpp
index 2bc57c4..62c0ce4 100644
--- a/kernel/src/devices/storage/storage_management.cpp
+++ b/kernel/src/devices/storage/management.cpp
@@ -1,11 +1,11 @@
-#include "kernel/devices/storage/storage_management.hpp"
+#include "kernel/devices/storage/management.hpp"
 
 #include "kapi/boot_modules.hpp"
 #include "kapi/system.hpp"
 
 #include "kernel/devices/device.hpp"
-#include "kernel/devices/storage/ram_disk/ram_disk_controller.hpp"
-#include "kernel/devices/storage/storage_controller.hpp"
+#include "kernel/devices/storage/controller.hpp"
+#include "kernel/devices/storage/ram_disk/controller.hpp"
 
 #include <kstd/memory>
 #include <kstd/vector>
@@ -22,25 +22,25 @@ namespace kernel::devices::storage
     constexpr size_t static START_MAJOR = 1;
     constinit size_t static next_free_major = START_MAJOR;
 
-    constinit auto static active_storage_management = std::optional<storage_management>{};
+    constinit auto static active_storage_management = std::optional<management>{};
   }  // namespace
 
-  auto storage_management::init() -> void
+  auto management::init() -> void
   {
     if (active_storage_management)
     {
       kapi::system::panic("[DEVICES] Storage management has already been initialized.");
     }
-    active_storage_management.emplace(storage_management{});
+    active_storage_management.emplace(management{});
 
     auto current_ram_disk_controller =
-        kstd::make_shared<ram_disk::ram_disk_controller>(&kapi::boot_modules::get_boot_module_registry());
+        kstd::make_shared<ram_disk::controller>(&kapi::boot_modules::get_boot_module_registry());
     active_storage_management->add_controller(current_ram_disk_controller);
 
     std::ranges::for_each(active_storage_management->m_controllers, [](auto controller) { controller->probe(); });
   }
 
-  auto storage_management::get() -> storage_management &
+  auto management::get() -> management &
   {
     if (!active_storage_management)
     {
@@ -50,18 +50,18 @@ namespace kernel::devices::storage
     return *active_storage_management;
   }
 
-  auto storage_management::add_controller(kstd::shared_ptr<storage_controller> const & controller) -> void
+  auto management::add_controller(kstd::shared_ptr<controller> const & controller) -> void
   {
     controller->set_ids(next_free_major++, MINORS_PER_DEVICE);
     m_controllers.push_back(controller);
   }
 
-  auto storage_management::all_controllers() const -> kstd::vector<kstd::shared_ptr<storage_controller>> const &
+  auto management::all_controllers() const -> kstd::vector<kstd::shared_ptr<controller>> const &
   {
     return m_controllers;
   }
 
-  auto storage_management::device_by_major_minor(size_t major, size_t minor) -> kstd::shared_ptr<device>
+  auto management::device_by_major_minor(size_t major, size_t minor) -> kstd::shared_ptr<device>
   {
     kstd::shared_ptr<device> found = nullptr;
 
@@ -77,7 +77,7 @@ namespace kernel::devices::storage
     return found;
   }
 
-  auto storage_management::determine_boot_device() -> kstd::shared_ptr<device>
+  auto management::determine_boot_device() -> kstd::shared_ptr<device>
   {
     return device_by_major_minor(START_MAJOR, 0);
   }
diff --git a/kernel/src/devices/storage/ram_disk/ram_disk_controller.cpp b/kernel/src/devices/storage/ram_disk/controller.cpp
index 26eb10b..040e61f 100644
--- a/kernel/src/devices/storage/ram_disk/ram_disk_controller.cpp
+++ b/kernel/src/devices/storage/ram_disk/controller.cpp
@@ -1,8 +1,8 @@
-#include "kernel/devices/storage/ram_disk/ram_disk_controller.hpp"
+#include "kernel/devices/storage/ram_disk/controller.hpp"
 
 #include "kapi/boot_module/boot_module_registry.hpp"
 
-#include "kernel/devices/storage/ram_disk/ram_disk_device.hpp"
+#include "kernel/devices/storage/ram_disk/device.hpp"
 
 #include <kstd/memory>
 
@@ -11,17 +11,17 @@
 
 namespace kernel::devices::storage::ram_disk
 {
-  ram_disk_controller::ram_disk_controller(kapi::boot_modules::boot_module_registry const * registry)
+  controller::controller(kapi::boot_modules::boot_module_registry const * registry)
       : m_boot_module_registry(registry)
   {}
 
-  auto ram_disk_controller::probe() -> void
+  auto controller::probe() -> void
   {
     size_t current_device_index = 0;
 
     std::ranges::for_each(*m_boot_module_registry, [this, &current_device_index](auto const & module) {
       auto const minor = current_device_index++ * m_minors_per_device;
-      m_devices.push_back(kstd::make_shared<ram_disk_device>(module, m_major, minor));
+      m_devices.push_back(kstd::make_shared<device>(module, m_major, minor));
     });
   }
 }  // 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/device.cpp
index 72e8025..5116c93 100644
--- a/kernel/src/devices/storage/ram_disk/ram_disk_device.cpp
+++ b/kernel/src/devices/storage/ram_disk/device.cpp
@@ -1,9 +1,8 @@
-#include "kernel/devices/storage/ram_disk/ram_disk_device.hpp"
-
 #include "kapi/boot_module/boot_module.hpp"
 #include "kapi/system.hpp"
 
 #include "kernel/devices/block_device.hpp"
+#include "kernel/devices/storage/ram_disk/device.hpp"
 
 #include <kstd/cstring>
 #include <kstd/string>
@@ -17,12 +16,12 @@ namespace kernel::devices::storage::ram_disk
     constexpr size_t RAM_DISK_BLOCK_SIZE = 512uz;
   }  // namespace
 
-  ram_disk_device::ram_disk_device(kapi::boot_modules::boot_module const & module, size_t major, size_t minor)
+  device::device(kapi::boot_modules::boot_module const & module, size_t major, size_t minor)
       : block_device(major, minor, "ram" + kstd::to_string(minor), RAM_DISK_BLOCK_SIZE)
       , m_boot_module(module)
   {}
 
-  auto ram_disk_device::read_block(size_t block_index, void * buffer) const -> void
+  auto device::read_block(size_t block_index, void * buffer) const -> void
   {
     if (buffer == nullptr)
     {
@@ -43,7 +42,7 @@ namespace kernel::devices::storage::ram_disk
     }
   }
 
-  auto ram_disk_device::write_block(size_t block_index, void const * buffer) -> void
+  auto device::write_block(size_t block_index, void const * buffer) -> void
   {
     if (buffer == nullptr)
     {
@@ -59,7 +58,7 @@ namespace kernel::devices::storage::ram_disk
     }
   }
 
-  auto ram_disk_device::size() const -> size_t
+  auto device::size() const -> size_t
   {
     return m_boot_module.size;
   }
diff --git a/kernel/src/filesystem/devfs/filesystem.cpp b/kernel/src/filesystem/devfs/filesystem.cpp
index e7d0e13..94c9b05 100644
--- a/kernel/src/filesystem/devfs/filesystem.cpp
+++ b/kernel/src/filesystem/devfs/filesystem.cpp
@@ -1,7 +1,7 @@
 #include "kernel/filesystem/devfs/filesystem.hpp"
 
 #include "kernel/devices/device.hpp"
-#include "kernel/devices/storage/storage_management.hpp"
+#include "kernel/devices/storage/management.hpp"
 #include "kernel/filesystem/devfs/inode.hpp"
 #include "kernel/filesystem/device_inode.hpp"
 #include "kernel/filesystem/inode.hpp"
@@ -49,7 +49,7 @@ namespace kernel::filesystem::devfs
   {
     m_inodes.clear();
 
-    auto storage_mgmt = devices::storage::storage_management::get();
+    auto storage_mgmt = devices::storage::management::get();
     std::ranges::for_each(storage_mgmt.all_controllers(), [&](auto const & controller) {
       std::ranges::for_each(controller->all_devices(),
                             [&](auto const & device) { m_inodes.push_back(kstd::make_shared<device_inode>(device)); });
diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index bee68e6..06214d2 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -2,7 +2,7 @@
 
 #include "kapi/system.hpp"
 
-#include "kernel/devices/storage/storage_management.hpp"
+#include "kernel/devices/storage/management.hpp"
 #include "kernel/filesystem/dentry.hpp"
 #include "kernel/filesystem/devfs/filesystem.hpp"
 #include "kernel/filesystem/ext2/filesystem.hpp"
@@ -43,7 +43,7 @@ namespace kernel::filesystem
     auto root_fs_root_dentry = kstd::make_shared<dentry>(nullptr, root_fs->root_inode());
     m_mount_table.add_mount(kstd::make_shared<mount>(nullptr, root_fs_root_dentry, root_fs, ""));
 
-    auto storage_mgmt = devices::storage::storage_management::get();
+    auto storage_mgmt = devices::storage::management::get();
     if (auto boot_device = storage_mgmt.determine_boot_device())
     {
       // TODO BA-FS26 detect fs type from boot device and load corresponding fs, for now just assume ext2
diff --git a/kernel/src/main.cpp b/kernel/src/main.cpp
index ff73985..37b4c5b 100644
--- a/kernel/src/main.cpp
+++ b/kernel/src/main.cpp
@@ -5,7 +5,7 @@
 #include "kapi/memory.hpp"
 #include "kapi/system.hpp"
 
-#include "kernel/devices/storage/storage_management.hpp"
+#include "kernel/devices/storage/management.hpp"
 #include "kernel/filesystem/device_inode.hpp"
 #include "kernel/filesystem/ext2/filesystem.hpp"
 #include "kernel/filesystem/file_descriptor_table.hpp"
@@ -24,7 +24,7 @@
 
 auto test_device_names() -> void
 {
-  auto storage_mgmt = kernel::devices::storage::storage_management::get();
+  auto storage_mgmt = kernel::devices::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()); });
@@ -35,7 +35,7 @@ auto test_file_description_manually() -> void
 {
   // setup
   auto fd_table = kernel::filesystem::file_descriptor_table::get();
-  auto storage_mgmt = kernel::devices::storage::storage_management::get();
+  auto storage_mgmt = kernel::devices::storage::management::get();
   auto device = storage_mgmt.device_by_major_minor(1, 0);
 
   auto dev_node = kstd::make_shared<kernel::filesystem::device_inode>(device);
@@ -111,7 +111,7 @@ auto test_file_lookup() -> void
   // TODO BA-FS26 implement a more complete test with multiple files and directories and mounts etc.
 
   auto vfs = kernel::filesystem::vfs::get();
-  auto storage_mgmt = kernel::devices::storage::storage_management::get();
+  auto storage_mgmt = kernel::devices::storage::management::get();
 
   auto ofd1 = vfs.open("/a/b/c");
   auto ofd2 = vfs.open("/dev/ram0");
@@ -182,7 +182,7 @@ auto main() -> int
   kapi::boot_modules::init();
   kstd::println("[OS] Boot module registry initialized.");
 
-  kernel::devices::storage::storage_management::init();
+  kernel::devices::storage::management::init();
   kstd::println("[OS] Storage management initialized.");
 
   kernel::filesystem::file_descriptor_table::init();