Merge pull request #2439 from TheFocusMan/master

Added Remove Debug Output Option

Docs/articles/Kernel/Startup.md

@@ -1,3 +1,5 @@
 On startup, there is some hand-coded assembly that runs before the Cosmos layer kicks in. From there, the C# entry point Cosmos.System.Kernel.Start() is called.
 
 Cosmos.System.Kernel is an abstract class that forms the Cosmos framework upon which your OS is built upon.
+
+You can override the Kernel.Start() method to suppress the standard Cosmos boot routines.

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

@@ -68,6 +68,9 @@ public static void Execute(Debugger mDebugger)
             Directory.CreateDirectory(@"0:\SYS\");
             Assert.IsTrue(Directory.GetDirectories(@"0:\SYS\").Length == 0, "Can create a directory and its content is emtpy");
 
+            ourDisk.DeletePartition(0);
+            mDebugger.Send("Partion is Deleted");
+
             mDebugger.Send("END TEST");
         }
     }

source/Cosmos.Build.Tasks/IL2CPU.cs

@@ -54,6 +54,8 @@ public class IL2CPU : ToolTask
 
         public bool CompileVBEMultiboot { get; set; }
 
+        public bool RemoveBootDebugOutput { get; set; }
+
         public string VBEResolution { get; set; }
 
         #endregion
@@ -97,6 +99,7 @@ protected override string GenerateResponseFileCommands()
                 ["IgnoreDebugStubAttribute"] = IgnoreDebugStubAttribute.ToString(),
                 ["CompileVBEMultiboot"] = CompileVBEMultiboot.ToString(),
                 ["VBEResolution"] = VBEResolution.ToString(),
+                ["RemoveBootDebugOutput"] = RemoveBootDebugOutput.ToString()
             }.ToList();
 
             foreach (var reference in References)

source/Cosmos.Build.Tasks/build/Cosmos.Build.targets

@@ -63,6 +63,9 @@
 
         <CompileVBEMultiboot Condition="'$(CompileVBEMultiboot)' == ''">False</CompileVBEMultiboot>
 
+
+        <RemoveBootDebugOutput Condition="'$(RemoveBootDebugOutput)' == ''">ELF</RemoveBootDebugOutput>
+
     </PropertyGroup>
 
     <PropertyGroup>

source/Cosmos.Core/CPU.cs

@@ -37,6 +37,16 @@ public static uint GetAmountOfRAM()
         [PlugMethod(PlugRequired = true)]
         public static uint GetEBPValue() => throw null;
 
+        /// <summary>
+        /// Get position of current ESP register
+        /// </summary>
+        /// <returns></returns>
+        [PlugMethod(PlugRequired = true)]
+        internal static uint GetESPValue() => throw null;
+
+        [PlugMethod(PlugRequired = true)]
+        internal static void SetESPValue(uint val) => throw null;
+
         /// <summary>
         /// Get the address at which the stack starts
         /// </summary>

source/Cosmos.Core_Asm/CPU/CPUGetESPValue.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using XSharp;
+using XSharp.Assembler;
+using static XSharp.XSRegisters;
+
+namespace Cosmos.Core_Asm
+{
+    public class CPUGetESPValue : AssemblerMethod
+    {
+        public override void AssembleNew(Assembler aAssembler, object aMethodInfo)
+        {
+            XS.Push(ESP);
+        }
+    }
+}

source/Cosmos.Core_Asm/CPU/CPUSetESPValue.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using XSharp;
+using XSharp.Assembler;
+using static XSharp.XSRegisters;
+
+namespace Cosmos.Core_Asm
+{
+    public class CPUSetESPValue : AssemblerMethod
+    {
+        public override void AssembleNew(Assembler aAssembler, object aMethodInfo)
+        {
+            XS.Set(EAX, EBP,sourceDisplacement:8);
+            XS.Set(ESP,EAX,destinationDisplacement:4);
+        }
+    }
+}

source/Cosmos.Core_Asm/CPUImpl.cs

@@ -15,6 +15,13 @@ public class CPUImpl
         public static uint GetEndOfKernel() => throw null;
         [PlugMethod(Assembler = typeof(CPUGetEBPValue))]
         public static uint GetEBPValue() => throw null;
