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)
fleximus · Aug 19, 2021 · 4abf399 · 4abf399
1 parent 43392c5
commit 4abf399
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/Kernel/Bus/USB/UHCIController.cpp → Kernel/Bus/USB/UHCI/UHCIController.cpp b/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>

diff --git a/Kernel/Bus/USB/UHCIController.h → Kernel/Bus/USB/UHCI/UHCIController.h b/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>

diff --git a/Kernel/Bus/USB/UHCIDescriptorTypes.h → Kernel/Bus/USB/UHCI/UHCIDescriptorTypes.h b/Kernel/Bus/USB/UHCIDescriptorTypes.h → Kernel/Bus/USB/UHCI/UHCIDescriptorTypes.h
diff --git a/Kernel/Bus/USB/UHCIRootHub.cpp → Kernel/Bus/USB/UHCI/UHCIRootHub.cpp b/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>

diff --git a/Kernel/Bus/USB/UHCIRootHub.h → Kernel/Bus/USB/UHCI/UHCIRootHub.h b/Kernel/Bus/USB/UHCIRootHub.h → Kernel/Bus/USB/UHCI/UHCIRootHub.h
diff --git a/Kernel/Bus/USB/USBManagement.cpp b/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>

diff --git a/Kernel/Bus/USB/USBPipe.cpp b/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>
 

diff --git a/Kernel/CMakeLists.txt b/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