summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Kernel/CMakeLists.txt16
-rw-r--r--Kernel/Storage/ATA/AHCI/Controller.cpp (renamed from Kernel/Storage/ATA/AHCIController.cpp)4
-rw-r--r--Kernel/Storage/ATA/AHCI/Controller.h (renamed from Kernel/Storage/ATA/AHCIController.h)2
-rw-r--r--Kernel/Storage/ATA/AHCI/Definitions.h (renamed from Kernel/Storage/ATA/AHCI.h)0
-rw-r--r--Kernel/Storage/ATA/AHCI/InterruptHandler.cpp (renamed from Kernel/Storage/ATA/AHCIInterruptHandler.cpp)2
-rw-r--r--Kernel/Storage/ATA/AHCI/InterruptHandler.h (renamed from Kernel/Storage/ATA/AHCIInterruptHandler.h)4
-rw-r--r--Kernel/Storage/ATA/AHCI/Port.cpp (renamed from Kernel/Storage/ATA/AHCIPort.cpp)2
-rw-r--r--Kernel/Storage/ATA/AHCI/Port.h (renamed from Kernel/Storage/ATA/AHCIPort.h)4
-rw-r--r--Kernel/Storage/ATA/ATADevice.cpp2
-rw-r--r--Kernel/Storage/ATA/ATADiskDevice.cpp2
-rw-r--r--Kernel/Storage/ATA/ATADiskDevice.h1
-rw-r--r--Kernel/Storage/ATA/ATAPIDiscDevice.cpp2
-rw-r--r--Kernel/Storage/ATA/GenericIDE/BusMasterChannel.cpp (renamed from Kernel/Storage/ATA/BMIDEChannel.cpp)4
-rw-r--r--Kernel/Storage/ATA/GenericIDE/BusMasterChannel.h (renamed from Kernel/Storage/ATA/BMIDEChannel.h)2
-rw-r--r--Kernel/Storage/ATA/GenericIDE/Channel.cpp (renamed from Kernel/Storage/ATA/IDEChannel.cpp)4
-rw-r--r--Kernel/Storage/ATA/GenericIDE/Channel.h (renamed from Kernel/Storage/ATA/IDEChannel.h)0
-rw-r--r--Kernel/Storage/ATA/GenericIDE/Controller.cpp (renamed from Kernel/Storage/ATA/IDEController.cpp)4
-rw-r--r--Kernel/Storage/ATA/GenericIDE/Controller.h (renamed from Kernel/Storage/ATA/IDEController.h)2
-rw-r--r--Kernel/Storage/ATA/GenericIDE/ISAController.cpp (renamed from Kernel/Storage/ATA/ISAIDEController.cpp)4
-rw-r--r--Kernel/Storage/ATA/GenericIDE/ISAController.h (renamed from Kernel/Storage/ATA/ISAIDEController.h)4
-rw-r--r--Kernel/Storage/ATA/GenericIDE/PCIController.cpp (renamed from Kernel/Storage/ATA/PCIIDEController.cpp)4
-rw-r--r--Kernel/Storage/ATA/GenericIDE/PCIController.h (renamed from Kernel/Storage/ATA/PCIIDEController.h)4
-rw-r--r--Kernel/Storage/StorageManagement.cpp7
23 files changed, 37 insertions, 43 deletions
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index f5e99b4701..5da08e4179 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -92,17 +92,17 @@ set(KERNEL_SOURCES
Graphics/VirtIOGPU/GPU3DDevice.cpp
Graphics/VirtIOGPU/GraphicsAdapter.cpp
SanCov.cpp
- Storage/ATA/AHCIController.cpp
- Storage/ATA/AHCIInterruptHandler.cpp
- Storage/ATA/AHCIPort.cpp
+ Storage/ATA/AHCI/Controller.cpp
+ Storage/ATA/AHCI/Port.cpp
+ Storage/ATA/AHCI/InterruptHandler.cpp
+ Storage/ATA/GenericIDE/BusMasterChannel.cpp
+ Storage/ATA/GenericIDE/Controller.cpp
+ Storage/ATA/GenericIDE/Channel.cpp
+ Storage/ATA/GenericIDE/ISAController.cpp
+ Storage/ATA/GenericIDE/PCIController.cpp
Storage/ATA/ATADevice.cpp
Storage/ATA/ATADiskDevice.cpp
Storage/ATA/ATAPIDiscDevice.cpp
- Storage/ATA/BMIDEChannel.cpp
- Storage/ATA/ISAIDEController.cpp
- Storage/ATA/PCIIDEController.cpp
- Storage/ATA/IDEController.cpp
- Storage/ATA/IDEChannel.cpp
Storage/Partition/DiskPartition.cpp
Storage/Partition/DiskPartitionMetadata.cpp
Storage/Partition/EBRPartitionTable.cpp
diff --git a/Kernel/Storage/ATA/AHCIController.cpp b/Kernel/Storage/ATA/AHCI/Controller.cpp
index f66ec99ed8..439cc58277 100644
--- a/Kernel/Storage/ATA/AHCIController.cpp
+++ b/Kernel/Storage/ATA/AHCI/Controller.cpp
@@ -12,8 +12,8 @@
#include <Kernel/Bus/PCI/API.h>
#include <Kernel/CommandLine.h>
#include <Kernel/Memory/MemoryManager.h>
-#include <Kernel/Storage/ATA/AHCIController.h>
-#include <Kernel/Storage/ATA/AHCIInterruptHandler.h>
+#include <Kernel/Storage/ATA/AHCI/Controller.h>
+#include <Kernel/Storage/ATA/AHCI/InterruptHandler.h>
namespace Kernel {
diff --git a/Kernel/Storage/ATA/AHCIController.h b/Kernel/Storage/ATA/AHCI/Controller.h
index 79abc0d1f7..a2cdc24498 100644
--- a/Kernel/Storage/ATA/AHCIController.h
+++ b/Kernel/Storage/ATA/AHCI/Controller.h
@@ -10,7 +10,7 @@
#include <AK/RefPtr.h>
#include <AK/Types.h>
#include <Kernel/Sections.h>
-#include <Kernel/Storage/ATA/AHCI.h>
+#include <Kernel/Storage/ATA/AHCI/Definitions.h>
#include <Kernel/Storage/ATA/ATAController.h>
#include <Kernel/Storage/StorageDevice.h>
diff --git a/Kernel/Storage/ATA/AHCI.h b/Kernel/Storage/ATA/AHCI/Definitions.h
index 988994ea2a..988994ea2a 100644
--- a/Kernel/Storage/ATA/AHCI.h
+++ b/Kernel/Storage/ATA/AHCI/Definitions.h
diff --git a/Kernel/Storage/ATA/AHCIInterruptHandler.cpp b/Kernel/Storage/ATA/AHCI/InterruptHandler.cpp
index a0f4304340..b17cbb0210 100644
--- a/Kernel/Storage/ATA/AHCIInterruptHandler.cpp
+++ b/Kernel/Storage/ATA/AHCI/InterruptHandler.cpp
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
-#include <Kernel/Storage/ATA/AHCIInterruptHandler.h>
+#include <Kernel/Storage/ATA/AHCI/InterruptHandler.h>
namespace Kernel {
diff --git a/Kernel/Storage/ATA/AHCIInterruptHandler.h b/Kernel/Storage/ATA/AHCI/InterruptHandler.h
index 266e9f11d4..5483ba7329 100644
--- a/Kernel/Storage/ATA/AHCIInterruptHandler.h
+++ b/Kernel/Storage/ATA/AHCI/InterruptHandler.h
@@ -15,8 +15,8 @@
#include <Kernel/PhysicalAddress.h>
#include <Kernel/Random.h>
#include <Kernel/Sections.h>
-#include <Kernel/Storage/ATA/AHCIController.h>
-#include <Kernel/Storage/ATA/AHCIPort.h>
+#include <Kernel/Storage/ATA/AHCI/Controller.h>
+#include <Kernel/Storage/ATA/AHCI/Port.h>
#include <Kernel/Storage/StorageDevice.h>
#include <Kernel/WaitQueue.h>
diff --git a/Kernel/Storage/ATA/AHCIPort.cpp b/Kernel/Storage/ATA/AHCI/Port.cpp
index 8f713c405c..71cfadc2c2 100644
--- a/Kernel/Storage/ATA/AHCIPort.cpp
+++ b/Kernel/Storage/ATA/AHCI/Port.cpp
@@ -12,7 +12,7 @@
#include <Kernel/Memory/MemoryManager.h>
#include <Kernel/Memory/ScatterGatherList.h>
#include <Kernel/Memory/TypedMapping.h>
-#include <Kernel/Storage/ATA/AHCIPort.h>
+#include <Kernel/Storage/ATA/AHCI/Port.h>
#include <Kernel/Storage/ATA/ATA.h>
#include <Kernel/Storage/ATA/ATADiskDevice.h>
#include <Kernel/Storage/StorageManagement.h>
diff --git a/Kernel/Storage/ATA/AHCIPort.h b/Kernel/Storage/ATA/AHCI/Port.h
index 8f24ae734d..db06200579 100644
--- a/Kernel/Storage/ATA/AHCIPort.h
+++ b/Kernel/Storage/ATA/AHCI/Port.h
@@ -20,8 +20,8 @@
#include <Kernel/PhysicalAddress.h>
#include <Kernel/Random.h>
#include <Kernel/Sections.h>
-#include <Kernel/Storage/ATA/AHCI.h>
-#include <Kernel/Storage/ATA/AHCIInterruptHandler.h>
+#include <Kernel/Storage/ATA/AHCI/Definitions.h>
+#include <Kernel/Storage/ATA/AHCI/InterruptHandler.h>
#include <Kernel/Storage/ATA/ATADevice.h>
#include <Kernel/WaitQueue.h>
diff --git a/Kernel/Storage/ATA/ATADevice.cpp b/Kernel/Storage/ATA/ATADevice.cpp
index 6acbaf7f08..53fbf18bb8 100644
--- a/Kernel/Storage/ATA/ATADevice.cpp
+++ b/Kernel/Storage/ATA/ATADevice.cpp
@@ -7,8 +7,6 @@
#include <AK/StringView.h>
#include <Kernel/Sections.h>
#include <Kernel/Storage/ATA/ATADevice.h>
-#include <Kernel/Storage/ATA/IDEChannel.h>
-#include <Kernel/Storage/ATA/IDEController.h>
#include <Kernel/Storage/StorageManagement.h>
namespace Kernel {
diff --git a/Kernel/Storage/ATA/ATADiskDevice.cpp b/Kernel/Storage/ATA/ATADiskDevice.cpp
index 321719beb9..ca9c33c333 100644
--- a/Kernel/Storage/ATA/ATADiskDevice.cpp
+++ b/Kernel/Storage/ATA/ATADiskDevice.cpp
@@ -8,8 +8,6 @@
#include <Kernel/Devices/DeviceManagement.h>
#include <Kernel/Sections.h>
#include <Kernel/Storage/ATA/ATADiskDevice.h>
-#include <Kernel/Storage/ATA/IDEChannel.h>
-#include <Kernel/Storage/ATA/IDEController.h>
#include <Kernel/Storage/StorageManagement.h>
namespace Kernel {
diff --git a/Kernel/Storage/ATA/ATADiskDevice.h b/Kernel/Storage/ATA/ATADiskDevice.h
index 5d611e0120..53fd22199b 100644
--- a/Kernel/Storage/ATA/ATADiskDevice.h
+++ b/Kernel/Storage/ATA/ATADiskDevice.h
@@ -13,7 +13,6 @@
namespace Kernel {
class IDEController;
-class IDEChannel;
class ATADiskDevice final : public ATADevice {
friend class IDEController;
friend class DeviceManagement;
diff --git a/Kernel/Storage/ATA/ATAPIDiscDevice.cpp b/Kernel/Storage/ATA/ATAPIDiscDevice.cpp
index f696043ecd..91723c6304 100644
--- a/Kernel/Storage/ATA/ATAPIDiscDevice.cpp
+++ b/Kernel/Storage/ATA/ATAPIDiscDevice.cpp
@@ -8,8 +8,6 @@
#include <Kernel/Devices/DeviceManagement.h>
#include <Kernel/Sections.h>
#include <Kernel/Storage/ATA/ATAPIDiscDevice.h>
-#include <Kernel/Storage/ATA/IDEChannel.h>
-#include <Kernel/Storage/ATA/IDEController.h>
#include <Kernel/Storage/StorageManagement.h>
namespace Kernel {
diff --git a/Kernel/Storage/ATA/BMIDEChannel.cpp b/Kernel/Storage/ATA/GenericIDE/BusMasterChannel.cpp
index cc29eaaf9f..d4757ee873 100644
--- a/Kernel/Storage/ATA/BMIDEChannel.cpp
+++ b/Kernel/Storage/ATA/GenericIDE/BusMasterChannel.cpp
@@ -7,8 +7,8 @@
#include <Kernel/Bus/PCI/API.h>
#include <Kernel/Sections.h>
#include <Kernel/Storage/ATA/ATA.h>
-#include <Kernel/Storage/ATA/BMIDEChannel.h>
-#include <Kernel/Storage/ATA/IDEController.h>
+#include <Kernel/Storage/ATA/GenericIDE/BusMasterChannel.h>
+#include <Kernel/Storage/ATA/GenericIDE/Controller.h>
#include <Kernel/WorkQueue.h>
namespace Kernel {
diff --git a/Kernel/Storage/ATA/BMIDEChannel.h b/Kernel/Storage/ATA/GenericIDE/BusMasterChannel.h
index 89d7f09090..5757ab9aba 100644
--- a/Kernel/Storage/ATA/BMIDEChannel.h
+++ b/Kernel/Storage/ATA/GenericIDE/BusMasterChannel.h
@@ -7,7 +7,7 @@
#pragma once
#include <AK/OwnPtr.h>
-#include <Kernel/Storage/ATA/IDEChannel.h>
+#include <Kernel/Storage/ATA/GenericIDE/Channel.h>
namespace Kernel {
diff --git a/Kernel/Storage/ATA/IDEChannel.cpp b/Kernel/Storage/ATA/GenericIDE/Channel.cpp
index 27716a6317..783df8facc 100644
--- a/Kernel/Storage/ATA/IDEChannel.cpp
+++ b/Kernel/Storage/ATA/GenericIDE/Channel.cpp
@@ -13,8 +13,8 @@
#include <Kernel/Sections.h>
#include <Kernel/Storage/ATA/ATA.h>
#include <Kernel/Storage/ATA/ATADiskDevice.h>
-#include <Kernel/Storage/ATA/IDEChannel.h>
-#include <Kernel/Storage/ATA/IDEController.h>
+#include <Kernel/Storage/ATA/GenericIDE/Channel.h>
+#include <Kernel/Storage/ATA/GenericIDE/Controller.h>
#include <Kernel/WorkQueue.h>
namespace Kernel {
diff --git a/Kernel/Storage/ATA/IDEChannel.h b/Kernel/Storage/ATA/GenericIDE/Channel.h
index 6d1bf1303a..6d1bf1303a 100644
--- a/Kernel/Storage/ATA/IDEChannel.h
+++ b/Kernel/Storage/ATA/GenericIDE/Channel.h
diff --git a/Kernel/Storage/ATA/IDEController.cpp b/Kernel/Storage/ATA/GenericIDE/Controller.cpp
index 030591e71a..9ad7b9f66f 100644
--- a/Kernel/Storage/ATA/IDEController.cpp
+++ b/Kernel/Storage/ATA/GenericIDE/Controller.cpp
@@ -11,8 +11,8 @@
#include <Kernel/FileSystem/ProcFS.h>
#include <Kernel/Sections.h>
#include <Kernel/Storage/ATA/ATADiskDevice.h>
-#include <Kernel/Storage/ATA/BMIDEChannel.h>
-#include <Kernel/Storage/ATA/IDEController.h>
+#include <Kernel/Storage/ATA/GenericIDE/BusMasterChannel.h>
+#include <Kernel/Storage/ATA/GenericIDE/Controller.h>
namespace Kernel {
diff --git a/Kernel/Storage/ATA/IDEController.h b/Kernel/Storage/ATA/GenericIDE/Controller.h
index 4ca4f3f2bf..59d5cf612c 100644
--- a/Kernel/Storage/ATA/IDEController.h
+++ b/Kernel/Storage/ATA/GenericIDE/Controller.h
@@ -10,7 +10,7 @@
#include <AK/RefPtr.h>
#include <AK/Types.h>
#include <Kernel/Storage/ATA/ATAController.h>
-#include <Kernel/Storage/ATA/IDEChannel.h>
+#include <Kernel/Storage/ATA/GenericIDE/Channel.h>
#include <Kernel/Storage/StorageDevice.h>
namespace Kernel {
diff --git a/Kernel/Storage/ATA/ISAIDEController.cpp b/Kernel/Storage/ATA/GenericIDE/ISAController.cpp
index 83fcd3b1a3..0772aa93df 100644
--- a/Kernel/Storage/ATA/ISAIDEController.cpp
+++ b/Kernel/Storage/ATA/GenericIDE/ISAController.cpp
@@ -11,8 +11,8 @@
#include <Kernel/FileSystem/ProcFS.h>
#include <Kernel/Sections.h>
#include <Kernel/Storage/ATA/ATADiskDevice.h>
-#include <Kernel/Storage/ATA/BMIDEChannel.h>
-#include <Kernel/Storage/ATA/ISAIDEController.h>
+#include <Kernel/Storage/ATA/GenericIDE/BusMasterChannel.h>
+#include <Kernel/Storage/ATA/GenericIDE/ISAController.h>
namespace Kernel {
diff --git a/Kernel/Storage/ATA/ISAIDEController.h b/Kernel/Storage/ATA/GenericIDE/ISAController.h
index 8142143b90..9a92719f26 100644
--- a/Kernel/Storage/ATA/ISAIDEController.h
+++ b/Kernel/Storage/ATA/GenericIDE/ISAController.h
@@ -9,8 +9,8 @@
#include <AK/OwnPtr.h>
#include <AK/RefPtr.h>
#include <AK/Types.h>
-#include <Kernel/Storage/ATA/IDEChannel.h>
-#include <Kernel/Storage/ATA/IDEController.h>
+#include <Kernel/Storage/ATA/GenericIDE/Channel.h>
+#include <Kernel/Storage/ATA/GenericIDE/Controller.h>
#include <Kernel/Storage/StorageDevice.h>
namespace Kernel {
diff --git a/Kernel/Storage/ATA/PCIIDEController.cpp b/Kernel/Storage/ATA/GenericIDE/PCIController.cpp
index 6e8b898185..119a26fd90 100644
--- a/Kernel/Storage/ATA/PCIIDEController.cpp
+++ b/Kernel/Storage/ATA/GenericIDE/PCIController.cpp
@@ -11,8 +11,8 @@
#include <Kernel/FileSystem/ProcFS.h>
#include <Kernel/Sections.h>
#include <Kernel/Storage/ATA/ATADiskDevice.h>
-#include <Kernel/Storage/ATA/BMIDEChannel.h>
-#include <Kernel/Storage/ATA/PCIIDEController.h>
+#include <Kernel/Storage/ATA/GenericIDE/BusMasterChannel.h>
+#include <Kernel/Storage/ATA/GenericIDE/PCIController.h>
namespace Kernel {
diff --git a/Kernel/Storage/ATA/PCIIDEController.h b/Kernel/Storage/ATA/GenericIDE/PCIController.h
index 981fea766b..29672632ff 100644
--- a/Kernel/Storage/ATA/PCIIDEController.h
+++ b/Kernel/Storage/ATA/GenericIDE/PCIController.h
@@ -9,8 +9,8 @@
#include <AK/OwnPtr.h>
#include <AK/RefPtr.h>
#include <AK/Types.h>
-#include <Kernel/Storage/ATA/IDEChannel.h>
-#include <Kernel/Storage/ATA/IDEController.h>
+#include <Kernel/Storage/ATA/GenericIDE/Channel.h>
+#include <Kernel/Storage/ATA/GenericIDE/Controller.h>
#include <Kernel/Storage/StorageDevice.h>
namespace Kernel {
diff --git a/Kernel/Storage/StorageManagement.cpp b/Kernel/Storage/StorageManagement.cpp
index 9f173ae864..56fac391cf 100644
--- a/Kernel/Storage/StorageManagement.cpp
+++ b/Kernel/Storage/StorageManagement.cpp
@@ -16,9 +16,10 @@
#include <Kernel/Devices/BlockDevice.h>
#include <Kernel/FileSystem/Ext2FileSystem.h>
#include <Kernel/Panic.h>
-#include <Kernel/Storage/ATA/AHCIController.h>
-#include <Kernel/Storage/ATA/ISAIDEController.h>
-#include <Kernel/Storage/ATA/PCIIDEController.h>
+#include <Kernel/Storage/ATA/AHCI/Controller.h>
+#include <Kernel/Storage/ATA/GenericIDE/Controller.h>
+#include <Kernel/Storage/ATA/GenericIDE/ISAController.h>
+#include <Kernel/Storage/ATA/GenericIDE/PCIController.h>
#include <Kernel/Storage/NVMe/NVMeController.h>
#include <Kernel/Storage/Partition/EBRPartitionTable.h>
#include <Kernel/Storage/Partition/GUIDPartitionTable.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 06:47:42 +0000