summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Kernel/Bus/USB/PacketTypes.h (renamed from Kernel/Devices/USB/PacketTypes.h)0
-rw-r--r--Kernel/Bus/USB/UHCIController.cpp (renamed from Kernel/Devices/USB/UHCIController.cpp)4
-rw-r--r--Kernel/Bus/USB/UHCIController.h (renamed from Kernel/Devices/USB/UHCIController.h)6
-rw-r--r--Kernel/Bus/USB/UHCIDescriptorTypes.h (renamed from Kernel/Devices/USB/UHCIDescriptorTypes.h)2
-rw-r--r--Kernel/Bus/USB/USBDescriptors.h (renamed from Kernel/Devices/USB/USBDescriptors.h)0
-rw-r--r--Kernel/Bus/USB/USBDevice.cpp (renamed from Kernel/Devices/USB/USBDevice.cpp)8
-rw-r--r--Kernel/Bus/USB/USBDevice.h (renamed from Kernel/Devices/USB/USBDevice.h)2
-rw-r--r--Kernel/Bus/USB/USBEndpoint.h (renamed from Kernel/Devices/USB/USBEndpoint.h)4
-rw-r--r--Kernel/Bus/USB/USBPipe.cpp (renamed from Kernel/Devices/USB/USBPipe.cpp)8
-rw-r--r--Kernel/Bus/USB/USBPipe.h (renamed from Kernel/Devices/USB/USBPipe.h)2
-rw-r--r--Kernel/Bus/USB/USBRequest.h (renamed from Kernel/Devices/USB/USBRequest.h)0
-rw-r--r--Kernel/Bus/USB/USBTransfer.cpp (renamed from Kernel/Devices/USB/USBTransfer.cpp)2
-rw-r--r--Kernel/Bus/USB/USBTransfer.h (renamed from Kernel/Devices/USB/USBTransfer.h)4
-rw-r--r--Kernel/CMakeLists.txt8
-rw-r--r--Kernel/init.cpp2
15 files changed, 26 insertions, 26 deletions
diff --git a/Kernel/Devices/USB/PacketTypes.h b/Kernel/Bus/USB/PacketTypes.h
index 8dc65094ef..8dc65094ef 100644
--- a/Kernel/Devices/USB/PacketTypes.h
+++ b/Kernel/Bus/USB/PacketTypes.h
diff --git a/Kernel/Devices/USB/UHCIController.cpp b/Kernel/Bus/USB/UHCIController.cpp
index 5d50415b80..7c0a565ff4 100644
--- a/Kernel/Devices/USB/UHCIController.cpp
+++ b/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>
diff --git a/Kernel/Devices/USB/UHCIController.h b/Kernel/Bus/USB/UHCIController.h
index 54cb8cf3c0..a4ab4b5a60 100644
--- a/Kernel/Devices/USB/UHCIController.h
+++ b/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>
diff --git a/Kernel/Devices/USB/UHCIDescriptorTypes.h b/Kernel/Bus/USB/UHCIDescriptorTypes.h
index 7715bad4b4..5525428a1a 100644
--- a/Kernel/Devices/USB/UHCIDescriptorTypes.h
+++ b/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 {
diff --git a/Kernel/Devices/USB/USBDescriptors.h b/Kernel/Bus/USB/USBDescriptors.h
index 0e8486bd8a..0e8486bd8a 100644
--- a/Kernel/Devices/USB/USBDescriptors.h
+++ b/Kernel/Bus/USB/USBDescriptors.h
diff --git a/Kernel/Devices/USB/USBDevice.cpp b/Kernel/Bus/USB/USBDevice.cpp
index 609f059f7d..0feb4becee 100644
--- a/Kernel/Devices/USB/USBDevice.cpp
+++ b/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
diff --git a/Kernel/Devices/USB/USBDevice.h b/Kernel/Bus/USB/USBDevice.h
index d884e13b3d..c57c8ce49f 100644
--- a/Kernel/Devices/USB/USBDevice.h
+++ b/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 {
diff --git a/Kernel/Devices/USB/USBEndpoint.h b/Kernel/Bus/USB/USBEndpoint.h
index 4bc0769381..c29aecb2ae 100644
--- a/Kernel/Devices/USB/USBEndpoint.h
+++ b/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 {
diff --git a/Kernel/Devices/USB/USBPipe.cpp b/Kernel/Bus/USB/USBPipe.cpp
index f7275b5b1c..6e3b302fb0 100644
--- a/Kernel/Devices/USB/USBPipe.cpp
+++ b/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 {
diff --git a/Kernel/Devices/USB/USBPipe.h b/Kernel/Bus/USB/USBPipe.h
index ab01984451..eeffde745b 100644
--- a/Kernel/Devices/USB/USBPipe.h
+++ b/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 {
diff --git a/Kernel/Devices/USB/USBRequest.h b/Kernel/Bus/USB/USBRequest.h
index 38f184de1f..38f184de1f 100644
--- a/Kernel/Devices/USB/USBRequest.h
+++ b/Kernel/Bus/USB/USBRequest.h
diff --git a/Kernel/Devices/USB/USBTransfer.cpp b/Kernel/Bus/USB/USBTransfer.cpp
index cd9ad7f00b..ec67d331c8 100644
--- a/Kernel/Devices/USB/USBTransfer.cpp
+++ b/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 {
diff --git a/Kernel/Devices/USB/USBTransfer.h b/Kernel/Bus/USB/USBTransfer.h
index 3360ea758f..b54d3a73b3 100644
--- a/Kernel/Devices/USB/USBTransfer.h
+++ b/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>
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 499b202fa2..0f8116ec36 100644
--- a/Kernel/CMakeLists.txt
+++ b/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
diff --git a/Kernel/init.cpp b/Kernel/init.cpp
index 106800382e..7ec06faac4 100644
--- a/Kernel/init.cpp
+++ b/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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 13:40:55 +0000