From 290eb53cb531021f41f30cd4abd38f8665d37460 Mon Sep 17 00:00:00 2001 From: Liav A Date: Fri, 22 Apr 2022 09:44:31 +0300 Subject: [PATCH] Kernel/SysFS: Stop cluttering the codebase with pieces of SysFS parts Instead, start to put everything in one place to resemble the directory structure of the SysFS when actually using it. --- Kernel/Bus/PCI/Initializer.cpp | 2 +- Kernel/Bus/USB/USBHub.cpp | 2 +- Kernel/Bus/USB/USBManagement.cpp | 2 +- Kernel/CMakeLists.txt | 12 ++++++------ Kernel/Devices/MemoryDevice.cpp | 2 +- Kernel/FileSystem/SysFS.h | 2 +- .../{SysFSComponent.cpp => SysFS/Component.cpp} | 2 +- .../{SysFSComponent.h => SysFS/Component.h} | 0 .../SysFS/Subsystems}/Bus/PCI/SysFSPCI.cpp | 2 +- .../SysFS/Subsystems}/Bus/PCI/SysFSPCI.h | 0 .../SysFS/Subsystems}/Bus/USB/SysFSUSB.cpp | 2 +- .../SysFS/Subsystems}/Bus/USB/SysFSUSB.h | 0 .../SysFS/Subsystems}/Firmware/BIOS.cpp | 2 +- .../SysFS/Subsystems}/Firmware/BIOS.h | 2 +- .../SysFS/Subsystems/Firmware/Directory.cpp} | 6 +++--- .../SysFS/Subsystems/Firmware/Directory.h} | 0 .../SysFS/Subsystems}/Firmware/PowerStateSwitch.cpp | 2 +- .../SysFS/Subsystems}/Firmware/PowerStateSwitch.h | 2 +- Kernel/Firmware/ACPI/Parser.cpp | 2 +- Kernel/Firmware/ACPI/Parser.h | 4 ++-- Kernel/Firmware/MultiProcessor/Parser.cpp | 2 +- Kernel/init.cpp | 2 +- 22 files changed, 26 insertions(+), 26 deletions(-) rename Kernel/FileSystem/{SysFSComponent.cpp => SysFS/Component.cpp} (97%) rename Kernel/FileSystem/{SysFSComponent.h => SysFS/Component.h} (100%) rename Kernel/{ => FileSystem/SysFS/Subsystems}/Bus/PCI/SysFSPCI.cpp (98%) rename Kernel/{ => FileSystem/SysFS/Subsystems}/Bus/PCI/SysFSPCI.h (100%) rename Kernel/{ => FileSystem/SysFS/Subsystems}/Bus/USB/SysFSUSB.cpp (99%) rename Kernel/{ => FileSystem/SysFS/Subsystems}/Bus/USB/SysFSUSB.h (100%) rename Kernel/{ => FileSystem/SysFS/Subsystems}/Firmware/BIOS.cpp (99%) rename Kernel/{ => FileSystem/SysFS/Subsystems}/Firmware/BIOS.h (98%) rename Kernel/{Firmware/SysFSFirmware.cpp => FileSystem/SysFS/Subsystems/Firmware/Directory.cpp} (82%) rename Kernel/{Firmware/SysFSFirmware.h => FileSystem/SysFS/Subsystems/Firmware/Directory.h} (100%) rename Kernel/{ => FileSystem/SysFS/Subsystems}/Firmware/PowerStateSwitch.cpp (97%) rename Kernel/{ => FileSystem/SysFS/Subsystems}/Firmware/PowerStateSwitch.h (94%) diff --git a/Kernel/Bus/PCI/Initializer.cpp b/Kernel/Bus/PCI/Initializer.cpp index 159948484e9..fd51bdd4888 100644 --- a/Kernel/Bus/PCI/Initializer.cpp +++ b/Kernel/Bus/PCI/Initializer.cpp @@ -8,8 +8,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/Kernel/Bus/USB/USBHub.cpp b/Kernel/Bus/USB/USBHub.cpp index f5684858fcb..c2c94df9615 100644 --- a/Kernel/Bus/USB/USBHub.cpp +++ b/Kernel/Bus/USB/USBHub.cpp @@ -5,11 +5,11 @@ */ #include -#include #include #include #include #include +#include #include namespace Kernel::USB { diff --git a/Kernel/Bus/USB/USBManagement.cpp b/Kernel/Bus/USB/USBManagement.cpp index 8b59a1a4e34..5130654fd89 100644 --- a/Kernel/Bus/USB/USBManagement.cpp +++ b/Kernel/Bus/USB/USBManagement.cpp @@ -6,10 +6,10 @@ #include #include -#include #include #include #include +#include #include namespace Kernel::USB { diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt index 2e4bfe317c1..13c75f1ae06 100644 --- a/Kernel/CMakeLists.txt +++ b/Kernel/CMakeLists.txt @@ -26,8 +26,6 @@ set(KERNEL_SOURCES Bus/PCI/API.cpp Bus/PCI/Device.cpp Bus/PCI/Initializer.cpp - Bus/PCI/SysFSPCI.cpp - Bus/USB/SysFSUSB.cpp Bus/USB/UHCI/UHCIController.cpp Bus/USB/UHCI/UHCIRootHub.cpp Bus/USB/USBConfiguration.cpp @@ -144,16 +142,18 @@ set(KERNEL_SOURCES FileSystem/Plan9FileSystem.cpp FileSystem/ProcFS.cpp FileSystem/SysFS.cpp - FileSystem/SysFSComponent.cpp + FileSystem/SysFS/Component.cpp + FileSystem/SysFS/Subsystems/Bus/PCI/SysFSPCI.cpp + FileSystem/SysFS/Subsystems/Bus/USB/SysFSUSB.cpp + FileSystem/SysFS/Subsystems/Firmware/BIOS.cpp + FileSystem/SysFS/Subsystems/Firmware/Directory.cpp + FileSystem/SysFS/Subsystems/Firmware/PowerStateSwitch.cpp FileSystem/TmpFS.cpp FileSystem/VirtualFileSystem.cpp Firmware/ACPI/Initialize.cpp Firmware/ACPI/Parser.cpp Firmware/Hypervisor/VMWareBackdoor.cpp Firmware/MultiProcessor/Parser.cpp - Firmware/BIOS.cpp - Firmware/PowerStateSwitch.cpp - Firmware/SysFSFirmware.cpp FutexQueue.cpp Interrupts/APIC.cpp Interrupts/GenericInterruptHandler.cpp diff --git a/Kernel/Devices/MemoryDevice.cpp b/Kernel/Devices/MemoryDevice.cpp index 34942485258..357bd2e02c2 100644 --- a/Kernel/Devices/MemoryDevice.cpp +++ b/Kernel/Devices/MemoryDevice.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Kernel/FileSystem/SysFS.h b/Kernel/FileSystem/SysFS.h index 1d600bcdaef..6fc19018c76 100644 --- a/Kernel/FileSystem/SysFS.h +++ b/Kernel/FileSystem/SysFS.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include namespace Kernel { diff --git a/Kernel/FileSystem/SysFSComponent.cpp b/Kernel/FileSystem/SysFS/Component.cpp similarity index 97% rename from Kernel/FileSystem/SysFSComponent.cpp rename to Kernel/FileSystem/SysFS/Component.cpp index df8be7646d1..4e5fa752ffa 100644 --- a/Kernel/FileSystem/SysFSComponent.cpp +++ b/Kernel/FileSystem/SysFS/Component.cpp @@ -5,7 +5,7 @@ */ #include -#include +#include namespace Kernel { diff --git a/Kernel/FileSystem/SysFSComponent.h b/Kernel/FileSystem/SysFS/Component.h similarity index 100% rename from Kernel/FileSystem/SysFSComponent.h rename to Kernel/FileSystem/SysFS/Component.h diff --git a/Kernel/Bus/PCI/SysFSPCI.cpp b/Kernel/FileSystem/SysFS/Subsystems/Bus/PCI/SysFSPCI.cpp similarity index 98% rename from Kernel/Bus/PCI/SysFSPCI.cpp rename to Kernel/FileSystem/SysFS/Subsystems/Bus/PCI/SysFSPCI.cpp index 069ae33804e..90948c5cb87 100644 --- a/Kernel/Bus/PCI/SysFSPCI.cpp +++ b/Kernel/FileSystem/SysFS/Subsystems/Bus/PCI/SysFSPCI.cpp @@ -6,8 +6,8 @@ #include #include -#include #include +#include #include namespace Kernel::PCI { diff --git a/Kernel/Bus/PCI/SysFSPCI.h b/Kernel/FileSystem/SysFS/Subsystems/Bus/PCI/SysFSPCI.h similarity index 100% rename from Kernel/Bus/PCI/SysFSPCI.h rename to Kernel/FileSystem/SysFS/Subsystems/Bus/PCI/SysFSPCI.h diff --git a/Kernel/Bus/USB/SysFSUSB.cpp b/Kernel/FileSystem/SysFS/Subsystems/Bus/USB/SysFSUSB.cpp similarity index 99% rename from Kernel/Bus/USB/SysFSUSB.cpp rename to Kernel/FileSystem/SysFS/Subsystems/Bus/USB/SysFSUSB.cpp index 568bda9b6af..361cb7ea22c 100644 --- a/Kernel/Bus/USB/SysFSUSB.cpp +++ b/Kernel/FileSystem/SysFS/Subsystems/Bus/USB/SysFSUSB.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include namespace Kernel::USB { diff --git a/Kernel/Bus/USB/SysFSUSB.h b/Kernel/FileSystem/SysFS/Subsystems/Bus/USB/SysFSUSB.h similarity index 100% rename from Kernel/Bus/USB/SysFSUSB.h rename to Kernel/FileSystem/SysFS/Subsystems/Bus/USB/SysFSUSB.h diff --git a/Kernel/Firmware/BIOS.cpp b/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS.cpp similarity index 99% rename from Kernel/Firmware/BIOS.cpp rename to Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS.cpp index e63b8b4c5cd..ad42d1336a2 100644 --- a/Kernel/Firmware/BIOS.cpp +++ b/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/Kernel/Firmware/BIOS.h b/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS.h similarity index 98% rename from Kernel/Firmware/BIOS.h rename to Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS.h index 0be5ad40aa0..19a1dd52242 100644 --- a/Kernel/Firmware/BIOS.h +++ b/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Kernel/Firmware/SysFSFirmware.cpp b/Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.cpp similarity index 82% rename from Kernel/Firmware/SysFSFirmware.cpp rename to Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.cpp index b0ee02e562e..294cb7625ed 100644 --- a/Kernel/Firmware/SysFSFirmware.cpp +++ b/Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.cpp @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#include +#include +#include #include -#include -#include -#include #include namespace Kernel { diff --git a/Kernel/Firmware/SysFSFirmware.h b/Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h similarity index 100% rename from Kernel/Firmware/SysFSFirmware.h rename to Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h diff --git a/Kernel/Firmware/PowerStateSwitch.cpp b/Kernel/FileSystem/SysFS/Subsystems/Firmware/PowerStateSwitch.cpp similarity index 97% rename from Kernel/Firmware/PowerStateSwitch.cpp rename to Kernel/FileSystem/SysFS/Subsystems/Firmware/PowerStateSwitch.cpp index 8e33ce5a5e6..31e51608bcd 100644 --- a/Kernel/Firmware/PowerStateSwitch.cpp +++ b/Kernel/FileSystem/SysFS/Subsystems/Firmware/PowerStateSwitch.cpp @@ -7,8 +7,8 @@ #include #include +#include #include -#include #include #include #include diff --git a/Kernel/Firmware/PowerStateSwitch.h b/Kernel/FileSystem/SysFS/Subsystems/Firmware/PowerStateSwitch.h similarity index 94% rename from Kernel/Firmware/PowerStateSwitch.h rename to Kernel/FileSystem/SysFS/Subsystems/Firmware/PowerStateSwitch.h index 03cff3e82a2..771455dc84e 100644 --- a/Kernel/Firmware/PowerStateSwitch.h +++ b/Kernel/FileSystem/SysFS/Subsystems/Firmware/PowerStateSwitch.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Kernel/Firmware/ACPI/Parser.cpp b/Kernel/Firmware/ACPI/Parser.cpp index 406275bffb5..ae064f843af 100644 --- a/Kernel/Firmware/ACPI/Parser.cpp +++ b/Kernel/Firmware/ACPI/Parser.cpp @@ -13,8 +13,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/Kernel/Firmware/ACPI/Parser.h b/Kernel/Firmware/ACPI/Parser.h index 05356fd73ef..e345db6a1f7 100644 --- a/Kernel/Firmware/ACPI/Parser.h +++ b/Kernel/Firmware/ACPI/Parser.h @@ -9,10 +9,10 @@ #include #include #include -#include +#include +#include #include #include -#include #include #include #include diff --git a/Kernel/Firmware/MultiProcessor/Parser.cpp b/Kernel/Firmware/MultiProcessor/Parser.cpp index 1883afc7753..75b7a75b95d 100644 --- a/Kernel/Firmware/MultiProcessor/Parser.cpp +++ b/Kernel/Firmware/MultiProcessor/Parser.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include diff --git a/Kernel/init.cpp b/Kernel/init.cpp index fd8ca7ee5a6..cf15035cbdc 100644 --- a/Kernel/init.cpp +++ b/Kernel/init.cpp @@ -29,11 +29,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include #include