From 5268bf6622463c3d233683fe56ae9977baf8eeaa Mon Sep 17 00:00:00 2001 From: Lukas Oesch Date: Tue, 3 Mar 2026 16:57:02 +0100 Subject: rename files to snake_case (temp_device part1 -> renamed to device later, due to capital-/lower-letter problem) --- kernel/devices/include/devices/BlockDevice.hpp | 33 ---------------------- kernel/devices/include/devices/Device.hpp | 22 --------------- kernel/devices/include/devices/block_device.hpp | 33 ++++++++++++++++++++++ .../devices/storage/RAMDisk/RAMDiskController.hpp | 30 -------------------- .../devices/storage/RAMDisk/RAMDiskDevice.hpp | 27 ------------------ .../include/devices/storage/StorageController.hpp | 28 ------------------ .../include/devices/storage/StorageManagement.hpp | 31 -------------------- .../storage/ram_disk/ram_disk_controller.hpp | 30 ++++++++++++++++++++ .../devices/storage/ram_disk/ram_disk_device.hpp | 27 ++++++++++++++++++ .../include/devices/storage/storage_controller.hpp | 28 ++++++++++++++++++ .../include/devices/storage/storage_management.hpp | 31 ++++++++++++++++++++ kernel/devices/include/devices/temp_device.hpp | 22 +++++++++++++++ 12 files changed, 171 insertions(+), 171 deletions(-) delete mode 100644 kernel/devices/include/devices/BlockDevice.hpp delete mode 100644 kernel/devices/include/devices/Device.hpp create mode 100644 kernel/devices/include/devices/block_device.hpp delete mode 100644 kernel/devices/include/devices/storage/RAMDisk/RAMDiskController.hpp delete mode 100644 kernel/devices/include/devices/storage/RAMDisk/RAMDiskDevice.hpp delete mode 100644 kernel/devices/include/devices/storage/StorageController.hpp delete mode 100644 kernel/devices/include/devices/storage/StorageManagement.hpp create mode 100644 kernel/devices/include/devices/storage/ram_disk/ram_disk_controller.hpp create mode 100644 kernel/devices/include/devices/storage/ram_disk/ram_disk_device.hpp create mode 100644 kernel/devices/include/devices/storage/storage_controller.hpp create mode 100644 kernel/devices/include/devices/storage/storage_management.hpp create mode 100644 kernel/devices/include/devices/temp_device.hpp (limited to 'kernel/devices/include') diff --git a/kernel/devices/include/devices/BlockDevice.hpp b/kernel/devices/include/devices/BlockDevice.hpp deleted file mode 100644 index 56e26d0..0000000 --- a/kernel/devices/include/devices/BlockDevice.hpp +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef TEACH_OS_KERNEL_DEVICES_BLOCK_DEVICE_HPP -#define TEACH_OS_KERNEL_DEVICES_BLOCK_DEVICE_HPP - -#include "devices/Device.hpp" - -#include - -namespace devices -{ - struct block_device : device - { - block_device(size_t major, size_t minor, size_t block_size); - virtual ~block_device() = default; - - virtual auto read_block(size_t block_index, void * buffer) const -> void = 0; - virtual auto write_block(size_t block_index, void const * buffer) -> void = 0; - - protected: - struct transfer_info - { - size_t offset; - size_t to_transfer; - size_t remainder; - }; - - virtual auto size() const -> size_t = 0; - auto calculate_transfer(size_t block_index) const -> transfer_info; - - size_t m_block_size; - }; -} // namespace devices - -#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/Device.hpp b/kernel/devices/include/devices/Device.hpp deleted file mode 100644 index 0f93bff..0000000 --- a/kernel/devices/include/devices/Device.hpp +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef TEACH_OS_KERNEL_DEVICES_DEVICE_HPP -#define TEACH_OS_KERNEL_DEVICES_DEVICE_HPP - -#include - -namespace devices -{ - struct device - { - device(size_t major, size_t minor); - virtual ~device() = default; - - auto major() const -> size_t; - auto minor() const -> size_t; - - private: - size_t m_major; - size_t m_minor; - }; -} // namespace devices - -#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/block_device.hpp b/kernel/devices/include/devices/block_device.hpp new file mode 100644 index 0000000..d1e4249 --- /dev/null +++ b/kernel/devices/include/devices/block_device.hpp @@ -0,0 +1,33 @@ +#ifndef TEACH_OS_KERNEL_DEVICES_BLOCK_DEVICE_HPP +#define TEACH_OS_KERNEL_DEVICES_BLOCK_DEVICE_HPP + +#include "devices/temp_device.hpp" + +#include + +namespace devices +{ + struct block_device : device + { + block_device(size_t major, size_t minor, size_t block_size); + virtual ~block_device() = default; + + virtual auto read_block(size_t block_index, void * buffer) const -> void = 0; + virtual auto write_block(size_t block_index, void const * buffer) -> void = 0; + + protected: + struct transfer_info + { + size_t offset; + size_t to_transfer; + size_t remainder; + }; + + virtual auto size() const -> size_t = 0; + auto calculate_transfer(size_t block_index) const -> transfer_info; + + size_t m_block_size; + }; +} // namespace devices + +#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/storage/RAMDisk/RAMDiskController.hpp b/kernel/devices/include/devices/storage/RAMDisk/RAMDiskController.hpp deleted file mode 100644 index 3e6e2bd..0000000 --- a/kernel/devices/include/devices/storage/RAMDisk/RAMDiskController.hpp +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_RAM_DISK_CONTROLLER_HPP -#define TEACH_OS_KERNEL_DEVICES_STORAGE_RAM_DISK_CONTROLLER_HPP - -#include "kapi/boot_module/boot_module_registry.hpp" - -#include "devices/BlockDevice.hpp" -#include "devices/storage/RAMDisk/RAMDiskDevice.hpp" -#include "devices/storage/StorageController.hpp" - -#include -#include - -namespace devices::storage::ram_disk -{ - struct ram_disk_controller : storage_controller - { - explicit ram_disk_controller(kapi::boot_modules::boot_module_registry const * registry); - - auto probe() -> void override; - - auto devices_count() -> size_t override; - auto device_by_major_minor(size_t major, size_t minor) -> block_device * override; - - private: - kapi::boot_modules::boot_module_registry const * m_boot_module_registry; - std::array m_devices{}; // TODO BA-FS26 use kstd::vector when available - }; -} // namespace devices::storage::ram_disk - -#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/storage/RAMDisk/RAMDiskDevice.hpp b/kernel/devices/include/devices/storage/RAMDisk/RAMDiskDevice.hpp deleted file mode 100644 index 5971970..0000000 --- a/kernel/devices/include/devices/storage/RAMDisk/RAMDiskDevice.hpp +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_RAM_DISK_DEVICE_HPP -#define TEACH_OS_KERNEL_DEVICES_STORAGE_RAM_DISK_DEVICE_HPP - -#include "kapi/boot_module/boot_module.hpp" - -#include "devices/BlockDevice.hpp" - -#include - -namespace devices::storage::ram_disk -{ - struct ram_disk_device : block_device - { - ram_disk_device(); // TODO BA-FS26 remove when kstd::vector is available - ram_disk_device(kapi::boot_modules::boot_module const & module, size_t major, size_t minor); - - auto read_block(size_t block_index, void * buffer) const -> void override; - auto write_block(size_t block_index, void const * buffer) -> void override; - - private: - auto size() const -> size_t override; - - kapi::boot_modules::boot_module m_boot_module{}; - }; -} // namespace devices::storage::ram_disk - -#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/storage/StorageController.hpp b/kernel/devices/include/devices/storage/StorageController.hpp deleted file mode 100644 index 50fdb34..0000000 --- a/kernel/devices/include/devices/storage/StorageController.hpp +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_CONTROLLER_HPP -#define TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_CONTROLLER_HPP - -#include "devices/BlockDevice.hpp" - -#include - -namespace devices::storage -{ - struct storage_controller - { - virtual ~storage_controller() = default; - - virtual auto probe() -> void = 0; - - auto set_ids(size_t major, size_t minors_per_dev) -> void; - auto major() const -> size_t; - - virtual auto devices_count() -> size_t = 0; - virtual auto device_by_major_minor(size_t major, size_t minor) -> block_device * = 0; - - protected: - size_t m_major{}; - size_t m_minors_per_device{}; - }; -} // namespace devices::storage - -#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/storage/StorageManagement.hpp b/kernel/devices/include/devices/storage/StorageManagement.hpp deleted file mode 100644 index 226fb28..0000000 --- a/kernel/devices/include/devices/storage/StorageManagement.hpp +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_MANAGEMENT_HPP -#define TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_MANAGEMENT_HPP - -#include "devices/BlockDevice.hpp" -#include "devices/storage/StorageController.hpp" - -#include -#include - -namespace devices::storage -{ - // TODO BA-FS26 add documentation - struct storage_management - { - auto static init() -> void; - - auto static get() -> storage_management &; - - auto add_controller(storage_controller * controller) -> void; - - auto device_by_major_minor(size_t major, size_t minor) -> block_device *; - auto determine_boot_device() -> block_device *; - - private: - storage_management() = default; - - std::array m_controllers{}; // TODO BA-FS26 use kstd::vector when available - }; -} // namespace devices::storage - -#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/storage/ram_disk/ram_disk_controller.hpp b/kernel/devices/include/devices/storage/ram_disk/ram_disk_controller.hpp new file mode 100644 index 0000000..f050ba0 --- /dev/null +++ b/kernel/devices/include/devices/storage/ram_disk/ram_disk_controller.hpp @@ -0,0 +1,30 @@ +#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_RAM_DISK_CONTROLLER_HPP +#define TEACH_OS_KERNEL_DEVICES_STORAGE_RAM_DISK_CONTROLLER_HPP + +#include "kapi/boot_module/boot_module_registry.hpp" + +#include "devices/block_device.hpp" +#include "devices/storage/ram_disk/ram_disk_device.hpp" +#include "devices/storage/storage_controller.hpp" + +#include +#include + +namespace devices::storage::ram_disk +{ + struct ram_disk_controller : storage_controller + { + explicit ram_disk_controller(kapi::boot_modules::boot_module_registry const * registry); + + auto probe() -> void override; + + auto devices_count() -> size_t override; + auto device_by_major_minor(size_t major, size_t minor) -> block_device * override; + + private: + kapi::boot_modules::boot_module_registry const * m_boot_module_registry; + std::array m_devices{}; // TODO BA-FS26 use kstd::vector when available + }; +} // namespace devices::storage::ram_disk + +#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/storage/ram_disk/ram_disk_device.hpp b/kernel/devices/include/devices/storage/ram_disk/ram_disk_device.hpp new file mode 100644 index 0000000..1f0292f --- /dev/null +++ b/kernel/devices/include/devices/storage/ram_disk/ram_disk_device.hpp @@ -0,0 +1,27 @@ +#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_RAM_DISK_DEVICE_HPP +#define TEACH_OS_KERNEL_DEVICES_STORAGE_RAM_DISK_DEVICE_HPP + +#include "kapi/boot_module/boot_module.hpp" + +#include "devices/block_device.hpp" + +#include + +namespace devices::storage::ram_disk +{ + struct ram_disk_device : block_device + { + ram_disk_device(); // TODO BA-FS26 remove when kstd::vector is available + ram_disk_device(kapi::boot_modules::boot_module const & module, size_t major, size_t minor); + + auto read_block(size_t block_index, void * buffer) const -> void override; + auto write_block(size_t block_index, void const * buffer) -> void override; + + private: + auto size() const -> size_t override; + + kapi::boot_modules::boot_module m_boot_module{}; + }; +} // namespace devices::storage::ram_disk + +#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/storage/storage_controller.hpp b/kernel/devices/include/devices/storage/storage_controller.hpp new file mode 100644 index 0000000..0c09815 --- /dev/null +++ b/kernel/devices/include/devices/storage/storage_controller.hpp @@ -0,0 +1,28 @@ +#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_CONTROLLER_HPP +#define TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_CONTROLLER_HPP + +#include "devices/block_device.hpp" + +#include + +namespace devices::storage +{ + struct storage_controller + { + virtual ~storage_controller() = default; + + virtual auto probe() -> void = 0; + + auto set_ids(size_t major, size_t minors_per_dev) -> void; + auto major() const -> size_t; + + virtual auto devices_count() -> size_t = 0; + virtual auto device_by_major_minor(size_t major, size_t minor) -> block_device * = 0; + + protected: + size_t m_major{}; + size_t m_minors_per_device{}; + }; +} // namespace devices::storage + +#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/storage/storage_management.hpp b/kernel/devices/include/devices/storage/storage_management.hpp new file mode 100644 index 0000000..c4f5679 --- /dev/null +++ b/kernel/devices/include/devices/storage/storage_management.hpp @@ -0,0 +1,31 @@ +#ifndef TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_MANAGEMENT_HPP +#define TEACH_OS_KERNEL_DEVICES_STORAGE_STORAGE_MANAGEMENT_HPP + +#include "devices/block_device.hpp" +#include "devices/storage/storage_controller.hpp" + +#include +#include + +namespace devices::storage +{ + // TODO BA-FS26 add documentation + struct storage_management + { + auto static init() -> void; + + auto static get() -> storage_management &; + + auto add_controller(storage_controller * controller) -> void; + + auto device_by_major_minor(size_t major, size_t minor) -> block_device *; + auto determine_boot_device() -> block_device *; + + private: + storage_management() = default; + + std::array m_controllers{}; // TODO BA-FS26 use kstd::vector when available + }; +} // namespace devices::storage + +#endif \ No newline at end of file diff --git a/kernel/devices/include/devices/temp_device.hpp b/kernel/devices/include/devices/temp_device.hpp new file mode 100644 index 0000000..0f93bff --- /dev/null +++ b/kernel/devices/include/devices/temp_device.hpp @@ -0,0 +1,22 @@ +#ifndef TEACH_OS_KERNEL_DEVICES_DEVICE_HPP +#define TEACH_OS_KERNEL_DEVICES_DEVICE_HPP + +#include + +namespace devices +{ + struct device + { + device(size_t major, size_t minor); + virtual ~device() = default; + + auto major() const -> size_t; + auto minor() const -> size_t; + + private: + size_t m_major; + size_t m_minor; + }; +} // namespace devices + +#endif \ No newline at end of file -- cgit v1.2.3