summaryrefslogtreecommitdiff
path: root/Kernel/Storage
diff options
context:
space:
mode:
Diffstat (limited to 'Kernel/Storage')
-rw-r--r--Kernel/Storage/ATA/AHCI.h (renamed from Kernel/Storage/AHCI.h)0
-rw-r--r--Kernel/Storage/ATA/AHCIController.cpp (renamed from Kernel/Storage/AHCIController.cpp)4
-rw-r--r--Kernel/Storage/ATA/AHCIController.h (renamed from Kernel/Storage/AHCIController.h)4
-rw-r--r--Kernel/Storage/ATA/AHCIPort.cpp (renamed from Kernel/Storage/AHCIPort.cpp)6
-rw-r--r--Kernel/Storage/ATA/AHCIPort.h (renamed from Kernel/Storage/AHCIPort.h)6
-rw-r--r--Kernel/Storage/ATA/AHCIPortHandler.cpp (renamed from Kernel/Storage/AHCIPortHandler.cpp)2
-rw-r--r--Kernel/Storage/ATA/AHCIPortHandler.h (renamed from Kernel/Storage/AHCIPortHandler.h)4
-rw-r--r--Kernel/Storage/ATA/ATA.h (renamed from Kernel/Storage/ATA.h)0
-rw-r--r--Kernel/Storage/ATA/ATAController.h (renamed from Kernel/Storage/ATAController.h)0
-rw-r--r--Kernel/Storage/ATA/ATADevice.cpp (renamed from Kernel/Storage/ATADevice.cpp)6
-rw-r--r--Kernel/Storage/ATA/ATADevice.h (renamed from Kernel/Storage/ATADevice.h)2
-rw-r--r--Kernel/Storage/ATA/ATADiskDevice.cpp (renamed from Kernel/Storage/ATADiskDevice.cpp)6
-rw-r--r--Kernel/Storage/ATA/ATADiskDevice.h (renamed from Kernel/Storage/ATADiskDevice.h)2
-rw-r--r--Kernel/Storage/ATA/ATAPIDiscDevice.cpp (renamed from Kernel/Storage/ATAPIDiscDevice.cpp)6
-rw-r--r--Kernel/Storage/ATA/ATAPIDiscDevice.h (renamed from Kernel/Storage/ATAPIDiscDevice.h)2
-rw-r--r--Kernel/Storage/ATA/BMIDEChannel.cpp (renamed from Kernel/Storage/BMIDEChannel.cpp)6
-rw-r--r--Kernel/Storage/ATA/BMIDEChannel.h (renamed from Kernel/Storage/BMIDEChannel.h)2
-rw-r--r--Kernel/Storage/ATA/IDEChannel.cpp (renamed from Kernel/Storage/IDEChannel.cpp)8
-rw-r--r--Kernel/Storage/ATA/IDEChannel.h (renamed from Kernel/Storage/IDEChannel.h)2
-rw-r--r--Kernel/Storage/ATA/IDEController.cpp (renamed from Kernel/Storage/IDEController.cpp)6
-rw-r--r--Kernel/Storage/ATA/IDEController.h (renamed from Kernel/Storage/IDEController.h)4
-rw-r--r--Kernel/Storage/StorageManagement.cpp4
22 files changed, 41 insertions, 41 deletions
diff --git a/Kernel/Storage/AHCI.h b/Kernel/Storage/ATA/AHCI.h
index 9502208d3b..9502208d3b 100644
--- a/Kernel/Storage/AHCI.h
+++ b/Kernel/Storage/ATA/AHCI.h
diff --git a/Kernel/Storage/AHCIController.cpp b/Kernel/Storage/ATA/AHCIController.cpp
index e57534c37d..1524fbfa1c 100644
--- a/Kernel/Storage/AHCIController.cpp
+++ b/Kernel/Storage/ATA/AHCIController.cpp
@@ -10,8 +10,8 @@
#include <AK/Types.h>
#include <Kernel/Bus/PCI/API.h>
#include <Kernel/Memory/MemoryManager.h>
-#include <Kernel/Storage/AHCIController.h>
-#include <Kernel/Storage/AHCIPortHandler.h>
+#include <Kernel/Storage/ATA/AHCIController.h>
+#include <Kernel/Storage/ATA/AHCIPortHandler.h>
namespace Kernel {
diff --git a/Kernel/Storage/AHCIController.h b/Kernel/Storage/ATA/AHCIController.h
index 5a83e58449..726696949d 100644
--- a/Kernel/Storage/AHCIController.h
+++ b/Kernel/Storage/ATA/AHCIController.h
@@ -10,8 +10,8 @@
#include <AK/RefPtr.h>
#include <AK/Types.h>
#include <Kernel/Sections.h>
-#include <Kernel/Storage/AHCI.h>
-#include <Kernel/Storage/ATAController.h>
+#include <Kernel/Storage/ATA/AHCI.h>
+#include <Kernel/Storage/ATA/ATAController.h>
#include <Kernel/Storage/StorageDevice.h>
namespace Kernel {
diff --git a/Kernel/Storage/AHCIPort.cpp b/Kernel/Storage/ATA/AHCIPort.cpp
index d439cc296a..9114541d88 100644
--- a/Kernel/Storage/AHCIPort.cpp
+++ b/Kernel/Storage/ATA/AHCIPort.cpp
@@ -12,9 +12,9 @@
#include <Kernel/Memory/MemoryManager.h>
#include <Kernel/Memory/ScatterGatherList.h>
#include <Kernel/Memory/TypedMapping.h>
-#include <Kernel/Storage/AHCIPort.h>
-#include <Kernel/Storage/ATA.h>
-#include <Kernel/Storage/ATADiskDevice.h>
+#include <Kernel/Storage/ATA/AHCIPort.h>
+#include <Kernel/Storage/ATA/ATA.h>
+#include <Kernel/Storage/ATA/ATADiskDevice.h>
#include <Kernel/Storage/StorageManagement.h>
#include <Kernel/WorkQueue.h>
diff --git a/Kernel/Storage/AHCIPort.h b/Kernel/Storage/ATA/AHCIPort.h
index ad866054f0..c99eccde29 100644
--- a/Kernel/Storage/AHCIPort.h
+++ b/Kernel/Storage/ATA/AHCIPort.h
@@ -20,9 +20,9 @@
#include <Kernel/PhysicalAddress.h>
#include <Kernel/Random.h>
#include <Kernel/Sections.h>
-#include <Kernel/Storage/AHCI.h>
-#include <Kernel/Storage/AHCIPortHandler.h>
-#include <Kernel/Storage/ATADevice.h>
+#include <Kernel/Storage/ATA/AHCI.h>
+#include <Kernel/Storage/ATA/AHCIPortHandler.h>
+#include <Kernel/Storage/ATA/ATADevice.h>
#include <Kernel/WaitQueue.h>
namespace Kernel {
diff --git a/Kernel/Storage/AHCIPortHandler.cpp b/Kernel/Storage/ATA/AHCIPortHandler.cpp
index 1dc74190b9..56d2559e4b 100644
--- a/Kernel/Storage/AHCIPortHandler.cpp
+++ b/Kernel/Storage/ATA/AHCIPortHandler.cpp
@@ -5,7 +5,7 @@
*/
#include <Kernel/CommandLine.h>
-#include <Kernel/Storage/AHCIPortHandler.h>
+#include <Kernel/Storage/ATA/AHCIPortHandler.h>
namespace Kernel {
diff --git a/Kernel/Storage/AHCIPortHandler.h b/Kernel/Storage/ATA/AHCIPortHandler.h
index 1ef4786ede..f44c992605 100644
--- a/Kernel/Storage/AHCIPortHandler.h
+++ b/Kernel/Storage/ATA/AHCIPortHandler.h
@@ -15,8 +15,8 @@
#include <Kernel/PhysicalAddress.h>
#include <Kernel/Random.h>
#include <Kernel/Sections.h>
-#include <Kernel/Storage/AHCIController.h>
-#include <Kernel/Storage/AHCIPort.h>
+#include <Kernel/Storage/ATA/AHCIController.h>
+#include <Kernel/Storage/ATA/AHCIPort.h>
#include <Kernel/Storage/StorageDevice.h>
#include <Kernel/WaitQueue.h>
diff --git a/Kernel/Storage/ATA.h b/Kernel/Storage/ATA/ATA.h
index 92ac91f9f1..92ac91f9f1 100644
--- a/Kernel/Storage/ATA.h
+++ b/Kernel/Storage/ATA/ATA.h
diff --git a/Kernel/Storage/ATAController.h b/Kernel/Storage/ATA/ATAController.h
index de0643f12e..de0643f12e 100644
--- a/Kernel/Storage/ATAController.h
+++ b/Kernel/Storage/ATA/ATAController.h
diff --git a/Kernel/Storage/ATADevice.cpp b/Kernel/Storage/ATA/ATADevice.cpp
index 3fe516908f..7e24a0cc68 100644
--- a/Kernel/Storage/ATADevice.cpp
+++ b/Kernel/Storage/ATA/ATADevice.cpp
@@ -6,9 +6,9 @@
#include <AK/StringView.h>
#include <Kernel/Sections.h>
-#include <Kernel/Storage/ATADevice.h>
-#include <Kernel/Storage/IDEChannel.h>
-#include <Kernel/Storage/IDEController.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/ATADevice.h b/Kernel/Storage/ATA/ATADevice.h
index 5e59f8e4ba..9c32d2d110 100644
--- a/Kernel/Storage/ATADevice.h
+++ b/Kernel/Storage/ATA/ATADevice.h
@@ -8,7 +8,7 @@
#include <Kernel/Interrupts/IRQHandler.h>
#include <Kernel/Locking/Mutex.h>
-#include <Kernel/Storage/ATAController.h>
+#include <Kernel/Storage/ATA/ATAController.h>
#include <Kernel/Storage/StorageDevice.h>
namespace Kernel {
diff --git a/Kernel/Storage/ATADiskDevice.cpp b/Kernel/Storage/ATA/ATADiskDevice.cpp
index 5eea1374c8..3d7af895be 100644
--- a/Kernel/Storage/ATADiskDevice.cpp
+++ b/Kernel/Storage/ATA/ATADiskDevice.cpp
@@ -7,9 +7,9 @@
#include <AK/StringView.h>
#include <Kernel/Devices/DeviceManagement.h>
#include <Kernel/Sections.h>
-#include <Kernel/Storage/ATADiskDevice.h>
-#include <Kernel/Storage/IDEChannel.h>
-#include <Kernel/Storage/IDEController.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/ATADiskDevice.h b/Kernel/Storage/ATA/ATADiskDevice.h
index ba52385306..6a5492f838 100644
--- a/Kernel/Storage/ATADiskDevice.h
+++ b/Kernel/Storage/ATA/ATADiskDevice.h
@@ -8,7 +8,7 @@
#include <Kernel/Interrupts/IRQHandler.h>
#include <Kernel/Locking/Mutex.h>
-#include <Kernel/Storage/ATADevice.h>
+#include <Kernel/Storage/ATA/ATADevice.h>
namespace Kernel {
diff --git a/Kernel/Storage/ATAPIDiscDevice.cpp b/Kernel/Storage/ATA/ATAPIDiscDevice.cpp
index a94ffb5308..7c60f54a14 100644
--- a/Kernel/Storage/ATAPIDiscDevice.cpp
+++ b/Kernel/Storage/ATA/ATAPIDiscDevice.cpp
@@ -7,9 +7,9 @@
#include <AK/StringView.h>
#include <Kernel/Devices/DeviceManagement.h>
#include <Kernel/Sections.h>
-#include <Kernel/Storage/ATAPIDiscDevice.h>
-#include <Kernel/Storage/IDEChannel.h>
-#include <Kernel/Storage/IDEController.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/ATAPIDiscDevice.h b/Kernel/Storage/ATA/ATAPIDiscDevice.h
index d7775bf20a..0556fb97d1 100644
--- a/Kernel/Storage/ATAPIDiscDevice.h
+++ b/Kernel/Storage/ATA/ATAPIDiscDevice.h
@@ -8,7 +8,7 @@
#include <Kernel/Interrupts/IRQHandler.h>
#include <Kernel/Locking/Mutex.h>
-#include <Kernel/Storage/ATADevice.h>
+#include <Kernel/Storage/ATA/ATADevice.h>
namespace Kernel {
diff --git a/Kernel/Storage/BMIDEChannel.cpp b/Kernel/Storage/ATA/BMIDEChannel.cpp
index 732b8baa41..8acf1dce5d 100644
--- a/Kernel/Storage/BMIDEChannel.cpp
+++ b/Kernel/Storage/ATA/BMIDEChannel.cpp
@@ -6,9 +6,9 @@
#include <Kernel/Bus/PCI/API.h>
#include <Kernel/Sections.h>
-#include <Kernel/Storage/ATA.h>
-#include <Kernel/Storage/BMIDEChannel.h>
-#include <Kernel/Storage/IDEController.h>
+#include <Kernel/Storage/ATA/ATA.h>
+#include <Kernel/Storage/ATA/BMIDEChannel.h>
+#include <Kernel/Storage/ATA/IDEController.h>
#include <Kernel/WorkQueue.h>
namespace Kernel {
diff --git a/Kernel/Storage/BMIDEChannel.h b/Kernel/Storage/ATA/BMIDEChannel.h
index c72e0a3da5..5f948149e5 100644
--- a/Kernel/Storage/BMIDEChannel.h
+++ b/Kernel/Storage/ATA/BMIDEChannel.h
@@ -7,7 +7,7 @@
#pragma once
#include <AK/OwnPtr.h>
-#include <Kernel/Storage/IDEChannel.h>
+#include <Kernel/Storage/ATA/IDEChannel.h>
namespace Kernel {
diff --git a/Kernel/Storage/IDEChannel.cpp b/Kernel/Storage/ATA/IDEChannel.cpp
index bc3012f45b..ef66424870 100644
--- a/Kernel/Storage/IDEChannel.cpp
+++ b/Kernel/Storage/ATA/IDEChannel.cpp
@@ -11,10 +11,10 @@
#include <Kernel/Memory/MemoryManager.h>
#include <Kernel/Process.h>
#include <Kernel/Sections.h>
-#include <Kernel/Storage/ATA.h>
-#include <Kernel/Storage/ATADiskDevice.h>
-#include <Kernel/Storage/IDEChannel.h>
-#include <Kernel/Storage/IDEController.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/WorkQueue.h>
namespace Kernel {
diff --git a/Kernel/Storage/IDEChannel.h b/Kernel/Storage/ATA/IDEChannel.h
index 0d8ac71d6b..ec14e00f7d 100644
--- a/Kernel/Storage/IDEChannel.h
+++ b/Kernel/Storage/ATA/IDEChannel.h
@@ -25,7 +25,7 @@
#include <Kernel/Memory/PhysicalPage.h>
#include <Kernel/PhysicalAddress.h>
#include <Kernel/Random.h>
-#include <Kernel/Storage/ATADevice.h>
+#include <Kernel/Storage/ATA/ATADevice.h>
#include <Kernel/Storage/StorageDevice.h>
#include <Kernel/WaitQueue.h>
diff --git a/Kernel/Storage/IDEController.cpp b/Kernel/Storage/ATA/IDEController.cpp
index 4566962813..8f70083fc5 100644
--- a/Kernel/Storage/IDEController.cpp
+++ b/Kernel/Storage/ATA/IDEController.cpp
@@ -10,9 +10,9 @@
#include <Kernel/Bus/PCI/API.h>
#include <Kernel/FileSystem/ProcFS.h>
#include <Kernel/Sections.h>
-#include <Kernel/Storage/ATADiskDevice.h>
-#include <Kernel/Storage/BMIDEChannel.h>
-#include <Kernel/Storage/IDEController.h>
+#include <Kernel/Storage/ATA/ATADiskDevice.h>
+#include <Kernel/Storage/ATA/BMIDEChannel.h>
+#include <Kernel/Storage/ATA/IDEController.h>
namespace Kernel {
diff --git a/Kernel/Storage/IDEController.h b/Kernel/Storage/ATA/IDEController.h
index f87158ea32..cea3540e9f 100644
--- a/Kernel/Storage/IDEController.h
+++ b/Kernel/Storage/ATA/IDEController.h
@@ -9,8 +9,8 @@
#include <AK/OwnPtr.h>
#include <AK/RefPtr.h>
#include <AK/Types.h>
-#include <Kernel/Storage/ATAController.h>
-#include <Kernel/Storage/IDEChannel.h>
+#include <Kernel/Storage/ATA/ATAController.h>
+#include <Kernel/Storage/ATA/IDEChannel.h>
#include <Kernel/Storage/StorageDevice.h>
namespace Kernel {
diff --git a/Kernel/Storage/StorageManagement.cpp b/Kernel/Storage/StorageManagement.cpp
index 9c1b6035a8..bed09b1f35 100644
--- a/Kernel/Storage/StorageManagement.cpp
+++ b/Kernel/Storage/StorageManagement.cpp
@@ -13,8 +13,8 @@
#include <Kernel/Devices/BlockDevice.h>
#include <Kernel/FileSystem/Ext2FileSystem.h>
#include <Kernel/Panic.h>
-#include <Kernel/Storage/AHCIController.h>
-#include <Kernel/Storage/IDEController.h>
+#include <Kernel/Storage/ATA/AHCIController.h>
+#include <Kernel/Storage/ATA/IDEController.h>
#include <Kernel/Storage/Partition/EBRPartitionTable.h>
#include <Kernel/Storage/Partition/GUIDPartitionTable.h>
#include <Kernel/Storage/Partition/MBRPartitionTable.h>