From 4dc3617f3c1e35a8865fb1d26b2779959e6423fc Mon Sep 17 00:00:00 2001 From: Liav A Date: Sat, 13 Nov 2021 10:19:31 +0200 Subject: [PATCH] Kernel/Storage: Move all ATA related code to a new subdirectory Like what happened with the PCI and USB code, this feels like the right thing to do because we can improve on the ATA capabilities and keep it distinguished from the rest of the subsystem. --- Kernel/CMakeLists.txt | 18 +++++++++--------- Kernel/Storage/{ => ATA}/AHCI.h | 0 Kernel/Storage/{ => ATA}/AHCIController.cpp | 4 ++-- Kernel/Storage/{ => ATA}/AHCIController.h | 4 ++-- Kernel/Storage/{ => ATA}/AHCIPort.cpp | 6 +++--- Kernel/Storage/{ => ATA}/AHCIPort.h | 6 +++--- Kernel/Storage/{ => ATA}/AHCIPortHandler.cpp | 2 +- Kernel/Storage/{ => ATA}/AHCIPortHandler.h | 4 ++-- Kernel/Storage/{ => ATA}/ATA.h | 0 Kernel/Storage/{ => ATA}/ATAController.h | 0 Kernel/Storage/{ => ATA}/ATADevice.cpp | 6 +++--- Kernel/Storage/{ => ATA}/ATADevice.h | 2 +- Kernel/Storage/{ => ATA}/ATADiskDevice.cpp | 6 +++--- Kernel/Storage/{ => ATA}/ATADiskDevice.h | 2 +- Kernel/Storage/{ => ATA}/ATAPIDiscDevice.cpp | 6 +++--- Kernel/Storage/{ => ATA}/ATAPIDiscDevice.h | 2 +- Kernel/Storage/{ => ATA}/BMIDEChannel.cpp | 6 +++--- Kernel/Storage/{ => ATA}/BMIDEChannel.h | 2 +- Kernel/Storage/{ => ATA}/IDEChannel.cpp | 8 ++++---- Kernel/Storage/{ => ATA}/IDEChannel.h | 2 +- Kernel/Storage/{ => ATA}/IDEController.cpp | 6 +++--- Kernel/Storage/{ => ATA}/IDEController.h | 4 ++-- Kernel/Storage/StorageManagement.cpp | 4 ++-- 23 files changed, 50 insertions(+), 50 deletions(-) rename Kernel/Storage/{ => ATA}/AHCI.h (100%) rename Kernel/Storage/{ => ATA}/AHCIController.cpp (98%) rename Kernel/Storage/{ => ATA}/AHCIController.h (95%) rename Kernel/Storage/{ => ATA}/AHCIPort.cpp (99%) rename Kernel/Storage/{ => ATA}/AHCIPort.h (97%) rename Kernel/Storage/{ => ATA}/AHCIPortHandler.cpp (98%) rename Kernel/Storage/{ => ATA}/AHCIPortHandler.h (96%) rename Kernel/Storage/{ => ATA}/ATA.h (100%) rename Kernel/Storage/{ => ATA}/ATAController.h (100%) rename Kernel/Storage/{ => ATA}/ATADevice.cpp (87%) rename Kernel/Storage/{ => ATA}/ATADevice.h (96%) rename Kernel/Storage/{ => ATA}/ATADiskDevice.cpp (92%) rename Kernel/Storage/{ => ATA}/ATADiskDevice.h (95%) rename Kernel/Storage/{ => ATA}/ATAPIDiscDevice.cpp (91%) rename Kernel/Storage/{ => ATA}/ATAPIDiscDevice.h (95%) rename Kernel/Storage/{ => ATA}/BMIDEChannel.cpp (98%) rename Kernel/Storage/{ => ATA}/BMIDEChannel.h (97%) rename Kernel/Storage/{ => ATA}/IDEChannel.cpp (99%) rename Kernel/Storage/{ => ATA}/IDEChannel.h (99%) rename Kernel/Storage/{ => ATA}/IDEController.cpp (98%) rename Kernel/Storage/{ => ATA}/IDEController.h (94%) diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt index 385f6a5d072..e0f4a050a2f 100644 --- a/Kernel/CMakeLists.txt +++ b/Kernel/CMakeLists.txt @@ -82,6 +82,15 @@ set(KERNEL_SOURCES Graphics/VGACompatibleAdapter.cpp Graphics/GenericFramebufferDevice.cpp SanCov.cpp + Storage/ATA/AHCIController.cpp + Storage/ATA/AHCIPort.cpp + Storage/ATA/AHCIPortHandler.cpp + Storage/ATA/ATADevice.cpp + Storage/ATA/ATADiskDevice.cpp + Storage/ATA/ATAPIDiscDevice.cpp + Storage/ATA/BMIDEChannel.cpp + Storage/ATA/IDEController.cpp + Storage/ATA/IDEChannel.cpp Storage/Partition/DiskPartition.cpp Storage/Partition/DiskPartitionMetadata.cpp Storage/Partition/EBRPartitionTable.cpp @@ -89,15 +98,6 @@ set(KERNEL_SOURCES Storage/Partition/MBRPartitionTable.cpp Storage/Partition/PartitionTable.cpp Storage/StorageDevice.cpp - Storage/AHCIController.cpp - Storage/AHCIPort.cpp - Storage/AHCIPortHandler.cpp - Storage/ATADevice.cpp - Storage/ATADiskDevice.cpp - Storage/ATAPIDiscDevice.cpp - Storage/BMIDEChannel.cpp - Storage/IDEController.cpp - Storage/IDEChannel.cpp Storage/RamdiskController.cpp Storage/RamdiskDevice.cpp Storage/StorageManagement.cpp diff --git a/Kernel/Storage/AHCI.h b/Kernel/Storage/ATA/AHCI.h similarity index 100% rename from Kernel/Storage/AHCI.h rename to Kernel/Storage/ATA/AHCI.h diff --git a/Kernel/Storage/AHCIController.cpp b/Kernel/Storage/ATA/AHCIController.cpp similarity index 98% rename from Kernel/Storage/AHCIController.cpp rename to Kernel/Storage/ATA/AHCIController.cpp index e57534c37d5..1524fbfa1ca 100644 --- a/Kernel/Storage/AHCIController.cpp +++ b/Kernel/Storage/ATA/AHCIController.cpp @@ -10,8 +10,8 @@ #include #include #include -#include -#include +#include +#include namespace Kernel { diff --git a/Kernel/Storage/AHCIController.h b/Kernel/Storage/ATA/AHCIController.h similarity index 95% rename from Kernel/Storage/AHCIController.h rename to Kernel/Storage/ATA/AHCIController.h index 5a83e584495..726696949d9 100644 --- a/Kernel/Storage/AHCIController.h +++ b/Kernel/Storage/ATA/AHCIController.h @@ -10,8 +10,8 @@ #include #include #include -#include -#include +#include +#include #include namespace Kernel { diff --git a/Kernel/Storage/AHCIPort.cpp b/Kernel/Storage/ATA/AHCIPort.cpp similarity index 99% rename from Kernel/Storage/AHCIPort.cpp rename to Kernel/Storage/ATA/AHCIPort.cpp index d439cc296a7..9114541d88b 100644 --- a/Kernel/Storage/AHCIPort.cpp +++ b/Kernel/Storage/ATA/AHCIPort.cpp @@ -12,9 +12,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/Kernel/Storage/AHCIPort.h b/Kernel/Storage/ATA/AHCIPort.h similarity index 97% rename from Kernel/Storage/AHCIPort.h rename to Kernel/Storage/ATA/AHCIPort.h index ad866054f0c..c99eccde29d 100644 --- a/Kernel/Storage/AHCIPort.h +++ b/Kernel/Storage/ATA/AHCIPort.h @@ -20,9 +20,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include namespace Kernel { diff --git a/Kernel/Storage/AHCIPortHandler.cpp b/Kernel/Storage/ATA/AHCIPortHandler.cpp similarity index 98% rename from Kernel/Storage/AHCIPortHandler.cpp rename to Kernel/Storage/ATA/AHCIPortHandler.cpp index 1dc74190b94..56d2559e4bd 100644 --- a/Kernel/Storage/AHCIPortHandler.cpp +++ b/Kernel/Storage/ATA/AHCIPortHandler.cpp @@ -5,7 +5,7 @@ */ #include -#include +#include namespace Kernel { diff --git a/Kernel/Storage/AHCIPortHandler.h b/Kernel/Storage/ATA/AHCIPortHandler.h similarity index 96% rename from Kernel/Storage/AHCIPortHandler.h rename to Kernel/Storage/ATA/AHCIPortHandler.h index 1ef4786ede3..f44c9926050 100644 --- a/Kernel/Storage/AHCIPortHandler.h +++ b/Kernel/Storage/ATA/AHCIPortHandler.h @@ -15,8 +15,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/Kernel/Storage/ATA.h b/Kernel/Storage/ATA/ATA.h similarity index 100% rename from Kernel/Storage/ATA.h rename to Kernel/Storage/ATA/ATA.h diff --git a/Kernel/Storage/ATAController.h b/Kernel/Storage/ATA/ATAController.h similarity index 100% rename from Kernel/Storage/ATAController.h rename to Kernel/Storage/ATA/ATAController.h diff --git a/Kernel/Storage/ATADevice.cpp b/Kernel/Storage/ATA/ATADevice.cpp similarity index 87% rename from Kernel/Storage/ATADevice.cpp rename to Kernel/Storage/ATA/ATADevice.cpp index 3fe516908f2..7e24a0cc687 100644 --- a/Kernel/Storage/ATADevice.cpp +++ b/Kernel/Storage/ATA/ATADevice.cpp @@ -6,9 +6,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include namespace Kernel { diff --git a/Kernel/Storage/ATADevice.h b/Kernel/Storage/ATA/ATADevice.h similarity index 96% rename from Kernel/Storage/ATADevice.h rename to Kernel/Storage/ATA/ATADevice.h index 5e59f8e4ba3..9c32d2d1102 100644 --- a/Kernel/Storage/ATADevice.h +++ b/Kernel/Storage/ATA/ATADevice.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include namespace Kernel { diff --git a/Kernel/Storage/ATADiskDevice.cpp b/Kernel/Storage/ATA/ATADiskDevice.cpp similarity index 92% rename from Kernel/Storage/ATADiskDevice.cpp rename to Kernel/Storage/ATA/ATADiskDevice.cpp index 5eea1374c8f..3d7af895bef 100644 --- a/Kernel/Storage/ATADiskDevice.cpp +++ b/Kernel/Storage/ATA/ATADiskDevice.cpp @@ -7,9 +7,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include namespace Kernel { diff --git a/Kernel/Storage/ATADiskDevice.h b/Kernel/Storage/ATA/ATADiskDevice.h similarity index 95% rename from Kernel/Storage/ATADiskDevice.h rename to Kernel/Storage/ATA/ATADiskDevice.h index ba52385306a..6a5492f8386 100644 --- a/Kernel/Storage/ATADiskDevice.h +++ b/Kernel/Storage/ATA/ATADiskDevice.h @@ -8,7 +8,7 @@ #include #include -#include +#include namespace Kernel { diff --git a/Kernel/Storage/ATAPIDiscDevice.cpp b/Kernel/Storage/ATA/ATAPIDiscDevice.cpp similarity index 91% rename from Kernel/Storage/ATAPIDiscDevice.cpp rename to Kernel/Storage/ATA/ATAPIDiscDevice.cpp index a94ffb53089..7c60f54a14b 100644 --- a/Kernel/Storage/ATAPIDiscDevice.cpp +++ b/Kernel/Storage/ATA/ATAPIDiscDevice.cpp @@ -7,9 +7,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include namespace Kernel { diff --git a/Kernel/Storage/ATAPIDiscDevice.h b/Kernel/Storage/ATA/ATAPIDiscDevice.h similarity index 95% rename from Kernel/Storage/ATAPIDiscDevice.h rename to Kernel/Storage/ATA/ATAPIDiscDevice.h index d7775bf20a9..0556fb97d13 100644 --- a/Kernel/Storage/ATAPIDiscDevice.h +++ b/Kernel/Storage/ATA/ATAPIDiscDevice.h @@ -8,7 +8,7 @@ #include #include -#include +#include namespace Kernel { diff --git a/Kernel/Storage/BMIDEChannel.cpp b/Kernel/Storage/ATA/BMIDEChannel.cpp similarity index 98% rename from Kernel/Storage/BMIDEChannel.cpp rename to Kernel/Storage/ATA/BMIDEChannel.cpp index 732b8baa41c..8acf1dce5d4 100644 --- a/Kernel/Storage/BMIDEChannel.cpp +++ b/Kernel/Storage/ATA/BMIDEChannel.cpp @@ -6,9 +6,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include namespace Kernel { diff --git a/Kernel/Storage/BMIDEChannel.h b/Kernel/Storage/ATA/BMIDEChannel.h similarity index 97% rename from Kernel/Storage/BMIDEChannel.h rename to Kernel/Storage/ATA/BMIDEChannel.h index c72e0a3da56..5f948149e5a 100644 --- a/Kernel/Storage/BMIDEChannel.h +++ b/Kernel/Storage/ATA/BMIDEChannel.h @@ -7,7 +7,7 @@ #pragma once #include -#include +#include namespace Kernel { diff --git a/Kernel/Storage/IDEChannel.cpp b/Kernel/Storage/ATA/IDEChannel.cpp similarity index 99% rename from Kernel/Storage/IDEChannel.cpp rename to Kernel/Storage/ATA/IDEChannel.cpp index bc3012f45b7..ef66424870a 100644 --- a/Kernel/Storage/IDEChannel.cpp +++ b/Kernel/Storage/ATA/IDEChannel.cpp @@ -11,10 +11,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include namespace Kernel { diff --git a/Kernel/Storage/IDEChannel.h b/Kernel/Storage/ATA/IDEChannel.h similarity index 99% rename from Kernel/Storage/IDEChannel.h rename to Kernel/Storage/ATA/IDEChannel.h index 0d8ac71d6b7..ec14e00f7d0 100644 --- a/Kernel/Storage/IDEChannel.h +++ b/Kernel/Storage/ATA/IDEChannel.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/Kernel/Storage/IDEController.cpp b/Kernel/Storage/ATA/IDEController.cpp similarity index 98% rename from Kernel/Storage/IDEController.cpp rename to Kernel/Storage/ATA/IDEController.cpp index 4566962813a..8f70083fc55 100644 --- a/Kernel/Storage/IDEController.cpp +++ b/Kernel/Storage/ATA/IDEController.cpp @@ -10,9 +10,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include namespace Kernel { diff --git a/Kernel/Storage/IDEController.h b/Kernel/Storage/ATA/IDEController.h similarity index 94% rename from Kernel/Storage/IDEController.h rename to Kernel/Storage/ATA/IDEController.h index f87158ea32f..cea3540e9fa 100644 --- a/Kernel/Storage/IDEController.h +++ b/Kernel/Storage/ATA/IDEController.h @@ -9,8 +9,8 @@ #include #include #include -#include -#include +#include +#include #include namespace Kernel { diff --git a/Kernel/Storage/StorageManagement.cpp b/Kernel/Storage/StorageManagement.cpp index 9c1b6035a8a..bed09b1f350 100644 --- a/Kernel/Storage/StorageManagement.cpp +++ b/Kernel/Storage/StorageManagement.cpp @@ -13,8 +13,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include