From 332903fcfc2d1b79b9b201cc98dd65125d2018e6 Mon Sep 17 00:00:00 2001 From: Lukas Oesch Date: Tue, 3 Mar 2026 17:01:46 +0100 Subject: rename temp_device back to device --- kernel/devices/CMakeLists.txt | 4 ++-- kernel/devices/include/devices/block_device.hpp | 2 +- kernel/devices/include/devices/device.hpp | 22 ++++++++++++++++++++++ kernel/devices/include/devices/temp_device.hpp | 22 ---------------------- kernel/devices/src/block_device.cpp | 2 +- kernel/devices/src/device.cpp | 21 +++++++++++++++++++++ kernel/devices/src/temp_device.cpp | 21 --------------------- 7 files changed, 47 insertions(+), 47 deletions(-) create mode 100644 kernel/devices/include/devices/device.hpp delete mode 100644 kernel/devices/include/devices/temp_device.hpp create mode 100644 kernel/devices/src/device.cpp delete mode 100644 kernel/devices/src/temp_device.cpp diff --git a/kernel/devices/CMakeLists.txt b/kernel/devices/CMakeLists.txt index 691bb11..15d03fa 100644 --- a/kernel/devices/CMakeLists.txt +++ b/kernel/devices/CMakeLists.txt @@ -2,7 +2,7 @@ add_library("kernel_devices" STATIC) add_library("kernel::devices" ALIAS "kernel_devices") target_sources("kernel_devices" PRIVATE - "src/temp_device.cpp" + "src/device.cpp" "src/block_device.cpp" "src/storage/storage_controller.cpp" "src/storage/storage_management.cpp" @@ -14,7 +14,7 @@ target_sources("kernel_devices" PUBLIC FILE_SET HEADERS BASE_DIRS "include" FILES - "include/devices/temp_device.hpp" + "include/devices/device.hpp" "include/devices/block_device.hpp" "include/devices/storage/storage_controller.hpp" "include/devices/storage/storage_management.hpp" diff --git a/kernel/devices/include/devices/block_device.hpp b/kernel/devices/include/devices/block_device.hpp index d1e4249..240cb3b 100644 --- a/kernel/devices/include/devices/block_device.hpp +++ b/kernel/devices/include/devices/block_device.hpp @@ -1,7 +1,7 @@ #ifndef TEACH_OS_KERNEL_DEVICES_BLOCK_DEVICE_HPP #define TEACH_OS_KERNEL_DEVICES_BLOCK_DEVICE_HPP -#include "devices/temp_device.hpp" +#include "devices/device.hpp" #include diff --git a/kernel/devices/include/devices/device.hpp b/kernel/devices/include/devices/device.hpp new file mode 100644 index 0000000..0f93bff --- /dev/null +++ b/kernel/devices/include/devices/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 diff --git a/kernel/devices/include/devices/temp_device.hpp b/kernel/devices/include/devices/temp_device.hpp deleted file mode 100644 index 0f93bff..0000000 --- a/kernel/devices/include/devices/temp_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/src/block_device.cpp b/kernel/devices/src/block_device.cpp index dd0fd44..dd63638 100644 --- a/kernel/devices/src/block_device.cpp +++ b/kernel/devices/src/block_device.cpp @@ -1,6 +1,6 @@ #include "devices/block_device.hpp" -#include "devices/temp_device.hpp" +#include "devices/device.hpp" #include diff --git a/kernel/devices/src/device.cpp b/kernel/devices/src/device.cpp new file mode 100644 index 0000000..aa5c1bb --- /dev/null +++ b/kernel/devices/src/device.cpp @@ -0,0 +1,21 @@ +#include "devices/device.hpp" + +#include + +namespace devices +{ + device::device(size_t major, size_t minor) + : m_major(major) + , m_minor(minor) + {} + + auto device::major() const -> size_t + { + return m_major; + } + + auto device::minor() const -> size_t + { + return m_minor; + } +} // namespace devices \ No newline at end of file diff --git a/kernel/devices/src/temp_device.cpp b/kernel/devices/src/temp_device.cpp deleted file mode 100644 index dae20b5..0000000 --- a/kernel/devices/src/temp_device.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "devices/temp_device.hpp" - -#include - -namespace devices -{ - device::device(size_t major, size_t minor) - : m_major(major) - , m_minor(minor) - {} - - auto device::major() const -> size_t - { - return m_major; - } - - auto device::minor() const -> size_t - { - return m_minor; - } -} // namespace devices \ No newline at end of file -- cgit v1.2.3