Browse Source

Kernel/USB: Move UHCI related structures to subdirectory

The number of UHCI related files is starting to expand to the point
where it's best if we move this into their own subdirectory. It'll
also make it easier to manage when we decide to add some more
controller types (whenever that may be)
Jesse Buhagiar 3 years ago
parent
commit
4abf399a74

+ 1 - 1
Kernel/Bus/USB/UHCIController.cpp → Kernel/Bus/USB/UHCI/UHCIController.cpp

@@ -6,7 +6,7 @@
  */
 
 #include <AK/Platform.h>
-#include <Kernel/Bus/USB/UHCIController.h>
+#include <Kernel/Bus/USB/UHCI/UHCIController.h>
 #include <Kernel/Bus/USB/USBRequest.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Debug.h>

+ 2 - 2
Kernel/Bus/USB/UHCIController.h → Kernel/Bus/USB/UHCI/UHCIController.h

@@ -11,8 +11,8 @@
 
 #include <AK/NonnullOwnPtr.h>
 #include <Kernel/Bus/PCI/Device.h>
-#include <Kernel/Bus/USB/UHCIDescriptorTypes.h>
-#include <Kernel/Bus/USB/UHCIRootHub.h>
+#include <Kernel/Bus/USB/UHCI/UHCIDescriptorTypes.h>
+#include <Kernel/Bus/USB/UHCI/UHCIRootHub.h>
 #include <Kernel/Bus/USB/USBController.h>
 #include <Kernel/IO.h>
 #include <Kernel/Memory/AnonymousVMObject.h>

+ 0 - 0
Kernel/Bus/USB/UHCIDescriptorTypes.h → Kernel/Bus/USB/UHCI/UHCIDescriptorTypes.h


+ 2 - 2
Kernel/Bus/USB/UHCIRootHub.cpp → Kernel/Bus/USB/UHCI/UHCIRootHub.cpp

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Bus/USB/UHCIController.h>
-#include <Kernel/Bus/USB/UHCIRootHub.h>
+#include <Kernel/Bus/USB/UHCI/UHCIController.h>
+#include <Kernel/Bus/USB/UHCI/UHCIRootHub.h>
 #include <Kernel/Bus/USB/USBClasses.h>
 #include <Kernel/Bus/USB/USBConstants.h>
 #include <Kernel/Bus/USB/USBEndpoint.h>

+ 0 - 0
Kernel/Bus/USB/UHCIRootHub.h → Kernel/Bus/USB/UHCI/UHCIRootHub.h


+ 1 - 1
Kernel/Bus/USB/USBManagement.cpp

@@ -7,7 +7,7 @@
 #include <AK/Singleton.h>
 #include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/Bus/USB/SysFSUSB.h>
-#include <Kernel/Bus/USB/UHCIController.h>
+#include <Kernel/Bus/USB/UHCI/UHCIController.h>
 #include <Kernel/Bus/USB/USBManagement.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Sections.h>

+ 1 - 1
Kernel/Bus/USB/USBPipe.cpp

@@ -5,7 +5,7 @@
  */
 
 #include <Kernel/Bus/USB/PacketTypes.h>
-#include <Kernel/Bus/USB/UHCIController.h>
+#include <Kernel/Bus/USB/UHCI/UHCIController.h>
 #include <Kernel/Bus/USB/USBPipe.h>
 #include <Kernel/Bus/USB/USBTransfer.h>
 

+ 2 - 2
Kernel/CMakeLists.txt

@@ -32,8 +32,8 @@ set(KERNEL_SOURCES
     Bus/PCI/Initializer.cpp
     Bus/PCI/WindowedMMIOAccess.cpp
     Bus/USB/SysFSUSB.cpp
-    Bus/USB/UHCIController.cpp
-    Bus/USB/UHCIRootHub.cpp
+    Bus/USB/UHCI/UHCIController.cpp
+    Bus/USB/UHCI/UHCIRootHub.cpp
     Bus/USB/USBController.cpp
     Bus/USB/USBDevice.cpp
     Bus/USB/USBHub.cpp