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

Kernel/Bus/USB/UHCIController.cpp

@@ -8,10 +8,10 @@
 #include <AK/JsonArraySerializer.h>
 #include <AK/JsonObjectSerializer.h>
 #include <AK/Platform.h>
+#include <Kernel/Bus/USB/UHCIController.h>
+#include <Kernel/Bus/USB/USBRequest.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Debug.h>
-#include <Kernel/Devices/USB/UHCIController.h>
-#include <Kernel/Devices/USB/USBRequest.h>
 #include <Kernel/KBufferBuilder.h>
 #include <Kernel/Process.h>
 #include <Kernel/ProcessExposed.h>

Kernel/Bus/USB/UHCIController.h

@@ -11,9 +11,9 @@
 
 #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/Bus/USB/UHCIDescriptorTypes.h>
+#include <Kernel/Bus/USB/USBDevice.h>
+#include <Kernel/Bus/USB/USBTransfer.h>
 #include <Kernel/IO.h>
 #include <Kernel/Process.h>
 #include <Kernel/Time/TimeManagement.h>

Kernel/Bus/USB/UHCIDescriptorTypes.h

@@ -9,7 +9,7 @@
 #include <AK/OwnPtr.h>
 #include <AK/Ptr32.h>
 #include <AK/Types.h>
-#include <Kernel/Devices/USB/USBTransfer.h>
+#include <Kernel/Bus/USB/USBTransfer.h>
 
 namespace Kernel::USB {
 

Kernel/Bus/USB/USBDevice.cpp

@@ -7,10 +7,10 @@
 #include <AK/OwnPtr.h>
 #include <AK/Types.h>
 #include <AK/Vector.h>
-#include <Kernel/Devices/USB/UHCIController.h>
-#include <Kernel/Devices/USB/USBDescriptors.h>
-#include <Kernel/Devices/USB/USBDevice.h>
-#include <Kernel/Devices/USB/USBRequest.h>
+#include <Kernel/Bus/USB/UHCIController.h>
+#include <Kernel/Bus/USB/USBDescriptors.h>
+#include <Kernel/Bus/USB/USBDevice.h>
+#include <Kernel/Bus/USB/USBRequest.h>
 
 static u32 s_next_usb_address = 1; // Next address we hand out to a device once it's plugged into the machine
 

Kernel/Bus/USB/USBDevice.h

@@ -8,7 +8,7 @@
 
 #include <AK/OwnPtr.h>
 #include <AK/Types.h>
-#include <Kernel/Devices/USB/USBPipe.h>
+#include <Kernel/Bus/USB/USBPipe.h>
 
 namespace Kernel::USB {
 

Kernel/Bus/USB/USBEndpoint.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <Kernel/Devices/USB/USBDescriptors.h>
-#include <Kernel/Devices/USB/USBPipe.h>
+#include <Kernel/Bus/USB/USBDescriptors.h>
+#include <Kernel/Bus/USB/USBPipe.h>
 
 namespace Kernel::USB {
 

Kernel/Bus/USB/USBPipe.cpp

@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Devices/USB/PacketTypes.h>
-#include <Kernel/Devices/USB/UHCIController.h>
-#include <Kernel/Devices/USB/USBPipe.h>
-#include <Kernel/Devices/USB/USBTransfer.h>
+#include <Kernel/Bus/USB/PacketTypes.h>
+#include <Kernel/Bus/USB/UHCIController.h>
+#include <Kernel/Bus/USB/USBPipe.h>
+#include <Kernel/Bus/USB/USBTransfer.h>
 
 namespace Kernel::USB {
 

Kernel/Bus/USB/USBPipe.h

@@ -8,7 +8,7 @@
 
 #include <AK/OwnPtr.h>
 #include <AK/Types.h>
-#include <Kernel/Devices/USB/USBDescriptors.h>
+#include <Kernel/Bus/USB/USBDescriptors.h>
 #include <Kernel/VM/Region.h>
 
 namespace Kernel::USB {

Kernel/Bus/USB/USBTransfer.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Devices/USB/USBTransfer.h>
+#include <Kernel/Bus/USB/USBTransfer.h>
 #include <Kernel/VM/MemoryManager.h>
 
 namespace Kernel::USB {

Kernel/Bus/USB/USBTransfer.h

@@ -8,8 +8,8 @@
 
 #include <AK/OwnPtr.h>
 #include <AK/RefPtr.h>
-#include <Kernel/Devices/USB/PacketTypes.h>
-#include <Kernel/Devices/USB/USBPipe.h>
+#include <Kernel/Bus/USB/PacketTypes.h>
+#include <Kernel/Bus/USB/USBPipe.h>
 #include <Kernel/VM/ContiguousVMObject.h>
 #include <Kernel/VM/PhysicalPage.h>
 #include <Kernel/VM/Region.h>

Kernel/CMakeLists.txt

@@ -33,6 +33,10 @@ set(KERNEL_SOURCES
     Bus/PCI/MMIOAccess.cpp
     Bus/PCI/Initializer.cpp
     Bus/PCI/WindowedMMIOAccess.cpp
+    Bus/USB/UHCIController.cpp
+    Bus/USB/USBDevice.cpp
+    Bus/USB/USBPipe.cpp
+    Bus/USB/USBTransfer.cpp
     CMOS.cpp
     CommandLine.cpp
     ConsoleDevice.cpp
@@ -49,13 +53,9 @@ set(KERNEL_SOURCES
     Devices/RandomDevice.cpp
     Devices/SB16.cpp
     Devices/SerialDevice.cpp
-    Devices/USB/UHCIController.cpp
     VirtIO/VirtIO.cpp
     VirtIO/VirtIOQueue.cpp
     VirtIO/VirtIOConsole.cpp
-    Devices/USB/USBDevice.cpp
-    Devices/USB/USBPipe.cpp
-    Devices/USB/USBTransfer.cpp
     Devices/VMWareBackdoor.cpp
     Devices/ZeroDevice.cpp
     Devices/HID/I8042Controller.cpp

Kernel/init.cpp

@@ -12,6 +12,7 @@
 #include <Kernel/Arch/x86/Processor.h>
 #include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/Bus/PCI/Initializer.h>
+#include <Kernel/Bus/USB/UHCIController.h>
 #include <Kernel/CMOS.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Devices/FullDevice.h>
@@ -22,7 +23,6 @@
 #include <Kernel/Devices/RandomDevice.h>
 #include <Kernel/Devices/SB16.h>
 #include <Kernel/Devices/SerialDevice.h>
-#include <Kernel/Devices/USB/UHCIController.h>
 #include <Kernel/Devices/VMWareBackdoor.h>
 #include <Kernel/Devices/ZeroDevice.h>
 #include <Kernel/FileSystem/Ext2FileSystem.h>