Reorder ATAPI to be last device and undo test changes

Author: MishaTy

Tests/Kernels/Cosmos.Kernel.Tests.DiskManager/System.FileSystem/DiskManagerTest.cs

@@ -15,7 +15,7 @@ public class DiskManagerTest
         /// </summary>
         public static void Execute(Debugger mDebugger)
         {
-            string driveName = @"1:\";
+            string driveName = @"0:\";
             var MyDrive = new System.FileSystem.DiskManager(driveName);
 
             mDebugger.Send("START TEST: Get Name");
@@ -56,16 +56,16 @@ public static void Execute(Debugger mDebugger)
             Assert.IsTrue(xDi.TotalSize == xDi.TotalFreeSpace, "DiskManager.Format (quick) failed TotalFreeSpace is not the same of TotalSize");
 
             /* Let's try to create a new file on the Root Directory */
-            File.Create(@"1:\newFile.txt");
+            File.Create(@"0:\newFile.txt");
 
-            Assert.IsTrue(File.Exists(@"1:\newFile.txt") == true, "Failed to create new file after disk format");
+            Assert.IsTrue(File.Exists(@"0:\newFile.txt") == true, "Failed to create new file after disk format");
 
             mDebugger.Send("END TEST");
 
             mDebugger.Send("Testing if you can create directories");
 
-            Directory.CreateDirectory(@"1:\SYS\");
-            Assert.IsTrue(Directory.GetDirectories(@"1:\SYS\").Length == 0, "Can create a directory and its content is emtpy");
+            Directory.CreateDirectory(@"0:\SYS\");
+            Assert.IsTrue(Directory.GetDirectories(@"0:\SYS\").Length == 0, "Can create a directory and its content is emtpy");
 
             mDebugger.Send("END TEST");
 

source/Cosmos.HAL2/BlockDevice/IDE.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Cosmos.HAL.BlockDevice;
 
 namespace Cosmos.HAL.BlockDevice
@@ -20,9 +21,15 @@ internal static void InitDriver()
                 Initialize(Ata.ControllerIdEnum.Secondary, Ata.BusPositionEnum.Master);
                 Console.WriteLine("ATA Secondary Slave");
                 Initialize(Ata.ControllerIdEnum.Secondary, Ata.BusPositionEnum.Slave);
+
+                //Add in the atapi devices
+                foreach (var item in ATAPIPartions)
+                {
+                    BlockDevice.Devices.Add(item);
+                }
             }
         }
-
+        private static List<Partition> ATAPIPartions = new List<Partition>();
         private static void Initialize(Ata.ControllerIdEnum aControllerID, Ata.BusPositionEnum aBusPosition)
         {
             var xIO = aControllerID == Ata.ControllerIdEnum.Primary ? Core.Global.BaseIOGroups.ATA1 : Core.Global.BaseIOGroups.ATA2;
@@ -41,7 +48,8 @@ private static void Initialize(Ata.ControllerIdEnum aControllerID, Ata.BusPositi
                 var atapi = new ATAPI(xATA);
 
                 //TODO: Replace 1000000 with proper size once ATAPI driver implements it
-                BlockDevice.Devices.Add(new Partition(atapi, 0, 1000000));
+                //Add the atapi device to an array so we reorder them to be last
+                ATAPIPartions.Add(new Partition(atapi, 0, 1000000));
                 Ata.AtaDebugger.Send("ATA device with speclevel ATAPI found");
                 return;
             }