From be16a91aeca82314da75a00ca02efb05e20093f7 Mon Sep 17 00:00:00 2001 From: Liav A Date: Fri, 9 Jun 2023 21:17:02 +0300 Subject: [PATCH] Kernel: Rename FirmwareSysFSDirectory => SysFSFirmwareDirectory This matches how we give the pattern names for other classses for SysFS components. --- Kernel/Arch/init.cpp | 2 +- .../SysFS/Subsystems/Firmware/BIOS/Directory.cpp | 4 ++-- .../FileSystem/SysFS/Subsystems/Firmware/BIOS/Directory.h | 4 ++-- Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.cpp | 8 ++++---- Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h | 4 ++-- Kernel/Firmware/ACPI/Parser.cpp | 4 ++-- Kernel/Firmware/ACPI/Parser.h | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Kernel/Arch/init.cpp b/Kernel/Arch/init.cpp index 755b99bb5c..0f73c0ef9b 100644 --- a/Kernel/Arch/init.cpp +++ b/Kernel/Arch/init.cpp @@ -391,7 +391,7 @@ void init_stage2(void*) if (!PCI::Access::is_disabled()) { USB::USBManagement::initialize(); } - FirmwareSysFSDirectory::initialize(); + SysFSFirmwareDirectory::initialize(); if (!PCI::Access::is_disabled()) { VirtIO::detect(); diff --git a/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Directory.cpp b/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Directory.cpp index a48ead7890..7c6007c989 100644 --- a/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Directory.cpp +++ b/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Directory.cpp @@ -39,7 +39,7 @@ UNMAP_AFTER_INIT void BIOSSysFSDirectory::set_dmi_32_bit_entry_initialization_va m_smbios_structure_table_length = smbios_entry.ptr()->legacy_structure.smbios_table_length; } -UNMAP_AFTER_INIT NonnullRefPtr BIOSSysFSDirectory::must_create(FirmwareSysFSDirectory& firmware_directory) +UNMAP_AFTER_INIT NonnullRefPtr BIOSSysFSDirectory::must_create(SysFSFirmwareDirectory& firmware_directory) { auto bios_directory = MUST(adopt_nonnull_ref_or_enomem(new (nothrow) BIOSSysFSDirectory(firmware_directory))); bios_directory->create_components(); @@ -76,7 +76,7 @@ UNMAP_AFTER_INIT void BIOSSysFSDirectory::initialize_dmi_exposer() dbgln("BIOSSysFSDirectory: Data table @ {}", m_smbios_structure_table); } -UNMAP_AFTER_INIT BIOSSysFSDirectory::BIOSSysFSDirectory(FirmwareSysFSDirectory& firmware_directory) +UNMAP_AFTER_INIT BIOSSysFSDirectory::BIOSSysFSDirectory(SysFSFirmwareDirectory& firmware_directory) : SysFSDirectory(firmware_directory) { auto entry_32bit = find_dmi_entry32bit_point(); diff --git a/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Directory.h b/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Directory.h index 28fb136454..aa9a4beb83 100644 --- a/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Directory.h +++ b/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Directory.h @@ -18,12 +18,12 @@ namespace Kernel { class BIOSSysFSDirectory : public SysFSDirectory { public: virtual StringView name() const override { return "bios"sv; } - static NonnullRefPtr must_create(FirmwareSysFSDirectory&); + static NonnullRefPtr must_create(SysFSFirmwareDirectory&); void create_components(); private: - explicit BIOSSysFSDirectory(FirmwareSysFSDirectory&); + explicit BIOSSysFSDirectory(SysFSFirmwareDirectory&); void set_dmi_64_bit_entry_initialization_values(); void set_dmi_32_bit_entry_initialization_values(); diff --git a/Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.cpp b/Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.cpp index 4ef941eb6d..345c114873 100644 --- a/Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.cpp +++ b/Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.cpp @@ -12,14 +12,14 @@ namespace Kernel { -UNMAP_AFTER_INIT void FirmwareSysFSDirectory::initialize() +UNMAP_AFTER_INIT void SysFSFirmwareDirectory::initialize() { - auto firmware_directory = adopt_ref_if_nonnull(new (nothrow) FirmwareSysFSDirectory()).release_nonnull(); + auto firmware_directory = adopt_ref_if_nonnull(new (nothrow) SysFSFirmwareDirectory()).release_nonnull(); SysFSComponentRegistry::the().register_new_component(firmware_directory); firmware_directory->create_components(); } -void FirmwareSysFSDirectory::create_components() +void SysFSFirmwareDirectory::create_components() { MUST(m_child_components.with([&](auto& list) -> ErrorOr { list.append(BIOSSysFSDirectory::must_create(*this)); @@ -29,7 +29,7 @@ void FirmwareSysFSDirectory::create_components() })); } -UNMAP_AFTER_INIT FirmwareSysFSDirectory::FirmwareSysFSDirectory() +UNMAP_AFTER_INIT SysFSFirmwareDirectory::SysFSFirmwareDirectory() : SysFSDirectory(SysFSComponentRegistry::the().root_directory()) { } diff --git a/Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h b/Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h index e491d80af7..d818c41dc5 100644 --- a/Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h +++ b/Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h @@ -11,7 +11,7 @@ namespace Kernel { -class FirmwareSysFSDirectory : public SysFSDirectory { +class SysFSFirmwareDirectory : public SysFSDirectory { public: virtual StringView name() const override { return "firmware"sv; } static void initialize(); @@ -19,7 +19,7 @@ public: void create_components(); private: - FirmwareSysFSDirectory(); + SysFSFirmwareDirectory(); }; } diff --git a/Kernel/Firmware/ACPI/Parser.cpp b/Kernel/Firmware/ACPI/Parser.cpp index 81a3358580..98863f7355 100644 --- a/Kernel/Firmware/ACPI/Parser.cpp +++ b/Kernel/Firmware/ACPI/Parser.cpp @@ -100,14 +100,14 @@ UNMAP_AFTER_INIT void ACPISysFSDirectory::find_tables_and_register_them_as_compo })); } -UNMAP_AFTER_INIT NonnullLockRefPtr ACPISysFSDirectory::must_create(FirmwareSysFSDirectory& firmware_directory) +UNMAP_AFTER_INIT NonnullLockRefPtr ACPISysFSDirectory::must_create(SysFSFirmwareDirectory& firmware_directory) { auto acpi_directory = MUST(adopt_nonnull_lock_ref_or_enomem(new (nothrow) ACPISysFSDirectory(firmware_directory))); acpi_directory->find_tables_and_register_them_as_components(); return acpi_directory; } -UNMAP_AFTER_INIT ACPISysFSDirectory::ACPISysFSDirectory(FirmwareSysFSDirectory& firmware_directory) +UNMAP_AFTER_INIT ACPISysFSDirectory::ACPISysFSDirectory(SysFSFirmwareDirectory& firmware_directory) : SysFSDirectory(firmware_directory) { } diff --git a/Kernel/Firmware/ACPI/Parser.h b/Kernel/Firmware/ACPI/Parser.h index f9c9c7f81b..f5168cc326 100644 --- a/Kernel/Firmware/ACPI/Parser.h +++ b/Kernel/Firmware/ACPI/Parser.h @@ -24,11 +24,11 @@ namespace Kernel::ACPI { class ACPISysFSDirectory : public SysFSDirectory { public: virtual StringView name() const override { return "acpi"sv; } - static NonnullLockRefPtr must_create(FirmwareSysFSDirectory& firmware_directory); + static NonnullLockRefPtr must_create(SysFSFirmwareDirectory& firmware_directory); private: void find_tables_and_register_them_as_components(); - explicit ACPISysFSDirectory(FirmwareSysFSDirectory& firmware_directory); + explicit ACPISysFSDirectory(SysFSFirmwareDirectory& firmware_directory); }; class ACPISysFSComponent : public SysFSComponent {