浏览代码

Kernel: Move Partition code files to the Storage folder

This folder is more appropriate for these files.
Liav A 4 年之前
父节点
当前提交
3a19e18d1e

+ 5 - 5
Kernel/CMakeLists.txt

@@ -21,14 +21,10 @@ set(KERNEL_SOURCES
     Devices/BXVGADevice.cpp
     Devices/BXVGADevice.cpp
     Devices/BlockDevice.cpp
     Devices/BlockDevice.cpp
     Devices/CharacterDevice.cpp
     Devices/CharacterDevice.cpp
-    Devices/Device.cpp
-    Devices/DiskPartition.cpp
-    Devices/EBRPartitionTable.cpp
+    Devices/Device.cpp    
     Devices/FullDevice.cpp
     Devices/FullDevice.cpp
-    Devices/GPTPartitionTable.cpp
     Devices/I8042Controller.cpp
     Devices/I8042Controller.cpp
     Devices/KeyboardDevice.cpp
     Devices/KeyboardDevice.cpp
-    Devices/MBRPartitionTable.cpp
     Devices/MBVGADevice.cpp
     Devices/MBVGADevice.cpp
     Devices/NullDevice.cpp
     Devices/NullDevice.cpp
     Devices/PCSpeaker.cpp
     Devices/PCSpeaker.cpp
@@ -39,6 +35,10 @@ set(KERNEL_SOURCES
     Devices/UHCIController.cpp
     Devices/UHCIController.cpp
     Devices/VMWareBackdoor.cpp
     Devices/VMWareBackdoor.cpp
     Devices/ZeroDevice.cpp
     Devices/ZeroDevice.cpp
+    Storage/Partition/DiskPartition.cpp
+    Storage/Partition/EBRPartitionTable.cpp
+    Storage/Partition/GPTPartitionTable.cpp
+    Storage/Partition/MBRPartitionTable.cpp
     Storage/StorageDevice.cpp
     Storage/StorageDevice.cpp
     Storage/IDEController.cpp
     Storage/IDEController.cpp
     Storage/IDEChannel.cpp
     Storage/IDEChannel.cpp

+ 1 - 1
Kernel/Devices/DiskPartition.cpp → Kernel/Storage/Partition/DiskPartition.cpp

@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  */
 
 
-#include <Kernel/Devices/DiskPartition.h>
 #include <Kernel/FileSystem/FileDescription.h>
 #include <Kernel/FileSystem/FileDescription.h>
+#include <Kernel/Storage/Partition/DiskPartition.h>
 
 
 // #define OFFD_DEBUG
 // #define OFFD_DEBUG
 
 

+ 0 - 0
Kernel/Devices/DiskPartition.h → Kernel/Storage/Partition/DiskPartition.h


+ 1 - 1
Kernel/Devices/EBRPartitionTable.cpp → Kernel/Storage/Partition/EBRPartitionTable.cpp

@@ -25,7 +25,7 @@
  */
  */
 
 
 #include <AK/ByteBuffer.h>
 #include <AK/ByteBuffer.h>
-#include <Kernel/Devices/EBRPartitionTable.h>
+#include <Kernel/Storage/Partition/EBRPartitionTable.h>
 
 
 #ifndef EBR_DEBUG
 #ifndef EBR_DEBUG
 #    define EBR_DEBUG
 #    define EBR_DEBUG

+ 2 - 2
Kernel/Devices/EBRPartitionTable.h → Kernel/Storage/Partition/EBRPartitionTable.h

@@ -28,8 +28,8 @@
 
 
 #include <AK/RefPtr.h>
 #include <AK/RefPtr.h>
 #include <AK/Vector.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 {
 namespace Kernel {
 
 

+ 1 - 1
Kernel/Devices/GPTPartitionTable.cpp → Kernel/Storage/Partition/GPTPartitionTable.cpp

@@ -25,7 +25,7 @@
  */
  */
 
 
 #include <AK/ByteBuffer.h>
 #include <AK/ByteBuffer.h>
-#include <Kernel/Devices/GPTPartitionTable.h>
+#include <Kernel/Storage/Partition/GPTPartitionTable.h>
 
 
 #ifndef GPT_DEBUG
 #ifndef GPT_DEBUG
 #    define GPT_DEBUG
 #    define GPT_DEBUG

+ 1 - 1
Kernel/Devices/GPTPartitionTable.h → Kernel/Storage/Partition/GPTPartitionTable.h

@@ -29,7 +29,7 @@
 #include <AK/RefPtr.h>
 #include <AK/RefPtr.h>
 #include <AK/Types.h>
 #include <AK/Types.h>
 #include <AK/Vector.h>
 #include <AK/Vector.h>
-#include <Kernel/Devices/DiskPartition.h>
+#include <Kernel/Storage/Partition/DiskPartition.h>
 
 
 namespace Kernel {
 namespace Kernel {
 
 

+ 1 - 1
Kernel/Devices/MBRPartitionTable.cpp → Kernel/Storage/Partition/MBRPartitionTable.cpp

@@ -25,7 +25,7 @@
  */
  */
 
 
 #include <AK/ByteBuffer.h>
 #include <AK/ByteBuffer.h>
-#include <Kernel/Devices/MBRPartitionTable.h>
+#include <Kernel/Storage/Partition/MBRPartitionTable.h>
 
 
 #ifndef MBR_DEBUG
 #ifndef MBR_DEBUG
 #    define MBR_DEBUG
 #    define MBR_DEBUG

+ 1 - 1
Kernel/Devices/MBRPartitionTable.h → Kernel/Storage/Partition/MBRPartitionTable.h

@@ -28,7 +28,7 @@
 
 
 #include <AK/RefPtr.h>
 #include <AK/RefPtr.h>
 #include <AK/Vector.h>
 #include <AK/Vector.h>
-#include <Kernel/Devices/DiskPartition.h>
+#include <Kernel/Storage/Partition/DiskPartition.h>
 
 
 namespace Kernel {
 namespace Kernel {
 
 

+ 4 - 4
Kernel/init.cpp

@@ -32,12 +32,8 @@
 #include <Kernel/CMOS.h>
 #include <Kernel/CMOS.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Devices/BXVGADevice.h>
 #include <Kernel/Devices/BXVGADevice.h>
-#include <Kernel/Devices/DiskPartition.h>
-#include <Kernel/Devices/EBRPartitionTable.h>
 #include <Kernel/Devices/FullDevice.h>
 #include <Kernel/Devices/FullDevice.h>
-#include <Kernel/Devices/GPTPartitionTable.h>
 #include <Kernel/Devices/I8042Controller.h>
 #include <Kernel/Devices/I8042Controller.h>
-#include <Kernel/Devices/MBRPartitionTable.h>
 #include <Kernel/Devices/MBVGADevice.h>
 #include <Kernel/Devices/MBVGADevice.h>
 #include <Kernel/Devices/NullDevice.h>
 #include <Kernel/Devices/NullDevice.h>
 #include <Kernel/Devices/RandomDevice.h>
 #include <Kernel/Devices/RandomDevice.h>
@@ -65,6 +61,10 @@
 #include <Kernel/RTC.h>
 #include <Kernel/RTC.h>
 #include <Kernel/Random.h>
 #include <Kernel/Random.h>
 #include <Kernel/Scheduler.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/Storage/StorageManagement.h>
 #include <Kernel/TTY/PTYMultiplexer.h>
 #include <Kernel/TTY/PTYMultiplexer.h>
 #include <Kernel/TTY/VirtualConsole.h>
 #include <Kernel/TTY/VirtualConsole.h>