RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 11:54:57 +00:00
Code Issues Activity Actions

Kernel: Rename FirmwareSysFSDirectory => SysFSFirmwareDirectory

Browse source 
This matches how we give the pattern names for other classses for SysFS
components.
This commit is contained in:
Liav A 2023-06-09 21:17:02 +03:00 • committed by Jelle Raaijmakers
parent 0a0ba4cbc5
commit be16a91aec
7 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/Arch/init.cpp
View file

@ -391,7 +391,7 @@ void init_stage2(void*)
if (!PCI::Access::is_disabled()) { if (!PCI::Access::is_disabled()) {
USB::USBManagement::initialize(); USB::USBManagement::initialize();
} }
FirmwareSysFSDirectory::initialize(); SysFSFirmwareDirectory::initialize();
if (!PCI::Access::is_disabled()) { if (!PCI::Access::is_disabled()) {
VirtIO::detect(); VirtIO::detect();

4
Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Directory.cpp
View file

@ -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; m_smbios_structure_table_length = smbios_entry.ptr()->legacy_structure.smbios_table_length;
} }
UNMAP_AFTER_INIT NonnullRefPtr<BIOSSysFSDirectory> BIOSSysFSDirectory::must_create(FirmwareSysFSDirectory& firmware_directory) UNMAP_AFTER_INIT NonnullRefPtr<BIOSSysFSDirectory> BIOSSysFSDirectory::must_create(SysFSFirmwareDirectory& firmware_directory)
{ {
auto bios_directory = MUST(adopt_nonnull_ref_or_enomem(new (nothrow) BIOSSysFSDirectory(firmware_directory))); auto bios_directory = MUST(adopt_nonnull_ref_or_enomem(new (nothrow) BIOSSysFSDirectory(firmware_directory)));
bios_directory->create_components(); bios_directory->create_components();
@ -76,7 +76,7 @@ UNMAP_AFTER_INIT void BIOSSysFSDirectory::initialize_dmi_exposer()
dbgln("BIOSSysFSDirectory: Data table @ {}", m_smbios_structure_table); 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) : SysFSDirectory(firmware_directory)
{ {
auto entry_32bit = find_dmi_entry32bit_point(); auto entry_32bit = find_dmi_entry32bit_point();

4
Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Directory.h
View file

@ -18,12 +18,12 @@ namespace Kernel {
class BIOSSysFSDirectory : public SysFSDirectory { class BIOSSysFSDirectory : public SysFSDirectory {
public: public:
virtual StringView name() const override { return "bios"sv; } virtual StringView name() const override { return "bios"sv; }
static NonnullRefPtr<BIOSSysFSDirectory> must_create(FirmwareSysFSDirectory&); static NonnullRefPtr<BIOSSysFSDirectory> must_create(SysFSFirmwareDirectory&);
void create_components(); void create_components();
private: private:
explicit BIOSSysFSDirectory(FirmwareSysFSDirectory&); explicit BIOSSysFSDirectory(SysFSFirmwareDirectory&);
void set_dmi_64_bit_entry_initialization_values(); void set_dmi_64_bit_entry_initialization_values();
void set_dmi_32_bit_entry_initialization_values(); void set_dmi_32_bit_entry_initialization_values();

8
Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.cpp
View file

@ -12,14 +12,14 @@
namespace Kernel { 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); SysFSComponentRegistry::the().register_new_component(firmware_directory);
firmware_directory->create_components(); firmware_directory->create_components();
} }
void FirmwareSysFSDirectory::create_components() void SysFSFirmwareDirectory::create_components()
{ {
MUST(m_child_components.with([&](auto& list) -> ErrorOr<void> { MUST(m_child_components.with([&](auto& list) -> ErrorOr<void> {
list.append(BIOSSysFSDirectory::must_create(*this)); 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()) : SysFSDirectory(SysFSComponentRegistry::the().root_directory())
{ {
} }

4
Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h
View file

@ -11,7 +11,7 @@
namespace Kernel { namespace Kernel {
class FirmwareSysFSDirectory : public SysFSDirectory { class SysFSFirmwareDirectory : public SysFSDirectory {
public: public:
virtual StringView name() const override { return "firmware"sv; } virtual StringView name() const override { return "firmware"sv; }
static void initialize(); static void initialize();
@ -19,7 +19,7 @@ public:
void create_components(); void create_components();
private: private:
FirmwareSysFSDirectory(); SysFSFirmwareDirectory();
}; };
} }

4
Kernel/Firmware/ACPI/Parser.cpp
View file

@ -100,14 +100,14 @@ UNMAP_AFTER_INIT void ACPISysFSDirectory::find_tables_and_register_them_as_compo
})); }));
} }
UNMAP_AFTER_INIT NonnullLockRefPtr<ACPISysFSDirectory> ACPISysFSDirectory::must_create(FirmwareSysFSDirectory& firmware_directory) UNMAP_AFTER_INIT NonnullLockRefPtr<ACPISysFSDirectory> ACPISysFSDirectory::must_create(SysFSFirmwareDirectory& firmware_directory)
{ {
auto acpi_directory = MUST(adopt_nonnull_lock_ref_or_enomem(new (nothrow) ACPISysFSDirectory(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(); acpi_directory->find_tables_and_register_them_as_components();
return acpi_directory; return acpi_directory;
} }
UNMAP_AFTER_INIT ACPISysFSDirectory::ACPISysFSDirectory(FirmwareSysFSDirectory& firmware_directory) UNMAP_AFTER_INIT ACPISysFSDirectory::ACPISysFSDirectory(SysFSFirmwareDirectory& firmware_directory)
: SysFSDirectory(firmware_directory) : SysFSDirectory(firmware_directory)
{ {
} }

4
Kernel/Firmware/ACPI/Parser.h
View file

@ -24,11 +24,11 @@ namespace Kernel::ACPI {
class ACPISysFSDirectory : public SysFSDirectory { class ACPISysFSDirectory : public SysFSDirectory {
public: public:
virtual StringView name() const override { return "acpi"sv; } virtual StringView name() const override { return "acpi"sv; }
static NonnullLockRefPtr<ACPISysFSDirectory> must_create(FirmwareSysFSDirectory& firmware_directory); static NonnullLockRefPtr<ACPISysFSDirectory> must_create(SysFSFirmwareDirectory& firmware_directory);
private: private:
void find_tables_and_register_them_as_components(); void find_tables_and_register_them_as_components();
explicit ACPISysFSDirectory(FirmwareSysFSDirectory& firmware_directory); explicit ACPISysFSDirectory(SysFSFirmwareDirectory& firmware_directory);
}; };
class ACPISysFSComponent : public SysFSComponent { class ACPISysFSComponent : public SysFSComponent {