From 3a19e18d1ea2b6956edcb4efe0eb6669ff2dd388 Mon Sep 17 00:00:00 2001
From: Liav A <liavalb@gmail.com>
Date: Fri, 25 Dec 2020 20:23:35 +0200
Subject: [PATCH] Kernel: Move Partition code files to the Storage folder

This folder is more appropriate for these files.
---
 Kernel/CMakeLists.txt                                  | 10 +++++-----
 .../{Devices => Storage/Partition}/DiskPartition.cpp   |  2 +-
 Kernel/{Devices => Storage/Partition}/DiskPartition.h  |  0
 .../Partition}/EBRPartitionTable.cpp                   |  2 +-
 .../{Devices => Storage/Partition}/EBRPartitionTable.h |  4 ++--
 .../Partition}/GPTPartitionTable.cpp                   |  2 +-
 .../{Devices => Storage/Partition}/GPTPartitionTable.h |  2 +-
 .../Partition}/MBRPartitionTable.cpp                   |  2 +-
 .../{Devices => Storage/Partition}/MBRPartitionTable.h |  2 +-
 Kernel/init.cpp                                        |  8 ++++----
 10 files changed, 17 insertions(+), 17 deletions(-)
 rename Kernel/{Devices => Storage/Partition}/DiskPartition.cpp (98%)
 rename Kernel/{Devices => Storage/Partition}/DiskPartition.h (100%)
 rename Kernel/{Devices => Storage/Partition}/EBRPartitionTable.cpp (99%)
 rename Kernel/{Devices => Storage/Partition}/EBRPartitionTable.h (95%)
 rename Kernel/{Devices => Storage/Partition}/GPTPartitionTable.cpp (98%)
 rename Kernel/{Devices => Storage/Partition}/GPTPartitionTable.h (97%)
 rename Kernel/{Devices => Storage/Partition}/MBRPartitionTable.cpp (98%)
 rename Kernel/{Devices => Storage/Partition}/MBRPartitionTable.h (97%)

diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 8467eaa7b3..5486c515cb 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -21,14 +21,10 @@ set(KERNEL_SOURCES
     Devices/BXVGADevice.cpp
     Devices/BlockDevice.cpp
     Devices/CharacterDevice.cpp
-    Devices/Device.cpp
-    Devices/DiskPartition.cpp
-    Devices/EBRPartitionTable.cpp
+    Devices/Device.cpp    
     Devices/FullDevice.cpp
-    Devices/GPTPartitionTable.cpp
     Devices/I8042Controller.cpp
     Devices/KeyboardDevice.cpp
-    Devices/MBRPartitionTable.cpp
     Devices/MBVGADevice.cpp
     Devices/NullDevice.cpp
     Devices/PCSpeaker.cpp
@@ -39,6 +35,10 @@ set(KERNEL_SOURCES
     Devices/UHCIController.cpp
     Devices/VMWareBackdoor.cpp
     Devices/ZeroDevice.cpp
+    Storage/Partition/DiskPartition.cpp
+    Storage/Partition/EBRPartitionTable.cpp
+    Storage/Partition/GPTPartitionTable.cpp
+    Storage/Partition/MBRPartitionTable.cpp
     Storage/StorageDevice.cpp
     Storage/IDEController.cpp
     Storage/IDEChannel.cpp
diff --git a/Kernel/Devices/DiskPartition.cpp b/Kernel/Storage/Partition/DiskPartition.cpp
similarity index 98%
rename from Kernel/Devices/DiskPartition.cpp
rename to Kernel/Storage/Partition/DiskPartition.cpp
index d07961f74c..64126c0b58 100644
--- a/Kernel/Devices/DiskPartition.cpp
+++ b/Kernel/Storage/Partition/DiskPartition.cpp
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/Devices/DiskPartition.h>
 #include <Kernel/FileSystem/FileDescription.h>
+#include <Kernel/Storage/Partition/DiskPartition.h>
 
 // #define OFFD_DEBUG
 
diff --git a/Kernel/Devices/DiskPartition.h b/Kernel/Storage/Partition/DiskPartition.h
similarity index 100%
rename from Kernel/Devices/DiskPartition.h
rename to Kernel/Storage/Partition/DiskPartition.h
diff --git a/Kernel/Devices/EBRPartitionTable.cpp b/Kernel/Storage/Partition/EBRPartitionTable.cpp
similarity index 99%
rename from Kernel/Devices/EBRPartitionTable.cpp
rename to Kernel/Storage/Partition/EBRPartitionTable.cpp
index 6cdd52fb8a..e026ea3576 100644
--- a/Kernel/Devices/EBRPartitionTable.cpp
+++ b/Kernel/Storage/Partition/EBRPartitionTable.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <AK/ByteBuffer.h>
-#include <Kernel/Devices/EBRPartitionTable.h>
+#include <Kernel/Storage/Partition/EBRPartitionTable.h>
 
 #ifndef EBR_DEBUG
 #    define EBR_DEBUG
diff --git a/Kernel/Devices/EBRPartitionTable.h b/Kernel/Storage/Partition/EBRPartitionTable.h
similarity index 95%
rename from Kernel/Devices/EBRPartitionTable.h
rename to Kernel/Storage/Partition/EBRPartitionTable.h
index 003048d716..a5dab9660a 100644
--- a/Kernel/Devices/EBRPartitionTable.h
+++ b/Kernel/Storage/Partition/EBRPartitionTable.h
@@ -28,8 +28,8 @@
 
 #include <AK/RefPtr.h>
 #include <AK/Vector.h>
-#include <Kernel/Devices/DiskPartition.h>
-#include <Kernel/Devices/MBRPartitionTable.h>
+#include <Kernel/Storage/Partition/DiskPartition.h>
+#include <Kernel/Storage/Partition/MBRPartitionTable.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Devices/GPTPartitionTable.cpp b/Kernel/Storage/Partition/GPTPartitionTable.cpp
similarity index 98%
rename from Kernel/Devices/GPTPartitionTable.cpp
rename to Kernel/Storage/Partition/GPTPartitionTable.cpp
index 019f8994e1..af81a1ae4e 100644
--- a/Kernel/Devices/GPTPartitionTable.cpp
+++ b/Kernel/Storage/Partition/GPTPartitionTable.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <AK/ByteBuffer.h>
-#include <Kernel/Devices/GPTPartitionTable.h>
+#include <Kernel/Storage/Partition/GPTPartitionTable.h>
 
 #ifndef GPT_DEBUG
 #    define GPT_DEBUG
diff --git a/Kernel/Devices/GPTPartitionTable.h b/Kernel/Storage/Partition/GPTPartitionTable.h
similarity index 97%
rename from Kernel/Devices/GPTPartitionTable.h
rename to Kernel/Storage/Partition/GPTPartitionTable.h
index 5ec974cf7f..b73d0ff005 100644
--- a/Kernel/Devices/GPTPartitionTable.h
+++ b/Kernel/Storage/Partition/GPTPartitionTable.h
@@ -29,7 +29,7 @@
 #include <AK/RefPtr.h>
 #include <AK/Types.h>
 #include <AK/Vector.h>
-#include <Kernel/Devices/DiskPartition.h>
+#include <Kernel/Storage/Partition/DiskPartition.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Devices/MBRPartitionTable.cpp b/Kernel/Storage/Partition/MBRPartitionTable.cpp
similarity index 98%
rename from Kernel/Devices/MBRPartitionTable.cpp
rename to Kernel/Storage/Partition/MBRPartitionTable.cpp
index 716e02119e..e2538ad87c 100644
--- a/Kernel/Devices/MBRPartitionTable.cpp
+++ b/Kernel/Storage/Partition/MBRPartitionTable.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <AK/ByteBuffer.h>
-#include <Kernel/Devices/MBRPartitionTable.h>
+#include <Kernel/Storage/Partition/MBRPartitionTable.h>
 
 #ifndef MBR_DEBUG
 #    define MBR_DEBUG
diff --git a/Kernel/Devices/MBRPartitionTable.h b/Kernel/Storage/Partition/MBRPartitionTable.h
similarity index 97%
rename from Kernel/Devices/MBRPartitionTable.h
rename to Kernel/Storage/Partition/MBRPartitionTable.h
index 0ae4be46fd..74b7d06b83 100644
--- a/Kernel/Devices/MBRPartitionTable.h
+++ b/Kernel/Storage/Partition/MBRPartitionTable.h
@@ -28,7 +28,7 @@
 
 #include <AK/RefPtr.h>
 #include <AK/Vector.h>
-#include <Kernel/Devices/DiskPartition.h>
+#include <Kernel/Storage/Partition/DiskPartition.h>
 
 namespace Kernel {
 
diff --git a/Kernel/init.cpp b/Kernel/init.cpp
index 9beeb58761..e124e1ddb2 100644
--- a/Kernel/init.cpp
+++ b/Kernel/init.cpp
@@ -32,12 +32,8 @@
 #include <Kernel/CMOS.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Devices/BXVGADevice.h>
-#include <Kernel/Devices/DiskPartition.h>
-#include <Kernel/Devices/EBRPartitionTable.h>
 #include <Kernel/Devices/FullDevice.h>
-#include <Kernel/Devices/GPTPartitionTable.h>
 #include <Kernel/Devices/I8042Controller.h>
-#include <Kernel/Devices/MBRPartitionTable.h>
 #include <Kernel/Devices/MBVGADevice.h>
 #include <Kernel/Devices/NullDevice.h>
 #include <Kernel/Devices/RandomDevice.h>
@@ -65,6 +61,10 @@
 #include <Kernel/RTC.h>
 #include <Kernel/Random.h>
 #include <Kernel/Scheduler.h>
+#include <Kernel/Storage/Partition/DiskPartition.h>
+#include <Kernel/Storage/Partition/EBRPartitionTable.h>
+#include <Kernel/Storage/Partition/GPTPartitionTable.h>
+#include <Kernel/Storage/Partition/MBRPartitionTable.h>
 #include <Kernel/Storage/StorageManagement.h>
 #include <Kernel/TTY/PTYMultiplexer.h>
 #include <Kernel/TTY/VirtualConsole.h>