Merge remote-tracking branch 'refs/remotes/CosmosOS/master'

Conflicts fixed!
trackam · Jan 14, 2016 · 1b7960c · 1b7960c
1 parent ee11522
commit 1b7960c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.FatBoot.Cosmos b/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.FatBoot.Cosmos
@@ -30,7 +30,7 @@
     <VMware_Description>Use VMware Player or Workstation to deploy and debug.</VMware_Description>
     <VMware_Deployment>ISO</VMware_Deployment>
     <VMware_Launch>VMware</VMware_Launch>
-    <VMware_DebugEnabled>False</VMware_DebugEnabled>
+    <VMware_DebugEnabled>True</VMware_DebugEnabled>
     <VMware_DebugMode>Source</VMware_DebugMode>
     <VMware_VisualStudioDebugPort>Pipe: Cosmos\Serial</VMware_VisualStudioDebugPort>
     <VMware_VMwareEdition>Player</VMware_VMwareEdition>
@@ -77,6 +77,7 @@
     <VMware_StartBochsDebugGui>False</VMware_StartBochsDebugGui>
     <StackCorruptionDetectionLevel>MethodFooters</StackCorruptionDetectionLevel>
     <Bochs_StackCorruptionDetectionLevel>MethodFooters</Bochs_StackCorruptionDetectionLevel>
+    <VMware_StackCorruptionDetectionLevel>MethodFooters</VMware_StackCorruptionDetectionLevel>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\source\Cosmos.Core.Plugs\Cosmos.Core.Plugs.csproj">

diff --git a/source/Cosmos.System/FileSystem/FAT/FatFileSystem.cs b/source/Cosmos.System/FileSystem/FAT/FatFileSystem.cs
@@ -414,7 +414,7 @@ internal void Read(ulong aFirstCluster, out byte[] aData, ulong aSize = 0, ulong
 
         internal void Write(ulong aFirstCluster, byte[] aData, ulong aSize = 0, ulong aOffset = 0)
         {
-            FileSystemHelpers.Debug("low level Write() called");
+            Global.mFileSystemDebugger.SendInternal("low level Write() called");
             if (aSize == 0)
             {
                 aSize = BytesPerCluster;