diff options
| -rw-r--r-- | arch/x86_64/kapi/boot_modules.cpp | 5 | ||||
| -rw-r--r-- | kapi/kapi/boot_modules.hpp | 6 | ||||
| -rw-r--r-- | kapi/kapi/boot_modules/bus.hpp | 10 | ||||
| -rw-r--r-- | kapi/kapi/boot_modules/module.hpp (renamed from kapi/kapi/boot_modules/boot_module.hpp) | 6 | ||||
| -rw-r--r-- | kapi/kapi/boot_modules/registry.hpp | 6 | ||||
| -rw-r--r-- | kernel/kapi/boot_module/bus.cpp | 4 | ||||
| -rw-r--r-- | kernel/kapi/boot_module/registry.cpp | 2 | ||||
| -rw-r--r-- | kernel/kernel/drivers/storage/ram_disk.cpp | 4 |
8 files changed, 21 insertions, 22 deletions
diff --git a/arch/x86_64/kapi/boot_modules.cpp b/arch/x86_64/kapi/boot_modules.cpp index 361a155a..136eb30d 100644 --- a/arch/x86_64/kapi/boot_modules.cpp +++ b/arch/x86_64/kapi/boot_modules.cpp @@ -4,10 +4,9 @@ #include <arch/boot/ld.hpp> #include <kapi/boot.hpp> -#include <kapi/boot_modules/boot_module.hpp> +#include <kapi/boot_modules/module.hpp> #include <kapi/boot_modules/registry.hpp> #include <kapi/memory.hpp> -#include <kapi/system.hpp> #include <kstd/print.hpp> @@ -28,7 +27,7 @@ namespace kapi::boot_modules auto modules = boot::bootstrap_information.mbi->modules(); std::ranges::for_each(modules, [](auto const & module) { - registry::get().add(kapi::boot_modules::boot_module{ + registry::get().add(kapi::boot_modules::module{ .name = module.string(), .start_address = memory::linear_address{module.start_address + std::bit_cast<std::uintptr_t>(&arch::boot::TEACHOS_VMA)}, diff --git a/kapi/kapi/boot_modules.hpp b/kapi/kapi/boot_modules.hpp index 49a83ef5..7f47c628 100644 --- a/kapi/kapi/boot_modules.hpp +++ b/kapi/kapi/boot_modules.hpp @@ -1,9 +1,9 @@ #ifndef TEACHOS_KAPI_BOOT_MODULES_HPP #define TEACHOS_KAPI_BOOT_MODULES_HPP -#include <kapi/boot_modules/boot_module.hpp> // IWYU pragma: export -#include <kapi/boot_modules/bus.hpp> // IWYU pragma: export -#include <kapi/boot_modules/registry.hpp> // IWYU pragma: export +#include <kapi/boot_modules/bus.hpp> // IWYU pragma: export +#include <kapi/boot_modules/module.hpp> // IWYU pragma: export +#include <kapi/boot_modules/registry.hpp> // IWYU pragma: export namespace kapi::boot_modules { diff --git a/kapi/kapi/boot_modules/bus.hpp b/kapi/kapi/boot_modules/bus.hpp index 7e3c773c..2c52677e 100644 --- a/kapi/kapi/boot_modules/bus.hpp +++ b/kapi/kapi/boot_modules/bus.hpp @@ -3,7 +3,7 @@ // IWYU pragma: private, include <kapi/boot_modules.hpp> -#include <kapi/boot_modules/boot_module.hpp> +#include <kapi/boot_modules/module.hpp> #include <kapi/boot_modules/registry.hpp> #include <kapi/devices.hpp> @@ -24,7 +24,7 @@ namespace kapi::boot_modules [[nodiscard]] auto virtual command_line() const -> std::string_view = 0; - [[nodiscard]] auto virtual module() const -> boot_module const & = 0; + [[nodiscard]] auto virtual module() const -> module const & = 0; }; struct boot_module_driver_identification @@ -38,17 +38,17 @@ namespace kapi::boot_modules struct boot_module_device final : kapi::devices::device, boot_module_identification { - boot_module_device(std::size_t index, boot_module const & module); + boot_module_device(std::size_t index, struct module const & module); [[nodiscard]] auto command_line() const -> std::string_view override; - [[nodiscard]] auto module() const -> boot_module const & override; + [[nodiscard]] auto module() const -> struct module const & override; protected: auto query_interface(kapi::devices::interface interface) -> void * override; private: - boot_module m_module; + struct module m_module; }; struct boot_module_bus final : kapi::devices::bus, kapi::devices::bus_protocol diff --git a/kapi/kapi/boot_modules/boot_module.hpp b/kapi/kapi/boot_modules/module.hpp index 85de7ab0..14898132 100644 --- a/kapi/kapi/boot_modules/boot_module.hpp +++ b/kapi/kapi/boot_modules/module.hpp @@ -1,5 +1,5 @@ -#ifndef TEACHOS_KAPI_BOOT_MODULES_BOOT_MODULE_HPP -#define TEACHOS_KAPI_BOOT_MODULES_BOOT_MODULE_HPP +#ifndef TEACHOS_KAPI_BOOT_MODULES_MODULE_HPP +#define TEACHOS_KAPI_BOOT_MODULES_MODULE_HPP // IWYU pragma: private, include <kapi/boot_modules.hpp> @@ -14,7 +14,7 @@ namespace kapi::boot_modules // ! // ! The boot module struct represents a module loaded by the bootloader, and contains information about it, such as // ! its name, virtual start address, and size. - struct boot_module + struct module { std::string_view name{}; memory::linear_address start_address{}; diff --git a/kapi/kapi/boot_modules/registry.hpp b/kapi/kapi/boot_modules/registry.hpp index 4c659fa4..33dc2169 100644 --- a/kapi/kapi/boot_modules/registry.hpp +++ b/kapi/kapi/boot_modules/registry.hpp @@ -3,7 +3,7 @@ // IWYU pragma: private, include <kapi/boot_modules.hpp> -#include <kapi/boot_modules/boot_module.hpp> +#include <kapi/boot_modules/module.hpp> #include <kstd/vector.hpp> @@ -21,7 +21,7 @@ namespace kapi::boot_modules //! providing access to them for the rest of the kernel. struct registry { - using container = kstd::vector<boot_module>; + using container = kstd::vector<module>; using value_type = container::value_type; using const_reference = container::const_reference; @@ -63,7 +63,7 @@ namespace kapi::boot_modules [[nodiscard]] auto operator[](std::size_t index) const noexcept -> const_reference; - auto add(boot_module module) -> void; + auto add(module module) -> void; private: container m_modules{}; diff --git a/kernel/kapi/boot_module/bus.cpp b/kernel/kapi/boot_module/bus.cpp index 88f2cda3..95264d00 100644 --- a/kernel/kapi/boot_module/bus.cpp +++ b/kernel/kapi/boot_module/bus.cpp @@ -28,7 +28,7 @@ namespace kapi::boot_modules return false; } - boot_module_device::boot_module_device(std::size_t index, boot_module const & module) + boot_module_device::boot_module_device(std::size_t index, struct module const & module) : kapi::devices::device{kstd::format("boot_module{}", index)} , m_module(module) {} @@ -38,7 +38,7 @@ namespace kapi::boot_modules return m_module.name; } - auto boot_module_device::module() const -> boot_modules::boot_module const & + auto boot_module_device::module() const -> boot_modules::module const & { return m_module; } diff --git a/kernel/kapi/boot_module/registry.cpp b/kernel/kapi/boot_module/registry.cpp index 80c76129..9876866b 100644 --- a/kernel/kapi/boot_module/registry.cpp +++ b/kernel/kapi/boot_module/registry.cpp @@ -106,7 +106,7 @@ namespace kapi::boot_modules return m_modules[index]; } - auto registry::add(boot_module module) -> void + auto registry::add(module module) -> void { m_modules.push_back(module); } diff --git a/kernel/kernel/drivers/storage/ram_disk.cpp b/kernel/kernel/drivers/storage/ram_disk.cpp index cd5368cb..db87a48b 100644 --- a/kernel/kernel/drivers/storage/ram_disk.cpp +++ b/kernel/kernel/drivers/storage/ram_disk.cpp @@ -32,7 +32,7 @@ namespace kernel::drivers::storage struct block_node final : kapi::devices::block_device { - explicit block_node(kapi::boot_modules::boot_module const & module) + explicit block_node(kapi::boot_modules::module const & module) : m_module(module) {} @@ -88,7 +88,7 @@ namespace kernel::drivers::storage } private: - kapi::boot_modules::boot_module m_module; + kapi::boot_modules::module m_module; }; } // namespace |