diff --git a/source2/Cosmos.Deploy.Pixie/TFTP/TrivialFTP.cs b/source2/Cosmos.Deploy.Pixie/TFTP/TrivialFTP.cs index b7c741606..7a8428713 100644 --- a/source2/Cosmos.Deploy.Pixie/TFTP/TrivialFTP.cs +++ b/source2/Cosmos.Deploy.Pixie/TFTP/TrivialFTP.cs @@ -39,7 +39,6 @@ namespace Cosmos.Deploy.Pixie { } } protected bool Connect() { - OpType xOp; var xReader = Receive(OpType.Read); mDataEP = new IPEndPoint(mRecvEP.Address, mRecvEP.Port); diff --git a/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7PendingBreakpoint.cs b/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7PendingBreakpoint.cs index 3d9bb0a1d..db1ce13f9 100644 --- a/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7PendingBreakpoint.cs +++ b/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7PendingBreakpoint.cs @@ -151,7 +151,7 @@ namespace Cosmos.Debug.VSDebugEngine { //} } } - catch(InvalidOperationException ex) + catch(InvalidOperationException) { //No elements in potXMethods sequence! return VSConstants.S_FALSE; diff --git a/source2/Debug/Cosmos.Debug.VSDebugEngine/Engine.Impl/EngineCallback.cs b/source2/Debug/Cosmos.Debug.VSDebugEngine/Engine.Impl/EngineCallback.cs index 6e1ab5da0..438d4b6d5 100644 --- a/source2/Debug/Cosmos.Debug.VSDebugEngine/Engine.Impl/EngineCallback.cs +++ b/source2/Debug/Cosmos.Debug.VSDebugEngine/Engine.Impl/EngineCallback.cs @@ -63,11 +63,11 @@ namespace Cosmos.Debug.VSDebugEngine { // Call this one for internal Cosmos dev. // Can be turned off and should be turned off by default. Use an IFDEF or something. public void OnOutputString(string outputString) { - if (false) { +#if DEV //System.Diagnostics.Debug.Assert(Worker.CurrentThreadId == m_engine.DebuggedProcess.PollThreadId); var eventObject = new AD7OutputDebugStringEvent(outputString); Send(eventObject, AD7OutputDebugStringEvent.IID, null); - } +#endif } // This is the user version, messages directly from Cosmos user code diff --git a/source2/Kernel/System/Cosmos.System/Filesystem/FAT/Listing/FatFile.cs b/source2/Kernel/System/Cosmos.System/Filesystem/FAT/Listing/FatFile.cs index a93243b96..c26d236d3 100644 --- a/source2/Kernel/System/Cosmos.System/Filesystem/FAT/Listing/FatFile.cs +++ b/source2/Kernel/System/Cosmos.System/Filesystem/FAT/Listing/FatFile.cs @@ -5,7 +5,7 @@ using System.Text; namespace Cosmos.System.Filesystem.FAT.Listing { public class FatFile : Cosmos.System.Filesystem.Listing.File { - public readonly FatFileSystem FileSystem; + public new readonly FatFileSystem FileSystem; public readonly UInt64 FirstClusterNum; // Size is UInt32 because FAT doesn't support bigger. diff --git a/source2/Kernel/System/Hardware/Core/Cosmos.Core/Heap.cs b/source2/Kernel/System/Hardware/Core/Cosmos.Core/Heap.cs index b01f3dedc..bc28e89fe 100644 --- a/source2/Kernel/System/Hardware/Core/Cosmos.Core/Heap.cs +++ b/source2/Kernel/System/Hardware/Core/Cosmos.Core/Heap.cs @@ -219,7 +219,7 @@ namespace Cosmos.Core } } - private static bool mDebugDisplayInitialized = false; + //private static bool mDebugDisplayInitialized = false; // this method displays the used/total memory of the heap on the first line of the text screen private static void UpdateDebugDisplay() diff --git a/source2/Kernel/System/Hardware/Core/Cosmos.Core/INTs.cs b/source2/Kernel/System/Hardware/Core/Cosmos.Core/INTs.cs index 280a8f19f..e85bc7ff0 100644 --- a/source2/Kernel/System/Hardware/Core/Cosmos.Core/INTs.cs +++ b/source2/Kernel/System/Hardware/Core/Cosmos.Core/INTs.cs @@ -477,7 +477,6 @@ namespace Cosmos.Core // At this point we are in a very unstable state. // Try not to use any Cosmos routines, just // report a crash dump. - const string SysFault = " *** System Fault *** "; const string xHex = "0123456789ABCDEF"; uint xPtr = ctx.EIP; diff --git a/source2/Kernel/System/Hardware/Cosmos.Hardware/Drivers/VGAScreen.cs b/source2/Kernel/System/Hardware/Cosmos.Hardware/Drivers/VGAScreen.cs index 3e5d6d3be..eecd1cbf7 100644 --- a/source2/Kernel/System/Hardware/Cosmos.Hardware/Drivers/VGAScreen.cs +++ b/source2/Kernel/System/Hardware/Cosmos.Hardware/Drivers/VGAScreen.cs @@ -308,7 +308,6 @@ namespace Cosmos.Hardware break; default: throw new Exception("Unknown screen size"); - break; } } //public void SetPixel320x200x4(uint x, uint y, uint c); @@ -332,11 +331,11 @@ namespace Cosmos.Hardware if ((x & 1) == 0) { - xSegment[xOffset] = (byte)((xSegment[xOffset] & 0xf) | (c << 4)); + xSegment[xOffset] = (byte)((xSegment[xOffset] & 0xf) | (byte)(c << 4)); } else { - xSegment[xOffset] = (byte)((xSegment[xOffset] & 0xf0) | c); + xSegment[xOffset] = (byte)((xSegment[xOffset] & 0xf0) | (byte)c); } } public uint GetPixel640x480x4(uint x, uint y)