+
+        [PlugMethod(Assembler = typeof(CPUGetESPValue))]
+        public static uint GetESPValue() => throw null;
+
+        [PlugMethod(Assembler = typeof(CPUSetESPValue))]
+        public static void SetESPValue(uint val) => throw null;
+
         [PlugMethod(Assembler = typeof(CPUGetStackStart))]
         public static uint GetStackStart() => throw null;
         [PlugMethod(Assembler = typeof(CPUZeroFillAsm))]

source/Cosmos.HAL2/BlockDevice/ATAPI.cs

@@ -2,6 +2,7 @@
 using Cosmos.HAL.BlockDevice;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using static Cosmos.HAL.BlockDevice.Ata;
 using static Cosmos.HAL.BlockDevice.ATA_PIO;
 
@@ -22,15 +23,20 @@ public class ATAPI : BlockDevice
         /// <summary>
         /// Is the ATAPI drive on the Primary or Secondary channel of the IDE controller.
         /// </summary>
-        private bool Primary { get; set; }
+        public bool Primary { get; private set; }
+
+        /// <summary>
+        /// Get The max lba
+        /// </summary>
+        public ulong MaxLBA { get; private set; }
 
         /// <summary>
         /// Each IDE channel also has a Master or a Slave. This just gets or sets which position it is at.
         /// </summary>
         private BusPositionEnum BusPosition { get; set; }
         public override BlockDeviceType Type => BlockDeviceType.RemovableCD;
 
-        private ATA_PIO device;
+        public ATA_PIO device;
 
         /// <summary>
         /// Collection of predefined command packets to be sent to the ATAPI device
@@ -39,6 +45,7 @@ public class PacketCommands
         {
             public static byte[] ReadSector = { (byte)ATA_PIO.Cmd.Read, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 };
             public static byte[] Unload = { (byte)ATA_PIO.Cmd.Eject, 0, 0, 0, 0x02, 0, 0, 0, 0, 0, 0, 0 };
+            public static byte[] GetMaxLBA = { 0x25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
         }
 
         /// <summary>
@@ -56,6 +63,7 @@ public ATAPI(ATA_PIO parentDevice)
             var p = BusPosition == BusPositionEnum.Master;
             Ata.AtaDebugger.Send("ATAPI: Primary controller: " + this.Primary + " Bus postion: IsMaster: " + p);
 
+            MaxLBA = GetMaxLBA();
             Init();
         }
 
@@ -264,5 +272,44 @@ private void CheckForErrors()
                 //throw new Exception("ATAPI DRQ not set");
             }
         }
+        /// <summary>
+        ///  The function returns the max LBA value of the ATAPI device. Code is based on https://forum.osdev.org/viewtopic.php?f=1&t=14604"
+        /// </summary>
+        /// <returns>The maximum LBA</returns>
+        private ulong GetMaxLBA()
+        {
+            //Select the ATAPI device
+            IO.DeviceSelect.Byte = (byte)(((byte)BusPosition << 4) +(1 << 6));
+
+            //Wait for the select complete
+            IO.Wait();
+
+            // get max lba
+            ulong Max_LBA;
+            if (device.LBA48Bit)
+            {
+                device.SendCmd(Cmd.ReadNativeMaxAdressExt,false); // says not check errors
+
+                Max_LBA = (ulong)IO.LBA0.Byte;
+                Max_LBA += (ulong)(IO.LBA1.Byte << 8);
+                Max_LBA += (ulong)(IO.LBA2.Byte << 16);
+
+                IO.Control.Byte = 0x80; // Set HOB to 1
+
+                Max_LBA += (ulong)(IO.LBA0.Byte << 24);
+                Max_LBA += (ulong)(IO.LBA1.Byte << 32);
+                Max_LBA += (ulong)(IO.LBA2.Byte << 40);
+            }
+            else
+            {
+                device.SendCmd(Cmd.ReadNativeMaxAdress,false); // says not check errors
+
+                Max_LBA = (ulong)(IO.LBA0.Byte);
+                Max_LBA += (ulong)(IO.LBA1.Byte << 8);
+                Max_LBA += (ulong)(IO.LBA2.Byte << 16);
+                Max_LBA += ((ulong)(IO.DeviceSelect.Byte & 0xF) << 24);
+            }
+            return Max_LBA;
+        }
     }
 }

source/Cosmos.HAL2/BlockDevice/ATA_PIO.cs

@@ -54,9 +54,9 @@ public string ModelNo
 		{
 			get { return mModelNo; }
 		}
