Kernel/PCI: Move the PCI components as a subfolder to the Bus directory

Author: https://github.com/supercomputer7
Commit: https://github.com/SerenityOS/serenity/commit/6568bb47cb6
Pull-request: https://github.com/SerenityOS/serenity/pull/8241
Issue: https://github.com/SerenityOS/serenity/issues/6948
Issue: https://github.com/SerenityOS/serenity/issues/7445
Issue: https://github.com/SerenityOS/serenity/issues/8331
Reviewed-by: https://github.com/IdanHo
Reviewed-by: https://github.com/awesomekling

Kernel/ACPI/Parser.cpp

@@ -10,9 +10,9 @@
 #include <Kernel/ACPI/Parser.h>
 #include <Kernel/Arch/PC/BIOS.h>
 #include <Kernel/Arch/x86/InterruptDisabler.h>
+#include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/Debug.h>
 #include <Kernel/IO.h>
-#include <Kernel/PCI/Access.h>
 #include <Kernel/Sections.h>
 #include <Kernel/StdLib.h>
 #include <Kernel/VM/TypedMapping.h>

Kernel/Bus/PCI/Access.cpp

@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Bus/PCI/IOAccess.h>
 #include <Kernel/Debug.h>
 #include <Kernel/IO.h>
-#include <Kernel/PCI/Access.h>
-#include <Kernel/PCI/IOAccess.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {

Kernel/Bus/PCI/Access.h

@@ -9,8 +9,8 @@
 #include <AK/Bitmap.h>
 #include <AK/String.h>
 #include <AK/Vector.h>
+#include <Kernel/Bus/PCI/Definitions.h>
 #include <Kernel/FileSystem/SysFS.h>
