Rename ram_disk and storage files

4 files changed, 18 insertions, 18 deletions

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.