-		#endregion
-		#region Enums
-		[Flags]
+        #endregion
+        #region Enums
+        [Flags]
 		public enum Status : byte
 		{
 			None = 0x00,
@@ -102,6 +102,7 @@ public enum Cmd : byte
 			ReadPioExt = 0x24,
 			ReadDma = 0xC8,
 			ReadDmaExt = 0x25,
+            ReadNativeMaxAdressExt =0x27,
 			WritePio = 0x30,
 			WritePioExt = 0x34,
 			WriteDma = 0xCA,
@@ -112,8 +113,9 @@ public enum Cmd : byte
 			IdentifyPacket = 0xA1,
 			Identify = 0xEC,
 			Read = 0xA8,
-			Eject = 0x1B
-		}
+			Eject = 0x1B,
+            ReadNativeMaxAdress = 0xF8
+        }
 
 		public enum Ident : byte
 		{

source/Cosmos.HAL2/BlockDevice/IDE.cs

@@ -50,7 +50,6 @@ private static void Initialize(Ata.ControllerIdEnum aControllerID, Ata.BusPositi
             else if (xATA.DriveType == ATA_PIO.SpecLevel.ATAPI)
             {
                 var atapi = new ATAPI(xATA);
-
                 //TODO: Replace 1000000 with proper size once ATAPI driver implements it
                 //Add the atapi device to an array so we reorder them to be last
                 ATAPIDevices.Add(atapi);

source/Cosmos.System2/FileSystem/Disk.cs

@@ -62,6 +62,7 @@ public List<ManagedPartition> Partitions
                 return converted;
             }
         }
+
         /// <summary>
         /// List of file systems.
         /// </summary>
@@ -200,6 +201,11 @@ public void CreatePartition(int size)
             mbrData[510] = boot[0];
             mbrData[511] = boot[1];
 
+            var partion = new Partition(Host, (ulong)startingSector, amountOfSectors);
+
+            Partition.Partitions.Add(partion);
+            parts.Add(new ManagedPartition(partion));
+
             //Save the data
             Host.WriteBlock(0, 1, ref mbrData);
         }
@@ -222,6 +228,10 @@ public void DeletePartition(int index)
                 mbr[i] = 0;
             }
             Host.WriteBlock(0, 1, ref mbr);
+
+            var part = parts[index];
+            Partition.Partitions.Remove(part.Host);
+            parts.RemoveAt(index);
         }
         /// <summary>
         /// Deletes all partitions on the disk.
@@ -279,7 +289,7 @@ public void MountPartition(int index)
                     Kernel.PrintDebug("Mounted partition.");
 
                     //We would have done Partitions[i].MountedFS = item.Create(...), but since the array is not cached, we need to store the mounted partitions in a list
-                    MountedPartitions[index] = item.Create(part.Host, xRootPath, xSize);
+                    MountedPartitions[index] = item.Create(part.Host, xRootPath, xSize);                  
                     return;
                 }
             }

source/Cosmos.System2/FileSystem/ISO9660/ISO9660FileSystem.cs

@@ -36,7 +36,7 @@ public ISO9660FileSystem(Partition aDevice, string aRootPath, long aSize)
             //Read primary descriptor
             var primaryDescriptor = aDevice.NewBlockArray(1);
             aDevice.ReadBlock(0x10, 1, ref primaryDescriptor);
-            var r = new BinaryReader(new MemoryStream(primaryDescriptor));
+            using var r = new BinaryReader(new MemoryStream(primaryDescriptor));
 
             var volType = r.ReadByte();
             var id = r.ReadBytes(5);
@@ -54,7 +54,7 @@ public ISO9660FileSystem(Partition aDevice, string aRootPath, long aSize)
 
             r.BaseStream.Position = 156;
             var b = r.ReadBytes(34);
-            BinaryReader rootdir = new BinaryReader(new MemoryStream(b));
+            using BinaryReader rootdir = new BinaryReader(new MemoryStream(b));
             RootDir = ReadDirectoryEntry(rootdir);
         }
         /// <summary>

source/Cosmos.VS.ProjectSystem/BuildSystem/Rules/CosmosPropertyPage.xaml

@@ -62,6 +62,12 @@
                   Category="Compile">
     </BoolProperty>
 
+    <BoolProperty Name="RemoveBootDebugOutput"
+                  DisplayName="Remove Boot Debug Output"
+                  Description="Removes The boot Debug output for faster startup"
+                  Category="Compile">
+    </BoolProperty>
+
     <StringProperty Name="VBEResolution"
                     DisplayName="VBE Resolution"
                     Description="Example format: 800x600x32"