From 4abf399a745b76de65673b18a84f6032c78562f2 Mon Sep 17 00:00:00 2001
From: Jesse Buhagiar <jooster669@gmail.com>
Date: Fri, 13 Aug 2021 16:10:43 +1000
Subject: [PATCH] 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)
---
 Kernel/Bus/USB/{ => UHCI}/UHCIController.cpp    | 2 +-
 Kernel/Bus/USB/{ => UHCI}/UHCIController.h      | 4 ++--
 Kernel/Bus/USB/{ => UHCI}/UHCIDescriptorTypes.h | 0
 Kernel/Bus/USB/{ => UHCI}/UHCIRootHub.cpp       | 4 ++--
 Kernel/Bus/USB/{ => UHCI}/UHCIRootHub.h         | 0
 Kernel/Bus/USB/USBManagement.cpp                | 2 +-
 Kernel/Bus/USB/USBPipe.cpp                      | 2 +-
 Kernel/CMakeLists.txt                           | 4 ++--
 8 files changed, 9 insertions(+), 9 deletions(-)
 rename Kernel/Bus/USB/{ => UHCI}/UHCIController.cpp (99%)
 rename Kernel/Bus/USB/{ => UHCI}/UHCIController.h (97%)
 rename Kernel/Bus/USB/{ => UHCI}/UHCIDescriptorTypes.h (100%)
 rename Kernel/Bus/USB/{ => UHCI}/UHCIRootHub.cpp (99%)
 rename Kernel/Bus/USB/{ => UHCI}/UHCIRootHub.h (100%)

diff --git a/Kernel/Bus/USB/UHCIController.cpp b/Kernel/Bus/USB/UHCI/UHCIController.cpp
similarity index 99%
rename from Kernel/Bus/USB/UHCIController.cpp
rename to Kernel/Bus/USB/UHCI/UHCIController.cpp
index 8a1f6c1fab..bd30013d2b 100644
--- a/Kernel/Bus/USB/UHCIController.cpp
+++ b/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 b/Kernel/Bus/USB/UHCI/UHCIController.h
similarity index 97%
rename from Kernel/Bus/USB/UHCIController.h
rename to Kernel/Bus/USB/UHCI/UHCIController.h
index c156611a09..102c4c1164 100644
--- a/Kernel/Bus/USB/UHCIController.h
+++ b/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 b/Kernel/Bus/USB/UHCI/UHCIDescriptorTypes.h
similarity index 100%
rename from Kernel/Bus/USB/UHCIDescriptorTypes.h
rename to Kernel/Bus/USB/UHCI/UHCIDescriptorTypes.h
diff --git a/Kernel/Bus/USB/UHCIRootHub.cpp b/Kernel/Bus/USB/UHCI/UHCIRootHub.cpp
similarity index 99%
rename from Kernel/Bus/USB/UHCIRootHub.cpp
rename to Kernel/Bus/USB/UHCI/UHCIRootHub.cpp
index 17c594f975..00eac03269 100644
--- a/Kernel/Bus/USB/UHCIRootHub.cpp
+++ b/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 b/Kernel/Bus/USB/UHCI/UHCIRootHub.h
similarity index 100%
rename from Kernel/Bus/USB/UHCIRootHub.h
rename to Kernel/Bus/USB/UHCI/UHCIRootHub.h
diff --git a/Kernel/Bus/USB/USBManagement.cpp b/Kernel/Bus/USB/USBManagement.cpp
index 97832c82d0..1b6c889fef 100644
--- 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
index a4bd6d3720..b374ba80a5 100644
--- 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
index b7d73ec981..3692259382 100644
--- 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