From b1c68dd2359914f79974fc397abfd3d7004f2e5b Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 11 Jul 2021 01:35:03 +0200 Subject: [PATCH] Kernel: Rename SysFS related classes in ACPI code Give them names that sound related to SysFS. --- Kernel/ACPI/Parser.cpp | 26 +++++++++++++------------- Kernel/ACPI/Parser.h | 10 +++++----- Kernel/init.cpp | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Kernel/ACPI/Parser.cpp b/Kernel/ACPI/Parser.cpp index 259702e5e2..da449b4831 100644 --- a/Kernel/ACPI/Parser.cpp +++ b/Kernel/ACPI/Parser.cpp @@ -27,12 +27,12 @@ Parser* Parser::the() return s_acpi_parser; } -UNMAP_AFTER_INIT NonnullRefPtr ExposedComponent::create(String name, PhysicalAddress paddr, size_t table_size) +UNMAP_AFTER_INIT NonnullRefPtr ACPISysFSComponent::create(String name, PhysicalAddress paddr, size_t table_size) { - return adopt_ref(*new (nothrow) ExposedComponent(name, paddr, table_size)); + return adopt_ref(*new (nothrow) ACPISysFSComponent(name, paddr, table_size)); } -KResultOr ExposedComponent::read_bytes(off_t offset, size_t count, UserOrKernelBuffer& buffer, FileDescription*) const +KResultOr ACPISysFSComponent::read_bytes(off_t offset, size_t count, UserOrKernelBuffer& buffer, FileDescription*) const { auto blob = try_to_generate_buffer(); if (!blob) @@ -47,48 +47,48 @@ KResultOr ExposedComponent::read_bytes(off_t offset, size_t count, UserO return nread; } -OwnPtr ExposedComponent::try_to_generate_buffer() const +OwnPtr ACPISysFSComponent::try_to_generate_buffer() const { auto acpi_blob = map_typed((m_paddr), m_length); return KBuffer::try_create_with_bytes(Span { acpi_blob.ptr(), m_length }); } -UNMAP_AFTER_INIT ExposedComponent::ExposedComponent(String name, PhysicalAddress paddr, size_t table_size) +UNMAP_AFTER_INIT ACPISysFSComponent::ACPISysFSComponent(String name, PhysicalAddress paddr, size_t table_size) : SysFSComponent(name) , m_paddr(paddr) , m_length(table_size) { } -UNMAP_AFTER_INIT void ExposedDirectory::initialize() +UNMAP_AFTER_INIT void ACPISysFSDirectory::initialize() { - auto acpi_folder = adopt_ref(*new (nothrow) ExposedDirectory()); + auto acpi_folder = adopt_ref(*new (nothrow) ACPISysFSDirectory()); SysFSComponentRegistry::the().register_new_component(acpi_folder); } -UNMAP_AFTER_INIT ExposedDirectory::ExposedDirectory() +UNMAP_AFTER_INIT ACPISysFSDirectory::ACPISysFSDirectory() : SysFSDirectory("acpi", SysFSComponentRegistry::the().root_folder()) { NonnullRefPtrVector components; size_t ssdt_count = 0; ACPI::Parser::the()->enumerate_static_tables([&](const StringView& signature, PhysicalAddress p_table, size_t length) { if (signature == "SSDT") { - components.append(ExposedComponent::create(String::formatted("{:4s}{}", signature.characters_without_null_termination(), ssdt_count), p_table, length)); + components.append(ACPISysFSComponent::create(String::formatted("{:4s}{}", signature.characters_without_null_termination(), ssdt_count), p_table, length)); ssdt_count++; return; } - components.append(ExposedComponent::create(signature, p_table, length)); + components.append(ACPISysFSComponent::create(signature, p_table, length)); }); m_components = components; auto rsdp = map_typed(ACPI::Parser::the()->rsdp()); - m_components.append(ExposedComponent::create("RSDP", ACPI::Parser::the()->rsdp(), rsdp->base.revision == 0 ? sizeof(Structures::RSDPDescriptor) : rsdp->length)); + m_components.append(ACPISysFSComponent::create("RSDP", ACPI::Parser::the()->rsdp(), rsdp->base.revision == 0 ? sizeof(Structures::RSDPDescriptor) : rsdp->length)); auto main_system_description_table = map_typed(ACPI::Parser::the()->main_system_description_table()); if (ACPI::Parser::the()->is_xsdt_supported()) { - m_components.append(ExposedComponent::create("XSDT", ACPI::Parser::the()->main_system_description_table(), main_system_description_table->length)); + m_components.append(ACPISysFSComponent::create("XSDT", ACPI::Parser::the()->main_system_description_table(), main_system_description_table->length)); } else { - m_components.append(ExposedComponent::create("RSDT", ACPI::Parser::the()->main_system_description_table(), main_system_description_table->length)); + m_components.append(ACPISysFSComponent::create("RSDT", ACPI::Parser::the()->main_system_description_table(), main_system_description_table->length)); } } diff --git a/Kernel/ACPI/Parser.h b/Kernel/ACPI/Parser.h index 26a11f6e6c..8fa5b589c7 100644 --- a/Kernel/ACPI/Parser.h +++ b/Kernel/ACPI/Parser.h @@ -17,23 +17,23 @@ namespace Kernel { namespace ACPI { -class ExposedDirectory : public SysFSDirectory { +class ACPISysFSDirectory : public SysFSDirectory { public: static void initialize(); private: - ExposedDirectory(); + ACPISysFSDirectory(); }; -class ExposedComponent : public SysFSComponent { +class ACPISysFSComponent : public SysFSComponent { public: - static NonnullRefPtr create(String name, PhysicalAddress, size_t table_size); + static NonnullRefPtr create(String name, PhysicalAddress, size_t table_size); virtual KResultOr read_bytes(off_t, size_t, UserOrKernelBuffer&, FileDescription*) const override; protected: OwnPtr try_to_generate_buffer() const; - ExposedComponent(String name, PhysicalAddress, size_t table_size); + ACPISysFSComponent(String name, PhysicalAddress, size_t table_size); PhysicalAddress m_paddr; size_t m_length; diff --git a/Kernel/init.cpp b/Kernel/init.cpp index 95df8a239c..341f066f2b 100644 --- a/Kernel/init.cpp +++ b/Kernel/init.cpp @@ -237,7 +237,7 @@ void init_stage2(void*) USB::UHCIController::detect(); BIOSExposedDirectory::initialize(); - ACPI::ExposedDirectory::initialize(); + ACPI::ACPISysFSDirectory::initialize(); VirtIO::detect();