-#include <Kernel/PCI/Definitions.h>
 
 namespace Kernel::PCI {
 

Kernel/Bus/PCI/Device.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/PCI/Device.h>
+#include <Kernel/Bus/PCI/Device.h>
 
 namespace Kernel {
 namespace PCI {

Kernel/Bus/PCI/Device.h

@@ -7,8 +7,8 @@
 #pragma once
 
 #include <AK/Types.h>
+#include <Kernel/Bus/PCI/Definitions.h>
 #include <Kernel/Interrupts/IRQHandler.h>
-#include <Kernel/PCI/Definitions.h>
 
 namespace Kernel {
 class PCI::Device : public IRQHandler {

Kernel/Bus/PCI/DeviceController.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/PCI/DeviceController.h>
+#include <Kernel/Bus/PCI/DeviceController.h>
 
 namespace Kernel {
 namespace PCI {

Kernel/Bus/PCI/DeviceController.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/Types.h>
-#include <Kernel/PCI/Definitions.h>
+#include <Kernel/Bus/PCI/Definitions.h>
 
 namespace Kernel {
 class PCI::DeviceController {

Kernel/Bus/PCI/IOAccess.cpp

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/Bus/PCI/IOAccess.h>
 #include <Kernel/Debug.h>
 #include <Kernel/IO.h>
-#include <Kernel/PCI/IOAccess.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {

Kernel/Bus/PCI/IOAccess.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <Kernel/PCI/Access.h>
+#include <Kernel/Bus/PCI/Access.h>
 
 namespace Kernel {
 namespace PCI {

Kernel/Bus/PCI/Initializer.cpp

@@ -5,12 +5,12 @@
  */
 
 #include <Kernel/ACPI/Parser.h>
+#include <Kernel/Bus/PCI/IOAccess.h>
+#include <Kernel/Bus/PCI/Initializer.h>
+#include <Kernel/Bus/PCI/MMIOAccess.h>
+#include <Kernel/Bus/PCI/WindowedMMIOAccess.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/IO.h>
-#include <Kernel/PCI/IOAccess.h>
-#include <Kernel/PCI/Initializer.h>
-#include <Kernel/PCI/MMIOAccess.h>
-#include <Kernel/PCI/WindowedMMIOAccess.h>
 #include <Kernel/Panic.h>
 #include <Kernel/Sections.h>
 

Kernel/Bus/PCI/MMIOAccess.cpp

@@ -7,8 +7,8 @@
 #include <AK/Optional.h>
 #include <AK/StringView.h>
 #include <Kernel/Arch/x86/InterruptDisabler.h>
+#include <Kernel/Bus/PCI/MMIOAccess.h>
 #include <Kernel/Debug.h>
-#include <Kernel/PCI/MMIOAccess.h>
 #include <Kernel/Sections.h>
 #include <Kernel/VM/MemoryManager.h>
 

Kernel/Bus/PCI/MMIOAccess.h

@@ -11,7 +11,7 @@
 #include <AK/OwnPtr.h>
 #include <AK/Types.h>
 #include <Kernel/ACPI/Definitions.h>
-#include <Kernel/PCI/Access.h>
+#include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/SpinLock.h>
 #include <Kernel/VM/AnonymousVMObject.h>
 #include <Kernel/VM/PhysicalRegion.h>

Kernel/Bus/PCI/WindowedMMIOAccess.cpp

@@ -7,8 +7,8 @@
 #include <AK/Optional.h>
 #include <AK/StringView.h>
 #include <Kernel/Arch/x86/InterruptDisabler.h>
+#include <Kernel/Bus/PCI/WindowedMMIOAccess.h>
 #include <Kernel/Debug.h>
-#include <Kernel/PCI/WindowedMMIOAccess.h>
 #include <Kernel/Sections.h>
 #include <Kernel/VM/MemoryManager.h>
 

Kernel/Bus/PCI/WindowedMMIOAccess.h

@@ -11,8 +11,8 @@
 #include <AK/OwnPtr.h>
 #include <AK/Types.h>
 #include <Kernel/ACPI/Definitions.h>
-#include <Kernel/PCI/Access.h>
-#include <Kernel/PCI/MMIOAccess.h>
+#include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Bus/PCI/MMIOAccess.h>
 #include <Kernel/VM/AnonymousVMObject.h>
 #include <Kernel/VM/PhysicalRegion.h>
 #include <Kernel/VM/Region.h>

Kernel/CMakeLists.txt

@@ -26,6 +26,13 @@ set(KERNEL_SOURCES
     AddressSanitizer.cpp
     Arch/PC/BIOS.cpp
     Arch/x86/SmapDisabler.h
+    Bus/PCI/Access.cpp
+    Bus/PCI/Device.cpp
+    Bus/PCI/DeviceController.cpp
+    Bus/PCI/IOAccess.cpp
+    Bus/PCI/MMIOAccess.cpp
+    Bus/PCI/Initializer.cpp
+    Bus/PCI/WindowedMMIOAccess.cpp
     CMOS.cpp
     CommandLine.cpp
     ConsoleDevice.cpp
@@ -139,13 +146,6 @@ set(KERNEL_SOURCES
     Net/Socket.cpp
     Net/TCPSocket.cpp
     Net/UDPSocket.cpp
-    PCI/Access.cpp
-    PCI/Device.cpp
-    PCI/DeviceController.cpp
-    PCI/IOAccess.cpp
-    PCI/MMIOAccess.cpp
-    PCI/Initializer.cpp
-    PCI/WindowedMMIOAccess.cpp
     Panic.cpp
     PerformanceEventBuffer.cpp
     Process.cpp

Kernel/Devices/PCISerialDevice.h

@@ -6,10 +6,10 @@
 
 #pragma once
 
+#include <Kernel/Bus/PCI/Device.h>
+#include <Kernel/Bus/PCI/IDs.h>
 #include <Kernel/Devices/CharacterDevice.h>
 #include <Kernel/Devices/SerialDevice.h>
-#include <Kernel/PCI/Device.h>
-#include <Kernel/PCI/IDs.h>
 
 namespace Kernel {
 

Kernel/Devices/USB/UHCIController.h

@@ -10,11 +10,11 @@
 #include <AK/Platform.h>
 
 #include <AK/NonnullOwnPtr.h>
+#include <Kernel/Bus/PCI/Device.h>
 #include <Kernel/Devices/USB/UHCIDescriptorTypes.h>
 #include <Kernel/Devices/USB/USBDevice.h>
 #include <Kernel/Devices/USB/USBTransfer.h>
 #include <Kernel/IO.h>
-#include <Kernel/PCI/Device.h>
 #include <Kernel/Process.h>
 #include <Kernel/Time/TimeManagement.h>
 #include <Kernel/VM/ContiguousVMObject.h>

Kernel/GlobalProcessExposed.cpp

@@ -9,6 +9,7 @@
 #include <Kernel/Arch/x86/CPU.h>
 #include <Kernel/Arch/x86/InterruptDisabler.h>
 #include <Kernel/Arch/x86/ProcessorInfo.h>
+#include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/ConsoleDevice.h>
 #include <Kernel/Devices/HID/HIDManagement.h>
@@ -26,7 +27,6 @@
 #include <Kernel/Net/Routing.h>
 #include <Kernel/Net/TCPSocket.h>
 #include <Kernel/Net/UDPSocket.h>
-#include <Kernel/PCI/Access.h>
 #include <Kernel/ProcessExposed.h>
 #include <Kernel/Sections.h>
 

Kernel/Graphics/BochsGraphicsAdapter.cpp

@@ -7,13 +7,13 @@
 #include <AK/Atomic.h>
 #include <AK/Checked.h>
 #include <AK/Singleton.h>
+#include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Graphics/Bochs.h>
 #include <Kernel/Graphics/BochsGraphicsAdapter.h>
 #include <Kernel/Graphics/Console/ContiguousFramebufferConsole.h>
 #include <Kernel/Graphics/GraphicsManagement.h>
 #include <Kernel/IO.h>
-#include <Kernel/PCI/Access.h>
 #include <Kernel/Process.h>
 #include <Kernel/Sections.h>
 #include <Kernel/VM/AnonymousVMObject.h>

Kernel/Graphics/BochsGraphicsAdapter.h

@@ -8,10 +8,10 @@
 
 #include <AK/String.h>
 #include <AK/Types.h>
+#include <Kernel/Bus/PCI/DeviceController.h>
 #include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
 #include <Kernel/Graphics/FramebufferDevice.h>
 #include <Kernel/Graphics/GraphicsDevice.h>
-#include <Kernel/PCI/DeviceController.h>
 #include <Kernel/PhysicalAddress.h>
 
 namespace Kernel {

Kernel/Graphics/GraphicsDevice.h

@@ -8,8 +8,8 @@
 
 #include <AK/String.h>
 #include <AK/Types.h>
+#include <Kernel/Bus/PCI/Definitions.h>
 #include <Kernel/Devices/BlockDevice.h>
-#include <Kernel/PCI/Definitions.h>
 #include <Kernel/PhysicalAddress.h>
 
 namespace Kernel {

Kernel/Graphics/GraphicsManagement.cpp

@@ -6,6 +6,7 @@
 
 #include <AK/Checked.h>
 #include <AK/Singleton.h>
+#include <Kernel/Bus/PCI/IDs.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Graphics/BochsGraphicsAdapter.h>
@@ -16,7 +17,6 @@
 #include <Kernel/Graphics/VirtIOGPU/VirtIOGraphicsAdapter.h>
 #include <Kernel/IO.h>
 #include <Kernel/Multiboot.h>
-#include <Kernel/PCI/IDs.h>
 #include <Kernel/Panic.h>
 #include <Kernel/Sections.h>
 #include <Kernel/VM/AnonymousVMObject.h>

Kernel/Graphics/GraphicsManagement.h

@@ -10,11 +10,11 @@
 #include <AK/NonnullRefPtr.h>
 #include <AK/NonnullRefPtrVector.h>
 #include <AK/Types.h>
+#include <Kernel/Bus/PCI/Definitions.h>
 #include <Kernel/Graphics/Console/Console.h>
 #include <Kernel/Graphics/GraphicsDevice.h>
 #include <Kernel/Graphics/VGACompatibleAdapter.h>
 #include <Kernel/Graphics/VirtIOGPU/VirtIOGraphicsAdapter.h>
-#include <Kernel/PCI/Definitions.h>
 #include <Kernel/VM/Region.h>
 
 namespace Kernel {

Kernel/Graphics/IntelNativeGraphicsAdapter.h

@@ -8,10 +8,10 @@
 
 #include <AK/String.h>
 #include <AK/Types.h>
+#include <Kernel/Bus/PCI/DeviceController.h>
 #include <Kernel/Graphics/Definitions.h>
 #include <Kernel/Graphics/FramebufferDevice.h>
 #include <Kernel/Graphics/VGACompatibleAdapter.h>
-#include <Kernel/PCI/DeviceController.h>
 #include <Kernel/PhysicalAddress.h>
 
 namespace Kernel {

Kernel/Graphics/VGACompatibleAdapter.h

@@ -8,10 +8,10 @@
 
 #include <AK/String.h>
 #include <AK/Types.h>
+#include <Kernel/Bus/PCI/DeviceController.h>
 #include <Kernel/Graphics/Console/Console.h>
 #include <Kernel/Graphics/FramebufferDevice.h>
 #include <Kernel/Graphics/GraphicsDevice.h>
-#include <Kernel/PCI/DeviceController.h>
 #include <Kernel/PhysicalAddress.h>
 
 namespace Kernel {

Kernel/Net/E1000ENetworkAdapter.cpp

@@ -5,9 +5,9 @@
  */
 
 #include <AK/MACAddress.h>
+#include <Kernel/Bus/PCI/IDs.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Net/E1000ENetworkAdapter.h>
-#include <Kernel/PCI/IDs.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {

Kernel/Net/E1000ENetworkAdapter.h

@@ -8,12 +8,12 @@
 
 #include <AK/NonnullOwnPtrVector.h>
 #include <AK/OwnPtr.h>
+#include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Bus/PCI/Device.h>
 #include <Kernel/IO.h>
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Net/E1000NetworkAdapter.h>
 #include <Kernel/Net/NetworkAdapter.h>
-#include <Kernel/PCI/Access.h>
-#include <Kernel/PCI/Device.h>
 #include <Kernel/Random.h>
 
 namespace Kernel {

Kernel/Net/E1000NetworkAdapter.cpp

@@ -5,9 +5,9 @@
  */
 
 #include <AK/MACAddress.h>
+#include <Kernel/Bus/PCI/IDs.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Net/E1000NetworkAdapter.h>
-#include <Kernel/PCI/IDs.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {

Kernel/Net/E1000NetworkAdapter.h

@@ -8,11 +8,11 @@
 
 #include <AK/NonnullOwnPtrVector.h>
 #include <AK/OwnPtr.h>
+#include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Bus/PCI/Device.h>
 #include <Kernel/IO.h>
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Net/NetworkAdapter.h>
-#include <Kernel/PCI/Access.h>
-#include <Kernel/PCI/Device.h>
 #include <Kernel/Random.h>
 
 namespace Kernel {

Kernel/Net/NE2000NetworkAdapter.h

@@ -7,10 +7,10 @@
 #pragma once
 
 #include <AK/OwnPtr.h>
+#include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Bus/PCI/Device.h>
 #include <Kernel/IO.h>
 #include <Kernel/Net/NetworkAdapter.h>
-#include <Kernel/PCI/Access.h>
-#include <Kernel/PCI/Device.h>
 #include <Kernel/Random.h>
 
 namespace Kernel {

Kernel/Net/NetworkAdapter.h

@@ -13,12 +13,12 @@
 #include <AK/Types.h>
 #include <AK/WeakPtr.h>
 #include <AK/Weakable.h>
+#include <Kernel/Bus/PCI/Definitions.h>
 #include <Kernel/KBuffer.h>
 #include <Kernel/Net/ARP.h>
 #include <Kernel/Net/EthernetFrameHeader.h>
 #include <Kernel/Net/ICMP.h>
 #include <Kernel/Net/IPv4.h>
-#include <Kernel/PCI/Definitions.h>
 #include <Kernel/UserOrKernelBuffer.h>
 
 namespace Kernel {

Kernel/Net/NetworkingManagement.h

@@ -11,7 +11,7 @@
 #include <AK/NonnullRefPtr.h>
 #include <AK/NonnullRefPtrVector.h>
 #include <AK/Types.h>
-#include <Kernel/PCI/Definitions.h>
+#include <Kernel/Bus/PCI/Definitions.h>
 #include <Kernel/VM/Region.h>
 
 namespace Kernel {

Kernel/Net/RTL8139NetworkAdapter.h

@@ -7,10 +7,10 @@
 #pragma once
 
 #include <AK/OwnPtr.h>
+#include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Bus/PCI/Device.h>
 #include <Kernel/IO.h>
 #include <Kernel/Net/NetworkAdapter.h>
-#include <Kernel/PCI/Access.h>
-#include <Kernel/PCI/Device.h>
 #include <Kernel/Random.h>
 
 namespace Kernel {

Kernel/Net/RTL8168NetworkAdapter.cpp

@@ -5,10 +5,10 @@
  */
 
 #include <AK/MACAddress.h>
+#include <Kernel/Bus/PCI/IDs.h>
 #include <Kernel/Debug.h>
 #include <Kernel/IO.h>
 #include <Kernel/Net/RTL8168NetworkAdapter.h>
-#include <Kernel/PCI/IDs.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {

Kernel/Net/RTL8168NetworkAdapter.h

@@ -8,10 +8,10 @@
 
 #include <AK/NonnullOwnPtrVector.h>
 #include <AK/OwnPtr.h>
+#include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Bus/PCI/Device.h>
 #include <Kernel/IO.h>
 #include <Kernel/Net/NetworkAdapter.h>
-#include <Kernel/PCI/Access.h>
-#include <Kernel/PCI/Device.h>
 #include <Kernel/Random.h>
 
 namespace Kernel {

Kernel/Storage/StorageController.h

@@ -8,11 +8,11 @@
 
 #include <AK/OwnPtr.h>
 #include <AK/RefPtr.h>
+#include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Bus/PCI/DeviceController.h>
 #include <Kernel/Devices/Device.h>
 #include <Kernel/IO.h>
 #include <Kernel/Lock.h>
-#include <Kernel/PCI/Access.h>
-#include <Kernel/PCI/DeviceController.h>
 #include <Kernel/PhysicalAddress.h>
 #include <Kernel/Random.h>
 #include <Kernel/VM/PhysicalPage.h>

Kernel/Storage/StorageManagement.cpp

@@ -5,10 +5,10 @@
  */
 
 #include <AK/UUID.h>
+#include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Devices/BlockDevice.h>
 #include <Kernel/FileSystem/Ext2FileSystem.h>
-#include <Kernel/PCI/Access.h>
 #include <Kernel/Panic.h>
 #include <Kernel/Storage/AHCIController.h>
 #include <Kernel/Storage/IDEController.h>

Kernel/VirtIO/VirtIO.cpp

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/Bus/PCI/IDs.h>
 #include <Kernel/CommandLine.h>
-#include <Kernel/PCI/IDs.h>
 #include <Kernel/Sections.h>
 #include <Kernel/VirtIO/VirtIO.h>
 #include <Kernel/VirtIO/VirtIOConsole.h>

Kernel/VirtIO/VirtIO.h

@@ -7,10 +7,10 @@
 #pragma once
 
 #include <AK/NonnullOwnPtrVector.h>
+#include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Bus/PCI/Device.h>
 #include <Kernel/IO.h>
 #include <Kernel/Interrupts/IRQHandler.h>
-#include <Kernel/PCI/Access.h>
-#include <Kernel/PCI/Device.h>
 #include <Kernel/VM/MemoryManager.h>
 #include <Kernel/VirtIO/VirtIOQueue.h>
 

Kernel/init.cpp

@@ -10,6 +10,8 @@
 #include <Kernel/ACPI/MultiProcessorParser.h>
 #include <Kernel/Arch/PC/BIOS.h>
 #include <Kernel/Arch/x86/Processor.h>
+#include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Bus/PCI/Initializer.h>
 #include <Kernel/CMOS.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Devices/FullDevice.h>
@@ -36,8 +38,6 @@
 #include <Kernel/Multiboot.h>
 #include <Kernel/Net/NetworkTask.h>
 #include <Kernel/Net/NetworkingManagement.h>
-#include <Kernel/PCI/Access.h>
-#include <Kernel/PCI/Initializer.h>
 #include <Kernel/Panic.h>
 #include <Kernel/Process.h>
 #include <Kernel/ProcessExposed.h>