diff --git a/Common.ruleset b/Common.ruleset index 5aa160e624..dc7b2804f9 100644 --- a/Common.ruleset +++ b/Common.ruleset @@ -331,9 +331,6 @@ - - - diff --git a/src/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/BitmapFontLoader.cs b/src/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/BitmapFontLoader.cs index e290401d98..0a46e3f237 100644 --- a/src/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/BitmapFontLoader.cs +++ b/src/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/BitmapFontLoader.cs @@ -12,8 +12,6 @@ namespace Cyotek.Drawing.BitmapFont public static class BitmapFontLoader { - #region  Public Class Methods - /// /// Loads a bitmap font from an XML file. /// @@ -115,10 +113,6 @@ namespace Cyotek.Drawing.BitmapFont return font; } - #endregion  Public Class Methods - - #region  Private Class Methods - /// /// Creates a Padding object from a string representation /// @@ -164,7 +158,5 @@ namespace Cyotek.Drawing.BitmapFont return result; } - - #endregion  Private Class Methods } } diff --git a/src/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Character.cs b/src/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Character.cs index ce412a4bd2..d974c20232 100644 --- a/src/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Character.cs +++ b/src/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Character.cs @@ -6,17 +6,11 @@ namespace Cyotek.Drawing.BitmapFont { public struct Character { - #region  Public Methods - public override string ToString() { return this.Char.ToString(); } - #endregion  Public Methods - - #region  Public Properties - public int Channel { get; set; } public Rectangle Bounds { get; set; } @@ -28,7 +22,5 @@ namespace Cyotek.Drawing.BitmapFont public int TexturePage { get; set; } public int XAdvance { get; set; } - - #endregion  Public Properties } } diff --git a/src/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Kerning.cs b/src/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Kerning.cs index c831a67a1c..755688210d 100644 --- a/src/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Kerning.cs +++ b/src/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Kerning.cs @@ -4,8 +4,6 @@ namespace Cyotek.Drawing.BitmapFont { public struct Kerning { - #region  Public Constructors - public Kerning(char firstCharacter, char secondCharacter, int amount) : this() { @@ -14,25 +12,15 @@ namespace Cyotek.Drawing.BitmapFont this.Amount = amount; } - #endregion  Public Constructors - - #region  Public Methods - public override string ToString() { return string.Format("{0} to {1} = {2}", this.FirstCharacter, this.SecondCharacter, this.Amount); } - #endregion  Public Methods - - #region  Public Properties - public char FirstCharacter { get; set; } public char SecondCharacter { get; set; } public int Amount { get; set; } - - #endregion  Public Properties } } diff --git a/src/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Padding.cs b/src/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Padding.cs index 20fab383d1..bdec22bff5 100644 --- a/src/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Padding.cs +++ b/src/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/Padding.cs @@ -4,8 +4,6 @@ namespace Cyotek.Drawing.BitmapFont { public struct Padding { - #region  Public Constructors - public Padding(int left, int top, int right, int bottom) : this() { @@ -15,19 +13,11 @@ namespace Cyotek.Drawing.BitmapFont this.Bottom = bottom; } - #endregion  Public Constructors - - #region  Public Methods - public override string ToString() { return string.Format("{0}, {1}, {2}, {3}", this.Left, this.Top, this.Right, this.Bottom); } - #endregion  Public Methods - - #region  Public Properties - public int Top { get; set; } public int Left { get; set; } @@ -35,7 +25,5 @@ namespace Cyotek.Drawing.BitmapFont public int Right { get; set; } public int Bottom { get; set; } - - #endregion  Public Properties } } diff --git a/src/BizHawk.Client.Common/Api/Classes/MemApi.cs b/src/BizHawk.Client.Common/Api/Classes/MemApi.cs index 5dde96ad78..e367530271 100644 --- a/src/BizHawk.Client.Common/Api/Classes/MemApi.cs +++ b/src/BizHawk.Client.Common/Api/Classes/MemApi.cs @@ -114,8 +114,6 @@ namespace BizHawk.Client.Common return ((int) u << sh) >> sh; } - #region Endian Handling - private uint ReadUnsignedLittle(long addr, int size, string domain = null) { uint v = 0; @@ -152,10 +150,6 @@ namespace BizHawk.Client.Common else WriteUnsignedLittle(addr, value, size, domain); } - #endregion - - #region Unique Library Methods - public void SetBigEndian(bool enabled = true) => _isBigEndian = enabled; public List GetMemoryDomainList() => @@ -210,10 +204,6 @@ namespace BizHawk.Client.Common return hasher.ComputeHash(data).BytesToHexString(); } - #endregion - - #region Common Special and Legacy Methods - public uint ReadByte(long addr, string domain = null) => ReadUnsignedByte(addr, domain); public void WriteByte(long addr, uint value, string domain = null) => WriteUnsignedByte(addr, value, domain); @@ -272,10 +262,6 @@ namespace BizHawk.Client.Common d.PokeUint(addr, BitConverter.ToUInt32(BitConverter.GetBytes((float) value), 0), _isBigEndian); } - #endregion - - #region 1 Byte - public int ReadS8(long addr, string domain = null) => (sbyte) ReadUnsignedByte(addr, domain); public uint ReadU8(long addr, string domain = null) => (byte) ReadUnsignedByte(addr, domain); @@ -284,10 +270,6 @@ namespace BizHawk.Client.Common public void WriteU8(long addr, uint value, string domain = null) => WriteUnsignedByte(addr, value, domain); - #endregion - - #region 2 Byte - public int ReadS16(long addr, string domain = null) => (short) ReadSigned(addr, 2, domain); public uint ReadU16(long addr, string domain = null) => (ushort) ReadUnsigned(addr, 2, domain); @@ -296,10 +278,6 @@ namespace BizHawk.Client.Common public void WriteU16(long addr, uint value, string domain = null) => WriteUnsigned(addr, value, 2, domain); - #endregion - - #region 3 Byte - public int ReadS24(long addr, string domain = null) => ReadSigned(addr, 3, domain); public uint ReadU24(long addr, string domain = null) => ReadUnsigned(addr, 3, domain); @@ -308,10 +286,6 @@ namespace BizHawk.Client.Common public void WriteU24(long addr, uint value, string domain = null) => WriteUnsigned(addr, value, 3, domain); - #endregion - - #region 4 Byte - public int ReadS32(long addr, string domain = null) => ReadSigned(addr, 4, domain); public uint ReadU32(long addr, string domain = null) => ReadUnsigned(addr, 4, domain); @@ -319,7 +293,5 @@ namespace BizHawk.Client.Common public void WriteS32(long addr, int value, string domain = null) => WriteSigned(addr, value, 4, domain); public void WriteU32(long addr, uint value, string domain = null) => WriteUnsigned(addr, value, 4, domain); - - #endregion } } diff --git a/src/BizHawk.Client.Common/Api/Interfaces/IComm.cs b/src/BizHawk.Client.Common/Api/Interfaces/IComm.cs index d6cf3b1eaf..c8f9f236e0 100644 --- a/src/BizHawk.Client.Common/Api/Interfaces/IComm.cs +++ b/src/BizHawk.Client.Common/Api/Interfaces/IComm.cs @@ -2,24 +2,19 @@ { public interface IComm : IExternalApi { - #region Sockets string SocketServerScreenShot(); string SocketServerScreenShotResponse(); string SocketServerSend(string SendString); string SocketServerResponse(); bool SocketServerSuccessful(); void SocketServerSetTimeout(int timeout); - #endregion - #region MemoryMappedFiles void MmfSetFilename(string filename); string MmfGetFilename(); int MmfScreenshot(); int MmfWrite(string mmf_filename, string outputString); string MmfRead(string mmf_filename, int expectedSize); - #endregion - #region HTTP string HttpTest(); string HttpTestGet(); string HttpGet(string url); @@ -30,6 +25,5 @@ void HttpSetGetUrl(string url); string HttpGetPostUrl(); string HttpGetGetUrl(); - #endregion } } diff --git a/src/BizHawk.Client.Common/Api/Interfaces/IGui.cs b/src/BizHawk.Client.Common/Api/Interfaces/IGui.cs index b580d193fd..aefa5a6b20 100644 --- a/src/BizHawk.Client.Common/Api/Interfaces/IGui.cs +++ b/src/BizHawk.Client.Common/Api/Interfaces/IGui.cs @@ -6,21 +6,17 @@ namespace BizHawk.Client.Common { public interface IGui : IDisposable, IExternalApi { - #region Gui API void ToggleCompositingMode(); ImageAttributes GetAttributes(); void SetAttributes(ImageAttributes a); void DrawNew(string name, bool clear = true); void DrawFinish(); bool HasGUISurface { get; } - #endregion - #region Helpers void SetPadding(int all); void SetPadding(int x, int y); void SetPadding(int l, int t, int r, int b); (int Left, int Top, int Right, int Bottom) GetPadding(); - #endregion void AddMessage(string message); void ClearGraphics(); diff --git a/src/BizHawk.Client.Common/Api/Interfaces/IMem.cs b/src/BizHawk.Client.Common/Api/Interfaces/IMem.cs index b636b449ea..e35824d8f5 100644 --- a/src/BizHawk.Client.Common/Api/Interfaces/IMem.cs +++ b/src/BizHawk.Client.Common/Api/Interfaces/IMem.cs @@ -6,51 +6,39 @@ namespace BizHawk.Client.Common { void SetBigEndian(bool enabled = true); - #region Domains List GetMemoryDomainList(); uint GetMemoryDomainSize(string name = ""); string GetCurrentMemoryDomain(); uint GetCurrentMemoryDomainSize(); bool UseMemoryDomain(string domain); string HashRegion(long addr, int count, string domain = null); - #endregion - #region Read - #region Special and Legacy Methods + uint ReadByte(long addr, string domain = null); List ReadByteRange(long addr, int length, string domain = null); float ReadFloat(long addr, string domain = null); - #endregion - #region Signed + int ReadS8(long addr, string domain = null); int ReadS16(long addr, string domain = null); int ReadS24(long addr, string domain = null); int ReadS32(long addr, string domain = null); - #endregion - #region Unsigned + uint ReadU8(long addr, string domain = null); uint ReadU16(long addr, string domain = null); uint ReadU24(long addr, string domain = null); uint ReadU32(long addr, string domain = null); - #endregion - #endregion - #region Write - #region Special and Legacy Methods + void WriteByte(long addr, uint value, string domain = null); void WriteByteRange(long addr, List memoryblock, string domain = null); void WriteFloat(long addr, double value, string domain = null); - #endregion - #region Signed + void WriteS8(long addr, int value, string domain = null); void WriteS16(long addr, int value, string domain = null); void WriteS24(long addr, int value, string domain = null); void WriteS32(long addr, int value, string domain = null); - #endregion - #region Unigned + void WriteU8(long addr, uint value, string domain = null); void WriteU16(long addr, uint value, string domain = null); void WriteU24(long addr, uint value, string domain = null); void WriteU32(long addr, uint value, string domain = null); - #endregion - #endregion } } diff --git a/src/BizHawk.Client.Common/QuickBmpFile.cs b/src/BizHawk.Client.Common/QuickBmpFile.cs index 3108e711bf..6efa5fb258 100644 --- a/src/BizHawk.Client.Common/QuickBmpFile.cs +++ b/src/BizHawk.Client.Common/QuickBmpFile.cs @@ -13,8 +13,6 @@ namespace BizHawk.Client.Common { public class QuickBmpFile { - #region Structs - [StructLayout(LayoutKind.Sequential, Pack = 1)] private class BITMAPFILEHEADER { @@ -86,8 +84,6 @@ namespace BizHawk.Client.Common BI_PNG = 5 } - #endregion - private static unsafe byte[] GetBytes(object o) { byte[] ret = new byte[Marshal.SizeOf(o)]; diff --git a/src/BizHawk.Client.Common/SystemInfo.cs b/src/BizHawk.Client.Common/SystemInfo.cs index 6ec2a5a751..16532c6ce9 100644 --- a/src/BizHawk.Client.Common/SystemInfo.cs +++ b/src/BizHawk.Client.Common/SystemInfo.cs @@ -30,10 +30,6 @@ namespace BizHawk.Client.Common AllSystemInfos.Add(this); } - #region Methods - - #region Get SystemInfo - /// /// Gets the instance for Apple II /// @@ -235,8 +231,6 @@ namespace BizHawk.Client.Common public static SystemInfo Sgb { get; } = new SystemInfo("SGB", CoreSystem.SuperGameBoy, 4); - #endregion Get SystemInfo - /// /// Get a by its /// @@ -294,10 +288,6 @@ namespace BizHawk.Client.Common return !(system1 == system2); } - #endregion - - #region Properties - /// /// Gets available for this system /// @@ -317,7 +307,5 @@ namespace BizHawk.Client.Common /// Gets core used for this system as enum /// public CoreSystem System { get; } - - #endregion } } diff --git a/src/BizHawk.Client.Common/lua/CommonLibs/MemoryLuaLibrary.cs b/src/BizHawk.Client.Common/lua/CommonLibs/MemoryLuaLibrary.cs index 06a1c882ed..2e38e75a23 100644 --- a/src/BizHawk.Client.Common/lua/CommonLibs/MemoryLuaLibrary.cs +++ b/src/BizHawk.Client.Common/lua/CommonLibs/MemoryLuaLibrary.cs @@ -21,8 +21,6 @@ namespace BizHawk.Client.Common public override string Name => "memory"; - #region Unique Library Methods - [LuaMethodExample("local nlmemget = memory.getmemorydomainlist();")] [LuaMethod("getmemorydomainlist", "Returns a string of the memory domains for the loaded platform core. List will be a single string delimited by line feeds")] public LuaTable GetMemoryDomainList() @@ -52,10 +50,6 @@ namespace BizHawk.Client.Common [LuaMethod("hash_region", "Returns a hash as a string of a region of memory, starting from addr, through count bytes. If the domain is unspecified, it uses the current region.")] public string HashRegion(int addr, int count, string domain = null) => APIs.Mem.HashRegion(addr, count, domain); - #endregion - - #region Common Special and Legacy Methods - [LuaMethodExample("local uimemrea = memory.readbyte( 0x100, mainmemory.getname( ) );")] [LuaMethod("readbyte", "gets the value from the given address as an unsigned byte")] public uint ReadByte(int addr, string domain = null) => APIs.Mem.ReadByte(addr, domain); @@ -120,10 +114,6 @@ namespace BizHawk.Client.Common APIs.Mem.WriteFloat(addr, value, domain); } - #endregion - - #region 1 Byte - [LuaMethodExample("local inmemrea = memory.read_s8( 0x100, mainmemory.getname( ) );")] [LuaMethod("read_s8", "read signed byte")] public int ReadS8(int addr, string domain = null) => APIs.Mem.ReadS8(addr, domain); @@ -140,10 +130,6 @@ namespace BizHawk.Client.Common [LuaMethod("write_u8", "write unsigned byte")] public void WriteU8(int addr, uint value, string domain = null) => APIs.Mem.WriteU8(addr, value, domain); - #endregion - - #region 2 Byte - [LuaMethodExample("local inmemrea = memory.read_s16_le( 0x100, mainmemory.getname( ) );")] [LuaMethod("read_s16_le", "read signed 2 byte value, little endian")] public int ReadS16Little(int addr, string domain = null) @@ -208,10 +194,6 @@ namespace BizHawk.Client.Common APIs.Mem.WriteU16(addr, value, domain); } - #endregion - - #region 3 Byte - [LuaMethodExample("local inmemrea = memory.read_s24_le( 0x100, mainmemory.getname( ) );")] [LuaMethod("read_s24_le", "read signed 24 bit value, little endian")] public int ReadS24Little(int addr, string domain = null) @@ -276,10 +258,6 @@ namespace BizHawk.Client.Common APIs.Mem.WriteU24(addr, value, domain); } - #endregion - - #region 4 Byte - [LuaMethodExample("local inmemrea = memory.read_s32_le( 0x100, mainmemory.getname( ) );")] [LuaMethod("read_s32_le", "read signed 4 byte value, little endian")] public int ReadS32Little(int addr, string domain = null) @@ -343,7 +321,5 @@ namespace BizHawk.Client.Common APIs.Mem.SetBigEndian(); APIs.Mem.WriteU32(addr, value, domain); } - - #endregion } } diff --git a/src/BizHawk.Client.Common/lua/LuaHelperLibs/EventsLuaLibrary.cs b/src/BizHawk.Client.Common/lua/LuaHelperLibs/EventsLuaLibrary.cs index 819ab03fc3..43a2b89740 100644 --- a/src/BizHawk.Client.Common/lua/LuaHelperLibs/EventsLuaLibrary.cs +++ b/src/BizHawk.Client.Common/lua/LuaHelperLibs/EventsLuaLibrary.cs @@ -32,8 +32,6 @@ namespace BizHawk.Client.Common public override string Name => "event"; - #region Events Library Helpers - public void CallExitEvent(LuaFile luaFile) { var exitCallbacks = RegisteredFunctions @@ -127,8 +125,6 @@ namespace BizHawk.Client.Common Log($"{scope} is not an available scope for {Emulator.Attributes().CoreName}"); } - #endregion - [LuaMethodExample("local steveonf = event.onframeend(\r\n\tfunction()\r\n\t\tconsole.log( \"Calls the given lua function at the end of each frame, after all emulation and drawing has completed. Note: this is the default behavior of lua scripts\" );\r\n\tend\r\n\t, \"Frame name\" );")] [LuaMethod("onframeend", "Calls the given lua function at the end of each frame, after all emulation and drawing has completed. Note: this is the default behavior of lua scripts")] diff --git a/src/BizHawk.Client.Common/lua/LuaHelperLibs/MainMemoryLuaLibrary.cs b/src/BizHawk.Client.Common/lua/LuaHelperLibs/MainMemoryLuaLibrary.cs index 8969a929de..8ad61d835b 100644 --- a/src/BizHawk.Client.Common/lua/LuaHelperLibs/MainMemoryLuaLibrary.cs +++ b/src/BizHawk.Client.Common/lua/LuaHelperLibs/MainMemoryLuaLibrary.cs @@ -40,8 +40,6 @@ namespace BizHawk.Client.Common } } - #region Unique Library Methods - [LuaMethodExample("local stmaiget = mainmemory.getname( );")] [LuaMethod("getname", "returns the name of the domain defined as main memory for the given core")] public string GetName() @@ -56,10 +54,6 @@ namespace BizHawk.Client.Common return (uint)Domain.Size; } - #endregion - - #region Common Special and Legacy Methods - [LuaMethodExample("local uimairea = mainmemory.readbyte( 0x100 );")] [LuaMethod("readbyte", "gets the value from the given address as an unsigned byte")] public uint ReadByte(int addr) => APIs.Mem.ReadByte(addr, Domain.Name); @@ -124,10 +118,6 @@ namespace BizHawk.Client.Common APIs.Mem.WriteFloat(addr, value, Domain.Name); } - #endregion - - #region 1 Byte - [LuaMethodExample("local inmairea = mainmemory.read_s8( 0x100 );")] [LuaMethod("read_s8", "read signed byte")] public int ReadS8(int addr) => APIs.Mem.ReadS8(addr, Domain.Name); @@ -144,10 +134,6 @@ namespace BizHawk.Client.Common [LuaMethod("write_u8", "write unsigned byte")] public void WriteU8(int addr, uint value) => APIs.Mem.WriteU8(addr, value, Domain.Name); - #endregion - - #region 2 Byte - [LuaMethodExample("local inmairea = mainmemory.read_s16_le( 0x100 );")] [LuaMethod("read_s16_le", "read signed 2 byte value, little endian")] public int ReadS16Little(int addr) @@ -212,10 +198,6 @@ namespace BizHawk.Client.Common APIs.Mem.WriteU16(addr, value, Domain.Name); } - #endregion - - #region 3 Byte - [LuaMethodExample("local inmairea = mainmemory.read_s24_le( 0x100 );")] [LuaMethod("read_s24_le", "read signed 24 bit value, little endian")] public int ReadS24Little(int addr) @@ -280,10 +262,6 @@ namespace BizHawk.Client.Common APIs.Mem.WriteU24(addr, value, Domain.Name); } - #endregion - - #region 4 Byte - [LuaMethodExample("local inmairea = mainmemory.read_s32_le( 0x100 );")] [LuaMethod("read_s32_le", "read signed 4 byte value, little endian")] public int ReadS32Little(int addr) @@ -347,7 +325,5 @@ namespace BizHawk.Client.Common APIs.Mem.SetBigEndian(); APIs.Mem.WriteU32(addr, value, Domain.Name); } - - #endregion } } diff --git a/src/BizHawk.Client.Common/movie/bk2/Bk2Controller.cs b/src/BizHawk.Client.Common/movie/bk2/Bk2Controller.cs index 8eab537d6c..f3c9562a35 100644 --- a/src/BizHawk.Client.Common/movie/bk2/Bk2Controller.cs +++ b/src/BizHawk.Client.Common/movie/bk2/Bk2Controller.cs @@ -41,17 +41,11 @@ namespace BizHawk.Client.Common .ToList(); } - #region IController Implementation - public ControllerDefinition Definition => _type; public bool IsPressed(string button) => _myBoolButtons[button]; public float AxisValue(string name) => _myAxisControls[name]; - #endregion - - #region IMovieController Implementation - public void SetFrom(IController source) { foreach (var button in Definition.BoolButtons) @@ -146,8 +140,6 @@ namespace BizHawk.Client.Common _myAxisControls[buttonName] = value; } - #endregion - private class ControlMap { public string Name { get; set; } diff --git a/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs b/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs index 2dcee13cef..39a7b582d5 100644 --- a/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs +++ b/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs @@ -81,8 +81,6 @@ namespace BizHawk.Client.Common } } - #region Log Editing - public void AppendFrame(IController source) { var lg = LogGeneratorInstance(source); @@ -165,8 +163,6 @@ namespace BizHawk.Client.Common Changes = true; } - #endregion - protected void SetFrameAt(int frameNum, string frame) { if (Log.Count > frameNum) diff --git a/src/BizHawk.Client.Common/movie/import/bkm/BkmControllerAdapter.cs b/src/BizHawk.Client.Common/movie/import/bkm/BkmControllerAdapter.cs index fbbbeee894..171b11e4d8 100644 --- a/src/BizHawk.Client.Common/movie/import/bkm/BkmControllerAdapter.cs +++ b/src/BizHawk.Client.Common/movie/import/bkm/BkmControllerAdapter.cs @@ -7,8 +7,6 @@ namespace BizHawk.Client.Common { internal class BkmControllerAdapter : IController { - #region IController Implementation - public ControllerDefinition Definition { get; set; } public bool IsPressed(string button) @@ -21,8 +19,6 @@ namespace BizHawk.Client.Common return _myFloatControls[name]; } - #endregion - /// /// latches all buttons from the supplied mnemonic string /// diff --git a/src/BizHawk.Client.Common/movie/interfaces/IMovie.cs b/src/BizHawk.Client.Common/movie/interfaces/IMovie.cs index a0faf9ecc9..c7295e6c89 100644 --- a/src/BizHawk.Client.Common/movie/interfaces/IMovie.cs +++ b/src/BizHawk.Client.Common/movie/interfaces/IMovie.cs @@ -33,8 +33,6 @@ namespace BizHawk.Client.Common // TODO: consider other event handlers, switching modes? public interface IMovie { - #region Status - /// /// Gets the current movie mode /// @@ -44,10 +42,6 @@ namespace BizHawk.Client.Common bool Changes { get; } - #endregion - - #region Properties - string Name { get; } /// @@ -120,10 +114,6 @@ namespace BizHawk.Client.Common /// ILogEntryGenerator LogGeneratorInstance(IController source); - #endregion - - #region File Handling API - // Filename of the movie, settable by the client string Filename { get; set; } @@ -165,10 +155,6 @@ namespace BizHawk.Client.Common /// Returns an error message, if any bool ExtractInputLog(TextReader reader, out string errorMessage); - #endregion - - #region Mode Handling API - /// /// Tells the movie to start recording from the beginning. /// @@ -202,10 +188,6 @@ namespace BizHawk.Client.Common /// void FinishedMode(); - #endregion - - #region Editing API - /// /// Replaces the given frame's input with an empty frame /// @@ -242,8 +224,6 @@ namespace BizHawk.Client.Common /// The frame of input to be retrieved /// A controller state representing the specified frame of input, if frame is out of range, will return null IMovieController GetInputState(int frame); - - #endregion } public static class MovieExtensions diff --git a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.History.cs b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.History.cs index 062da7e657..37d829e969 100644 --- a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.History.cs +++ b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.History.cs @@ -282,8 +282,6 @@ namespace BizHawk.Client.Common } } - #region Change History - private bool AddMovieAction(string name) { if (UndoIndex + 1 != _history.Count) @@ -379,12 +377,8 @@ namespace BizHawk.Client.Common _history.Last().Add(new MovieActionBindInput(_movie, frame, isDelete)); } } - - #endregion } - #region Classes - public interface IMovieAction { void Undo(ITasMovie movie); @@ -747,6 +741,4 @@ namespace BizHawk.Client.Common movie.BindMarkersToInput = _bindMarkers; } } - - #endregion } \ No newline at end of file diff --git a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs index a25e434d51..95dcfee175 100644 --- a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs +++ b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs @@ -325,8 +325,6 @@ namespace BizHawk.Client.Common Changes = true; } - #region Events and Handlers - public event PropertyChangedEventHandler PropertyChanged; private bool _changes; @@ -357,7 +355,5 @@ namespace BizHawk.Client.Common public void ClearChanges() => Changes = false; public void FlagChanges() => Changes = true; - - #endregion } } diff --git a/src/BizHawk.Client.Common/tools/RamSearchEngine/RamSearchEngine.cs b/src/BizHawk.Client.Common/tools/RamSearchEngine/RamSearchEngine.cs index 134ffae1d3..bf8d5f2c17 100644 --- a/src/BizHawk.Client.Common/tools/RamSearchEngine/RamSearchEngine.cs +++ b/src/BizHawk.Client.Common/tools/RamSearchEngine/RamSearchEngine.cs @@ -41,8 +41,6 @@ namespace BizHawk.Client.Common.RamSearchEngine CompareValue = compareValue; } - #region API - public IEnumerable OutOfRangeAddress => _watchList .Where(watch => watch.Address >= Domain.Size) .Select(watch => watch.Address); @@ -313,10 +311,6 @@ namespace BizHawk.Client.Common.RamSearchEngine } } - #endregion - - #region Undo API - public bool UndoEnabled { get; set; } @@ -350,10 +344,6 @@ namespace BizHawk.Client.Common.RamSearchEngine return _watchList.Count; } - #endregion - - #region Comparisons - private IEnumerable ComparePrevious(IEnumerable watchList) { switch (Operator) @@ -599,8 +589,6 @@ namespace BizHawk.Client.Common.RamSearchEngine throw new InvalidCastException(); } - #endregion - private long SignExtendAsNeeded(long val) { if (_settings.Type != DisplayType.Signed) diff --git a/src/BizHawk.Client.Common/tools/Watch/Watch.cs b/src/BizHawk.Client.Common/tools/Watch/Watch.cs index 617ce3aaa3..dfd50ecca2 100644 --- a/src/BizHawk.Client.Common/tools/Watch/Watch.cs +++ b/src/BizHawk.Client.Common/tools/Watch/Watch.cs @@ -50,10 +50,6 @@ namespace BizHawk.Client.Common } } - #region Methods - - #region Static - /// /// Generate sa from a given string /// String is tab separate @@ -146,8 +142,6 @@ namespace BizHawk.Client.Common }; } - #region Operators - /// /// Equality operator between two /// @@ -255,12 +249,6 @@ namespace BizHawk.Client.Common return a.CompareTo(b) >= 0; } - #endregion Operators - - #endregion Static - - #region Abstracts - /// /// Gets a list a that can be used for this /// @@ -277,10 +265,6 @@ namespace BizHawk.Client.Common /// public abstract void Update(); - #endregion Abstracts - - #region Protected - protected byte GetByte(bool bypassFreeze = false) { if (!bypassFreeze && Global.CheatList.IsActive(_domain, Address)) @@ -365,8 +349,6 @@ namespace BizHawk.Client.Common } } - #endregion Protected - /// /// Sets the number of changes to 0 /// @@ -375,8 +357,6 @@ namespace BizHawk.Client.Common ChangeCount = 0; } - #region IEquatable - /// /// Determines if this is equals to another /// @@ -394,10 +374,6 @@ namespace BizHawk.Client.Common Size == other.Size; } - #endregion IEquatable - - #region IEquatable - /// /// Determines if this is equals to an instance of /// @@ -411,10 +387,6 @@ namespace BizHawk.Client.Common && Size == other.Size; } - #endregion IEquatable - - #region IComparable - /// /// Compares two together and determine which one comes first. /// First we look the address and then the size @@ -442,8 +414,6 @@ namespace BizHawk.Client.Common return Address.CompareTo(other.Address); } - #endregion IComparable - /// /// Determines if this object is Equals to another /// @@ -499,12 +469,6 @@ namespace BizHawk.Client.Common /// A well formatted string representation public virtual string ToDisplayString() => $"{Notes}: {ValueString}"; - #endregion - - #region Properties - - #region Abstracts - /// /// Gets a string representation of difference /// between current value and the previous one @@ -551,8 +515,6 @@ namespace BizHawk.Client.Common /// public abstract string PreviousStr { get; } - #endregion Abstracts - /// /// Gets the address in the /// @@ -631,8 +593,6 @@ namespace BizHawk.Client.Common /// public WatchSize Size { get; } - #endregion - // TODO: Replace all the following stuff by implementing ISerializable public static string DisplayTypeToString(DisplayType type) { diff --git a/src/BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs b/src/BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs index 228fb8215d..6b00842ada 100644 --- a/src/BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs +++ b/src/BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs @@ -19,8 +19,6 @@ namespace BizHawk.Client.Common public sealed partial class WatchList : IList { - #region Fields - public const string Address = "AddressColumn"; public const string Value = "ValueColumn"; public const string Prev = "PrevColumn"; @@ -36,10 +34,6 @@ namespace BizHawk.Client.Common private readonly string _systemId; private IMemoryDomains _memoryDomains; - #endregion - - #region cTor(s) - /// /// Static constructor for the class. /// @@ -71,12 +65,6 @@ namespace BizHawk.Client.Common _systemId = systemId; } - #endregion - - #region Methods - - #region ICollection - /// /// Adds a into the current collection /// @@ -135,10 +123,6 @@ namespace BizHawk.Client.Common return result; } - #endregion - - #region IList - /// /// Determines the zero-base position of the specified /// into the @@ -170,10 +154,6 @@ namespace BizHawk.Client.Common Changes = true; } - #endregion IList - - #region IEnumerable - /// /// Returns an enumerator that iterates through the collection /// @@ -192,8 +172,6 @@ namespace BizHawk.Client.Common return GetEnumerator(); } - #endregion IEnumerable - /// /// Add an existing collection of into the current one /// equality will be checked to avoid doubles @@ -284,12 +262,6 @@ namespace BizHawk.Client.Common }); } - #endregion - - #region Propeties - - #region ICollection - /// /// Gets the number of elements contained in this /// @@ -301,10 +273,6 @@ namespace BizHawk.Client.Common /// public bool IsReadOnly => false; - #endregion ICollection - - #region IList - /// /// Gets or sets element at the specified index /// @@ -316,8 +284,6 @@ namespace BizHawk.Client.Common set => _watchList[index] = value; } - #endregion IList - /// /// Gets or sets a value indicating whether the collection has changed or not /// @@ -333,10 +299,6 @@ namespace BizHawk.Client.Common /// public int WatchCount => _watchList.Count(watch => !watch.IsSeparator); - #endregion - - #region File handling logic - probably needs to be its own class - public bool Load(string path, bool append) { var result = LoadFile(path, append); @@ -519,6 +481,5 @@ namespace BizHawk.Client.Common return true; } - #endregion } } diff --git a/src/BizHawk.Client.EmuHawk/AVOut/NutMuxer.cs b/src/BizHawk.Client.EmuHawk/AVOut/NutMuxer.cs index def2a9629f..bfc473132f 100644 --- a/src/BizHawk.Client.EmuHawk/AVOut/NutMuxer.cs +++ b/src/BizHawk.Client.EmuHawk/AVOut/NutMuxer.cs @@ -15,8 +15,6 @@ namespace BizHawk.Client.EmuHawk { // this code isn't really any good for general purpose nut creation - #region simple buffer reuser - public class ReusableBufferPool { private readonly List _available = new List(); @@ -84,10 +82,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region binary write helpers - /// /// variable length value, unsigned /// @@ -183,10 +177,6 @@ namespace BizHawk.Client.EmuHawk stream.Write(b, 0, 4); } - #endregion - - #region CRC calculator - private static readonly uint[] CrcTable = { 0x00000000, 0x04C11DB7, 0x09823B6E, 0x0D4326D9, @@ -211,8 +201,6 @@ namespace BizHawk.Client.EmuHawk return crc; } - #endregion - /// /// writes a single packet out, including CheckSums /// @@ -303,8 +291,6 @@ namespace BizHawk.Client.EmuHawk } } - #region fields - /// /// stores basic AV parameters /// @@ -354,10 +340,6 @@ namespace BizHawk.Client.EmuHawk readonly ReusableBufferPool _bufferPool = new ReusableBufferPool(12); - #endregion - - #region header writers - /// /// write out the main header /// @@ -442,8 +424,6 @@ namespace BizHawk.Client.EmuHawk header.Flush(); } - #endregion - /// /// stores a single frame with syncpoint, in mux-ready form /// used because reordering of audio and video can be needed for proper interleave diff --git a/src/BizHawk.Client.EmuHawk/Api/ClientApi.cs b/src/BizHawk.Client.EmuHawk/Api/ClientApi.cs index 208bddc5c9..3a005cd4d2 100644 --- a/src/BizHawk.Client.EmuHawk/Api/ClientApi.cs +++ b/src/BizHawk.Client.EmuHawk/Api/ClientApi.cs @@ -22,8 +22,6 @@ namespace BizHawk.Client.EmuHawk /// public static class ClientApi { - #region Fields - private static IEmulator Emulator { get; set; } private static IVideoProvider VideoProvider { get; set; } @@ -60,10 +58,6 @@ namespace BizHawk.Client.EmuHawk /// public static event StateSavedEventHandler StateSaved; - #endregion - - #region cTor(s) - /// /// Static stuff initialization /// @@ -80,12 +74,6 @@ namespace BizHawk.Client.EmuHawk VideoProvider = emu.AsVideoProviderOrDefault(); } - #endregion - - #region Methods - - #region Helpers - private static void InvokeMainFormMethod(string name, object[] paramList = null) { List typeList = new List(); @@ -114,9 +102,6 @@ namespace BizHawk.Client.EmuHawk MainFormClass.GetField(name).SetValue(ClientMainFormInstance, value); } - #endregion - - #region Public /// /// THE FrameAdvance stuff /// @@ -393,7 +378,6 @@ namespace BizHawk.Client.EmuHawk { InvokeMainFormMethod("UnpauseEmulator"); } - #endregion Public /// /// Gets all current inputs for each joypad and store @@ -690,10 +674,6 @@ namespace BizHawk.Client.EmuHawk return (int)t.GetField("Y").GetValue(o); } - #endregion - - #region Properties - /// /// Gets current emulated system /// @@ -748,7 +728,5 @@ namespace BizHawk.Client.EmuHawk } } } - - #endregion } } diff --git a/src/BizHawk.Client.EmuHawk/Api/Joypad.cs b/src/BizHawk.Client.EmuHawk/Api/Joypad.cs index ba9ae4a6f2..a2f2fe58de 100644 --- a/src/BizHawk.Client.EmuHawk/Api/Joypad.cs +++ b/src/BizHawk.Client.EmuHawk/Api/Joypad.cs @@ -9,17 +9,11 @@ namespace BizHawk.Client.EmuHawk /// public sealed class Joypad { - #region Fields - private JoypadButton _pressedButtons; private float _analogX; private float _analogY; private int _player; - #endregion - - #region cTor(s) - /// /// Initialize a new instance of /// @@ -37,10 +31,6 @@ namespace BizHawk.Client.EmuHawk _player = player; } - #endregion - - #region Methods - /// /// Add specified input to current ones /// @@ -68,10 +58,6 @@ namespace BizHawk.Client.EmuHawk _pressedButtons ^= input; } - #endregion - - #region Properties - /// /// Gets or sets X value for Analog stick /// @@ -111,7 +97,5 @@ namespace BizHawk.Client.EmuHawk /// Gets for current /// public SystemInfo System { get; } - - #endregion } } diff --git a/src/BizHawk.Client.EmuHawk/Api/Libraries/CommApi.cs b/src/BizHawk.Client.EmuHawk/Api/Libraries/CommApi.cs index c96ed0bffe..6d36ad333c 100644 --- a/src/BizHawk.Client.EmuHawk/Api/Libraries/CommApi.cs +++ b/src/BizHawk.Client.EmuHawk/Api/Libraries/CommApi.cs @@ -28,8 +28,6 @@ namespace BizHawk.Client.EmuHawk public string SocketServerGetInfo() => GlobalWin.socketServer.GetInfo(); - #region MemoryMappedFile - public void MmfSetFilename(string filename) => GlobalWin.memoryMappedFiles.Filename = filename; public string MmfGetFilename() => GlobalWin.memoryMappedFiles.Filename; @@ -40,10 +38,6 @@ namespace BizHawk.Client.EmuHawk public string MmfRead(string mmf_filename, int expectedSize) => GlobalWin.memoryMappedFiles.ReadFromFile(mmf_filename, expectedSize); - #endregion - - #region HTTP - public string HttpTest() => string.Join("\n", GlobalWin.httpCommunication.TestGet(), GlobalWin.httpCommunication.SendScreenshot(), "done testing"); public string HttpTestGet() => GlobalWin.httpCommunication.TestGet(); @@ -63,7 +57,5 @@ namespace BizHawk.Client.EmuHawk public string HttpGetPostUrl() => GlobalWin.httpCommunication.PostUrl; public string HttpGetGetUrl() => GlobalWin.httpCommunication.GetUrl; - - #endregion } } diff --git a/src/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs b/src/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs index 0c2fec01cf..5e40681da6 100644 --- a/src/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs +++ b/src/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs @@ -12,8 +12,6 @@ namespace BizHawk.Client.EmuHawk { public partial class CoreFeatureAnalysis : ToolFormBase, IToolFormAutoConfig { - #region ConfigPersist - private class CoreInfo { public string CoreName { get; set; } @@ -106,8 +104,6 @@ namespace BizHawk.Client.EmuHawk [ConfigPersist] private Dictionary KnownCores { get; set; } - #endregion - // ReSharper disable once UnusedAutoPropertyAccessor.Local [RequiredService] IEmulator Emulator { get; set; } diff --git a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs index 402b124853..0f8e3ebb40 100644 --- a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs +++ b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs @@ -36,8 +36,8 @@ namespace BizHawk.Client.EmuHawk private int _rowCount; private SizeF _charSize; - private int[] _horizontalColumnTops; // Updated on paint, contains one extra item to allow inference of last column height - + private int[] _horizontalColumnTops; // Updated on paint, contains one extra item to allow inference of last column height + private RollColumn _columnDown; private RollColumn _columnResizing; @@ -178,8 +178,6 @@ namespace BizHawk.Client.EmuHawk base.OnDoubleClick(e); } - #region Properties - /// /// Gets or sets the amount of left and right padding on the text inside a cell /// @@ -400,10 +398,6 @@ namespace BizHawk.Client.EmuHawk [Category("Behavior")] public bool Rotatable { get; set; } - #endregion - - #region Event Handlers - /// /// Fire the event which requests the text for the passed cell /// @@ -556,10 +550,6 @@ namespace BizHawk.Client.EmuHawk public int NewDisplayIndex { get; } } - #endregion - - #region Api - private int? _lastSelectedRow; public void SelectRow(int index, bool val) @@ -962,10 +952,6 @@ namespace BizHawk.Client.EmuHawk public string RotateHotkeyStr => "Ctrl+Shift+F"; - #endregion - - #region Mouse and Key Events - private bool _columnDownMoved; private int _previousX; // TODO: move me @@ -1549,10 +1535,6 @@ namespace BizHawk.Client.EmuHawk base.OnKeyDown(e); } - #endregion - - #region Change Events - protected override void OnResize(EventArgs e) { RecalculateScrollBars(); @@ -1634,10 +1616,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region Helpers - private void DoColumnReorder() { if (_columnDown != CurrentCell.Column) @@ -2092,7 +2070,5 @@ namespace BizHawk.Client.EmuHawk { return (VisibleRows + 1) * LagFramesToHide; } - - #endregion } } diff --git a/src/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs b/src/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs index 307dc33f44..2a08f1c7ac 100644 --- a/src/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs +++ b/src/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs @@ -125,8 +125,6 @@ namespace BizHawk.Client.EmuHawk return instance; } - #region Enumerable to Enumerable - /// /// Converts the outdated IEnumerable Controls property to an like .NET should have done a long time ago /// @@ -140,8 +138,6 @@ namespace BizHawk.Client.EmuHawk { return tabControl.TabPages.Cast(); } - - #endregion } public static class FormExtensions diff --git a/src/BizHawk.Client.EmuHawk/Input/OTK_Gamepad.cs b/src/BizHawk.Client.EmuHawk/Input/OTK_Gamepad.cs index c19c7983e8..82b99c672b 100644 --- a/src/BizHawk.Client.EmuHawk/Input/OTK_Gamepad.cs +++ b/src/BizHawk.Client.EmuHawk/Input/OTK_Gamepad.cs @@ -15,8 +15,6 @@ namespace BizHawk.Client.EmuHawk /// public class OTK_GamePad { - #region Static Members - /// They don't have a way to query this for some reason. 4 is the minimum promised. private const int MAX_GAMEPADS = 4; @@ -45,7 +43,7 @@ namespace BizHawk.Client.EmuHawk { lock (_syncObj) { - if (initialized) + if (initialized) foreach (var device in Devices) yield return device; } @@ -77,10 +75,6 @@ namespace BizHawk.Client.EmuHawk return num * 10000.0f; } - #endregion - - #region Instance Members - /// The GUID as detected by OpenTK.Input.Joystick (or if that failed, a random one generated on construction) public readonly Guid Guid; @@ -366,8 +360,6 @@ namespace BizHawk.Client.EmuHawk _gamePadCapabilities?.HasLeftVibrationMotor == true ? left : 0, _gamePadCapabilities?.HasRightVibrationMotor == true ? right : 0 ); - - #endregion } } diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs index 4362e6078e..39aa5a7ccb 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -32,8 +32,6 @@ namespace BizHawk.Client.EmuHawk { public partial class MainForm { - #region File Menu - private void FileSubMenu_DropDownOpened(object sender, EventArgs e) { SaveStateSubMenu.Enabled = @@ -685,10 +683,6 @@ namespace BizHawk.Client.EmuHawk _exitCode = exitCode; } - #endregion - - #region Emulation Menu - private void EmulationMenuItem_DropDownOpened(object sender, EventArgs e) { PauseMenuItem.Checked = _didMenuPause ? _wasPaused : EmulatorPaused; @@ -736,10 +730,6 @@ namespace BizHawk.Client.EmuHawk HardReset(); } - #endregion - - #region View - private void ViewSubMenu_DropDownOpened(object sender, EventArgs e) { DisplayFPSMenuItem.Checked = Config.DisplayFps; @@ -857,10 +847,6 @@ namespace BizHawk.Client.EmuHawk Tools.Load(); } - #endregion - - #region Config - private void ConfigSubMenu_DropDownOpened(object sender, EventArgs e) { ControllersMenuItem.Enabled = Emulator.ControllerDefinition.Any(); @@ -1378,10 +1364,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region Tools - private void ToolsSubMenu_DropDownOpened(object sender, EventArgs e) { ToolBoxMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["ToolBox"].Bindings; @@ -1535,10 +1517,6 @@ namespace BizHawk.Client.EmuHawk form.ShowDialog(); } - #endregion - - #region NES - private void NesSubMenu_DropDownOpened(object sender, EventArgs e) { var boardName = Emulator.HasBoardInfo() ? Emulator.AsBoardInfo().BoardName : null; @@ -1720,10 +1698,6 @@ namespace BizHawk.Client.EmuHawk Tools.Load(); } - #endregion - - #region PCE - private void PceSettingsMenuItem_Click(object sender, EventArgs e) { GenericCoreConfig.DoDialog(this, "PCE Settings"); @@ -1744,10 +1718,6 @@ namespace BizHawk.Client.EmuHawk Tools.Load(); } - #endregion - - #region SMS - private void SmsSubMenu_DropDownOpened(object sender, EventArgs e) { SmsVdpViewerMenuItem.Visible = Game.System != "SG"; @@ -1763,10 +1733,6 @@ namespace BizHawk.Client.EmuHawk Tools.Load(); } - #endregion - - #region TI83 - private void Ti83SubMenu_DropDownOpened(object sender, EventArgs e) { AutoloadKeypadMenuItem.Checked = Config.Ti83AutoloadKeyPad; @@ -1826,19 +1792,11 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region Atari - private void AtariSettingsMenuItem_Click(object sender, EventArgs e) { GenericCoreConfig.DoDialog(this, "Atari 2600 Settings"); } - #endregion - - #region Atari7800 - private void A7800SubMenu_DropDownOpened(object sender, EventArgs e) { A7800ControllerSettingsMenuItem.Enabled @@ -1864,10 +1822,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region GB - private void GbSubMenu_DropDownOpened(object sender, EventArgs e) { LoadGBInSGBMenuItem.Checked = Config.GbAsSgb; @@ -1901,10 +1855,6 @@ namespace BizHawk.Client.EmuHawk Tools.Load(); } - #endregion - - #region GBA - private void GbaCoreSettingsMenuItem_Click(object sender, EventArgs e) { GenericCoreConfig.DoDialog(this, "Gameboy Advance Settings"); @@ -1920,10 +1870,6 @@ namespace BizHawk.Client.EmuHawk GbaGpuViewerMenuItem.Enabled = !OSTailoredCode.IsUnixHost; } - #endregion - - #region NDS - private void NDSSubMenu_DropDownOpened(object sender, EventArgs e) { NdsSyncSettingsMenuItem.Enabled = MovieSession.Movie.NotActive(); @@ -1944,10 +1890,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region PSX - private void PsxSubMenu_DropDownOpened(object sender, EventArgs e) { PSXControllerSettingsMenuItem.Enabled = MovieSession.Movie.NotActive(); @@ -1987,10 +1929,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region SNES - private void SnesSubMenu_DropDownOpened(object sender, EventArgs e) { if (((LibsnesCore)Emulator).IsSGB) @@ -2040,10 +1978,6 @@ namespace BizHawk.Client.EmuHawk GenericCoreConfig.DoDialog(this, "Snes9x Settings"); } - #endregion - - #region Coleco - private void ColecoSubMenu_DropDownOpened(object sender, EventArgs e) { if (Emulator is ColecoVision coleco) @@ -2084,10 +2018,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region N64 - private void N64SubMenu_DropDownOpened(object sender, EventArgs e) { N64PluginSettingsMenuItem.Enabled = @@ -2157,19 +2087,11 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region Saturn - private void SaturnPreferencesMenuItem_Click(object sender, EventArgs e) { GenericCoreConfig.DoDialog(this, "Saturn Settings"); } - #endregion - - #region DGB - private void DgbSettingsMenuItem_Click(object sender, EventArgs e) { if (Emulator is GambatteLink gambatte) @@ -2183,64 +2105,36 @@ namespace BizHawk.Client.EmuHawk GenericCoreConfig.DoDialog(this, "Gameboy Settings"); } - #endregion - - #region GB3x - private void GB3xSettingsMenuItem_Click(object sender, EventArgs e) { GenericCoreConfig.DoDialog(this, "Gameboy Settings"); } - #endregion - - #region GB4x - private void GB4xSettingsMenuItem_Click(object sender, EventArgs e) { GenericCoreConfig.DoDialog(this, "Gameboy Settings"); } - #endregion - - #region GGL - private void GgSettingsMenuItem_Click(object sender, EventArgs e) { GenericCoreConfig.DoDialog(this, "Game Gear Settings"); } - #endregion - - #region Vectrex - private void VectrexSettingsMenuItem_Click(object sender, EventArgs e) { GenericCoreConfig.DoDialog(this, "Vectrex Settings", true, false); } - #endregion - - #region MSX - private void MsxSettingsMenuItem_Click(object sender, EventArgs e) { GenericCoreConfig.DoDialog(this, "MSX Settings"); } - #endregion - - #region O2Hawk - private void O2HawkSettingsMenuItem_Click(object sender, EventArgs e) { GenericCoreConfig.DoDialog(this, "Odyssey Settings"); } - #endregion - - #region GEN - private void GenVdpViewerMenuItem_Click(object sender, EventArgs e) { Tools.Load(); @@ -2251,19 +2145,11 @@ namespace BizHawk.Client.EmuHawk GenericCoreConfig.DoDialog(this, "Genesis Settings"); } - #endregion - - #region Wondersawn - private void WonderSwanSettingsMenuItem_Click(object sender, EventArgs e) { GenericCoreConfig.DoDialog(this, "WonderSwan Settings"); } - #endregion - - #region Apple II - private void AppleIISettingsMenuItem_Click(object sender, EventArgs e) { GenericCoreConfig.DoDialog(this, "Apple II Settings"); @@ -2303,10 +2189,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region C64 - private void C64SubMenu_DropDownOpened(object sender, EventArgs e) { if (Emulator is C64 c64) @@ -2346,10 +2228,6 @@ namespace BizHawk.Client.EmuHawk GenericCoreConfig.DoDialog(this, "C64 Settings"); } - #endregion - - #region Intv - private void IntVSubMenu_DropDownOpened(object sender, EventArgs e) { IntVControllerSettingsMenuItem.Enabled = MovieSession.Movie.NotActive(); @@ -2364,36 +2242,21 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region VirtualBoy private void VirtualBoySettingsMenuItem_Click(object sender, EventArgs e) { GenericCoreConfig.DoDialog(this, "VirtualBoy Settings"); } - #endregion - - #region NeoGeoPocket - private void NeoGeoSettingsMenuItem_Click(object sender, EventArgs e) { GenericCoreConfig.DoDialog(this, "NeoPop Settings"); } - #endregion - - #region PC-FX - private void PCFXSettingsMenuItem_Click(object sender, EventArgs e) { GenericCoreConfig.DoDialog(this, "PC-FX Settings"); } - #endregion - - #region ZXSpectrum - private void ZXSpectrumControllerConfigurationMenuItem_Click(object sender, EventArgs e) { if (Emulator is ZXSpectrum zxs) @@ -2542,10 +2405,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region AmstradCPC - private void AmstradCpcCoreEmulationSettingsMenuItem_Click(object sender, EventArgs e) { if (Emulator is AmstradCPC cpc) @@ -2660,18 +2519,11 @@ namespace BizHawk.Client.EmuHawk } - #endregion - - #region Arcade private void ArcadeSettingsMenuItem_Click(object sender, EventArgs e) { GenericCoreConfig.DoDialog(this, "Arcade Settings"); } - #endregion - - #region Help - private void HelpSubMenu_DropDownOpened(object sender, EventArgs e) { FeaturesMenuItem.Visible = VersionInfo.DeveloperBuild; @@ -2698,10 +2550,6 @@ namespace BizHawk.Client.EmuHawk form.ShowDialog(); } - #endregion - - #region Context Menu - private void MainFormContextMenu_Opening(object sender, System.ComponentModel.CancelEventArgs e) { _wasPaused = EmulatorPaused; @@ -2914,10 +2762,6 @@ namespace BizHawk.Client.EmuHawk FrameBufferResized(); } - #endregion - - #region Status Bar - private void DumpStatusButton_Click(object sender, EventArgs e) { string details = Emulator.RomDetails(); @@ -3031,10 +2875,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region Form Events - private void MainForm_Activated(object sender, EventArgs e) { if (!Config.RunInBackground) @@ -3167,7 +3007,5 @@ namespace BizHawk.Client.EmuHawk Sound.StartSound(); } } - - #endregion } } diff --git a/src/BizHawk.Client.EmuHawk/MainForm.FileLoader.cs b/src/BizHawk.Client.EmuHawk/MainForm.FileLoader.cs index 7b29bb9888..84c42cba6b 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.FileLoader.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.FileLoader.cs @@ -41,8 +41,6 @@ namespace BizHawk.Client.EmuHawk private readonly string[] _nonArchive = { ".ISO", ".CUE", ".CCD" }; - #region Loaders - private void LoadCdl(string filename, string archive = null) { if (Tools.IsAvailable()) @@ -127,8 +125,6 @@ namespace BizHawk.Client.EmuHawk ((RamWatch) Tools.Get()).LoadWatchFile(new FileInfo(filename), false); } - #endregion - private void ProcessFileList(IEnumerable fileList, ref Dictionary> sortedFiles, string archive = null) { foreach (string file in fileList) diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs index d5087280f6..3c9a23e8ee 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.cs @@ -36,8 +36,6 @@ namespace BizHawk.Client.EmuHawk { public partial class MainForm : Form { - #region Constructors and Initialization, and Tear down - private void MainForm_Load(object sender, EventArgs e) { SetWindowText(); @@ -634,10 +632,6 @@ namespace BizHawk.Client.EmuHawk base.Dispose(disposing); } - #endregion - - #region Pause - private bool _emulatorPaused; public bool EmulatorPaused { @@ -668,10 +662,6 @@ namespace BizHawk.Client.EmuHawk public bool Paused { get; } } - #endregion - - #region Properties - public string CurrentlyOpenRom { get; private set; } // todo - delete me and use only args instead public LoadRomArgs CurrentlyOpenRomArgs { get; private set; } public bool PauseAvi { get; set; } @@ -726,10 +716,6 @@ namespace BizHawk.Client.EmuHawk private bool IsTurboSeeking => PauseOnFrame.HasValue && Config.TurboSeek; public bool IsTurboing => InputManager.ClientControls["Turbo"] || IsTurboSeeking; - #endregion - - #region Public Methods - public void AddOnScreenMessage(string message) { GlobalWin.OSD.AddMessage(message); @@ -1427,10 +1413,6 @@ namespace BizHawk.Client.EmuHawk return true; } - #endregion - - #region Private variables - private Size _lastVideoSize = new Size(-1, -1), _lastVirtualSize = new Size(-1, -1); private readonly SaveSlotManager _stateSlots = new SaveSlotManager(); @@ -1496,9 +1478,6 @@ namespace BizHawk.Client.EmuHawk // countdown for saveram autoflushing public int AutoFlushSaveRamIn { get; set; } - #endregion - - #region Private methods private void SetStatusBar() { @@ -2804,10 +2783,6 @@ namespace BizHawk.Client.EmuHawk AddOnScreenMessage($"Config file loaded: {iniPath}"); } - #endregion - - #region Frame Loop - private void StepRunLoop_Throttle() { SyncThrottle(); @@ -3098,10 +3073,6 @@ namespace BizHawk.Client.EmuHawk _framesSinceLastFpsUpdate = 0; } - #endregion - - #region AVI Stuff - /// /// start AVI recording, unattended /// @@ -3459,10 +3430,6 @@ namespace BizHawk.Client.EmuHawk return null; } - #endregion - - #region Scheduled for refactor - public string SaveStatePrefix() { var name = Game.FilesystemSafeName(); @@ -3998,10 +3965,6 @@ namespace BizHawk.Client.EmuHawk Rewinder.Clear(); } - #endregion - - #region Tool Control API - // TODO: move me public IControlMainform Master { get; private set; } @@ -4448,7 +4411,5 @@ namespace BizHawk.Client.EmuHawk return isRewinding; } - - #endregion } } diff --git a/src/BizHawk.Client.EmuHawk/config/PathConfig.cs b/src/BizHawk.Client.EmuHawk/config/PathConfig.cs index 86f8f82911..36b6e5d54e 100644 --- a/src/BizHawk.Client.EmuHawk/config/PathConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/PathConfig.cs @@ -292,8 +292,6 @@ namespace BizHawk.Client.EmuHawk } } - #region Events - private void NewPathConfig_Load(object sender, EventArgs e) { LoadSettings(); @@ -335,7 +333,5 @@ namespace BizHawk.Client.EmuHawk _mainForm.AddOnScreenMessage("Path config aborted"); Close(); } - - #endregion } } diff --git a/src/BizHawk.Client.EmuHawk/movie/PlayMovie.cs b/src/BizHawk.Client.EmuHawk/movie/PlayMovie.cs index cb9cd41ef8..ee46cf52c0 100644 --- a/src/BizHawk.Client.EmuHawk/movie/PlayMovie.cs +++ b/src/BizHawk.Client.EmuHawk/movie/PlayMovie.cs @@ -287,10 +287,6 @@ namespace BizHawk.Client.EmuHawk RefreshMovieList(); } - #region Events - - #region Movie List - private void RefreshMovieList() { MovieView.VirtualListSize = _movieList.Count; @@ -473,10 +469,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region Details - private void DetailsView_ColumnClick(object sender, ColumnClickEventArgs e) { var detailsList = new List(); @@ -543,10 +535,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region Misc Widgets - private void BrowseMovies_Click(object sender, EventArgs e) { using var ofd = new OpenFileDialog @@ -616,8 +604,6 @@ namespace BizHawk.Client.EmuHawk Close(); } - #endregion - private bool _programmaticallyChangingStopFrameCheckbox; private void StopOnFrameCheckbox_CheckedChanged(object sender, EventArgs e) { @@ -645,7 +631,5 @@ namespace BizHawk.Client.EmuHawk StopOnFrameTextBox.Enabled = !LastFrameCheckbox.Checked; } - - #endregion } } diff --git a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs index 9c55c79e81..8693268472 100644 --- a/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs +++ b/src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs @@ -58,8 +58,6 @@ namespace BizHawk.Client.EmuHawk private bool _previousDisplayMessage; private bool _previousInvisibleEmulation; - #region Services and Settings - [RequiredService] private IEmulator Emulator { get; set; } @@ -80,8 +78,6 @@ namespace BizHawk.Client.EmuHawk public bool InvisibleEmulation { get; set; } } - #endregion - public BasicBot() { InitializeComponent(); @@ -98,8 +94,6 @@ namespace BizHawk.Client.EmuHawk _previousDisplayMessage = Config.DisplayMessages; } - #region UI Bindings - private Dictionary ControlProbabilities => ControlProbabilityPanel.Controls .OfType() @@ -250,8 +244,6 @@ namespace BizHawk.Client.EmuHawk // However this also causes a problem with RamWatch not being up to date since that TOO gets called. // Need to find out if having RamWatch open while TasStudio is open causes issues. // there appears to be "hack"(?) line in ToolManager.UpdateBefore that seems to refresh the RamWatch. Not sure that is causing any issue since it does look like the RamWatch is ahead too much.. - - #endregion protected override void UpdateBefore() => Update(fast: false); protected override void FastUpdateBefore() => Update(fast: true); @@ -283,10 +275,6 @@ namespace BizHawk.Client.EmuHawk } } - #region Control Events - - #region FileMenu - private void FileSubMenu_DropDownOpened(object sender, EventArgs e) { SaveMenuItem.Enabled = !string.IsNullOrWhiteSpace(CurrentFileName); @@ -373,10 +361,6 @@ namespace BizHawk.Client.EmuHawk Close(); } - #endregion - - #region Options Menu - private void OptionsSubMenu_DropDownOpened(object sender, EventArgs e) { TurboWhileBottingMenuItem.Checked = Settings.TurboWhenBotting; @@ -423,8 +407,6 @@ namespace BizHawk.Client.EmuHawk Settings.TurboWhenBotting ^= true; } - #endregion - private void RunBtn_Click(object sender, EventArgs e) { StartBot(); @@ -469,10 +451,6 @@ namespace BizHawk.Client.EmuHawk Frames = 0; } - #endregion - - #region Classes - private class BotAttempt { public long Attempt { get; set; } @@ -518,10 +496,6 @@ namespace BizHawk.Client.EmuHawk public int DataSize { get; set; } } - #endregion - - #region File Handling - private void LoadFileFromRecent(string path) { var result = LoadBotFile(path); @@ -667,8 +641,6 @@ namespace BizHawk.Client.EmuHawk MessageLabel.Text = $"{Path.GetFileName(CurrentFileName)} saved"; } - #endregion - public bool HasFrameAdvanced() { // If the emulator frame is different from the last time it tried calling diff --git a/src/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs b/src/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs index c119279909..1a9e42cfc1 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Cheats/CheatEdit.cs @@ -19,8 +19,6 @@ namespace BizHawk.Client.EmuHawk ValueBox.Nullable = false; } - #region Privates - private const string HexInd = "0x"; private Cheat _cheat; @@ -271,10 +269,6 @@ namespace BizHawk.Client.EmuHawk _editCallback?.Invoke(); } - #endregion - - #region API - public void SetCheat(Cheat cheat) { _editMode = true; @@ -346,8 +340,6 @@ namespace BizHawk.Client.EmuHawk _editCallback = editCallback; } - #endregion - private void CompareBox_TextChanged(object sender, EventArgs e) { var compareBox = (WatchValueBox)sender; diff --git a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs index 5377aaeed6..1492ad2a5a 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs @@ -332,10 +332,6 @@ namespace BizHawk.Client.EmuHawk } } - #region Events - - #region File - private void FileSubMenu_DropDownOpened(object sender, EventArgs e) { SaveMenuItem.Enabled = Global.CheatList.Changes; @@ -391,10 +387,6 @@ namespace BizHawk.Client.EmuHawk Close(); } - #endregion - - #region Cheats - private void CheatsSubMenu_DropDownOpened(object sender, EventArgs e) { RemoveCheatMenuItem.Enabled = @@ -520,10 +512,6 @@ namespace BizHawk.Client.EmuHawk Tools.Load(); } - #endregion - - #region Options - private void OptionsSubMenu_DropDownOpened(object sender, EventArgs e) { AlwaysLoadCheatsMenuItem.Checked = Config.LoadCheatFileByGame; @@ -592,10 +580,6 @@ namespace BizHawk.Client.EmuHawk SetColumns(); } - #endregion - - #region ListView and Dialog Events - private void CheatListView_DoubleClick(object sender, EventArgs e) { ToggleMenuItem_Click(sender, e); @@ -682,10 +666,6 @@ namespace BizHawk.Client.EmuHawk base.OnShown(e); } - #endregion - - #endregion - public class CheatsSettings : ToolDialogSettings { public CheatsSettings() diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs index 4f0ca5eff8..ae7efecf9f 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs @@ -21,8 +21,6 @@ namespace BizHawk.Client.EmuHawk private RegisterValue PCRegister => Debuggable.GetCpuFlagsAndRegisters()[Disassembler.PCRegisterName]; - #region Implementation checking - // TODO: be cachey with checks that depend on catching exceptions private bool CanUseMemoryCallbacks { @@ -128,8 +126,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - private void FullUpdate() { RegisterPanel.UpdateValues(); diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs index 304c285033..d3f795b146 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs @@ -185,17 +185,11 @@ namespace BizHawk.Client.EmuHawk Disassembler.Cpu = ((ComboBox) sender).SelectedItem.ToString(); } - #region File - private void ExitMenuItem_Click(object sender, EventArgs e) { Close(); } - #endregion - - #region Debug - private void RunBtn_Click(object sender, EventArgs e) { MainForm.UnpauseEmulator(); @@ -228,8 +222,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - protected override bool ProcessCmdKey(ref Message msg, Keys keyData) { if (keyData == Keys.F11) diff --git a/src/BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs b/src/BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs index 1cf16fd086..6347987560 100644 --- a/src/BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs +++ b/src/BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs @@ -17,15 +17,9 @@ namespace BizHawk.Client.EmuHawk /// public static class ExternalToolManager { - #region Fields - private static readonly FileSystemWatcher DirectoryMonitor; private static readonly List MenuItems = new List(); - #endregion - - #region cTor(s) - /// /// Initialization /// @@ -50,10 +44,6 @@ namespace BizHawk.Client.EmuHawk BuildToolStrip(); } - #endregion - - #region Methods - /// /// Build the ToolStrip menu /// @@ -162,16 +152,10 @@ namespace BizHawk.Client.EmuHawk MenuItems.Add(GenerateToolTipFromFileName(e.FullPath)); } - #endregion - - #region Properties - /// /// Gets a prebuild /// This list auto-updated by the itself /// public static IEnumerable ToolStripMenu => MenuItems; - - #endregion } } diff --git a/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs b/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs index 5c2a1da4a7..c0b3e1f29b 100644 --- a/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs +++ b/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs @@ -100,8 +100,6 @@ namespace BizHawk.Client.EmuHawk } - #region drawing primitives - /// /// draw a single 2bpp tile /// @@ -354,8 +352,6 @@ namespace BizHawk.Client.EmuHawk b.UnlockBits(lockData); } - #endregion - void ScanlineCallback(byte lcdc) { using (_memory.EnterExit()) @@ -483,8 +479,6 @@ namespace BizHawk.Client.EmuHawk Gb?.SetScanlineCallback(null, 0); } - #region refresh - private void radioButtonRefreshFrame_CheckedChanged(object sender, EventArgs e) { ComputeRefreshValues(); } private void radioButtonRefreshScanline_CheckedChanged(object sender, EventArgs e) { ComputeRefreshValues(); } private void radioButtonRefreshManual_CheckedChanged(object sender, EventArgs e) { ComputeRefreshValues(); } @@ -565,10 +559,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region mouseovers - private string _freezeLabel; private Bitmap _freezeBmp; private string _freezeDetails; @@ -894,8 +884,6 @@ namespace BizHawk.Client.EmuHawk SpriteMouseover(e.X, e.Y); } - #endregion - private void bmpView_MouseClick(object sender, MouseEventArgs e) { if (e.Button == MouseButtons.Right) @@ -909,8 +897,6 @@ namespace BizHawk.Client.EmuHawk } } - #region copyimage - private readonly Timer _messageTimer = new Timer(); private void GbGpuView_KeyDown(object sender, KeyEventArgs e) @@ -943,8 +929,6 @@ namespace BizHawk.Client.EmuHawk labelClipboard.Text = "CTRL+C copies the pane under the mouse."; } - #endregion - private void ButtonChangeColor_Click(object sender, EventArgs e) { using var dlg = new ColorDialog diff --git a/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs b/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs index 0d4844c1b7..b91f0ec2fc 100644 --- a/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs +++ b/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs @@ -44,8 +44,6 @@ namespace BizHawk.Client.EmuHawk RecomputeRefresh(); } - #region drawing primitives - private unsafe void DrawTile256(int* dest, int pitch, byte* tile, ushort* palette, bool hFlip, bool vFlip) { if (vFlip) @@ -535,8 +533,6 @@ namespace BizHawk.Client.EmuHawk } - #endregion - private unsafe void DrawEverything() { ushort dispcnt = ((ushort*)_mmio)[0]; @@ -751,8 +747,6 @@ namespace BizHawk.Client.EmuHawk ShowSelectedWidget(); } - #region refresh control - private int? _cbScanline; private int? _cbScanlineEmu = 500; @@ -793,15 +787,11 @@ namespace BizHawk.Client.EmuHawk DrawEverything(); } - #endregion - private void GbaGpuView_FormClosed(object sender, FormClosedEventArgs e) { GBA?.SetScanlineCallback(null, 0); } - #region copy to clipboard - private void timerMessage_Tick(object sender, EventArgs e) { timerMessage.Stop(); @@ -831,6 +821,5 @@ namespace BizHawk.Client.EmuHawk } } } - #endregion } } diff --git a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs index b6d5db8fa2..5cfe10660c 100644 --- a/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs +++ b/src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs @@ -152,8 +152,6 @@ namespace BizHawk.Client.EmuHawk GeneralUpdate(); } - #region API - protected override void UpdateAfter() { AddressesLabel.Text = GenerateMemoryViewString(true); @@ -344,8 +342,6 @@ namespace BizHawk.Client.EmuHawk _hexFind.Close(); } - #endregion - private byte[] ConvertHexStringToByteArray(string str) { if (string.IsNullOrWhiteSpace(str)) { @@ -1247,10 +1243,6 @@ namespace BizHawk.Client.EmuHawk return true; } - #region Events - - #region File Menu - private void FileSubMenu_DropDownOpened(object sender, EventArgs e) { if (_domain.Name == "File on Disk") @@ -1395,10 +1387,6 @@ namespace BizHawk.Client.EmuHawk Close(); } - #endregion - - #region Edit - private void EditMenuItem_DropDownOpened(object sender, EventArgs e) { var data = Clipboard.GetDataObject(); @@ -1551,10 +1539,6 @@ namespace BizHawk.Client.EmuHawk FindPrev(_findStr, false); } - #endregion - - #region Options - private void OptionsSubMenu_DropDownOpened(object sender, EventArgs e) { BigEndianMenuItem.Checked = BigEndian; @@ -1729,10 +1713,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region Settings Menu - private void SetColorsMenuItem_Click(object sender, EventArgs e) { using var form = new HexColorsForm(this); @@ -1749,10 +1729,6 @@ namespace BizHawk.Client.EmuHawk Colors = new ColorConfig(); } - #endregion - - #region Context Menu and Dialog Events - private void HexEditor_Resize(object sender, EventArgs e) { SetUpScrollBar(); @@ -2086,10 +2062,6 @@ namespace BizHawk.Client.EmuHawk GeneralUpdate(); } - #endregion - - #region MemoryViewer Events - private void HexEditor_MouseWheel(object sender, MouseEventArgs e) { var delta = 0; @@ -2284,10 +2256,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #endregion - private void viewN64MatrixToolStripMenuItem_Click(object sender, EventArgs e) { if (!_highlightedAddress.HasValue) diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/FormsLuaLibrary.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/FormsLuaLibrary.cs index 4ee1578bef..4e87a08937 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/FormsLuaLibrary.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/FormsLuaLibrary.cs @@ -23,8 +23,6 @@ namespace BizHawk.Client.EmuHawk // TODO: replace references to ConsoleLuaLibrary.Log with a callback that is passed in public override string Name => "forms"; - #region Forms Library Helpers - private readonly List _luaForms = new List(); public void WindowClosed(IntPtr handle) @@ -60,8 +58,6 @@ namespace BizHawk.Client.EmuHawk control.Text = caption ?? ""; } - #endregion - [LuaMethodExample("forms.addclick( 332, function()\r\n\tconsole.log( \"adds the given lua function as a click event to the given control\" );\r\nend );")] [LuaMethod("addclick", "adds the given lua function as a click event to the given control")] public void AddClick(int handle, LuaFunction clickEvent) @@ -448,8 +444,6 @@ namespace BizHawk.Client.EmuHawk return (int)pictureBox.Handle; } - #region LuaPictureBox Methods - [LuaMethodExample("forms.clear( 334, 0x000000FF );")] [LuaMethod( "clear", @@ -1236,8 +1230,6 @@ namespace BizHawk.Client.EmuHawk return 0; } - #endregion - [LuaMethodExample("forms.setdropdownitems( 332, { \"item1\", \"item2\" } );")] [LuaMethod("setdropdownitems", "Sets the items for a given dropdown box")] public void SetDropdownItems(int handle, LuaTable items) diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/TAStudioLuaLibrary.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/TAStudioLuaLibrary.cs index 9d33e93b9a..628fe6ce31 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/TAStudioLuaLibrary.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/TAStudioLuaLibrary.cs @@ -329,8 +329,6 @@ namespace BizHawk.Client.EmuHawk } } - #region Branches - [LuaMethodExample("tastudio.setbranchtext( \"Some text\", 1 );")] [LuaMethod("setbranchtext", "adds the given message to the existing branch, or to the branch that will be created next if branch index is not specified")] public void SetBranchText(string text, int? index = null) @@ -407,10 +405,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region Markers - [LuaMethodExample("local sttasget = tastudio.getmarker( 500 );")] [LuaMethod("getmarker", "returns the marker text at the given frame, or an empty string if there is no marker for the given frame")] public string GetMarker(int frame) @@ -461,10 +455,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region Events - [LuaMethodExample("tastudio.onqueryitembg( function( currentindex, itemname )\r\n\tconsole.log( \"called during the background draw event of the tastudio listview. luaf must be a function that takes 2 params: index, column. The first is the integer row index of the listview, and the 2nd is the string column name. luaf should return a value that can be parsed into a .NET Color object (string color name, or integer value)\" );\r\nend );")] [LuaMethod("onqueryitembg", "called during the background draw event of the tastudio listview. luaf must be a function that takes 2 params: index, column. The first is the integer row index of the listview, and the 2nd is the string column name. luaf should return a value that can be parsed into a .NET Color object (string color name, or integer value)")] public void OnQueryItemBg(LuaFunction luaf) @@ -572,7 +562,5 @@ namespace BizHawk.Client.EmuHawk }; } } - - #endregion } } diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaAutocompleteInstaller.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaAutocompleteInstaller.cs index 210062fcca..fb30c8a695 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaAutocompleteInstaller.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaAutocompleteInstaller.cs @@ -6,8 +6,6 @@ namespace BizHawk.Client.EmuHawk { public class LuaAutocompleteInstaller { - #region API - public enum TextEditors { Sublime2, NotePad } public bool IsInstalled(TextEditors editor) @@ -43,8 +41,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - private string AppDataFolder => Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData); private bool IsSublimeInstalled() diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs index 3bb507e41e..4e7d34abde 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs @@ -723,10 +723,6 @@ namespace BizHawk.Client.EmuHawk } } - #region Events - - #region File Menu - private void FileSubMenu_DropDownOpened(object sender, EventArgs e) { SaveSessionMenuItem.Enabled = LuaImp.ScriptList.Changes; @@ -808,10 +804,6 @@ namespace BizHawk.Client.EmuHawk Close(); } - #endregion - - #region Script - private void ScriptSubMenu_DropDownOpened(object sender, EventArgs e) { ToggleScriptMenuItem.Enabled = @@ -1124,10 +1116,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region Options - private void OptionsSubMenu_DropDownOpened(object sender, EventArgs e) { DisableScriptsOnLoadMenuItem.Checked = Config.DisableLuaScriptsOnLoad; @@ -1219,10 +1207,6 @@ namespace BizHawk.Client.EmuHawk _luaAutoInstaller.InstallBizLua(LuaAutocompleteInstaller.TextEditors.NotePad, LuaImp.Docs); } - #endregion - - #region Help - private void FunctionsListMenuItem_Click(object sender, EventArgs e) { new LuaFunctionsForm(LuaImp.Docs).Show(); @@ -1233,10 +1217,6 @@ namespace BizHawk.Client.EmuHawk Process.Start("http://tasvideos.org/BizHawk/LuaFunctions.html"); } - #endregion - - #region Toolbar and Context Menu - private void ScriptListContextMenu_Opening(object sender, CancelEventArgs e) { ToggleScriptContextItem.Enabled = @@ -1302,10 +1282,6 @@ namespace BizHawk.Client.EmuHawk LuaImp.RegisteredFunctions.Clear(Emulator); } - #endregion - - #region Dialog, Listview, OutputBox, InputBox - private void LuaConsole_DragDrop(object sender, DragEventArgs e) { if (OSTailoredCode.IsUnixHost) @@ -1510,8 +1486,6 @@ namespace BizHawk.Client.EmuHawk return false; } - #endregion - private void EraseToolbarItem_Click(object sender, EventArgs e) { GlobalWin.DisplayManager.ClearLuaSurfaces(); @@ -1523,8 +1497,6 @@ namespace BizHawk.Client.EmuHawk GenericDragEnter(sender, e); } - #endregion - private void LuaListView_DoubleClick(object sender, EventArgs e) { var index = LuaListView.CurrentCell?.RowIndex; diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs index fcb85b0fa9..db9f1fb979 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaPictureBox.cs @@ -9,7 +9,6 @@ namespace BizHawk.Client.EmuHawk { public class LuaPictureBox : PictureBox { - #region Helpers private readonly Dictionary _imageCache = new Dictionary(); private readonly Dictionary _solidBrushes = new Dictionary(); @@ -37,8 +36,6 @@ namespace BizHawk.Client.EmuHawk return p; } - #endregion - private Color _defaultForeground = Color.Black; private Color? _defaultBackground; private Color? _defaultTextBackground = Color.FromArgb(128, 0, 0, 0); diff --git a/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs b/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs index 60d20945e8..70b4d982be 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs @@ -214,8 +214,6 @@ namespace BizHawk.Client.EmuHawk SelectedZone.PlaceZone(CurrentMovie); } - #region Menu Items - private void SaveAsToolStripMenuItem_Click(object sender, EventArgs e) { if (SelectedZone == null) @@ -265,8 +263,6 @@ namespace BizHawk.Client.EmuHawk Global.Game.FilesystemSafeName()), null); } - #endregion - public bool SaveMacroAs(MovieZone macro) { using var dialog = new SaveFileDialog diff --git a/src/BizHawk.Client.EmuHawk/tools/Macros/MovieZone.cs b/src/BizHawk.Client.EmuHawk/tools/Macros/MovieZone.cs index b52baf9678..bb3ab5216b 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Macros/MovieZone.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Macros/MovieZone.cs @@ -275,8 +275,6 @@ namespace BizHawk.Client.EmuHawk _controller = _movieSession.GenerateMovieController(d); } - #region Custom Latch - private void LatchFromSourceButtons(IMovieController latching, IController source) { foreach (string button in source.Definition.BoolButtons) @@ -307,7 +305,5 @@ namespace BizHawk.Client.EmuHawk } } } - - #endregion } } diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs index e64819be50..8df73485cf 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs @@ -179,10 +179,6 @@ namespace BizHawk.Client.EmuHawk NameTableView.Refresh(); } - #region Events - - #region Menu and Context Menu - private void ScreenshotMenuItem_Click(object sender, EventArgs e) { NameTableView.Screenshot(); @@ -204,10 +200,6 @@ namespace BizHawk.Client.EmuHawk NameTableView.Refresh(); } - #endregion - - #region Dialog and Controls - private void NesNameTableViewer_KeyDown(object sender, KeyEventArgs e) { switch (e.KeyCode) @@ -322,9 +314,5 @@ namespace BizHawk.Client.EmuHawk TableLabel.Text = ""; PaletteLabel.Text = ""; } - - #endregion - - #endregion } } diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs index e2a1f16d72..dfc4b23211 100644 --- a/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs +++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs @@ -309,12 +309,6 @@ namespace BizHawk.Client.EmuHawk } } - #region Events - - #region Menu and Context Menu - - #region File - private void SavePaletteScreenshotMenuItem_Click(object sender, EventArgs e) { PaletteView.Screenshot(); @@ -350,10 +344,6 @@ namespace BizHawk.Client.EmuHawk Close(); } - #endregion - - #region Pattern - private void Table0PaletteSubMenu_DropDownOpened(object sender, EventArgs e) { Table0P0MenuItem.Checked = PatternView.Pal0 == 0; @@ -448,19 +438,11 @@ namespace BizHawk.Client.EmuHawk UpdatePaletteSelection(); } - #endregion - - #region Settings - private void SettingsSubMenu_DropDownOpened(object sender, EventArgs e) { cHRROMTileViewerToolStripMenuItem.Checked = ChrRomView; } - #endregion - - #region Context Menus - private void PaletteRefreshMenuItem_Click(object sender, EventArgs e) { PaletteView.Refresh(); @@ -476,12 +458,6 @@ namespace BizHawk.Client.EmuHawk SpriteView.Refresh(); } - #endregion - - #endregion - - #region Dialog and Controls - private void NesPPU_MouseClick(object sender, MouseEventArgs e) { ZoomBox.Image = new Bitmap(64, 64); @@ -779,8 +755,6 @@ namespace BizHawk.Client.EmuHawk _ppu?.RemoveCallback2(); } - #endregion - private MemoryDomain _chrRom; private readonly byte[] _chrRomCache = new byte[8192]; @@ -824,8 +798,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - private void NumericUpDownChrRomBank_ValueChanged(object sender, EventArgs e) { ChrRomViewRefresh(); diff --git a/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs b/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs index 35c304788c..7d7f2f7c58 100644 --- a/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs @@ -83,10 +83,6 @@ namespace BizHawk.Client.EmuHawk protected override void UpdateBefore() => Generate(); - #region Events - - #region Menu - private void FileSubMenu_DropDownOpened(object sender, EventArgs e) { VDC2MenuItem.Enabled = PCE.SystemId == "SGX"; @@ -110,8 +106,6 @@ namespace BizHawk.Client.EmuHawk Close(); } - #endregion - private void Canvas_MouseMove(object sender, MouseEventArgs e) { var vdc = _vdcType == 0 ? PCE.VDC1 : PCE.VDC2; @@ -123,7 +117,5 @@ namespace BizHawk.Client.EmuHawk XYLabel.Text = $"{xTile}:{yTile}"; PaletteLabel.Text = paletteNo.ToString(); } - - #endregion } } diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs index d9fdf47c61..0bc666b7ff 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs @@ -77,8 +77,6 @@ namespace BizHawk.Client.EmuHawk }); } - #region Query callbacks - private void QueryItemText(int index, RollColumn column, out string text, ref int offsetX, ref int offsetY) { text = ""; @@ -125,10 +123,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region Actions - public void Branch() { var branch = CreateBranch(); @@ -574,10 +568,6 @@ namespace BizHawk.Client.EmuHawk return false; } - #endregion - - #region Events - private void BranchView_MouseDown(object sender, MouseEventArgs e) { BranchesContextMenu.Close(); @@ -676,7 +666,5 @@ namespace BizHawk.Client.EmuHawk _screenshot.FadeOut(); } } - - #endregion } } diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs index f7979f4633..56e1477943 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs @@ -125,8 +125,6 @@ namespace BizHawk.Client.EmuHawk } } - #region Query callbacks - // public static Color CurrentFrame_FrameCol = Color.FromArgb(0xCF, 0xED, 0xFC); Why? public static Color CurrentFrame_InputLog => Color.FromArgb(0xB5, 0xE7, 0xF7); public static Color SeekFrame_InputLog => Color.FromArgb(0x70, 0xB5, 0xE7, 0xF7); @@ -362,10 +360,6 @@ namespace BizHawk.Client.EmuHawk return (lag.Lagged.HasValue && lag.Lagged.Value) || (hideWasLag && lag.WasLagged.HasValue && lag.WasLagged.Value); } - #endregion - - #region Events - private void TasView_ColumnClick(object sender, InputRoll.ColumnClickEventArgs e) { if (TasView.AnyRowsSelected) @@ -1460,7 +1454,5 @@ namespace BizHawk.Client.EmuHawk RefreshDialog(); } - - #endregion } } diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index ce5015ef71..20bbf59eab 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -12,8 +12,6 @@ namespace BizHawk.Client.EmuHawk { public partial class TAStudio { - #region File Menu - private void FileSubMenu_DropDownOpened(object sender, EventArgs e) { ToBk2MenuItem.Enabled = @@ -304,10 +302,6 @@ namespace BizHawk.Client.EmuHawk Close(); } - #endregion - - #region Edit - private void EditSubMenu_DropDownOpened(object sender, EventArgs e) { DeselectMenuItem.Enabled = @@ -775,10 +769,6 @@ namespace BizHawk.Client.EmuHawk MessageBox.Show("Integrity Check passed"); } - #endregion - - #region Config - private void ConfigSubMenu_DropDownOpened(object sender, EventArgs e) { AutopauseAtEndOfMovieMenuItem.Checked = Settings.AutoPause; @@ -981,10 +971,6 @@ namespace BizHawk.Client.EmuHawk Settings.LoadBranchOnDoubleClick ^= true; } - #endregion - - #region Metadata - private void HeaderMenuItem_Click(object sender, EventArgs e) { new MovieHeaderEditor(CurrentTasMovie) @@ -1030,10 +1016,6 @@ namespace BizHawk.Client.EmuHawk }.ShowDialog(); } - #endregion - - #region Settings Menu - private void SettingsSubMenu_DropDownOpened(object sender, EventArgs e) { RotateMenuItem.ShortcutKeyDisplayString = TasView.RotateHotkeyStr; @@ -1163,10 +1145,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region Columns - private void SetUpToolStripColumns() { ColumnsSubMenu.DropDownItems.Clear(); @@ -1336,10 +1314,6 @@ namespace BizHawk.Client.EmuHawk BranchesMarkersSplit.SplitterDistance = _defaultBranchMarkerSplitDistance; } - #endregion - - #region Context Menu - private void RightClickMenu_Opened(object sender, EventArgs e) { SetMarkersContextMenuItem.Enabled = @@ -1393,10 +1367,6 @@ namespace BizHawk.Client.EmuHawk BookMarkControl.Branch(); } - #endregion - - #region Help - private void TASEditorManualOnlineMenuItem_Click(object sender, EventArgs e) { System.Diagnostics.Process.Start("http://www.fceux.com/web/help/taseditor/"); @@ -1406,7 +1376,5 @@ namespace BizHawk.Client.EmuHawk { System.Diagnostics.Process.Start("http://tasvideos.org/forum/viewtopic.php?t=13505"); } - - #endregion } } diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index ffb00be3a2..97ce3595c5 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -102,8 +102,6 @@ namespace BizHawk.Client.EmuHawk public bool BindMarkersToInput { get; set; } } - #region Initializing - public TAStudio() { void SetImages() @@ -610,10 +608,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region Loading - private void ConvertCurrentMovieToTasproj() { MovieSession.ConvertToTasProj(); @@ -780,8 +774,6 @@ namespace BizHawk.Client.EmuHawk loadZone.PlaceZone(CurrentTasMovie); } - #endregion - private void TastudioPlayMode() { TasPlaybackBox.RecordingMode = false; @@ -1130,8 +1122,6 @@ namespace BizHawk.Client.EmuHawk } } - #region Dialog Events - private void Tastudio_Closing(object sender, FormClosingEventArgs e) { if (!_initialized) @@ -1199,8 +1189,6 @@ namespace BizHawk.Client.EmuHawk return base.ProcessCmdKey(ref msg, keyData); } - #endregion - private bool AutoAdjustInput() { var lagLog = CurrentTasMovie[Emulator.Frame - 1]; // Minus one because get frame is +1; diff --git a/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs b/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs index 4460aa49dd..20f6b7ea6b 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs @@ -99,10 +99,6 @@ namespace BizHawk.Client.EmuHawk KeyPadToolTips.RemoveAll(); } - #region Events - - #region Menu - private void ExitMenuItem_Click(object sender, EventArgs e) { Close(); @@ -127,10 +123,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region Dialog and Controls - private void EnterButton_Click(object sender, EventArgs e) => KeyClick("ENTER"); private void DashButton_Click(object sender, EventArgs e) => KeyClick("DASH"); private void OneButton_Click(object sender, EventArgs e) => KeyClick("1"); @@ -183,9 +175,5 @@ namespace BizHawk.Client.EmuHawk private void GraphButton_Click(object sender, EventArgs e) => KeyClick("GRAPH"); private void PeriodButton_Click(object sender, EventArgs e) => KeyClick("DOT"); private void ZeroButton_Click(object sender, EventArgs e) => KeyClick("0"); - - #endregion - - #endregion } } diff --git a/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs index ee44e8e394..5901f45f38 100644 --- a/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs +++ b/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs @@ -718,7 +718,6 @@ namespace BizHawk.Client.EmuHawk public bool IsAvailable() => IsAvailable(typeof(T)); // Note: Referencing these properties creates an instance of the tool and persists it. They should be referenced by type if this is not desired - #region Tools private T GetTool() where T : class, IToolForm, new() { @@ -750,10 +749,6 @@ namespace BizHawk.Client.EmuHawk public TAStudio TAStudio => GetTool(); - #endregion - - #region Specialized Tool Loading Logic - public void LoadRamWatch(bool loadDialog) { if (IsLoaded()) @@ -777,8 +772,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - public string GenerateDefaultCheatFilename() { var path = _config.PathEntries.CheatsAbsolutePath(Global.Game.System); diff --git a/src/BizHawk.Client.EmuHawk/tools/TraceLogger.cs b/src/BizHawk.Client.EmuHawk/tools/TraceLogger.cs index 955949be56..98ea08d88e 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TraceLogger.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TraceLogger.cs @@ -297,10 +297,6 @@ namespace BizHawk.Client.EmuHawk return result.IsOk() ? new FileInfo(sfd.FileName) : null; } - #region Events - - #region Menu Items - private void SaveLogMenuItem_Click(object sender, EventArgs e) { LogFile = GetFileFromUser(); @@ -380,10 +376,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region Dialog and ListView Events - private void LoggingEnabled_CheckedChanged(object sender, EventArgs e) { //Tracer.Enabled = LoggingEnabled.Checked; @@ -485,10 +477,6 @@ namespace BizHawk.Client.EmuHawk SetTracerBoxTitle(); } - #endregion - - #endregion - private void ClearMenuItem_Click(object sender, EventArgs e) { ClearList(); diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs index 15b9036455..dafc7ba906 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs @@ -182,8 +182,6 @@ namespace BizHawk.Client.EmuHawk } } - #region Menu - private void PadsSubMenu_DropDownOpened(object sender, EventArgs e) { StickyMenuItem.Checked = StickyPads; @@ -218,7 +216,5 @@ namespace BizHawk.Client.EmuHawk { ClearAlsoClearsAnalog ^= true; } - - #endregion } } diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs index e4453420a0..392c329446 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs @@ -30,8 +30,6 @@ namespace BizHawk.Client.EmuHawk InitializeComponent(); } - #region IVirtualPadControl Implementation - public void UpdateValues() { if (AnalogTrackBar.Value != (int)Global.InputManager.StickyXorAdapter.AxisValue(Name)) @@ -75,8 +73,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - public void Bump(int? x) { if (x.HasValue) diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadButton.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadButton.cs index ee952d79cc..66b6c4731b 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadButton.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadButton.cs @@ -23,8 +23,6 @@ namespace BizHawk.Client.EmuHawk ForeColor = SystemColors.ControlText; } - #region IVirtualPadControl Implementation - public void Clear() { if (!ReadOnly) @@ -75,8 +73,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - protected override void WndProc(ref Message m) { switch (m.Msg) diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.cs index 1977f78910..6774eea234 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.cs @@ -64,8 +64,6 @@ namespace BizHawk.Client.EmuHawk } - #region IVirtualPadControl - public void Clear() { } @@ -132,8 +130,6 @@ namespace BizHawk.Client.EmuHawk public bool ReadOnly { get; set; } - #endregion - private void lvDiscs_SelectedIndexChanged(object sender, EventArgs e) { // emergency measure: if no selection, set no disc diff --git a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadTargetScreen.cs b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadTargetScreen.cs index 4bcfb89a6a..d632377942 100644 --- a/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadTargetScreen.cs +++ b/src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadTargetScreen.cs @@ -32,8 +32,6 @@ namespace BizHawk.Client.EmuHawk YNumeric.Maximum = TargetPanel.Height - 1; } - #region IVirtualPadControl Implementation - public void UpdateValues() { TargetPanel.Refresh(); @@ -99,8 +97,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - // Size of the extra controls to the right / bottom of the target panel at 96 DPI private Size PaddingSize => new Size(0, 30); diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs index 7e82d2e411..7369749c8f 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs @@ -40,8 +40,6 @@ namespace BizHawk.Client.EmuHawk private bool _dropdownDontfire; // Used as a hack to get around lame .net dropdowns, there's no way to set their index without firing the SelectedIndexChanged event! - #region Initialize, Load, and Save - public RamSearch() { SetStyle(ControlStyles.AllPaintingInWmPaint, true); @@ -233,10 +231,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region Public - /// /// This should be called anytime the search list changes /// @@ -413,10 +407,6 @@ namespace BizHawk.Client.EmuHawk mi?.Invoke(radios[index], new object[] { new EventArgs() }); } - #endregion - - #region Private - private void ToggleSearchDependentToolBarItems() { DoSearchToolButton.Enabled = @@ -937,8 +927,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - public class RamSearchSettings : ToolDialogSettings { public RamSearchSettings() @@ -965,10 +953,6 @@ namespace BizHawk.Client.EmuHawk public RecentFiles RecentSearches { get; set; } } - #region Winform Events - - #region File - private void FileSubMenu_DropDownOpened(object sender, EventArgs e) { SaveMenuItem.Enabled = !string.IsNullOrWhiteSpace(_currentFileName); @@ -1040,10 +1024,6 @@ namespace BizHawk.Client.EmuHawk Close(); } - #endregion - - #region Settings - private void SettingsSubMenu_DropDownOpened(object sender, EventArgs e) { CheckMisalignedMenuItem.Checked = _settings.CheckMisAligned; @@ -1183,10 +1163,6 @@ namespace BizHawk.Client.EmuHawk _searches.SetEndian(_settings.BigEndian); } - #endregion - - #region Search - private void SearchSubMenu_DropDownOpened(object sender, EventArgs e) { ClearChangeCountsMenuItem.Enabled = _settings.IsDetailed(); @@ -1294,10 +1270,6 @@ namespace BizHawk.Client.EmuHawk UpdateUndoToolBarButtons(); } - #endregion - - #region Options - private void OptionsSubMenu_DropDownOpened(object sender, EventArgs e) { AutoloadDialogMenuItem.Checked = Settings.AutoLoad; @@ -1392,10 +1364,6 @@ namespace BizHawk.Client.EmuHawk SetColumns(); } - #endregion - - #region ContextMenu and Toolbar - private void ListViewContextMenu_Opening(object sender, CancelEventArgs e) { DoSearchContextMenuItem.Enabled = _searches.Count > 0; @@ -1509,10 +1477,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region Compare To Box - private void PreviousValueRadio_Click(object sender, EventArgs e) { SpecificValueBox.Enabled = false; @@ -1611,10 +1575,6 @@ namespace BizHawk.Client.EmuHawk SetCompareValue(((INumberBox)sender).ToRawInt()); } - #endregion - - #region Comparison Operator Box - private void EqualToRadio_Click(object sender, EventArgs e) { DifferentByBox.Enabled = false; @@ -1676,10 +1636,6 @@ namespace BizHawk.Client.EmuHawk WatchListView.Refresh(); } - #endregion - - #region ListView Events - private void WatchListView_KeyDown(object sender, KeyEventArgs e) { switch (e.KeyCode) @@ -1736,10 +1692,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region Dialog Events - private void NewRamSearch_Activated(object sender, EventArgs e) { WatchListView.Refresh(); @@ -1769,9 +1721,5 @@ namespace BizHawk.Client.EmuHawk { GenericDragEnter(sender, e); } - - #endregion - - #endregion } } diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs index b9b92114e2..9de453b2b7 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs @@ -99,8 +99,6 @@ namespace BizHawk.Client.EmuHawk public IEnumerable Watches => _watches.Where(x => !x.IsSeparator); - #region API - public void AddWatch(Watch watch) { _watches.Add(watch); @@ -234,10 +232,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region Private Methods - private void MinimalUpdate() { if ((!IsHandleCreated || IsDisposed) && !Config.DisplayRamWatch) @@ -637,12 +631,6 @@ namespace BizHawk.Client.EmuHawk } } - #endregion - - #region Winform Events - - #region File Menu - private void FileSubMenu_DropDownOpened(object sender, EventArgs e) { SaveMenuItem.Enabled = _watches.Changes; @@ -691,10 +679,6 @@ namespace BizHawk.Client.EmuHawk Close(); } - #endregion - - #region Watch - private void WatchesSubMenu_DropDownOpened(object sender, EventArgs e) { EditWatchMenuItem.Enabled = @@ -945,10 +929,6 @@ namespace BizHawk.Client.EmuHawk WatchListView.SelectAll(); } - #endregion - - #region Options - private void OptionsSubMenu_DropDownOpened(object sender, EventArgs e) { WatchesOnScreenMenuItem.Checked = Config.DisplayRamWatch; @@ -1029,10 +1009,6 @@ namespace BizHawk.Client.EmuHawk SetColumns(); } - #endregion - - #region Dialog, Context Menu, and ListView Events - private void RamWatch_Load(object sender, EventArgs e) { // Hack for previous config settings @@ -1230,9 +1206,6 @@ namespace BizHawk.Client.EmuHawk UpdateStatusBar(); } - #endregion - #endregion - // Stupid designer protected void DragEnterWrapper(object sender, DragEventArgs e) { diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs index c0eaa6d0dd..6c5ffbbc8a 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs @@ -200,8 +200,6 @@ namespace BizHawk.Client.EmuHawk BigEndianCheckBox.Checked = domain.EndianType == Emu.MemoryDomain.Endian.Big; } - #region Events - private void Cancel_Click(object sender, EventArgs e) { DialogResult = DialogResult.Cancel; @@ -323,7 +321,5 @@ namespace BizHawk.Client.EmuHawk { _changedDisplayType = true; } - - #endregion } } diff --git a/src/BizHawk.Common/BinaryQuickSerializer.cs b/src/BizHawk.Common/BinaryQuickSerializer.cs index 1121d97380..a7a88591a5 100644 --- a/src/BizHawk.Common/BinaryQuickSerializer.cs +++ b/src/BizHawk.Common/BinaryQuickSerializer.cs @@ -16,8 +16,6 @@ namespace BizHawk.Common // to do anything useful, passed targets should be [StructLayout.Sequential] or [StructLayout.Explicit] public class BinaryQuickSerializer { - #region methodinfo from a lambda expression. cool. - private static MethodInfo FromExpression(Expression e) { var caller = e as MethodCallExpression; @@ -34,10 +32,6 @@ namespace BizHawk.Common return FromExpression(f.Body); } - #endregion - - #region read and write handlers for individual fields - private static readonly Dictionary Readhandlers = new Dictionary(); private static readonly Dictionary Writehandlers = new Dictionary(); @@ -93,10 +87,6 @@ namespace BizHawk.Common AddW(r => r.Write(0UL)); } - #endregion - - #region dynamic code generation - private delegate void Reader(object target, BinaryReader r); private delegate void Writer(object target, BinaryWriter w); @@ -171,8 +161,6 @@ namespace BizHawk.Common }; } - #endregion - private static readonly IDictionary Serializers = new ConcurrentDictionary(); diff --git a/src/BizHawk.Common/Serializer.cs b/src/BizHawk.Common/Serializer.cs index a8732a4e0e..28cfd471f9 100644 --- a/src/BizHawk.Common/Serializer.cs +++ b/src/BizHawk.Common/Serializer.cs @@ -14,8 +14,6 @@ namespace BizHawk.Common { public Serializer() { } - #region Public - public bool IsReader => _isReader; public bool IsWriter => !IsReader; @@ -749,10 +747,6 @@ namespace BizHawk.Common } } - #endregion - - #region Privates - private BinaryReader _br; private BinaryWriter _bw; private TextReader _tr; @@ -1283,7 +1277,5 @@ namespace BizHawk.Common public string Name = ""; public readonly Dictionary Items = new Dictionary(); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Common/DSKIdentifier.cs b/src/BizHawk.Emulation.Common/DSKIdentifier.cs index ce7d818ce4..ec74893d35 100644 --- a/src/BizHawk.Emulation.Common/DSKIdentifier.cs +++ b/src/BizHawk.Emulation.Common/DSKIdentifier.cs @@ -363,8 +363,6 @@ namespace BizHawk.Emulation.Common } } - #region Internal Classes - public class Track { public string TrackIdent { get; set; } @@ -407,7 +405,5 @@ namespace BizHawk.Emulation.Common public int GetChecksum256() => SectorData.Sum(b => b % 256); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Arcades/MAME/LibMAME.cs b/src/BizHawk.Emulation.Cores/Arcades/MAME/LibMAME.cs index 554f90379d..3e44733124 100644 --- a/src/BizHawk.Emulation.Cores/Arcades/MAME/LibMAME.cs +++ b/src/BizHawk.Emulation.Cores/Arcades/MAME/LibMAME.cs @@ -18,8 +18,6 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME NONE, NOT_FOUND, ILLEGAL_REGISTRATIONS, INVALID_HEADER, READ_ERROR, WRITE_ERROR, DISABLED }; - #region C API - // main launcher [DllImport(dll, CallingConvention = cc)] public static extern uint mame_launch(int argc, string[] argv); @@ -30,10 +28,6 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME [DllImport(dll, CallingConvention = cc)] public static extern SaveError mame_load_buffer(byte[] buf, int length); - #endregion - - #region Lua API - // execute [DllImport(dll, CallingConvention = cc)] public static extern void mame_lua_execute(string code); @@ -58,10 +52,6 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME [DllImport(dll, CallingConvention = cc)] public static extern bool mame_lua_free_string(IntPtr pointer); - #endregion - - #region Callbacks - // periodic [UnmanagedFunctionPointer(CallingConvention.Cdecl)] public delegate void PeriodicCallbackDelegate(); @@ -85,7 +75,5 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME public delegate void LogCallbackDelegate(OutputChannel channel, int size, string data); [DllImport(dll, CallingConvention = cc)] public static extern void mame_set_log_callback(LogCallbackDelegate cb); - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs b/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs index 4bce49f0d6..3dddf94319 100644 --- a/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs +++ b/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs @@ -1,5 +1,3 @@ -#region Implementation docs - /* FrameAdvance() @@ -68,8 +66,6 @@ made that way to make the buffer persist actoss C API calls. */ -#endregion - using System; using System.Collections.Generic; using System.Linq; @@ -116,8 +112,6 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME } } - #region Utility - private static string MameGetString(string command) { IntPtr ptr = LibMAME.mame_lua_get_string(command, out var lengthInBytes); @@ -138,10 +132,6 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME return ret; } - #endregion - - #region Properties - public IEmulatorServiceProvider ServiceProvider { get; } public ControllerDefinition ControllerDefinition => MAMEController; public string SystemId => "MAME"; @@ -163,10 +153,6 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME [FeatureNotImplemented] public IInputCallbackSystem InputCallbacks => throw new NotImplementedException(); - #endregion - - #region Fields - private SyncSettings _syncSettings; private Thread _mameThread; private ManualResetEvent _mameStartupComplete = new ManualResetEvent(false); @@ -197,10 +183,6 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME private LibMAME.BootCallbackDelegate _bootCallback; private LibMAME.LogCallbackDelegate _logCallback; - #endregion - - #region Launchers - private void AsyncLaunchMAME() { _mameThread.Start(); @@ -250,10 +232,6 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME LibMAME.mame_launch(args.Length, args); } - #endregion - - #region IEmulator - public bool FrameAdvance(IController controller, bool render, bool renderSound = true) { if (_exiting) @@ -300,10 +278,6 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME _hawkSaveBuffer = new byte[0]; } - #endregion - - #region IStatable - public void SaveStateBinary(BinaryWriter writer) { writer.Write(_mameSaveBuffer.Length); @@ -364,10 +338,6 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME return _hawkSaveBuffer; } - #endregion - - #region ISettable - public object GetSettings() => null; public PutSettingsDirtyBits PutSettings(object o) => PutSettingsDirtyBits.None; @@ -398,10 +368,6 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME public ExpandoObject ExpandoSettings { get; set; } } - #endregion - - #region ISoundProvider - public void SetSyncMode(SyncSoundMode mode) { if (mode == SyncSoundMode.Async) @@ -471,10 +437,6 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME _audioSamples.Clear(); } - #endregion - - #region IMemoryDomains - private byte _peek(long addr, int firstOffset, long size) { if (addr < 0 || addr >= size) @@ -576,10 +538,6 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME (ServiceProvider as BasicServiceProvider).Register(_memoryDomains); } - #endregion - - #region Updaters - private void UpdateFramerate() { VsyncNumerator = 1000000000; @@ -646,10 +604,6 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME $"MAMEHawk is { version }"); } - #endregion - - #region Callbacks - private void MAMEPeriodicCallback() { if (_exiting) @@ -757,10 +711,6 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME } } - #endregion - - #region Input - public static ControllerDefinition MAMEController = new ControllerDefinition { Name = "MAME Controller", @@ -800,10 +750,6 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME } } - #endregion - - #region Lua Commands - private class MAMELuaCommand { // commands @@ -861,7 +807,5 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME "table.sort(final) " + "return table.concat(final)"; } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/CPUs/68000/OpcodeTable.cs b/src/BizHawk.Emulation.Cores/CPUs/68000/OpcodeTable.cs index 8cdbbf1c68..7512d95cad 100644 --- a/src/BizHawk.Emulation.Cores/CPUs/68000/OpcodeTable.cs +++ b/src/BizHawk.Emulation.Cores/CPUs/68000/OpcodeTable.cs @@ -163,8 +163,6 @@ namespace BizHawk.Emulation.Cores.Components.M68000 return res; } - #region Tables - static readonly string[] Size2_0 = { "01", "11", "10" }; static readonly string[] Size2_1 = { "00", "01", "10" }; static readonly string[] Size1 = { "0", "1" }; @@ -347,7 +345,5 @@ namespace BizHawk.Emulation.Cores.Components.M68000 "1110", // GT Greater Than (signed) "1111" // LE Less or Equal (signed) }; - - #endregion } } \ No newline at end of file diff --git a/src/BizHawk.Emulation.Cores/CPUs/Z80A/NewDisassembler.cs b/src/BizHawk.Emulation.Cores/CPUs/Z80A/NewDisassembler.cs index 8903621584..9a2e6a45c1 100644 --- a/src/BizHawk.Emulation.Cores/CPUs/Z80A/NewDisassembler.cs +++ b/src/BizHawk.Emulation.Cores/CPUs/Z80A/NewDisassembler.cs @@ -431,8 +431,6 @@ namespace BizHawk.Emulation.Cores.Components.Z80A return temp; } - #region IDisassemblable - public string Cpu { get => "Z80"; @@ -451,7 +449,5 @@ namespace BizHawk.Emulation.Cores.Components.Z80A string ret = Disassemble((ushort)addr, a => m.PeekByte(a), out length); return ret; } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.Messaging.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.Messaging.cs index 0f18c8a2fc..7308954caa 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.Messaging.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.Messaging.cs @@ -43,8 +43,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC CoreComm.Notify(sb.ToString()); } - #region Input Message Methods - /// /// Called when certain input presses are detected /// @@ -55,10 +53,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC SendMessage(sb.ToString().TrimEnd('\n'), MessageCategory.Input); } - #endregion - - #region DiskDevice Message Methods - /// /// Disk message that is fired on core init /// @@ -146,10 +140,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } } - #endregion - - #region TapeDevice Message Methods - /// /// Tape message that is fired on core init /// @@ -458,8 +448,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC SendMessage(sb.ToString().TrimEnd('\n'), MessageCategory.Tape); } - #endregion - /// /// Checks whether message category is allowed to be sent /// diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.cs index 2092720394..32a59ad375 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.cs @@ -185,20 +185,12 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } - #region IRegionable - public DisplayType Region => DisplayType.PAL; - #endregion - - #region IDriveLight - public bool DriveLightEnabled => true; public bool DriveLightOn => (_machine?.TapeDevice != null && _machine.TapeDevice.TapeIsPlaying) || (_machine?.UPDDiskDevice != null && _machine.UPDDiskDevice.DriveLight); - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Datacorder/DatacorderDevice.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Datacorder/DatacorderDevice.cs index 450fa39c46..2132a36674 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Datacorder/DatacorderDevice.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Datacorder/DatacorderDevice.cs @@ -12,8 +12,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// public class DatacorderDevice { - #region Construction - private CPCBase _machine; private Z80A _cpu => _machine.CPU; private IBeeperDevice _buzzer => _machine.TapeBuzzer; @@ -34,10 +32,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC _machine = machine; } - #endregion - - #region State Information - /// /// Signs whether the tape motor is running /// @@ -142,20 +136,12 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// private bool currentState = false; - #endregion - - #region Datacorder Device Settings - /// /// Signs whether the device should autodetect when the Z80 has entered into /// 'load' mode and auto-play the tape if neccesary /// private bool _autoPlay; - #endregion - - #region Emulator - /// /// Should be fired at the end of every frame /// Primary purpose is to detect tape traps and manage auto play (if/when this is ever implemented) @@ -170,10 +156,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC //_buzzer.ProcessPulseValue(currentState); } - #endregion - - #region Tape Controls - /// /// Starts the tape playing from the beginning of the current block /// @@ -380,10 +362,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC RTZ(); } - #endregion - - #region Tape Device Methods - /// /// Is called every cpu cycle but runs every 50 t-states /// This enables the tape devices to play out even if the spectrum itself is not @@ -642,11 +620,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC currentState = !currentState; } - #endregion - - #region TapeMonitor - - public void AutoStopTape() { @@ -743,10 +716,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } */ - #endregion - - #region IPortIODevice - /// /// Mask constants /// @@ -800,10 +769,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC */ } - #endregion - - #region State Serialization - /// /// BizHawk state serialization /// @@ -820,7 +785,5 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC ser.Sync(nameof(tapeMotor), ref tapeMotor); ser.EndSection(); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/CHRN.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/CHRN.cs index 76d7ae23be..228e5df82e 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/CHRN.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/CHRN.cs @@ -56,8 +56,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// public int DataID { get; set; } - #region Helper Methods - /// /// Missing Address Mark (Sector_ID or DAM not found) /// @@ -174,7 +172,5 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC else { NECUPD765.UnSetBit(6, ref _flag2); } } } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.Definitions.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.Definitions.cs index a560164411..aaef0d92b6 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.Definitions.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.Definitions.cs @@ -6,18 +6,14 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Definitions /// - #region Attribution /* Implementation based on the information contained here: http://www.cpcwiki.eu/index.php/765_FDC and here: http://www.cpcwiki.eu/imgs/f/f3/UPD765_Datasheet_OCRed.pdf */ - #endregion public partial class NECUPD765 { - #region Enums - /// /// Defines the current phase of the controller /// @@ -307,10 +303,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC Decrement } - #endregion - - #region Constants - // Command Instruction Constants // Designates the default postitions within the cmdbuffer array @@ -683,10 +675,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC public const int SEEK_ABNORMALTERM = 5; public const int SEEK_DRIVENOTREADY = 6; - #endregion - - #region Classes & Structs - /// /// Class that holds information about a specific command /// @@ -819,8 +807,5 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC ser.EndSection(); } } - - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDC.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDC.cs index a68d84dec6..dfa8e97c25 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDC.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDC.cs @@ -8,18 +8,14 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// FDC State and Methods /// - #region Attribution /* Implementation based on the information contained here: http://www.cpcwiki.eu/index.php/765_FDC and here: http://www.cpcwiki.eu/imgs/f/f3/UPD765_Datasheet_OCRed.pdf */ - #endregion public partial class NECUPD765 { - #region Controller State - /// /// Signs whether the drive is active /// @@ -275,12 +271,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC */ private byte Status3; - #endregion - - #region UPD Internal Functions - - #region READ Commands - /// /// Read Data /// COMMAND: 8 parameter bytes @@ -1263,10 +1253,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } } - #endregion - - #region WRITE Commands - /// /// Write Data /// COMMAND: 8 parameter bytes @@ -1741,10 +1727,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } } - #endregion - - #region SCAN Commands - /// /// Scan Equal /// COMMAND: 8 parameter bytes @@ -1853,10 +1835,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } } - #endregion - - #region OTHER Commands - /// /// Specify /// COMMAND: 2 parameter bytes @@ -2326,12 +2304,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } } - #endregion - - #endregion - - #region Controller Methods - /// /// Called when a status register read is required /// This can be called at any time @@ -2810,7 +2782,5 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC CommCounter = 0; ResCounter = 0; } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDD.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDD.cs index a1ec95fdba..8ba0235604 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDD.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDD.cs @@ -8,18 +8,14 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Floppy drive related stuff /// - #region Attribution /* Implementation based on the information contained here: http://www.cpcwiki.eu/index.php/765_FDC and here: http://www.cpcwiki.eu/imgs/f/f3/UPD765_Datasheet_OCRed.pdf */ - #endregion public partial class NECUPD765 : IFDDHost { - #region Drive State - /// /// FDD Flag - motor on/off /// @@ -50,10 +46,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// private DriveState[] DriveStates = new DriveState[4]; - #endregion - - #region FDD Methods - /// /// Initialization / reset of the floppy drive subsystem /// @@ -145,10 +137,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC return sector; } - #endregion - - #region IFDDHost - // IFDDHost methods that fall through to the currently active drive /// @@ -180,17 +168,11 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC public FloppyDisk Disk { get; set; } - #endregion - - #region Drive Status Class - /// /// Holds specfic state information about a drive /// private class DriveState : IFDDHost { - #region State - /// /// The drive ID from an FDC perspective /// @@ -304,10 +286,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// private NECUPD765 FDC; - #endregion - - #region Lookups - /// /// TRUE if we are on track 0 /// @@ -320,9 +298,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } } - #endregion - - #region Public Methods /* /// /// Moves the head across the disk cylinders @@ -763,20 +738,12 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } */ - #endregion - - #region Construction - public DriveState(int driveID, NECUPD765 fdc) { ID = driveID; FDC = fdc; } - #endregion - - #region IFDDHost - /// /// Parses a new disk image and loads it into this floppy drive /// @@ -837,10 +804,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } } - #endregion - - #region StateSerialization - public void SyncState(Serializer ser) { ser.Sync(nameof(ID), ref ID); @@ -866,10 +829,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC //ser.SyncEnum(nameof(SeekState), ref SeekState); //ser.SyncEnum(nameof(SeekIntState), ref SeekIntState); } - - #endregion } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.IPortIODevice.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.IPortIODevice.cs index 5f6e87f99a..5af3d77e2b 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.IPortIODevice.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.IPortIODevice.cs @@ -8,18 +8,14 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// IPortIODevice /// - #region Attribution /* Implementation based on the information contained here: http://www.cpcwiki.eu/index.php/765_FDC and here: http://www.cpcwiki.eu/imgs/f/f3/UPD765_Datasheet_OCRed.pdf */ - #endregion public partial class NECUPD765 : IPortIODevice { - #region Dev Logging - public string outputfile = @"D:\Dropbox\Dropbox\_Programming\TASVideos\BizHawk\output\zxhawkio-" + DateTime.Now.ToString("yyyyMMdd_HHmmss") + ".csv"; public string outputString = "STATUS,WRITE,READ,CODE,MT,MF,SK,CMDCNT,RESCNT,EXECCNT,EXECLEN\r\n"; public bool writeDebug = false; @@ -69,8 +65,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC dLog.Add(sb.ToString()); } - #endregion - public void ReadStatus(ref int data) { // read main status register diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.Timing.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.Timing.cs index c6fb76300b..29555c75f9 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.Timing.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.Timing.cs @@ -4,14 +4,12 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Timimng /// - #region Attribution /* Implementation based on the information contained here: http://www.cpcwiki.eu/index.php/765_FDC and here: http://www.cpcwiki.eu/imgs/f/f3/UPD765_Datasheet_OCRed.pdf */ - #endregion public partial class NECUPD765 { /// diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.cs index b876db870c..96dfd86b3c 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.cs @@ -6,27 +6,19 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// The NEC floppy disk controller (and floppy drive) found in the +3 /// - #region Attribution /* Implementation based on the information contained here: http://www.cpcwiki.eu/index.php/765_FDC and here: http://www.cpcwiki.eu/imgs/f/f3/UPD765_Datasheet_OCRed.pdf */ - #endregion public partial class NECUPD765 { - #region Devices - /// /// The emulated spectrum machine /// private CPCBase _machine; - #endregion - - #region Construction & Initialization - /// /// Main constructor /// @@ -148,10 +140,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC }; } - #endregion - - #region State Serialization - public void SyncState(Serializer ser) { void SyncFDDState(Serializer ser1) @@ -242,7 +230,5 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC SyncTimingState(ser); ser.EndSection(); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPS765.Static.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPS765.Static.cs index 9abd27e6a5..44cbe24081 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPS765.Static.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPS765.Static.cs @@ -5,14 +5,12 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Static helper methods /// - #region Attribution /* Implementation based on the information contained here: http://www.cpcwiki.eu/index.php/765_FDC and here: http://www.cpcwiki.eu/imgs/f/f3/UPD765_Datasheet_OCRed.pdf */ - #endregion public partial class NECUPD765 { /// diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/AmstradGateArray.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/AmstradGateArray.cs index f12028334b..bc85e00f2d 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/AmstradGateArray.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/AmstradGateArray.cs @@ -16,8 +16,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// public class AmstradGateArray : IPortIODevice, IVideoProvider { - #region Devices - private CPCBase _machine; private Z80A CPU => _machine.CPU; private CRCT_6845 CRCT => _machine.CRCT; @@ -30,10 +28,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC private GateArrayType ChipType; - #endregion - - #region Palettes - /// /// The standard CPC Pallete (ordered by firmware #) /// http://www.cpcwiki.eu/index.php/CPC_Palette @@ -109,10 +103,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC Colors.ARGB(0x80, 0x80, 0xFF), // Pastel Blue }; - #endregion - - #region Clocks and Timing - /// /// The Gate Array Clock Speed /// @@ -143,10 +133,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// public int GAFrameLength = 319488; - #endregion - - #region Construction - public AmstradGateArray(CPCBase machine, GateArrayType chipType) { _machine = machine; @@ -164,10 +150,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC CalculateNextScreenMemory(); } - #endregion - - #region Registers and Internal State - /// /// PENR (register 0) - Pen Selection /// This register can be used to select one of the 17 color-registers (pen 0 to 15 or the border). @@ -427,10 +409,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// private byte VideoByte2; - #endregion - - #region Clock Business - /// /// Called every CPU cycle /// In reality the GA is clocked at 16Mhz (4 times the frequency of the CPU) @@ -549,10 +527,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } } - #endregion - - #region Frame & Interrupt Handling - /// /// The CRCT builds the picture in a strange way, so that the top left of the display area is the first pixel from /// video RAM. The borders come either side of the HSYNC and VSYNCs later on: @@ -661,10 +635,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } } - #endregion - - #region Rendering Business - /// /// Builds up current scanline character information /// Ther GA modifies HSYNC and VSYNC signals before they are sent to the monitor @@ -923,10 +893,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC }); } - #endregion - - #region Public Methods - /// /// Called when the Z80 acknowledges an interrupt /// @@ -973,10 +939,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC slCounter = 0; } - #endregion - - #region IVideoProvider - public int[] ScreenBuffer; private int _virtualWidth; @@ -1178,10 +1140,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC set => _borderType = value; } - #endregion - - #region IPortIODevice - /// /// Device responds to an IN instruction /// @@ -1237,10 +1195,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC return true; } - #endregion - - #region Serialization - public void SyncState(Serializer ser) { ser.BeginSection("GateArray"); @@ -1275,10 +1229,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC ser.EndSection(); } - #endregion - - #region Enums, Classes & Lookups - /// /// Represents a single scanline (in characters) /// @@ -1379,7 +1329,5 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// Amstrad40489, } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRCT_6845.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRCT_6845.cs index 3b6b17370e..1a9ba61bad 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRCT_6845.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRCT_6845.cs @@ -10,15 +10,9 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// public class CRCT_6845 : IPortIODevice { - #region Devices - private CPCBase _machine { get; set; } private CRCTType ChipType; - #endregion - - #region CallBacks - public delegate void CallBack(); private CallBack HSYNC_Callbacks; @@ -34,10 +28,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC HSYNC_Callbacks += hCall; } - #endregion - - #region Construction - public CRCT_6845(CRCTType chipType, CPCBase machine) { _machine = machine; @@ -48,10 +38,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC private const int WRITE = 0; private const int READ = 1; - #endregion - - #region Public Lines - /// /// Denotes that HSYNC is active /// @@ -84,10 +70,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// public int VLC; - #endregion - - #region Public Lookups - /* * These are not accessible directlyon real hardware * It just makes screen generation easier to have these accessbile from the gate array @@ -227,10 +209,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// public int LatchedScreenWidthBytes; - #endregion - - #region Internal Registers and State - /* Index Register Name Range CPC Setting Notes 0 Horizontal Total 00000000 63 Width of the screen, in characters. Should always be 63 (64 characters). 1 character == 1μs. @@ -430,10 +408,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// private int VSYNCCounter; - #endregion - - #region Public Methods - public void ClockCycle() { CheckHSYNCOff(); @@ -796,10 +770,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC VLC = 0; } - #endregion - - #region Internal Methods - /// /// Selects a register /// @@ -1018,10 +988,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } } - #endregion - - #region PortIODevice - /* #BCXX %x0xxxx00 xxxxxxxx 6845 CRTC Index - Write #BDXX %x0xxxx01 xxxxxxxx 6845 CRTC Data Out - Write @@ -1094,10 +1060,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC return accessed; } - #endregion - - #region Serialization - public void SyncState(Serializer ser) { ser.BeginSection("CRTC"); @@ -1122,10 +1084,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC ser.EndSection(); } - #endregion - - #region Enums - /// /// The types of CRCT chip found in the CPC range /// @@ -1138,7 +1096,5 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC AMS40489 = 3, AMS40226 = 4 } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRTC6845.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRTC6845.cs index 5b1a82041e..20bbc6d21b 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRTC6845.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRTC6845.cs @@ -42,8 +42,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// private CRTCType ChipType; - #region Construction - /// /// The only constructor /// @@ -52,10 +50,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC ChipType = type; } - #endregion - - #region Input Lines - /// /// The ClK isaTTUMOS-compatible input used to synchronize all CRT' functions except for the processor interface. /// An external dot counter is used to derive this signal which is usually the character rate in an alphanumeric CRT. @@ -85,10 +79,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC private bool _LPSTB; - #endregion - - #region Output Lines - // State output lines /// /// This TTL compatible output is an active high signal which drives the monitor directly or is fed to Video Processing Logic for composite generation. @@ -199,10 +189,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } } - #endregion - - #region Internal State - /// /// Character pos address (0 index). /// Feeds the MA lines @@ -291,10 +277,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// private int StartAddressLatch; - #endregion - - #region Internal Registers - /// /// The currently selected register /// @@ -324,10 +306,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// private byte AsicStatusRegister2; - #endregion - - #region Databus Interface - /* RegIdx Register Name Type 0 1 2 3 4 @@ -430,10 +408,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC return accessed; } - #endregion - - #region Type-Specific Logic - /// /// Runs a clock cycle for the current chip type /// CPC will call this every 1Mhz @@ -679,12 +653,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } } - #endregion - - #region Type-Specific Internal Methods - - #region Sync Widths - /// /// Current programmed HSYNC width for Type 0 (HD6845S & UM6845) & Type 1 (UM6845R) /// @@ -731,10 +699,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // Vertical Sync is fixed at 16 lines. private int VSYNCWidth_Type1_2 => 16; - #endregion - - #region Register Access - /// /// Read Register (HD6845S & UM6845) /// @@ -1129,12 +1093,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC return false; } - #endregion - - #endregion - - #region Clock Cycles - /* persistent switch signals */ bool s_VS; bool s_HDISP; @@ -2147,10 +2105,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } - #endregion - - #region Enums & Constants - /* Horizontal Timing Register Constants */ /// /// This 8 bit write-only register determines the horizontal frequency of HS. @@ -2283,10 +2237,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC TransparentMemory } - #endregion - - #region Serialization - public void SyncState(Serializer ser) { ser.BeginSection("CRCT"); @@ -2324,7 +2274,5 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC //ser.Sync(nameof(VS), ref VS); ser.EndSection(); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRTDevice.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRTDevice.cs index c2fbc88dcb..fd350064c3 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRTDevice.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRTDevice.cs @@ -10,16 +10,10 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// public class CRTDevice : IVideoProvider { - #region Devices - private CPCBase _machine; private CRCT_6845 CRCT => _machine.CRCT; private AmstradGateArray GateArray => _machine.GateArray; - #endregion - - #region Construction - public CRTDevice(CPCBase machine) { _machine = machine; @@ -29,10 +23,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC CRCT.AttachVSYNCCallback(OnVSYNC); } - #endregion - - #region Palettes - /// /// The standard CPC Pallete (ordered by firmware #) /// http://www.cpcwiki.eu/index.php/CPC_Palette @@ -109,10 +99,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC }; - #endregion - - #region Public Stuff - /// /// The current scanline that is being added to /// (will be processed and committed to the screen buffer every HSYNC) @@ -170,10 +156,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } - #endregion - - #region IVideoProvider - /// /// Video output buffer /// @@ -232,10 +214,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC protected int[] croppedBuffer; - #endregion - - #region Serialization - public void SyncState(Serializer ser) { ser.BeginSection("CRT"); @@ -247,8 +225,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC ser.Sync(nameof(ScanlineCounter), ref ScanlineCounter); ser.EndSection(); } - - #endregion } /// diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/PPI/PPI_8255.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/PPI/PPI_8255.cs index 7570ce10c8..6a2b95aa02 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/PPI/PPI_8255.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/PPI/PPI_8255.cs @@ -11,8 +11,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// public class PPI_8255 : IPortIODevice { - #region Devices - private CPCBase _machine; private CRCT_6845 CRTC => _machine.CRCT; private AmstradGateArray GateArray => _machine.GateArray; @@ -20,20 +18,12 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC private DatacorderDevice Tape => _machine.TapeDevice; private IKeyboard Keyboard => _machine.KeyboardDevice; - #endregion - - #region Construction - public PPI_8255(CPCBase machine) { _machine = machine; Reset(); } - #endregion - - #region Implementation - /// /// BDIR Line connected to PSG /// @@ -75,8 +65,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// private PortDirection DirPortCU => Regs[PORT_CONTROL].Bit(3) ? PortDirection.Input : PortDirection.Output; - #region OUT Methods - /// /// Writes to Port A /// @@ -187,10 +175,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } } - #endregion - - #region IN Methods - /// /// Reads from Port A /// @@ -296,12 +280,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } - #endregion - - #endregion - - #region Reset - public void Reset() { for (int i = 0; i < 3; i++) @@ -312,10 +290,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC Regs[3] = 0xff; } - #endregion - - #region IPortIODevice - /* #F4XX %xxxx0x00 xxxxxxxx 8255 PIO Port A (PSG Data) Read Write #F5XX %xxxx0x01 xxxxxxxx 8255 PIO Port B (Vsync,PrnBusy,Tape,etc.) Read - @@ -419,18 +393,12 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC return true; } - #endregion - - #region Serialization - public void SyncState(Serializer ser) { ser.BeginSection("PPI"); ser.Sync(nameof(Regs), ref Regs, false); ser.EndSection(); } - - #endregion } public enum PortDirection diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/SoundOutput/AY38912.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/SoundOutput/AY38912.cs index d07bbd185d..759bcee18b 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/SoundOutput/AY38912.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/SoundOutput/AY38912.cs @@ -13,8 +13,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// public class AY38912 : IPSG { - #region Device Fields - /// /// The emulated machine (passed in via constructor) /// @@ -31,10 +29,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC //private int _clockCyclesPerFrame; //private int _cyclesPerSample; - #endregion - - #region Construction & Initialization - /// /// Main constructor /// @@ -58,12 +52,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC Reset(); } - #endregion - - #region AY Implementation - - #region Public Properties - /// /// AY mixer panning configuration /// @@ -124,10 +112,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC set => _activeRegister = (byte)value; } - #endregion - - #region Public Methods - /// /// Resets the PSG /// @@ -357,10 +341,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC BufferUpdate(frameCycle); } - #endregion - - #region Private Fields - /// /// Register indicies /// @@ -568,10 +548,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC 0x905E,0x905E,0xB550,0xB550,0xD7A0,0xD7A0,0xFFFF,0xFFFF, }; - #endregion - - #region Private Methods - /// /// Forces an update of the volume tables /// @@ -726,12 +702,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC _lastStateRendered = cycle; } - #endregion - - #endregion - - #region ISoundProvider - public bool CanProvideAsync => false; public SyncSoundMode SyncMode => SyncSoundMode.Sync; @@ -798,10 +768,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC */ } - #endregion - - #region State Serialization - public int nullDump = 0; /// @@ -866,7 +832,5 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC ser.EndSection(); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/SoundOutput/Beeper.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/SoundOutput/Beeper.cs index db6dbda9f0..6ec1c22067 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/SoundOutput/Beeper.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/SoundOutput/Beeper.cs @@ -12,8 +12,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// public class Beeper : ISoundProvider, IBeeperDevice { - #region Fields and Properties - /// /// Sample Rate /// This usually has to be 44100 for ISoundProvider @@ -72,10 +70,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// private readonly BlipBuffer blip = new BlipBuffer(883); - #endregion - - #region Private Methods - /// /// Takes an int 0-100 and returns the relevant short volume to output /// @@ -101,10 +95,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC return shortvol / increment; } - #endregion - - #region Construction & Initialisation - public Beeper(CPCBase machine) { _machine = machine; @@ -120,10 +110,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC _tStatesPerFrame = tStatesPerFrame; } - #endregion - - #region IBeeperDevice - /// /// Processes an incoming pulse value and adds it to the blipbuffer /// @@ -151,10 +137,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC LastPulse = pulse; } - #endregion - - #region ISoundProvider - public bool CanProvideAsync => false; public SyncSoundMode SyncMode => SyncSoundMode.Sync; @@ -187,10 +169,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } } - #endregion - - #region State Serialization - public void SyncState(Serializer ser) { ser.BeginSection("Buzzer"); @@ -200,7 +178,5 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC ser.Sync(nameof(LastPulseTState), ref LastPulseTState); ser.EndSection(); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC464/CPC464.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC464/CPC464.cs index 98f100afbb..79d443bd41 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC464/CPC464.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC464/CPC464.cs @@ -8,8 +8,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// public partial class CPC464 : CPCBase { - #region Construction - /// /// Main constructor /// @@ -39,7 +37,5 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC InitializeMedia(files); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.cs index 2128e34ca6..f00c49f81e 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.cs @@ -8,8 +8,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// public partial class CPC6128 : CPCBase { - #region Construction - /// /// Main constructor /// @@ -42,7 +40,5 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC InitializeMedia(files); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Memory.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Memory.cs index 1485ab1e56..80cb7bcd9f 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Memory.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Memory.cs @@ -6,8 +6,6 @@ /// public abstract partial class CPCBase { - #region Memory Fields & Properties - /* ROM Banks */ /// /// Lower: OS ROM @@ -60,10 +58,6 @@ /// public int RAM64KBank; - #endregion - - #region Memory Related Methods - /// /// Simulates reading from the bus /// Paging should be handled here @@ -137,7 +131,5 @@ return result; } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.cs index 0e9d9427d9..0b29565118 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.cs @@ -9,8 +9,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// public abstract partial class CPCBase { - #region Devices - /// /// The calling ZXSpectrum class (piped in via constructor) /// @@ -77,10 +75,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// public int FrameLength; - #endregion - - #region Emulator State - /// /// Signs whether the frame has ended /// @@ -117,10 +111,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC public bool _render; public bool _renderSound; - #endregion - - #region Constants - /// /// Mask constants & misc /// @@ -130,10 +120,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC protected const int TAPE_BIT = 0x40; protected const int AY_SAMPLE_RATE = 16; - #endregion - - #region Emulation Loop - /// /// Executes a single frame /// @@ -199,10 +185,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC GateArray.FrameClock = 0; } - #endregion - - #region Reset Functions - /// /// Hard reset of the emulated machine /// @@ -311,10 +293,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC */ } - #endregion - - #region IStatable - public void SyncState(Serializer ser) { ser.BeginSection("CPCMachine"); @@ -363,8 +341,5 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC ser.EndSection(); } - - #endregion - } } diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/GateArrayBase.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/GateArrayBase.cs index b1bf9676bd..454bfaac69 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/GateArrayBase.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/GateArrayBase.cs @@ -16,17 +16,11 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC public int Z80ClockSpeed = 4000000; public int FrameLength = 79872; - #region Devices - private CPCBase _machine; private Z80A CPU => _machine.CPU; private CRCT_6845 CRCT => _machine.CRCT; private IPSG PSG => _machine.AYDevice; - #endregion - - #region Constants - /// /// CRTC Register constants /// @@ -49,10 +43,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC public const int LPEN_ADDR_H = 16; public const int LPEN_ADDR_L = 17; - #endregion - - #region Palletes - /// /// The standard CPC Pallete (ordered by firmware #) /// http://www.cpcwiki.eu/index.php/CPC_Palette @@ -128,10 +118,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC Colors.ARGB(0x80, 0x80, 0xFF), // Pastel Blue }; - #endregion - - #region Construction - public GateArrayBase(CPCBase machine) { _machine = machine; @@ -204,10 +190,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } } - #endregion - - #region State - private int[] PenColours; private int CurrentPen; private int ScreenMode; @@ -225,10 +207,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC public bool WaitLine; - #endregion - - #region Clock Operations - /// /// The gatearray runs on a 16Mhz clock /// (for the purposes of emulation, we will use a 4Mhz clock) @@ -265,10 +243,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } } - #endregion - - #region Internal Methods - /// /// Selects the pen /// @@ -363,13 +337,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } - - - - #endregion - - #region Reset - public void Reset() { CurrentPen = 0; @@ -380,10 +347,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC //VSYNCDelyCnt = 0; } - #endregion - - #region IPortIODevice - /// /// Device responds to an IN instruction /// @@ -434,10 +397,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC return true; } - #endregion - - #region IVideoProvider - /// /// Video output buffer /// @@ -512,7 +471,5 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } protected int[] croppedBuffer; - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/MediaConverter.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/MediaConverter.cs index 39ae1db445..894930e5a2 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/MediaConverter.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/MediaConverter.cs @@ -51,8 +51,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC "Check type operation is not implemented for this converter"); } - #region Static Tools - /// /// Converts an int32 value into a byte array /// @@ -117,7 +115,5 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC DeflateStream ds = new DeflateStream(stream, CompressionMode.Decompress, false); ds.Read(destBuffer, 0, destBuffer.Length); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs index 401e97ff56..5e1265d151 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs @@ -41,8 +41,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// private List> _loopCounter = new List>(); - #region Construction - private DatacorderDevice _datacorder; public CdtConverter(DatacorderDevice _tapeDevice) @@ -50,8 +48,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC _datacorder = _tapeDevice; } - #endregion - /// /// CDT format is essentially exactly the same as the TZX format /// However all timings are based on spectrum timings (3.5Mhz) @@ -328,9 +324,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } } - #region TZX Block Processors - - #region ID 10 - Standard Speed Data Block /* length: [02,03]+04 Offset Value Type Description 0x00 - WORD Pause after this block (ms.) {1000} @@ -374,9 +367,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // generate PAUSE block CreatePauseBlock(_datacorder.DataBlocks.Last()); } - #endregion - #region ID 11 - Turbo Speed Data Block /* length: [0F,10,11]+12 Offset Value Type Description 0x00 - WORD Length of PILOT pulse {2168} @@ -436,9 +427,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // generate PAUSE block CreatePauseBlock(_datacorder.DataBlocks.Last()); } - #endregion - #region ID 12 - Pure Tone /* length: 04 Offset Value Type Description 0x00 - WORD Length of one pulse in T-states @@ -476,9 +465,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // advance the position to the next block _position += blockLen; } - #endregion - #region ID 13 - Pulse sequence /* length: [00]*02+01 Offset Value Type Description 0x00 N BYTE Number of pulses @@ -513,9 +500,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // add the block _datacorder.DataBlocks.Add(t); } - #endregion - #region ID 14 - Pure Data Block /* length: [07,08,09]+0A Offset Value Type Description 0x00 - WORD Length of ZERO bit pulse @@ -566,9 +551,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // generate PAUSE block CreatePauseBlock(_datacorder.DataBlocks.Last()); } - #endregion - #region ID 15 - Direct Recording /* length: [05,06,07]+08 Offset Value Type Description 0x00 - WORD Number of T-states per sample (bit of data) @@ -674,9 +657,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // generate PAUSE block CreatePauseBlock(_datacorder.DataBlocks.Last()); } - #endregion - #region ID 18 - CSW Recording /* length: [00,01,02,03]+04 Offset Value Type Description 0x00 10+N DWORD Block length (without these four bytes) @@ -747,9 +728,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // generate PAUSE block CreatePauseBlock(_datacorder.DataBlocks.Last()); } - #endregion - #region ID 19 - Generalized Data Block /* length: [00,01,02,03]+04 Offset Value Type Description 0x00 - DWORD Block length (without these four bytes) @@ -845,9 +824,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // advance the position to the next block _position += blockLen; } - #endregion - #region ID 20 - Pause (silence) or 'Stop the Tape' command /* length: 02 Offset Value Type Description 0x00 - WORD Pause duration (ms.) @@ -904,9 +881,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC CreatePauseBlock(_datacorder.DataBlocks.Last()); } - #endregion - #region ID 21 - Group start /* length: [00]+01 Offset Value Type Description 0x00 L BYTE Length of the group name string @@ -940,9 +915,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // advance to next block _position += nameLength; } - #endregion - #region ID 22 - Group end /* length: 00 This indicates the end of a group. This block has no body. */ @@ -960,9 +933,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // add to tape _datacorder.DataBlocks.Add(t); } - #endregion - #region ID 23 - Jump to block /* length: 02 Offset Value Type Description 0x00 - WORD Relative jump value @@ -1013,9 +984,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // advance to next block _position += 2; } - #endregion - #region ID 24 - Loop start /* length: 02 Offset Value Type Description 0x00 - WORD Number of repetitions (greater than 1) @@ -1054,9 +1023,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // advance to next block _position += 2; } - #endregion - #region ID 25 - Loop end /* length: 00 This is the same as BASIC's NEXT statement. It means that the utility should jump back to the start of the loop if it hasn't @@ -1103,9 +1070,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } } } - #endregion - #region ID 26 - Call sequence /* length: [00,01]*02+02 Offset Value Type Description 0x00 N WORD Number of calls to be made @@ -1136,9 +1101,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // advance to next block _position += blockSize; } - #endregion - #region ID 27 - Return from sequence /* length: 00 This block indicates the end of the Called Sequence. The next block played will be the block after the last CALL block (or the next Call, @@ -1158,9 +1121,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // add to tape _datacorder.DataBlocks.Add(t); } - #endregion - #region ID 28 - Select block /* length: [00,01]+02 Offset Value Type Description 0x00 - WORD Length of the whole block (without these two bytes) @@ -1199,9 +1160,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // advance to next block _position += blockSize; } - #endregion - #region ID 2A - Stop the tape if in 48K mode /* length: 04 Offset Value Type Description 0x00 0 DWORD Length of the block without these four bytes (0) @@ -1229,9 +1188,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // advance to next block _position += blockSize; } - #endregion - #region ID 2B - Set signal level /* length: 05 Offset Value Type Description 0x00 1 DWORD Block length (without these four bytes) @@ -1255,9 +1212,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // advance to next block _position += 5; } - #endregion - #region ID 30 - Text description /* length: [00]+01 Offset Value Type Description 0x00 N BYTE Length of the text description @@ -1293,9 +1248,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // advance to next block _position += textLen; } - #endregion - #region ID 31 - Message block /* length: [01]+02 Offset Value Type Description 0x00 - BYTE Time (in seconds) for which the message should be displayed @@ -1338,9 +1291,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // advance to next block _position += msgLen; } - #endregion - #region ID 32 - Archive info /* length: [00,01]+02 Offset Value Type Description 0x00 - WORD Length of the whole block (without these two bytes) @@ -1447,9 +1398,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // add to tape _datacorder.DataBlocks.Add(t); } - #endregion - #region ID 33 - Hardware type /* length: [00]*03+01 Offset Value Type Description 0x00 N BYTE Number of machines and hardware types for which info is supplied @@ -1503,9 +1452,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // add to tape _datacorder.DataBlocks.Add(t); } - #endregion - #region ID 35 - Custom info block /* length: [10,11,12,13]+14 Offset Value Type Description 0x00 - CHAR[10] Identification string (in ASCII) @@ -1537,9 +1484,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // advance to next block _position += blockLen; } - #endregion - #region ID 5A - "Glue" block /* length: 09 Offset Value Type Description 0x00 - BYTE[9] Value: { "XTape!",0x1A,MajR,MinR } @@ -1566,9 +1511,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // advance to next block _position += 9; } - #endregion - - #region UnDetected Blocks private void ProcessUnidentifiedBlock(byte[] data) { @@ -1589,13 +1531,8 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC _position += 4; } - #endregion - - #region Depreciated Blocks - // These mostly should be ignored by ZXHawk - here for completeness - #region ID 16 - C64 ROM Type Data Block private void ProcessBlockID16(byte[] data) { // zxhawk will not implement this block. it will however handle it so subsequent blocks can be parsed @@ -1614,9 +1551,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC int blockLen = GetInt32(data, _position); _position += blockLen; } - #endregion - #region ID 17 - C64 Turbo Tape Data Block private void ProcessBlockID17(byte[] data) { // zxhawk will not implement this block. it will however handle it so subsequent blocks can be parsed @@ -1635,9 +1570,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC int blockLen = GetInt32(data, _position); _position += blockLen; } - #endregion - #region ID 34 - Emulation info private void ProcessBlockID34(byte[] data) { // currently not implemented properly in ZXHawk @@ -1654,9 +1587,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // advance to next block _position += 8; } - #endregion - #region ID 40 - Snapshot block /* length: [01,02,03]+04 Offset Value Type Description 0x00 - BYTE Snapshot type: @@ -1693,13 +1624,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC // advance to next block _position += blockLen; } - #endregion - - #endregion - - #endregion - - #region DataBlockDecoder /// /// Used to process either a standard or turbo data block @@ -1972,10 +1896,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC return nBlock; } - #endregion - - #region Pause Block Creator - /// /// If necessary a separate PAUSE block will be created /// @@ -2010,8 +1930,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC _datacorder.DataBlocks.Add(pBlock); } } - - #endregion } public enum DataBlockType diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/TapeDataBlock.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/TapeDataBlock.cs index 75dcc3995c..1810940d18 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/TapeDataBlock.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/TapeDataBlock.cs @@ -79,8 +79,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC */ - #region Block Meta Data - /// /// Dictionary of block related data /// @@ -105,9 +103,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } } - #endregion - - /// /// List containing the pulse timing values diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/SoundProviderMixer.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/SoundProviderMixer.cs index 53216dc24b..347a72dced 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/SoundProviderMixer.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/SoundProviderMixer.cs @@ -112,8 +112,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC } } - #region ISoundProvider - public bool CanProvideAsync => false; public SyncSoundMode SyncMode => SyncSoundMode.Sync; @@ -208,8 +206,5 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC samples[i] = sectorVal; } } - - #endregion - } } diff --git a/src/BizHawk.Emulation.Cores/Computers/MSX/LibMSX.cs b/src/BizHawk.Emulation.Cores/Computers/MSX/LibMSX.cs index 229bac5fe1..80422d205a 100644 --- a/src/BizHawk.Emulation.Cores/Computers/MSX/LibMSX.cs +++ b/src/BizHawk.Emulation.Cores/Computers/MSX/LibMSX.cs @@ -9,7 +9,6 @@ namespace BizHawk.Emulation.Cores.Computers.MSX /// public static class LibMSX { - # region Core /// opaque state pointer [DllImport("MSXHawk.dll", CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr MSX_create(); @@ -71,10 +70,6 @@ namespace BizHawk.Emulation.Cores.Computers.MSX [DllImport("MSXHawk.dll", CallingConvention = CallingConvention.Cdecl)] public static extern uint MSX_get_audio(IntPtr core, int[] aud_buf, ref uint n_samp); - #endregion - - #region State Save / Load - /// /// Save State /// @@ -91,10 +86,6 @@ namespace BizHawk.Emulation.Cores.Computers.MSX [DllImport("MSXHAWK.dll", CallingConvention = CallingConvention.Cdecl)] public static extern void MSX_load_state(IntPtr core, byte[] loader); - #endregion - - #region Memory Domain Functions - /// /// Read the system bus /// @@ -119,9 +110,6 @@ namespace BizHawk.Emulation.Cores.Computers.MSX [DllImport("MSXHawk.dll", CallingConvention = CallingConvention.Cdecl)] public static extern byte MSX_getram(IntPtr core, int addr); - #endregion - - #region Tracer /// /// type of the cpu trace callback /// @@ -186,6 +174,5 @@ namespace BizHawk.Emulation.Cores.Computers.MSX /// copy length, must be obtained from appropriate get legnth function [DllImport("MSXHawk.dll", CallingConvention = CallingConvention.Cdecl)] public static extern void MSX_getdisassembly(IntPtr core, StringBuilder h, int t, int l); - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.IEmulator.cs b/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.IEmulator.cs index dbe8449bc0..199dc9b6d4 100644 --- a/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.IEmulator.cs +++ b/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.IEmulator.cs @@ -165,8 +165,6 @@ namespace BizHawk.Emulation.Cores.Computers.MSX } } - #region Audio - public BlipBuffer blip = new BlipBuffer(4500); public int[] Aud = new int [9000]; @@ -213,9 +211,6 @@ namespace BizHawk.Emulation.Cores.Computers.MSX blip.Clear(); } - #endregion - - #region Video public int _frameHz = 60; public int[] _vidbuffer = new int[192 * 256]; @@ -234,7 +229,5 @@ namespace BizHawk.Emulation.Cores.Computers.MSX public int BackgroundColor => unchecked((int)0xFF000000); public int VsyncNumerator => _frameHz; public int VsyncDenominator => 1; - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.cs b/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.cs index c81919ea6e..96e175d670 100644 --- a/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.cs +++ b/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.cs @@ -119,7 +119,6 @@ namespace BizHawk.Emulation.Cores.Computers.MSX public DisplayType Region => DisplayType.NTSC; - #region Trace Logger private ITraceable Tracer; private LibMSX.TraceCallback tracecb; @@ -144,8 +143,6 @@ namespace BizHawk.Emulation.Cores.Computers.MSX }); } - #endregion - private MemoryCallbackSystem _memorycallbacks = new MemoryCallbackSystem(new[] { "System Bus" }); public IMemoryCallbackSystem MemoryCallbacks => _memorycallbacks; } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs index 909df491aa..5924416a26 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs @@ -13,8 +13,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// public class DatacorderDevice : IPortIODevice { - #region Construction - private SpectrumBase _machine { get; set; } private Z80A _cpu { get; set; } private OneBitBeeper _buzzer { get; set; } @@ -37,10 +35,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum _buzzer = machine.TapeBuzzer; } - #endregion - - #region State Information - /// /// Internal counter used to trigger tape buzzer output /// @@ -113,20 +107,12 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// private bool currentState = false; - #endregion - - #region Datacorder Device Settings - /// /// Signs whether the device should autodetect when the Z80 has entered into /// 'load' mode and auto-play the tape if neccesary /// private bool _autoPlay; - #endregion - - #region Emulator - /// /// Should be fired at the end of every frame /// Primary purpose is to detect tape traps and manage auto play @@ -144,10 +130,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum //_buzzer.ProcessPulseValue(currentState); } - #endregion - - #region Tape Controls - /// /// Starts the tape playing from the beginning of the current block /// @@ -431,10 +413,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum RTZ(); } - #endregion - - #region Tape Device Methods - /// /// Is called every cpu cycle but runs every 50 t-states /// This enables the tape devices to play out even if the spectrum itself is not @@ -731,10 +709,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } - #endregion - - #region TapeMonitor - private long _lastINCycle = 0; private int _monitorCount; private int _monitorTimeOut; @@ -908,10 +882,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } } - #endregion - - #region IPortIODevice - /// /// Mask constants /// @@ -961,10 +931,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum return true; } - #endregion - - #region State Serialization - /// /// Bizhawk state serialization /// @@ -985,7 +951,5 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum ser.Sync(nameof(_monitorLastRegs), ref _monitorLastRegs, false); ser.EndSection(); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/CHRN.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/CHRN.cs index a3f7bf3fd4..33cb8e48d8 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/CHRN.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/CHRN.cs @@ -56,8 +56,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// public int DataID { get; set; } - #region Helper Methods - /// /// Missing Address Mark (Sector_ID or DAM not found) /// @@ -174,7 +172,5 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum else { NECUPD765.UnSetBit(6, ref _flag2); } } } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.Definitions.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.Definitions.cs index 351e993631..7e0c9f09f1 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.Definitions.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.Definitions.cs @@ -6,18 +6,14 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Definitions /// - #region Attribution /* Implementation based on the information contained here: http://www.cpcwiki.eu/index.php/765_FDC and here: http://www.cpcwiki.eu/imgs/f/f3/UPD765_Datasheet_OCRed.pdf */ - #endregion public partial class NECUPD765 { - #region Enums - /// /// Defines the current phase of the controller /// @@ -306,10 +302,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum Increment, Decrement } - - #endregion - - #region Constants // Command Instruction Constants // Designates the default postitions within the cmdbuffer array @@ -683,10 +675,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum public const int SEEK_ABNORMALTERM = 5; public const int SEEK_DRIVENOTREADY = 6; - #endregion - - #region Classes & Structs - /// /// Class that holds information about a specific command /// @@ -819,8 +807,5 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum ser.EndSection(); } } - - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs index 094e3eab19..9e2f6c2673 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs @@ -8,18 +8,14 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// FDC State and Methods /// - #region Attribution /* Implementation based on the information contained here: http://www.cpcwiki.eu/index.php/765_FDC and here: http://www.cpcwiki.eu/imgs/f/f3/UPD765_Datasheet_OCRed.pdf */ - #endregion public partial class NECUPD765 { - #region Controller State - /// /// Signs whether the drive is active /// @@ -275,12 +271,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum */ private byte Status3; - #endregion - - #region UPD Internal Functions - - #region READ Commands - /// /// Read Data /// COMMAND: 8 parameter bytes @@ -1281,10 +1271,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } } - #endregion - - #region WRITE Commands - /// /// Write Data /// COMMAND: 8 parameter bytes @@ -1759,10 +1745,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } } - #endregion - - #region SCAN Commands - /// /// Scan Equal /// COMMAND: 8 parameter bytes @@ -1871,10 +1853,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } } - #endregion - - #region OTHER Commands - /// /// Specify /// COMMAND: 2 parameter bytes @@ -2344,12 +2322,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } } - #endregion - - #endregion - - #region Controller Methods - /// /// Called when a status register read is required /// This can be called at any time @@ -2834,7 +2806,5 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum CommCounter = 0; ResCounter = 0; } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDD.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDD.cs index 5ea4b182a4..3f3a9f3dcc 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDD.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDD.cs @@ -8,18 +8,14 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Floppy drive related stuff /// - #region Attribution /* Implementation based on the information contained here: http://www.cpcwiki.eu/index.php/765_FDC and here: http://www.cpcwiki.eu/imgs/f/f3/UPD765_Datasheet_OCRed.pdf */ - #endregion public partial class NECUPD765 : IFDDHost { - #region Drive State - /// /// FDD Flag - motor on/off /// @@ -50,10 +46,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// private DriveState[] DriveStates = new DriveState[4]; - #endregion - - #region FDD Methods - /// /// Initialization / reset of the floppy drive subsystem /// @@ -145,10 +137,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum return sector; } - #endregion - - #region IFDDHost - // IFDDHost methods that fall through to the currently active drive /// @@ -180,17 +168,11 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum public FloppyDisk Disk { get; set; } - #endregion - - #region Drive Status Class - /// /// Holds specfic state information about a drive /// private class DriveState : IFDDHost { - #region State - /// /// The drive ID from an FDC perspective /// @@ -304,18 +286,11 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// private NECUPD765 FDC; - #endregion - - #region Lookups - /// /// TRUE if we are on track 0 /// public bool FLAG_TRACK0 => TrackIndex == 0; - #endregion - - #region Public Methods /* /// /// Moves the head across the disk cylinders @@ -756,20 +731,12 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } */ - #endregion - - #region Construction - public DriveState(int driveID, NECUPD765 fdc) { ID = driveID; FDC = fdc; } - #endregion - - #region IFDDHost - /// /// Parses a new disk image and loads it into this floppy drive /// @@ -838,10 +805,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } } - #endregion - - #region StateSerialization - public void SyncState(Serializer ser) { ser.Sync(nameof(ID), ref ID); @@ -867,10 +830,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum //ser.SyncEnum(nameof(SeekState), ref SeekState); //ser.SyncEnum(nameof(SeekIntState), ref SeekIntState); } - - #endregion } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.IPortIODevice.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.IPortIODevice.cs index 7964653bab..1429e21e7a 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.IPortIODevice.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.IPortIODevice.cs @@ -8,18 +8,14 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// IPortIODevice /// - #region Attribution /* Implementation based on the information contained here: http://www.cpcwiki.eu/index.php/765_FDC and here: http://www.cpcwiki.eu/imgs/f/f3/UPD765_Datasheet_OCRed.pdf */ - #endregion public partial class NECUPD765 : IPortIODevice { - #region Dev Logging - public string outputfile = @"D:\Dropbox\Dropbox\_Programming\TASVideos\BizHawk\output\zxhawkio-" + DateTime.Now.ToString("yyyyMMdd_HHmmss") + ".csv"; public string outputString = "STATUS,WRITE,READ,CODE,MT,MF,SK,CMDCNT,RESCNT,EXECCNT,EXECLEN\r\n"; public bool writeDebug = false; @@ -69,8 +65,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum dLog.Add(sb.ToString()); } - #endregion - /// /// Device responds to an IN instruction /// diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.Timing.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.Timing.cs index 2ef6f4080d..82b6cdcb69 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.Timing.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.Timing.cs @@ -4,14 +4,12 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Timimng /// - #region Attribution /* Implementation based on the information contained here: http://www.cpcwiki.eu/index.php/765_FDC and here: http://www.cpcwiki.eu/imgs/f/f3/UPD765_Datasheet_OCRed.pdf */ - #endregion public partial class NECUPD765 { /// diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.cs index a248f6fd76..beab241727 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.cs @@ -6,27 +6,19 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// The NEC floppy disk controller (and floppy drive) found in the +3 /// - #region Attribution /* Implementation based on the information contained here: http://www.cpcwiki.eu/index.php/765_FDC and here: http://www.cpcwiki.eu/imgs/f/f3/UPD765_Datasheet_OCRed.pdf */ - #endregion public partial class NECUPD765 { - #region Devices - /// /// The emulated spectrum machine /// private SpectrumBase _machine; - #endregion - - #region Construction & Initialization - /// /// Main constructor /// @@ -148,10 +140,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum }; } - #endregion - - #region State Serialization - public void SyncState(Serializer ser) { void SyncFDDState(Serializer ser1) @@ -242,7 +230,5 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum SyncTimingState(ser); ser.EndSection(); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPS765.Static.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPS765.Static.cs index 276bd41ccd..319951ff3a 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPS765.Static.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPS765.Static.cs @@ -5,14 +5,12 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Static helper methods /// - #region Attribution /* Implementation based on the information contained here: http://www.cpcwiki.eu/index.php/765_FDC and here: http://www.cpcwiki.eu/imgs/f/f3/UPD765_Datasheet_OCRed.pdf */ - #endregion public partial class NECUPD765 { /// diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/CursorJoystick.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/CursorJoystick.cs index 57fc3c867b..85e41fdcc3 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/CursorJoystick.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/CursorJoystick.cs @@ -12,8 +12,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum //private int _joyLine; private SpectrumBase _machine; - #region Construction - public CursorJoystick(SpectrumBase machine, int playerNumber) { _machine = machine; @@ -39,10 +37,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum "Key 0", // fire }; - #endregion - - #region IJoystick - public JoystickType JoyType => JoystickType.Cursor; public string[] ButtonCollection { get; set; } @@ -92,8 +86,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum return l; } - #endregion - /// /// Gets the bit position of a particular joystick binding from the matrix /// diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/KempstonJoystick.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/KempstonJoystick.cs index 3a1040d045..5e2d710f7e 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/KempstonJoystick.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/KempstonJoystick.cs @@ -8,8 +8,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum private int _joyLine; private SpectrumBase _machine; - #region Construction - public KempstonJoystick(SpectrumBase machine, int playerNumber) { _machine = machine; @@ -26,10 +24,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum }.ToArray(); } - #endregion - - #region IJoystick - public JoystickType JoyType => JoystickType.Kempston; public string[] ButtonCollection { get; set; } @@ -62,8 +56,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum return (_joyLine & (1 << pos)) != 0; } - #endregion - /// /// Active bits high /// 0 0 0 F U D L R diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/NullJoystick.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/NullJoystick.cs index 95bbb879a9..f2b52a3d62 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/NullJoystick.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/NullJoystick.cs @@ -11,8 +11,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum private int _joyLine; private SpectrumBase _machine; - #region Construction - public NullJoystick(SpectrumBase machine, int playerNumber) { _machine = machine; @@ -25,10 +23,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum }.ToArray(); } - #endregion - - #region IJoystick - public JoystickType JoyType => JoystickType.NULL; public string[] ButtonCollection { get; set; } @@ -61,8 +55,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum return (_joyLine & (1 << pos)) != 0; } - #endregion - /// /// Active bits high /// 0 0 0 F U D L R diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick1.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick1.cs index 9908f344de..713112c119 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick1.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick1.cs @@ -12,8 +12,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum //private int _joyLine; private SpectrumBase _machine; - #region Construction - public SinclairJoystick1(SpectrumBase machine, int playerNumber) { _machine = machine; @@ -39,10 +37,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum "Key 5", // fire }; - #endregion - - #region IJoystick - public JoystickType JoyType => JoystickType.SinclairLEFT; public string[] ButtonCollection { get; set; } @@ -91,8 +85,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum return _machine.KeyboardDevice.GetKeyStatus(btnLookups[pos]); } - #endregion - /// /// Gets the bit position of a particular joystick binding from the matrix /// diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick2.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick2.cs index a01c4435d9..572b11806a 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick2.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick2.cs @@ -12,8 +12,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum //private int _joyLine; private SpectrumBase _machine; - #region Construction - public SinclairJoystick2(SpectrumBase machine, int playerNumber) { _machine = machine; @@ -39,10 +37,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum "Key 0", // fire }; - #endregion - - #region IJoystick - public JoystickType JoyType => JoystickType.SinclairRIGHT; public string[] ButtonCollection { get; set; } @@ -91,8 +85,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum return _machine.KeyboardDevice.GetKeyStatus(btnLookups[pos]); } - #endregion - /// /// Gets the bit position of a particular joystick binding from the matrix /// diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/StandardKeyboard.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/StandardKeyboard.cs index 9a26c28bdf..eb9e7eb96c 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/StandardKeyboard.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/StandardKeyboard.cs @@ -183,8 +183,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum return (byte)index; } - #region IPortIODevice - /// /// Device responds to an IN instruction /// @@ -267,8 +265,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum return false; } - #endregion - public void SyncState(Serializer ser) { ser.BeginSection("Keyboard"); diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/SoundOuput/AY38912.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/SoundOuput/AY38912.cs index 453012f47c..d9bde18075 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/SoundOuput/AY38912.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/SoundOuput/AY38912.cs @@ -17,8 +17,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// public class AY38912 : IPSG { - #region Device Fields - /// /// The emulated machine (passed in via constructor) /// @@ -32,10 +30,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum private int _audioBufferIndex; private int _lastStateRendered; - #endregion - - #region Construction & Initialization - /// /// Main constructor /// @@ -54,10 +48,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum Reset(); } - #endregion - - #region IPortIODevice - /// /// |11-- ---- ---- --0-| - IN - Read value of currently selected register /// @@ -109,12 +99,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum return false; } - #endregion - - #region AY Implementation - - #region Public Properties - /// /// AY mixer panning configuration /// @@ -183,10 +167,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum return _registers; } - #endregion - - #region Public Methods - /// /// Resets the PSG /// @@ -357,10 +337,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum BufferUpdate(frameCycle); } - #endregion - - #region Private Fields - /// /// Register indicies /// @@ -564,10 +540,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum 0x905E,0x905E,0xB550,0xB550,0xD7A0,0xD7A0,0xFFFF,0xFFFF, }; - #endregion - - #region Private Methods - /// /// Forces an update of the volume tables /// @@ -722,12 +694,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum _lastStateRendered = cycle; } - #endregion - - #endregion - - #region ISoundProvider - public bool CanProvideAsync => false; public SyncSoundMode SyncMode => SyncSoundMode.Sync; @@ -755,10 +721,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum DiscardSamples(); } - #endregion - - #region State Serialization - public int nullDump = 0; /// @@ -819,7 +781,5 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum ser.EndSection(); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/CPUMonitor.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/CPUMonitor.cs index c06b5cd8b3..0105b39941 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/CPUMonitor.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/CPUMonitor.cs @@ -9,16 +9,10 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// public class CPUMonitor { - #region Devices - private SpectrumBase _machine; private Z80A _cpu; public MachineType machineType = MachineType.ZXSpectrum48; - #endregion - - #region Lookups - /// /// CPU total executes t-states /// @@ -42,20 +36,12 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } } - #endregion - - #region Construction - public CPUMonitor(SpectrumBase machine) { _machine = machine; _cpu = _machine.CPU; } - #endregion - - #region State - /// /// The last 16-bit port address that was detected /// @@ -66,10 +52,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// public bool NextMemReadContended; - #endregion - - #region Methods - /// /// Handles the ULA and CPU cycle clocks, along with any memory and port contention /// @@ -387,10 +369,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } - #endregion - - #region Serialization - public void SyncState(Serializer ser) { ser.BeginSection(nameof(CPUMonitor)); @@ -398,7 +376,5 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum ser.Sync(nameof(NextMemReadContended), ref NextMemReadContended); ser.EndSection(); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Screen.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Screen.cs index da3a95b61d..382a257cf2 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Screen.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Screen.cs @@ -6,8 +6,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// class ScreenPentagon128 : ULA { - #region Construction - public ScreenPentagon128(SpectrumBase machine) : base(machine) { @@ -42,7 +40,5 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum SetupScreenSize(); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.cs index ae6163431e..2c1eba8b0c 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.cs @@ -9,8 +9,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// public partial class Pentagon128 : SpectrumBase { - #region Construction - /// /// Main constructor /// @@ -44,7 +42,5 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum InitializeMedia(files); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Memory.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Memory.cs index 694109c642..d15a59f528 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Memory.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Memory.cs @@ -8,8 +8,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// public abstract partial class SpectrumBase { - #region Memory Fields & Properties - /// /// ROM Banks /// @@ -88,10 +86,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// public byte LastContendedReadByte; - #endregion - - #region Memory Related Methods - /// /// Simulates reading from the bus /// Paging should be handled here @@ -159,10 +153,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// public abstract bool ContendedBankPaged(); - #endregion - - #region Helper Methods - /// /// Detects whether this is a 48k machine (or a 128k in 48k mode) /// @@ -242,7 +232,5 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } } } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.cs index c44f01f840..57a418cd31 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.cs @@ -10,8 +10,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// public abstract partial class SpectrumBase { - #region Devices - /// /// The calling ZXSpectrum class (piped in via constructor) /// @@ -78,10 +76,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// protected bool PrinterPortStrobe; - #endregion - - #region Emulator State - /// /// Signs whether the frame has ended /// @@ -118,10 +112,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum public bool _render; public bool _renderSound; - #endregion - - #region Constants - /// /// Mask constants & misc /// @@ -131,10 +121,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum protected const int TAPE_BIT = 0x40; protected const int AY_SAMPLE_RATE = 16; - #endregion - - #region Emulation Loop - /// /// Executes a single frame /// @@ -209,10 +195,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } } - #endregion - - #region Reset Functions - /// /// Hard reset of the emulated machine /// @@ -317,10 +299,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } } - #endregion - - #region IStatable - public void SyncState(Serializer ser) { ser.BeginSection("ZXMachine"); @@ -387,7 +365,5 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum ser.EndSection(); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ULA.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ULA.cs index 542c3b3a4e..2461953f98 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ULA.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ULA.cs @@ -10,8 +10,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// public abstract class ULA : IVideoProvider { - #region Other Devices - /// /// The emulated spectrum /// @@ -22,10 +20,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// protected CPUMonitor CPUMon; - #endregion - - #region Construction & Initialisation - public ULA(SpectrumBase machine) { _machine = machine; @@ -33,10 +27,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum borderType = _machine.Spectrum.SyncSettings.BorderType; } - #endregion - - #region Palettes - /// /// The standard ULA palette /// @@ -60,10 +50,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum Colors.ARGB(0xFF, 0xFF, 0xFF), // Bright White }; - #endregion - - #region Timing - /// /// The CPU speed /// @@ -120,10 +106,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum public bool Border4T; public int Border4TStage; - #endregion - - #region Interrupt Generation - /// /// Signs that an interrupt has been raised in this frame. /// @@ -200,10 +182,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } } - #endregion - - #region Screen Layout - /// /// Total pixels in one display row /// @@ -233,10 +211,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// protected int ScanLineWidth; - #endregion - - #region State - /// /// The last T-State cycle at which the screen was rendered /// @@ -264,16 +238,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum public int BorderColor = 7; - #endregion - - #region Conversions - public int FrameLength => FrameCycleLength; - #endregion - - #region Rendering Configuration - /// /// Holds all information regarding rendering the screen based on the current T-State /// @@ -539,10 +505,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } } - #endregion - - #region Render Methods - /// /// Renders to the screen buffer based on the current cycle /// @@ -760,10 +722,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } } - #endregion - - #region Contention - /// /// Returns the contention value for the current t-state /// @@ -800,10 +758,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum return RenderingTable.Renderer[tstate].ContentionValue; } - #endregion - - #region IVideoProvider - /// /// Video output buffer /// @@ -1017,10 +971,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum set => _borderType = value; } - #endregion - - #region Serialization - public void SyncState(Serializer ser) { ser.BeginSection(nameof(ULA)); @@ -1048,7 +998,5 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum ser.Sync(nameof(InterruptRaised), ref InterruptRaised); ser.EndSection(); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Screen.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Screen.cs index cbb98eec3f..d70c137857 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Screen.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Screen.cs @@ -6,8 +6,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// class Screen128 : ULA { - #region Construction - public Screen128(SpectrumBase machine) : base(machine) { @@ -42,7 +40,5 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum SetupScreenSize(); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.cs index 20c965097d..a41b77cac6 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.cs @@ -9,8 +9,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// public partial class ZX128 : SpectrumBase { - #region Construction - /// /// Main constructor /// @@ -44,7 +42,5 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum InitializeMedia(files); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2/ZX128Plus2.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2/ZX128Plus2.cs index e8aecf71f7..cd042921be 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2/ZX128Plus2.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2/ZX128Plus2.cs @@ -9,8 +9,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// public partial class ZX128Plus2 : ZX128 { - #region Construction - /// /// Main constructor /// @@ -19,7 +17,5 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum { } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Screen.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Screen.cs index ecbbccbb04..ce8640e8bd 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Screen.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Screen.cs @@ -6,8 +6,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// class Screen128Plus2a : ULA { - #region Construction - public Screen128Plus2a(SpectrumBase machine) : base(machine) { @@ -44,7 +42,5 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum GenerateP3PortTable(); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.cs index ee0e0af87d..472e29f7b4 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.cs @@ -9,8 +9,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// public partial class ZX128Plus2a : SpectrumBase { - #region Construction - /// /// Main constructor /// @@ -44,7 +42,5 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum InitializeMedia(files); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.cs index cb3bb54eab..02409f58ab 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.cs @@ -9,8 +9,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// public partial class ZX128Plus3 : SpectrumBase { - #region Construction - /// /// Main constructor /// @@ -47,7 +45,5 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum InitializeMedia(files); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum16K/ZX16.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum16K/ZX16.cs index 410fa1843c..0a3eaf4d28 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum16K/ZX16.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum16K/ZX16.cs @@ -8,8 +8,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// public class ZX16 : ZX48 { - #region Construction - /// /// Main constructor /// @@ -19,10 +17,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } - #endregion - - #region Memory - /* 48K Spectrum has NO memory paging * * @@ -132,7 +126,5 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // for 16/48k machines only ROM0 is used (no paging) RomData.RomBytes?.CopyTo(ROM0, 0); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Screen.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Screen.cs index 3507b6ce10..eac161b4e8 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Screen.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Screen.cs @@ -6,8 +6,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// class Screen48 : ULA { - #region Construction - public Screen48(SpectrumBase machine) : base(machine) { @@ -42,7 +40,5 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum SetupScreenSize(); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.cs index 2a793f0a47..eba23b3b59 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.cs @@ -10,8 +10,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// public partial class ZX48 : SpectrumBase { - #region Construction - /// /// Main constructor /// @@ -37,10 +35,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum InitializeMedia(files); } - #endregion - - #region Reset - public override void HardReset() { base.HardReset(); @@ -51,7 +45,5 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum RAM0[d] = (byte)rn.Next(255); } } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/FloppyDisk.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/FloppyDisk.cs index 1058f98b4a..f3e37fe03f 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/FloppyDisk.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/FloppyDisk.cs @@ -589,15 +589,11 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum public byte FillerByte { get; set; } public virtual Sector[] Sectors { get; set; } - #region UDI - public virtual byte TrackType { get; set; } public virtual int TLEN { get; set; } public virtual int CLEN => TLEN / 8 + (TLEN % 8 / 7) / 8; public virtual byte[] TrackData { get; set; } - #endregion - /// /// Presents a contiguous byte array of all sector data for this track /// (including any multiple weak/random data) diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/IPFFormat/IPFFloppyDisk.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/IPFFormat/IPFFloppyDisk.cs index 96e446c2c2..4ceedf9d22 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/IPFFormat/IPFFloppyDisk.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/IPFFormat/IPFFloppyDisk.cs @@ -249,8 +249,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum public byte[] RawBlockData; public int StartPos; - #region INFO - public int INFOmediaType; public int INFOencoderType; public int INFOencoderRev; @@ -270,10 +268,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum public int INFOdiskNumber; public int INFOcreatorId; - #endregion - - #region IMGE - public int IMGEtrack; public int IMGEside; public int IMGEdensity; @@ -289,18 +283,12 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum public int IMGEtrackFlags; public int IMGEdataKey; - #endregion - - #region DATA - public int DATAlength; public int DATAbitSize; public int DATAcrc; public int DATAdataKey; public byte[] DATAextraDataRaw; - #endregion - public static IPFBlock ParseNextBlock(ref int startPos, FloppyDisk disk, byte[] data, List blockCollection) { IPFBlock ipf = new IPFBlock(); diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/MediaConverter.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/MediaConverter.cs index 67a345a99a..ecb1cdafb9 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/MediaConverter.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/MediaConverter.cs @@ -53,8 +53,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum "Check type operation is not implemented for this converter"); } - #region Static Tools - /// /// Converts an int32 value into a byte array /// @@ -192,7 +190,5 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum Marshal.FreeHGlobal(buff); return rObj; } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Snapshot/SZX/SZX.Objects.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Snapshot/SZX/SZX.Objects.cs index c9419a3de5..0d4eb15789 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Snapshot/SZX/SZX.Objects.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Snapshot/SZX/SZX.Objects.cs @@ -8,8 +8,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// public partial class SZX { - #region ZX-State Header - public enum MachineIdentifier : byte { ZXSTMID_16K = 0, @@ -50,10 +48,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum public byte chFlags; } - #endregion - - #region ZXSTBLOCK Header - /// /// Block Header. Each real block starts with this header. /// @@ -63,10 +57,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum public uint dwSize; } - #endregion - - #region ZXSTCREATOR - /// /// This block identifies the program that created this zx-state file. /// @@ -81,10 +71,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum public byte[] chData; } - #endregion - - #region ZXSTZ80REGS - /// /// The last instruction executed was an EI instruction or an invalid $DD or $FD prefix. /// @@ -114,10 +100,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum public ushort wMemPtr; } - #endregion - - #region ZXSTSPECREGS - [StructLayout(LayoutKind.Sequential, Pack = 1)] public struct ZXSTSPECREGS { @@ -129,10 +111,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum public byte[] chReserved; } - #endregion - - #region ZXSTAYBLOCK - /// /// Fuller Box emulation /// @@ -156,10 +134,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum public byte[] chAyRegs; } - #endregion - - #region ZXSTRAMPAGE - /// /// Ram pages are compressed using Zlib /// @@ -177,10 +151,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum public byte[] ramPage; } - #endregion - - #region ZXSTKEYBOARD - /// /// Keyboard state /// @@ -212,10 +182,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum public byte chKeyboardJoystick; } - #endregion - - #region ZXSTJOYSTICK - /// /// Joystick setup for both players. /// @@ -227,10 +193,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum public byte chTypePlayer2; } - #endregion - - #region ZXSTTAPE - /// /// Cassette Recorder state /// @@ -251,10 +213,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum public char[] szFileExtension; } - #endregion - - #region ZXSTPLUS3 - /// /// The number of drives connected to the Spectrum +3 and whether their motors are turned on. /// Any blocks specifying which disk files are in which drive will follow this one. @@ -266,10 +224,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum public byte fMotorOn; } - #endregion - - #region ZXSTDSKFILE - /// /// Not implemented. All disk images are currently links to external .dsk or .ipf files /// @@ -295,111 +249,5 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum public byte chDriveNum; public int dwUncompressedSize; } - - #endregion - - #region Not Yet Implemented - - #region ZXSTATASP - - #endregion - - #region ZXSTATARAM - - #endregion - - #region ZXSTCF - - #endregion - - #region ZXSTCFRAM - - #endregion - - #region ZXSTCOVOX - - #endregion - - #region ZXSTBETA128 - - #endregion - - #region ZXSTBETADISK - - #endregion - - #region ZXSTDOCK - - #endregion - - #region ZXSTGS - - #endregion - - #region ZXSTGSRAMPAGE - - #endregion - - #region ZXSTIF1 - - #endregion - - #region ZXSTIF2ROM - - #endregion - - #region ZXSTMCART - - #endregion - - #region ZXSTMOUSE - - #endregion - - #region ZXSTMULTIFACE - - #endregion - - #region ZXSTOPUS - - #endregion - - #region ZXSTOPUSDISK - - #endregion - - #region ZXSTPLUSD - - #endregion - - #region ZXSTPLUSDDISK - - #endregion - - #region ZXSTROM - - #endregion - - #region ZXSTSCLDREGS - - #endregion - - #region ZXSTSIDE - - #endregion - - #region ZXSTSPECDRUM - - #endregion - - #region ZXSTUSPEECH - - #endregion - - #region ZXSTZXPRINTER - - #endregion - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/CSW/CswConverter.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/CSW/CswConverter.cs index 479571ebc4..660bf96f19 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/CSW/CswConverter.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/CSW/CswConverter.cs @@ -32,8 +32,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// public override bool IsWriter => false; - #region Construction - private DatacorderDevice _datacorder; public CswConverter(DatacorderDevice _tapeDevice) @@ -41,8 +39,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum _datacorder = _tapeDevice; } - #endregion - /// /// Returns TRUE if pzx header is detected /// diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/PZX/PzxConverter.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/PZX/PzxConverter.cs index 7f1b1b29dc..279079778d 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/PZX/PzxConverter.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/PZX/PzxConverter.cs @@ -42,8 +42,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// private List> _loopCounter = new List>(); - #region Construction - private DatacorderDevice _datacorder; public PzxConverter(DatacorderDevice _tapeDevice) @@ -51,8 +49,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum _datacorder = _tapeDevice; } - #endregion - /// /// Returns TRUE if pzx header is detected /// diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TAP/TapConverter.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TAP/TapConverter.cs index 3016b7aba0..76c51ce8ba 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TAP/TapConverter.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TAP/TapConverter.cs @@ -27,8 +27,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// public override bool IsWriter => false; - #region Construction - private DatacorderDevice _datacorder; public TapConverter(DatacorderDevice _tapeDevice) @@ -36,10 +34,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum _datacorder = _tapeDevice; } - #endregion - - #region TAP Format Constants - /// /// Pilot pulse length /// @@ -90,8 +84,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// public const int BIT_COUNT_IN_LAST = 8; - #endregion - /// /// DeSerialization method /// diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TZX/TzxConverter.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TZX/TzxConverter.cs index 94a5f21f97..20b1538480 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TZX/TzxConverter.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TZX/TzxConverter.cs @@ -41,8 +41,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// private List> _loopCounter = new List>(); - #region Construction - private DatacorderDevice _datacorder; public TzxConverter(DatacorderDevice _tapeDevice) @@ -50,8 +48,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum _datacorder = _tapeDevice; } - #endregion - /// /// Returns TRUE if tzx header is detected /// @@ -268,9 +264,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } } - #region TZX Block Processors - - #region ID 10 - Standard Speed Data Block /* length: [02,03]+04 Offset Value Type Description 0x00 - WORD Pause after this block (ms.) {1000} @@ -312,9 +305,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // generate PAUSE block CreatePauseBlock(_datacorder.DataBlocks.Last()); } - #endregion - #region ID 11 - Turbo Speed Data Block /* length: [0F,10,11]+12 Offset Value Type Description 0x00 - WORD Length of PILOT pulse {2168} @@ -372,9 +363,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // generate PAUSE block CreatePauseBlock(_datacorder.DataBlocks.Last()); } - #endregion - #region ID 12 - Pure Tone /* length: 04 Offset Value Type Description 0x00 - WORD Length of one pulse in T-states @@ -411,9 +400,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // advance the position to the next block _position += blockLen; } - #endregion - #region ID 13 - Pulse sequence /* length: [00]*02+01 Offset Value Type Description 0x00 N BYTE Number of pulses @@ -448,9 +435,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // add the block _datacorder.DataBlocks.Add(t); } - #endregion - #region ID 14 - Pure Data Block /* length: [07,08,09]+0A Offset Value Type Description 0x00 - WORD Length of ZERO bit pulse @@ -499,9 +484,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // generate PAUSE block CreatePauseBlock(_datacorder.DataBlocks.Last()); } - #endregion - #region ID 15 - Direct Recording /* length: [05,06,07]+08 Offset Value Type Description 0x00 - WORD Number of T-states per sample (bit of data) @@ -605,9 +588,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // generate PAUSE block CreatePauseBlock(_datacorder.DataBlocks.Last()); } - #endregion - #region ID 18 - CSW Recording /* length: [00,01,02,03]+04 Offset Value Type Description 0x00 10+N DWORD Block length (without these four bytes) @@ -676,9 +657,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // generate PAUSE block CreatePauseBlock(_datacorder.DataBlocks.Last()); } - #endregion - #region ID 19 - Generalized Data Block /* length: [00,01,02,03]+04 Offset Value Type Description 0x00 - DWORD Block length (without these four bytes) @@ -773,9 +752,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // advance the position to the next block _position += blockLen; } - #endregion - #region ID 20 - Pause (silence) or 'Stop the Tape' command /* length: 02 Offset Value Type Description 0x00 - WORD Pause duration (ms.) @@ -830,9 +807,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum CreatePauseBlock(_datacorder.DataBlocks.Last()); } - #endregion - #region ID 21 - Group start /* length: [00]+01 Offset Value Type Description 0x00 L BYTE Length of the group name string @@ -864,9 +839,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // advance to next block _position += nameLength; } - #endregion - #region ID 22 - Group end /* length: 00 This indicates the end of a group. This block has no body. */ @@ -883,9 +856,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // add to tape _datacorder.DataBlocks.Add(t); } - #endregion - #region ID 23 - Jump to block /* length: 02 Offset Value Type Description 0x00 - WORD Relative jump value @@ -935,9 +906,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // advance to next block _position += 2; } - #endregion - #region ID 24 - Loop start /* length: 02 Offset Value Type Description 0x00 - WORD Number of repetitions (greater than 1) @@ -974,9 +943,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // advance to next block _position += 2; } - #endregion - #region ID 25 - Loop end /* length: 00 This is the same as BASIC's NEXT statement. It means that the utility should jump back to the start of the loop if it hasn't @@ -1021,9 +988,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } } } - #endregion - #region ID 26 - Call sequence /* length: [00,01]*02+02 Offset Value Type Description 0x00 N WORD Number of calls to be made @@ -1052,9 +1017,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // advance to next block _position += blockSize; } - #endregion - #region ID 27 - Return from sequence /* length: 00 This block indicates the end of the Called Sequence. The next block played will be the block after the last CALL block (or the next Call, @@ -1073,9 +1036,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // add to tape _datacorder.DataBlocks.Add(t); } - #endregion - #region ID 28 - Select block /* length: [00,01]+02 Offset Value Type Description 0x00 - WORD Length of the whole block (without these two bytes) @@ -1112,9 +1073,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // advance to next block _position += blockSize; } - #endregion - #region ID 2A - Stop the tape if in 48K mode /* length: 04 Offset Value Type Description 0x00 0 DWORD Length of the block without these four bytes (0) @@ -1140,9 +1099,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // advance to next block _position += blockSize; } - #endregion - #region ID 2B - Set signal level /* length: 05 Offset Value Type Description 0x00 1 DWORD Block length (without these four bytes) @@ -1165,9 +1122,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // advance to next block _position += 5; } - #endregion - #region ID 30 - Text description /* length: [00]+01 Offset Value Type Description 0x00 N BYTE Length of the text description @@ -1201,9 +1156,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // advance to next block _position += textLen; } - #endregion - #region ID 31 - Message block /* length: [01]+02 Offset Value Type Description 0x00 - BYTE Time (in seconds) for which the message should be displayed @@ -1245,9 +1198,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // advance to next block _position += msgLen; } - #endregion - #region ID 32 - Archive info /* length: [00,01]+02 Offset Value Type Description 0x00 - WORD Length of the whole block (without these two bytes) @@ -1354,9 +1305,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // add to tape _datacorder.DataBlocks.Add(t); } - #endregion - #region ID 33 - Hardware type /* length: [00]*03+01 Offset Value Type Description 0x00 N BYTE Number of machines and hardware types for which info is supplied @@ -1409,9 +1358,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // add to tape _datacorder.DataBlocks.Add(t); } - #endregion - #region ID 35 - Custom info block /* length: [10,11,12,13]+14 Offset Value Type Description 0x00 - CHAR[10] Identification string (in ASCII) @@ -1442,9 +1389,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // advance to next block _position += blockLen; } - #endregion - #region ID 5A - "Glue" block /* length: 09 Offset Value Type Description 0x00 - BYTE[9] Value: { "XTape!",0x1A,MajR,MinR } @@ -1470,9 +1415,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // advance to next block _position += 9; } - #endregion - - #region UnDetected Blocks private void ProcessUnidentifiedBlock(byte[] data) { @@ -1491,13 +1433,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum _position += 4; } - #endregion - - #region Depreciated Blocks - // These mostly should be ignored by ZXHawk - here for completeness - #region ID 16 - C64 ROM Type Data Block private void ProcessBlockID16(byte[] data) { // zxhawk will not implement this block. it will however handle it so subsequent blocks can be parsed @@ -1515,9 +1452,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum int blockLen = GetInt32(data, _position); _position += blockLen; } - #endregion - #region ID 17 - C64 Turbo Tape Data Block private void ProcessBlockID17(byte[] data) { // zxhawk will not implement this block. it will however handle it so subsequent blocks can be parsed @@ -1535,9 +1470,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum int blockLen = GetInt32(data, _position); _position += blockLen; } - #endregion - #region ID 34 - Emulation info private void ProcessBlockID34(byte[] data) { // currently not implemented properly in ZXHawk @@ -1553,9 +1486,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // advance to next block _position += 8; } - #endregion - #region ID 40 - Snapshot block /* length: [01,02,03]+04 Offset Value Type Description 0x00 - BYTE Snapshot type: @@ -1590,13 +1521,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum // advance to next block _position += blockLen; } - #endregion - - #endregion - - #endregion - - #region DataBlockDecoder /// /// Used to process either a standard or turbo data block @@ -1864,10 +1788,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum return nBlock; } - #endregion - - #region Pause Block Creator - /// /// If neccessary a seperate PAUSE block will be created /// @@ -1900,8 +1820,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum _datacorder.DataBlocks.Add(pBlock); } } - - #endregion } public enum DataBlockType diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TapeDataBlock.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TapeDataBlock.cs index 9b8d7d1fc6..80ddb7e31e 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TapeDataBlock.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TapeDataBlock.cs @@ -48,8 +48,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum set => _blockData = value; } - #region Block Meta Data - /// /// Dictionary of block related data /// @@ -74,8 +72,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } } - #endregion - /// /// List containing the pulse timing values /// diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/WAV/WavConverter.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/WAV/WavConverter.cs index 8d1780c193..d6ce0d4fb4 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/WAV/WavConverter.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/WAV/WavConverter.cs @@ -31,9 +31,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Position counter /// //private int _position = 0; - - #region Construction - private DatacorderDevice _datacorder; public WavConverter(DatacorderDevice _tapeDevice) @@ -41,8 +38,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum _datacorder = _tapeDevice; } - #endregion - /// /// Returns TRUE if pzx header is detected /// diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Messaging.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Messaging.cs index c5be96f6b6..33463c244b 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Messaging.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Messaging.cs @@ -44,8 +44,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum CoreComm.Notify(sb.ToString()); } - #region Input Message Methods - /// /// Called when certain input presses are detected /// @@ -56,10 +54,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum SendMessage(sb.ToString().TrimEnd('\n'), MessageCategory.Input); } - #endregion - - #region DiskDevice Message Methods - /// /// Disk message that is fired on core init /// @@ -146,10 +140,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } } - #endregion - - #region TapeDevice Message Methods - /// /// Tape message that is fired on core init /// @@ -430,8 +420,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum SendMessage(sb.ToString().TrimEnd('\n'), MessageCategory.Tape); } - #endregion - /// /// Checks whether message category is allowed to be sent /// diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.cs index c94ef321b4..e48b6fa737 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.cs @@ -282,21 +282,12 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum } } - #region IRegionable - public DisplayType Region => DisplayType.PAL; - #endregion - - #region IDriveLight - public bool DriveLightEnabled => true; public bool DriveLightOn => _machine?.TapeDevice?.TapeIsPlaying == true || _machine?.UPDDiskDevice?.DriveLight == true; - - #endregion - } } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mAR.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mAR.cs index f0f3469b3c..cf3c9facd8 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mAR.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mAR.cs @@ -33,8 +33,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 */ internal sealed class mAR : MapperBase { - #region SuperCharger Data - private readonly byte[] _dummyRomCode = { 0xa5, 0xfa, 0x85, 0x80, 0x4c, 0x18, 0xf8, 0xff, @@ -112,8 +110,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00 }; - #endregion - private byte[] _superChargerImage = new byte[8192]; private int[] _imageOffsets = new int[2]; private bool _writePending; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IEmulator.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IEmulator.cs index d09704bcf8..73993ac0f1 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IEmulator.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IEmulator.cs @@ -335,8 +335,6 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk } - #region Video provider - public int _frameHz = 60; public int _screen_width = 320; public int _screen_height = 263; @@ -373,10 +371,6 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk { "Pal", "Pal"} }; - #endregion - - #region Sound provider - private BlipBuffer _blip = new BlipBuffer(4096); public bool CanProvideAsync => false; @@ -429,7 +423,5 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk _blip.Dispose(); _blip = null; } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.cs index d9ba690c95..f44539c755 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.cs @@ -160,8 +160,6 @@ namespace BizHawk.Emulation.Cores.Atari.Lynx } } - #region Controller - private static readonly ControllerDefinition LynxTroller = new ControllerDefinition { Name = "Lynx Controller", @@ -185,7 +183,5 @@ namespace BizHawk.Emulation.Cores.Atari.Lynx return ret; } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.IVideoProvider.cs b/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.IVideoProvider.cs index 69926573e1..d03f65872e 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.IVideoProvider.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.IVideoProvider.cs @@ -9,8 +9,6 @@ namespace BizHawk.Emulation.Cores.Consoles.ChannelF public int[] CroppedBuffer = new int[102 * 58]; - #region IVideoProvider - public int VirtualWidth => BufferWidth * 2; public int VirtualHeight => (int)((double)BufferHeight * 1.3) * 2; public int BufferWidth => 102; //128 @@ -50,12 +48,6 @@ namespace BizHawk.Emulation.Cores.Consoles.ChannelF } - #endregion - - #region IRegionable - public DisplayType Region => DisplayType.NTSC; - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Disassembler.cs b/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Disassembler.cs index 49fcf6aa85..09b2c6f61b 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Disassembler.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Disassembler.cs @@ -314,10 +314,6 @@ namespace BizHawk.Emulation.Cores.Consoles.ChannelF return temp; } - #region IDisassemblable - - #endregion - public string Cpu { get => "F3850"; diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/Audio.cs b/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/Audio.cs index dd577dfec7..5eaf9b2e2e 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/Audio.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/Audio.cs @@ -331,8 +331,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Vectrex _blip.SetRates(1500000, 44100); } - #region audio - public bool CanProvideAsync => false; public void SetSyncMode(SyncSoundMode mode) @@ -385,7 +383,5 @@ namespace BizHawk.Emulation.Cores.Consoles.Vectrex _blip.Dispose(); _blip = null; } - - #endregion } } \ No newline at end of file diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.IEmulator.cs b/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.IEmulator.cs index a24dfdc826..cf94af71b1 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.IEmulator.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.IEmulator.cs @@ -114,8 +114,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Vectrex audio.DisposeSound(); } - #region Video provider - public int _frameHz = 50; public int[] _vidbuffer; @@ -145,7 +143,5 @@ namespace BizHawk.Emulation.Cores.Consoles.Vectrex public int BackgroundColor => unchecked((int)0xFF000000); public int VsyncNumerator => _frameHz; public int VsyncDenominator => 1; - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IEmulator.cs b/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IEmulator.cs index fa2b4d618f..3d92f8f007 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IEmulator.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IEmulator.cs @@ -208,8 +208,6 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk ppu.DisposeSound(); } - #region Video provider - public int _frameHz = 60; public int[] _vidbuffer; @@ -252,7 +250,5 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk public static readonly uint[] color_palette_Gr = { 0xFFA4C505, 0xFF88A905, 0xFF1D551D, 0xFF052505 }; public uint[] color_palette = new uint[4]; - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/PPU.cs b/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/PPU.cs index 3014eaaa81..97360f0636 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/PPU.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/PPU.cs @@ -1031,8 +1031,6 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk AudioSyncState(ser); } - #region audio - private BlipBuffer _blip_C = new BlipBuffer(15000); public byte sample; @@ -1218,8 +1216,6 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk _blip_C.Dispose(); _blip_C = null; } - - #endregion } public class NTSC_PPU : PPU diff --git a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs index 4846650bfa..9e42e55739 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs @@ -129,8 +129,6 @@ namespace BizHawk.Emulation.Cores.Consoles.NEC.PCFX public bool DriveLightEnabled => true; public bool DriveLightOn { get; private set; } - #region ISettable - public class Settings { [Description("Emulate a buggy ADPCM codec that makes some games sound better")] @@ -390,7 +388,5 @@ namespace BizHawk.Emulation.Cores.Consoles.NEC.PCFX l |= LibTst.Layers.RAINBOW; _core.EnableLayers(l); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Audio.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Audio.cs index 2956f2b959..eea297bd3d 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Audio.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Audio.cs @@ -1184,8 +1184,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk ((NOISE_enable ? 1 : 0) << 3)); } - #region audio - public bool CanProvideAsync => false; public void SetSyncMode(SyncSoundMode mode) @@ -1242,7 +1240,5 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk _blip_L = null; _blip_R = null; } - - #endregion } } \ No newline at end of file diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IEmulator.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IEmulator.cs index ebd77f4cf9..5a766e8ff0 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IEmulator.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IEmulator.cs @@ -321,8 +321,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk audio.DisposeSound(); } - #region Video provider - public int[] frame_buffer; @@ -371,7 +369,5 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk public static readonly uint[] color_palette_BW = { 0xFFFFFFFF, 0xFFAAAAAA, 0xFF555555, 0xFF000000 }; public static readonly uint[] color_palette_Gr = { 0xFFA4C505, 0xFF88A905, 0xFF1D551D, 0xFF052505 }; - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs index 048683cbf6..4704625e67 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs @@ -209,8 +209,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk _scanlineCallback = null; } - #region GPUViewer - public bool IsCGBMode() => is_GBC; public IntPtr iptr0 = IntPtr.Zero; @@ -284,8 +282,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk _printerCallback = null; } - #endregion - public DisplayType Region => DisplayType.NTSC; private readonly GBHawkControllerDeck _controllerDeck; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IEmulator.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IEmulator.cs index 3cbbbf3958..047bb6ead9 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IEmulator.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IEmulator.cs @@ -230,8 +230,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink R.Dispose(); } - #region Video provider - public int[] _vidbuffer = new int[160 * 2 * 144]; public int[] GetVideoBuffer() => _vidbuffer; @@ -288,10 +286,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink public uint[] color_palette = new uint[4]; - #endregion - - #region audio - public bool CanProvideAsync => false; public void SetSyncMode(SyncSoundMode mode) @@ -342,7 +336,5 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink L.audio.DisposeSound(); R.audio.DisposeSound(); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IEmulator.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IEmulator.cs index 27368a6f28..1abaae0d64 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IEmulator.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IEmulator.cs @@ -419,8 +419,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x R.Dispose(); } - #region Video provider - public int[] _vidbuffer = new int[160 * 2 * 144 * 2]; public int[] GetVideoBuffer() => _vidbuffer; @@ -450,10 +448,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x public static readonly uint[] color_palette_BW = { 0xFFFFFFFF , 0xFFAAAAAA, 0xFF555555, 0xFF000000 }; public static readonly uint[] color_palette_Gr = { 0xFFA4C505, 0xFF88A905, 0xFF1D551D, 0xFF052505 }; - #endregion - - #region audio - public bool CanProvideAsync => false; public void SetSyncMode(SyncSoundMode mode) @@ -512,7 +506,5 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x C.audio.DisposeSound(); R.audio.DisposeSound(); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IEmulator.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IEmulator.cs index a0b43dca89..469e7aaa94 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IEmulator.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IEmulator.cs @@ -993,8 +993,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x D.Dispose(); } - #region Video provider - public int[] _vidbuffer = new int[160 * 2 * 144 * 2]; public int[] GetVideoBuffer() @@ -1030,10 +1028,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x public uint[] color_palette = new uint[4]; - #endregion - - #region audio - public bool CanProvideAsync => false; public void SetSyncMode(SyncSoundMode mode) @@ -1105,7 +1099,5 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x C.audio.DisposeSound(); D.audio.DisposeSound(); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs index d94b21bc07..8086b7f35e 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs @@ -161,8 +161,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy /// private LibGambatte.Buttons CurrentButtons = 0; - #region ALL SAVESTATEABLE STATE GOES HERE - /// /// internal gambatte state /// @@ -187,10 +185,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy public long CycleCount => (long)_cycleCount; public double ClockRate => TICKSPERSECOND; - #endregion - - #region controller - public static readonly ControllerDefinition GbController = new ControllerDefinition { Name = "Gameboy Controller", @@ -207,8 +201,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy return CurrentButtons; } - #endregion - /// /// true if the emulator is currently emulating CGB /// @@ -370,8 +362,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy } } - #region ppudebug - public IntPtr _vram = IntPtr.Zero; public IntPtr _bgpal = IntPtr.Zero; public IntPtr _sppal = IntPtr.Zero; @@ -458,10 +448,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy LibGambatte.ScanlineCallback scanlinecb; ScanlineCallback endofframecallback; - #endregion - - #region palette - /// /// update gambatte core's internal colors /// @@ -478,7 +464,5 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy int[] lut = GBColors.GetLut(type); LibGambatte.gambatte_setcgbpalette(GambatteState, lut); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Sameboy.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Sameboy.cs index 24ff131a1d..257d172c50 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Sameboy.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Sameboy.cs @@ -105,8 +105,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.Gameboy InitializeRtc(_syncSettings.InitialTime); } - #region Controller - private static readonly ControllerDefinition _gbDefinition; private static readonly ControllerDefinition _sgbDefinition; public override ControllerDefinition ControllerDefinition => _sgb ? _sgbDefinition : _gbDefinition; @@ -166,10 +164,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.Gameboy return b; } - #endregion - - #region ISaveram - public new bool SaveRamModified => _core.HasSaveRam(); public new byte[] CloneSaveRam() @@ -186,10 +180,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.Gameboy _exe.RemoveReadonlyFile("save.ram"); } - #endregion - - #region ISettable - private Settings _settings; private SyncSettings _syncSettings; @@ -271,8 +261,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.Gameboy return ret ? PutSettingsDirtyBits.RebootCore : PutSettingsDirtyBits.None; } - #endregion - protected override LibWaterboxCore.FrameInfo FrameAdvancePrep(IController controller, bool render, bool rendersound) { return new LibSameboy.FrameInfo diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC2_4.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC2_4.cs index 4f2af51890..4e9a1d60e2 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC2_4.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC2_4.cs @@ -10,8 +10,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES //If you change any of the IRQ logic here, be sure to change it in VRC 3/6/7 as well. internal sealed class VRC2_4 : NesBoardBase { - #region addressmaps - // remaps addresses into vrc2b form // all varieties of vrc2&4 require A15 = 1 (ie, we're in 8000:ffff), and key on A14:A12 in the same way // in addition, each variety has two other bits; a "low bit" and a "high bit" @@ -55,8 +53,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES return addr & 0x7000 | (addr >> 3) & 1 | (addr >> 1) & 3 | (addr << 1) & 2; } - #endregion - private int prg_bank_mask_8k, chr_bank_mask_1k; private int prg_reg_mask_8k; private Func remap; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC6.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC6.cs index 6db8ca2420..ceb3c2a018 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC6.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC6.cs @@ -10,7 +10,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES //If you change any of the IRQ logic here, be sure to change it in VRC 4/7 as well. internal sealed class VRC6 : NesBoardBase { - #region CHRLUT // what did i do in a previous life to deserve this? // given the bottom four bits of $b003, and a 1K address region in PPU $0000:$3fff, @@ -104,7 +103,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES } } } - #endregion //configuration int prg_bank_mask_8k, chr_bank_mask_1k; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/FDS.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/FDS.cs index df253f5912..1e38b5b48a 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/FDS.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/FDS.cs @@ -17,14 +17,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES [NesBoardImplCancel] internal sealed class FDS : NesBoardBase { - #region configuration /// FDS bios image; should be 8192 bytes public byte[] biosrom; /// .FDS disk image byte[] diskimage; - #endregion - #region state RamAdapter diskdrive; FDSAudio audio; /// currently loaded side of the .FDS image, 0 based @@ -48,7 +45,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int timervalue; /// 4022.0,1 byte timerreg; - #endregion public override void SyncState(Serializer ser) { diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/RamAdapter.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/RamAdapter.cs index f31decf0ae..4256e32743 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/RamAdapter.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/RamAdapter.cs @@ -10,8 +10,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// public class RamAdapter { - #region fix broken images - static void WriteBlock(Stream dest, byte[] data, int pregap) { for (int i = 0; i < pregap - 1; i++) @@ -91,10 +89,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES return tmp; } - #endregion - - #region crc - /// /// advance a 16 bit CRC register with 1 new input bit. x.25 standard /// @@ -120,8 +114,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES return crc; } - #endregion - public void SyncState(Serializer ser) { ser.Sync(nameof(originaldisk), ref originaldisk, true); @@ -154,7 +146,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES ser.Sync(nameof(lookingforendofgap), ref lookingforendofgap); } - #region state /// the original contents of this disk when it was loaded. for virtual saveram diff byte[] originaldisk = null; /// currently loaded disk side (ca 65k bytes) @@ -196,8 +187,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES bool bytetransferflag; bool lookingforendofgap = false; - #endregion - public Action DriveLightCallback; /// diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.Core.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.Core.cs index 68f7b6d823..a6c3db99c0 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.Core.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.Core.cs @@ -62,8 +62,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES //Sound config public void SetVol1(int v) { apu.m_vol = v; } - #region Audio - BlipBuffer blip = new BlipBuffer(4096); const int blipbuffsize = 4096; @@ -117,8 +115,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES apu.sampleclock = 0; } - #endregion - public void HardReset() { cpu = new MOS6502X(new CpuLink(this)) diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NESControllers.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NESControllers.cs index 3b3fa17ac6..0dddca8254 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NESControllers.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NESControllers.cs @@ -14,8 +14,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES * possible with the electronic interface available, but never used. */ - #region interfaces and such - /// /// callback type for PPU to tell if there's light for a lightgun to detect /// @@ -121,8 +119,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES void SyncState(Serializer ser); } - #endregion - /// /// a NES or AV famicom, with two attached devices /// @@ -804,7 +800,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES public class FamilyBasicKeyboard : IFamicomExpansion { - #region buttonlookup static string[] Buttons = { "0]", @@ -889,7 +884,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES "0DOWN", }; - #endregion static ControllerDefinition Definition = new ControllerDefinition { BoolButtons = new List(Buttons) }; @@ -1130,8 +1124,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES } } - #region settings - public class NESControlSettings { static readonly Dictionary FamicomExpansions; @@ -1244,6 +1236,4 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES } } } - - #endregion } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs index 7fdcb79385..2f0a07e770 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs @@ -89,8 +89,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES int IVideoLogicalOffsets.ScreenY => _settings.ClipTopAndBottom ? 8 : 0; - #region FPU precision - private interface IFPCtrl : IDisposable { IDisposable Save(); @@ -125,10 +123,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES IFPCtrl FP; - #endregion - - #region Controller - public ControllerDefinition ControllerDefinition { get; private set; } void SetControllerDefinition() @@ -195,8 +189,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES j2 = 0; } - #endregion - public bool FrameAdvance(IController controller, bool render, bool rendersound = true) { CheckDisposed(); @@ -243,8 +235,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES LagCount = 0; } - #region bootgod - public RomStatus? BootGodStatus { get; private set; } public string BootGodName { get; private set; } @@ -298,8 +288,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES } } - #endregion - public void Dispose() { if (Context != IntPtr.Zero) @@ -338,8 +326,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES return file; } - #region Blacklist - // These games are known to not work in quicknes but quicknes thinks it can run them, bail out if one of these is loaded private static readonly HashSet HashBlackList = new HashSet { @@ -593,7 +579,5 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES "D9B1B87204E025A637821A0168475E1209CE0C8A", // Top Gun (VS) "4D5C2BF0B8EAA1690182D692A02BE1CC871481F4", // Punch-Out!! (E) (VS) }; - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES9X/Snes9x.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES9X/Snes9x.cs index 5e161a1765..2ea911572f 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES9X/Snes9x.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES9X/Snes9x.cs @@ -70,8 +70,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES9X PutSettings(settings); } - #region controller - private readonly short[] _inputState = new short[16 * 8]; private List _cdums; private readonly List _controllers = new List(); @@ -267,8 +265,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES9X private ControllerDefinition _controllerDefinition; public override ControllerDefinition ControllerDefinition => _controllerDefinition; - #endregion - public DisplayType Region { get; } protected override LibWaterboxCore.FrameInfo FrameAdvancePrep(IController controller, bool render, bool rendersound) @@ -286,17 +282,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES9X public override int VirtualWidth => BufferWidth == 256 && BufferHeight <= 240 ? 293 : 587; public override int VirtualHeight => BufferHeight <= 240 && BufferWidth == 512 ? BufferHeight * 2 : BufferHeight; - #region IStatable - protected override void LoadStateBinaryInternal(BinaryReader reader) { _core.biz_post_load_state(); } - #endregion - - #region settings - private Settings _settings; private SyncSettings _syncSettings; @@ -460,7 +450,5 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES9X return !DeepEquality.DeepEquals(x, y); } } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/VirtualBoyee.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/VirtualBoyee.cs index 24f01a7f49..24d767ca48 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/VirtualBoyee.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/VB/VirtualBoyee.cs @@ -66,8 +66,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.VB return new LibVirtualBoyee.FrameInfo { Buttons = GetButtons(controller) }; } - #region Controller - private LibVirtualBoyee.Buttons GetButtons(IController c) { var ret = 0; @@ -118,10 +116,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.VB public override ControllerDefinition ControllerDefinition => VirtualBoyController; - #endregion - - #region ISettable - public class SyncSettings { [DefaultValue(false)] @@ -249,7 +243,5 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.VB _syncSettings = o; return ret ? PutSettingsDirtyBits.RebootCore : PutSettingsDirtyBits.None; } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Consoles/SNK/DualNeoGeoPort.cs b/src/BizHawk.Emulation.Cores/Consoles/SNK/DualNeoGeoPort.cs index c21e20c425..08970b5f70 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/SNK/DualNeoGeoPort.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/SNK/DualNeoGeoPort.cs @@ -67,8 +67,6 @@ namespace BizHawk.Emulation.Cores.Consoles.SNK return true; } - #region link cable - private class LinkCable { public readonly BlockingCollection LeftIn = new BlockingCollection(); @@ -278,8 +276,6 @@ namespace BizHawk.Emulation.Cores.Consoles.SNK } } - #endregion - private class PrefixController : IController { public PrefixController(IController controller, string prefix) diff --git a/src/BizHawk.Emulation.Cores/Consoles/SNK/NeoGeoPort.cs b/src/BizHawk.Emulation.Cores/Consoles/SNK/NeoGeoPort.cs index a5c78ed327..fec4409bb2 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/SNK/NeoGeoPort.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/SNK/NeoGeoPort.cs @@ -75,8 +75,6 @@ namespace BizHawk.Emulation.Cores.Consoles.SNK }; } - #region Controller - private static int GetButtons(IController c) { var ret = 0; @@ -119,10 +117,6 @@ namespace BizHawk.Emulation.Cores.Consoles.SNK public override ControllerDefinition ControllerDefinition => NeoGeoPortableController; - #endregion - - #region ISettable - private SyncSettings _syncSettings; public class SyncSettings @@ -180,10 +174,6 @@ namespace BizHawk.Emulation.Cores.Consoles.SNK return ret ? PutSettingsDirtyBits.RebootCore : PutSettingsDirtyBits.None; } - #endregion - - #region ISaveram - public new bool SaveRamModified => _neopop.HasSaveRam(); public new byte[] CloneSaveRam() @@ -202,7 +192,5 @@ namespace BizHawk.Emulation.Cores.Consoles.SNK if (!_neopop.PutSaveRam(data, data.Length)) throw new InvalidOperationException("Core rejected the saveram"); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.IEmulator.cs b/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.IEmulator.cs index a2a3e84bee..d000f1d6fa 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.IEmulator.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.IEmulator.cs @@ -290,8 +290,6 @@ namespace BizHawk.Emulation.Cores.Sega.GGHawkLink R.Dispose(); } - #region Video provider - public int _frameHz = 60; public int[] _vidbuffer = new int[160 * 2 * 144]; @@ -329,10 +327,6 @@ namespace BizHawk.Emulation.Cores.Sega.GGHawkLink public uint[] color_palette = new uint[4]; - #endregion - - #region audio - public bool CanProvideAsync => false; public void SetSyncMode(SyncSoundMode mode) @@ -385,7 +379,5 @@ namespace BizHawk.Emulation.Cores.Sega.GGHawkLink { } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/PicoDrive.cs b/src/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/PicoDrive.cs index d6fc0a0b10..1c2dd0da78 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/PicoDrive.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/PicoDrive.cs @@ -183,8 +183,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.PicoDrive _core.SetCDReadCallback(_cdcallback); } - #region ISettable - public class SyncSettings { [DefaultValue(LibPicoDrive.Region.Auto)] @@ -243,19 +241,9 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.PicoDrive return ret ? PutSettingsDirtyBits.RebootCore : PutSettingsDirtyBits.None; } - #endregion - - #region IDriveLight - public bool DriveLightEnabled { get; } public bool DriveLightOn { get; private set; } - #endregion - - #region IRegionable - public DisplayType Region => _isPal ? DisplayType.PAL : DisplayType.NTSC; - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs b/src/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs index 4a8f705c6c..fd31bdaf12 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs @@ -183,8 +183,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn public DisplayType Region => _isPal ? DisplayType.PAL : DisplayType.NTSC; - #region ISettable - public class Settings { public enum ResolutionModeTypes @@ -479,10 +477,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn _core.SetVideoParameters(correctAspect, _settings.HBlend, _settings.HOverscan, sls, sle); } - #endregion - - #region IStatable - protected override void SaveStateBinaryInternal(BinaryWriter writer) { writer.Write(_activeDisk); @@ -505,10 +499,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn //PutSettings(_settings); } - #endregion - - #region Callbacks - private LibSaturnus.FirmwareSizeCallback _firmwareSizeCallback; private LibSaturnus.FirmwareDataCallback _firmwareDataCallback; private LibSaturnus.CDTOCCallback _cdTocCallback; @@ -602,8 +592,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn public bool DriveLightEnabled => true; public bool DriveLightOn { get; private set; } - #endregion - private const int PalFpsNum = 1734687500; private const int PalFpsDen = 61 * 455 * 1251; private const int NtscFpsNum = 1746818182; // 1746818181.8 diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs b/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs index ce95183ee3..61674e5e08 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs @@ -890,8 +890,6 @@ namespace BizHawk.Emulation.Cores.Sony.PSX public System.Drawing.Size VideoProvider_Padding { get; private set; } - #region Debugging - OctoshockDll.ShockCallback_Mem mem_cb; void ShockMemCallback(uint address, OctoshockDll.eShockMemCb type, uint size, uint value) @@ -956,10 +954,6 @@ namespace BizHawk.Emulation.Cores.Sony.PSX private IMemoryDomains MemoryDomains; - #endregion - - #region ISoundProvider - //private short[] sbuff = new short[1454 * 2]; //this is the most ive ever seen.. don't know why. two frames worth i guess private short[] sbuff = new short[1611 * 2]; //need this for pal private int sbuffcontains = 0; @@ -992,10 +986,6 @@ namespace BizHawk.Emulation.Cores.Sony.PSX throw new InvalidOperationException("Async mode is not supported."); } - #endregion - - #region ISaveRam - public byte[] CloneSaveRam() { var cfg = _SyncSettings.FIOConfig.ToLogical(); @@ -1058,10 +1048,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX } } - #endregion //ISaveRam - - #region Savestates //THIS IS STILL AWFUL byte[] savebuff; @@ -1144,10 +1131,6 @@ namespace BizHawk.Emulation.Cores.Sony.PSX return savebuff2; } - #endregion - - #region Settings - Settings _Settings = new Settings(); SyncSettings _SyncSettings; @@ -1295,7 +1278,5 @@ namespace BizHawk.Emulation.Cores.Sony.PSX return reboot ? PutSettingsDirtyBits.RebootCore : PutSettingsDirtyBits.None; } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs b/src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs index f30d37b66e..d868866c2c 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs @@ -98,8 +98,6 @@ namespace BizHawk.Emulation.Cores.WonderSwan public string SystemId => "WSWAN"; public bool DeterministicEmulation { get; } - #region Debugging - private readonly InputCallbackSystem _inputCallbacks = new InputCallbackSystem(); public IInputCallbackSystem InputCallbacks => _inputCallbacks; @@ -189,10 +187,6 @@ namespace BizHawk.Emulation.Cores.WonderSwan MemoryCallbacks.HasExecutes ? ExecCallbackD : null); } - #endregion - - #region IVideoProvider - void InitVideo(bool rotate) { if (rotate) @@ -219,7 +213,5 @@ namespace BizHawk.Emulation.Cores.WonderSwan public int VsyncNumerator => 3072000; // master CPU clock, also pixel clock public int VsyncDenominator => (144 + 15) * (224 + 32); // 144 vislines, 15 vblank lines; 224 vispixels, 32 hblank pixels - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Libretro/LibretroCore.cs b/src/BizHawk.Emulation.Cores/Libretro/LibretroCore.cs index ed6803e871..0eef7fe8af 100644 --- a/src/BizHawk.Emulation.Cores/Libretro/LibretroCore.cs +++ b/src/BizHawk.Emulation.Cores/Libretro/LibretroCore.cs @@ -207,8 +207,6 @@ namespace BizHawk.Emulation.Cores.Libretro public int VsyncNumerator { get; private set; } public int VsyncDenominator { get; private set; } - #region ISoundProvider - SpeexResampler resampler; short[] sampbuff = new short[0]; @@ -243,8 +241,6 @@ namespace BizHawk.Emulation.Cores.Libretro nsamprecv += (int)frames; } - #endregion - public static ControllerDefinition CreateControllerDefinition(SyncSettings syncSettings) { ControllerDefinition definition = new ControllerDefinition(); @@ -296,7 +292,6 @@ namespace BizHawk.Emulation.Cores.Libretro public string SystemId => "Libretro"; public bool DeterministicEmulation => false; - #region ISaveRam //TODO - terrible things will happen if this changes at runtime byte[] saverambuff = new byte[0]; @@ -340,8 +335,6 @@ namespace BizHawk.Emulation.Cores.Libretro set => throw new NotImplementedException(); } - #endregion - public void ResetCounters() { timeFrameCounter = 0; @@ -349,8 +342,6 @@ namespace BizHawk.Emulation.Cores.Libretro IsLagFrame = false; } - #region savestates - private byte[] savebuff, savebuff2; public void SaveStateBinary(BinaryWriter writer) @@ -400,10 +391,6 @@ namespace BizHawk.Emulation.Cores.Libretro ms.Close(); return savebuff2; } - - #endregion - - } //class } //namespace diff --git a/src/BizHawk.Emulation.Cores/Sound/OneBitBeeper.cs b/src/BizHawk.Emulation.Cores/Sound/OneBitBeeper.cs index e56bd59f9d..b62d6760a6 100644 --- a/src/BizHawk.Emulation.Cores/Sound/OneBitBeeper.cs +++ b/src/BizHawk.Emulation.Cores/Sound/OneBitBeeper.cs @@ -81,8 +81,6 @@ namespace BizHawk.Emulation.Cores.Sound lastPulse = pulse; } - #region Volume Handling - /// /// Beeper volume /// Accepts an int 0-100 value @@ -131,10 +129,6 @@ namespace BizHawk.Emulation.Cores.Sound return shortvol / increment; } - #endregion - - #region ISoundProvider - public bool CanProvideAsync => false; public SyncSoundMode SyncMode => SyncSoundMode.Sync; @@ -169,10 +163,6 @@ namespace BizHawk.Emulation.Cores.Sound clockCounter = 0; } - #endregion - - #region State Serialization - public void SyncState(Serializer ser) { ser.BeginSection("Beeper_" + _beeperId); @@ -183,7 +173,5 @@ namespace BizHawk.Emulation.Cores.Sound ser.Sync(nameof(lastPulse), ref lastPulse); ser.EndSection(); } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Sound/SyncSoundMixer.cs b/src/BizHawk.Emulation.Cores/Sound/SyncSoundMixer.cs index e3bc37285e..13e4713d65 100644 --- a/src/BizHawk.Emulation.Cores/Sound/SyncSoundMixer.cs +++ b/src/BizHawk.Emulation.Cores/Sound/SyncSoundMixer.cs @@ -173,8 +173,6 @@ namespace BizHawk.Emulation.Cores.Components return lookup.InputNSamp; } - #region ISoundProvider - public bool CanProvideAsync => false; public SyncSoundMode SyncMode => SyncSoundMode.Sync; @@ -240,8 +238,6 @@ namespace BizHawk.Emulation.Cores.Components } } - #endregion - /// /// Instantiated for every ISoundProvider source that is added to the mixer /// diff --git a/src/BizHawk.Emulation.Cores/Sound/YM2413.cs b/src/BizHawk.Emulation.Cores/Sound/YM2413.cs index dfff84f51f..858e5dd46d 100644 --- a/src/BizHawk.Emulation.Cores/Sound/YM2413.cs +++ b/src/BizHawk.Emulation.Cores/Sound/YM2413.cs @@ -72,8 +72,6 @@ namespace BizHawk.Emulation.Cores.Components } } - #region Implementation Uglyness - /* Mask */ static int OPLL_MASK_CH(int x) { return (1 << (x)); } const int OPLL_MASK_HH = (1 << (9)); @@ -1858,7 +1856,5 @@ namespace BizHawk.Emulation.Cores.Components } } - - #endregion } } diff --git a/src/BizHawk.Emulation.Cores/Waterbox/WaterboxCore.cs b/src/BizHawk.Emulation.Cores/Waterbox/WaterboxCore.cs index 61baef0cc8..c814a55ae2 100644 --- a/src/BizHawk.Emulation.Cores/Waterbox/WaterboxCore.cs +++ b/src/BizHawk.Emulation.Cores/Waterbox/WaterboxCore.cs @@ -84,8 +84,6 @@ namespace BizHawk.Emulation.Cores.Waterbox } } - #region RTC - private static readonly DateTime Epoch = new DateTime(1970, 1, 1, 0, 0, 0); private long _clockTime; private int _clockRemainder; @@ -112,10 +110,6 @@ namespace BizHawk.Emulation.Cores.Waterbox } } - #endregion - - #region ISaveRam - private LibWaterboxCore.MemoryArea[] _saveramAreas; private int _saveramSize; @@ -179,10 +173,6 @@ namespace BizHawk.Emulation.Cores.Waterbox } } - #endregion ISaveRam - - #region IEmulator - protected abstract LibWaterboxCore.FrameInfo FrameAdvancePrep(IController controller, bool render, bool rendersound); protected virtual void FrameAdvancePost() { } @@ -245,10 +235,6 @@ namespace BizHawk.Emulation.Cores.Waterbox public IInputCallbackSystem InputCallbacks { get; } = new InputCallbackSystem(); public virtual ControllerDefinition ControllerDefinition { get; protected set; } = NullController.Instance.Definition; - #endregion - - #region IStatable - public void LoadStateBinary(BinaryReader reader) { _exe.LoadStateBinary(reader); @@ -310,10 +296,6 @@ namespace BizHawk.Emulation.Cores.Waterbox } - #endregion - - #region ISoundProvider - public void SetSyncMode(SyncSoundMode mode) { if (mode == SyncSoundMode.Async) @@ -342,10 +324,6 @@ namespace BizHawk.Emulation.Cores.Waterbox public bool CanProvideAsync => false; public SyncSoundMode SyncMode => SyncSoundMode.Sync; - #endregion - - #region IVideoProvider - public virtual int[] GetVideoBuffer() { return _videoBuffer; @@ -359,7 +337,5 @@ namespace BizHawk.Emulation.Cores.Waterbox public virtual int VsyncNumerator { get; protected set; } public virtual int VsyncDenominator { get; protected set; } public int BackgroundColor => unchecked((int)0xff000000); - - #endregion } } diff --git a/src/BizHawk.Emulation.DiscSystem/CDFS/EndianBitConverter.cs b/src/BizHawk.Emulation.DiscSystem/CDFS/EndianBitConverter.cs index 1816e5c303..5b7172ac2c 100644 --- a/src/BizHawk.Emulation.DiscSystem/CDFS/EndianBitConverter.cs +++ b/src/BizHawk.Emulation.DiscSystem/CDFS/EndianBitConverter.cs @@ -16,8 +16,6 @@ namespace BizHawk.Emulation.DiscSystem /// begins. /// public class EndianBitConverter { - #region Static Constructors - /// /// Build a converter from little endian to the system endian-ness. /// @@ -30,19 +28,11 @@ namespace BizHawk.Emulation.DiscSystem /// The converter public static EndianBitConverter CreateForBigEndian() => new EndianBitConverter(BitConverter.IsLittleEndian); - #endregion - - #region Private Properties - /// /// Keep track of whether we need to swap the bytes or not /// private bool swap; - #endregion - - #region Private Constructor - /// /// Create the converter with the given endian-ness. /// @@ -51,10 +41,6 @@ namespace BizHawk.Emulation.DiscSystem swap = swapBytes; } - #endregion - - #region 16-bit - public short ToInt16(byte[] data) { return ToInt16(data, 0); } @@ -70,10 +56,6 @@ namespace BizHawk.Emulation.DiscSystem return BitConverter.ToInt16(corrected, offset); } - #endregion - - #region 32-bit - public int ToInt32(byte[] data) { return ToInt32(data, 0); } @@ -89,10 +71,6 @@ namespace BizHawk.Emulation.DiscSystem return BitConverter.ToInt32(corrected, offset); } - #endregion - - #region 64-bit - public long ToInt64(byte[] data) { return ToInt64(data, 0); } @@ -108,11 +86,8 @@ namespace BizHawk.Emulation.DiscSystem return BitConverter.ToInt64(corrected, offset); } - #endregion - // (asni 20171013) - Some methods I wrote that have been shoehorned in from another project to speed up development time // If these are offensive in any way, tell me I suck and that I need to do more work with existing methods - #region Misc /// /// Returns a byte array of any length @@ -143,7 +118,5 @@ namespace BizHawk.Emulation.DiscSystem int result = BitConverter.ToInt32(bytes, 0); return result; } - - #endregion } } diff --git a/src/BizHawk.Emulation.DiscSystem/CDFS/ISODirectoryNode.cs b/src/BizHawk.Emulation.DiscSystem/CDFS/ISODirectoryNode.cs index 07e8e71731..a36a22a16e 100644 --- a/src/BizHawk.Emulation.DiscSystem/CDFS/ISODirectoryNode.cs +++ b/src/BizHawk.Emulation.DiscSystem/CDFS/ISODirectoryNode.cs @@ -10,17 +10,11 @@ namespace BizHawk.Emulation.DiscSystem /// public class ISODirectoryNode : ISONode { - #region Public Properties - /// /// The children in this directory. /// public Dictionary Children; - #endregion - - #region Construction - /// /// Constructor. /// @@ -31,10 +25,6 @@ namespace BizHawk.Emulation.DiscSystem this.Children = new Dictionary(); } - #endregion - - #region Parsing - /// /// Parse the children based on the data in this directory. /// @@ -118,10 +108,6 @@ namespace BizHawk.Emulation.DiscSystem s.Seek(currentPosition, SeekOrigin.Begin); } - #endregion - - #region Printing - /// /// Print out this node's children. /// @@ -151,7 +137,5 @@ namespace BizHawk.Emulation.DiscSystem } } } - - #endregion } } diff --git a/src/BizHawk.Emulation.DiscSystem/CDFS/ISOFile.cs b/src/BizHawk.Emulation.DiscSystem/CDFS/ISOFile.cs index aad68e2e8d..613c0d3496 100644 --- a/src/BizHawk.Emulation.DiscSystem/CDFS/ISOFile.cs +++ b/src/BizHawk.Emulation.DiscSystem/CDFS/ISOFile.cs @@ -46,17 +46,11 @@ namespace BizHawk.Emulation.DiscSystem /// public class ISOFile { - #region Constants - /// /// We are hard coding the SECTOR_SIZE /// public const int SECTOR_SIZE = 2048; - #endregion - - #region Static Members - /// /// Making this a static for now. Every other way I tried was fairly ineligant (asni) /// @@ -64,10 +58,6 @@ namespace BizHawk.Emulation.DiscSystem public static List CDIPathTable; - #endregion - - #region Public Members - /// /// This is a list of all the volume descriptors in the disk image. /// NOTE: The first entry should be the primary volume. @@ -84,10 +74,6 @@ namespace BizHawk.Emulation.DiscSystem /// public ISOFormat CDFSType; - #endregion - - #region Construction - /// /// Construct the ISO file data structures, but leave everything /// blank. @@ -96,10 +82,6 @@ namespace BizHawk.Emulation.DiscSystem { } - #endregion - - #region Parsing - /// /// Parse the given stream to populate the iso information /// @@ -216,10 +198,6 @@ namespace BizHawk.Emulation.DiscSystem } } - #endregion - - #region Printing - /// /// Print the directory tree for the image. /// @@ -229,17 +207,11 @@ namespace BizHawk.Emulation.DiscSystem this.Root.Print(0); } - #endregion - - #region Misc - public enum ISOFormat { Unknown, ISO9660, CDInteractive } - - #endregion } } diff --git a/src/BizHawk.Emulation.DiscSystem/CDFS/ISOFileNode.cs b/src/BizHawk.Emulation.DiscSystem/CDFS/ISOFileNode.cs index f4cbdcb4cf..27d2a8af18 100644 --- a/src/BizHawk.Emulation.DiscSystem/CDFS/ISOFileNode.cs +++ b/src/BizHawk.Emulation.DiscSystem/CDFS/ISOFileNode.cs @@ -5,8 +5,6 @@ /// public class ISOFileNode : ISONode { - #region Construction - /// /// Constructor. /// @@ -16,7 +14,5 @@ { // Do Nothing } - - #endregion } } diff --git a/src/BizHawk.Emulation.DiscSystem/CDFS/ISONode.cs b/src/BizHawk.Emulation.DiscSystem/CDFS/ISONode.cs index 039a278306..727801235d 100644 --- a/src/BizHawk.Emulation.DiscSystem/CDFS/ISONode.cs +++ b/src/BizHawk.Emulation.DiscSystem/CDFS/ISONode.cs @@ -5,8 +5,6 @@ /// public class ISONode { - #region Public Properties - /// /// The record this node was created from. /// @@ -21,10 +19,6 @@ /// public long Length; - #endregion - - #region Construction - /// /// Constructor. /// TODO: Make this constructor protected??? @@ -36,7 +30,5 @@ this.Offset = record.OffsetOfData; this.Length = record.LengthOfData; } - - #endregion } } diff --git a/src/BizHawk.Emulation.DiscSystem/CDFS/ISONodeRecord.cs b/src/BizHawk.Emulation.DiscSystem/CDFS/ISONodeRecord.cs index fb56a5070a..8c48eb3c28 100644 --- a/src/BizHawk.Emulation.DiscSystem/CDFS/ISONodeRecord.cs +++ b/src/BizHawk.Emulation.DiscSystem/CDFS/ISONodeRecord.cs @@ -8,8 +8,6 @@ namespace BizHawk.Emulation.DiscSystem /// public class ISONodeRecord { - #region Constants - /// /// String representing the current directory entry /// @@ -20,10 +18,6 @@ namespace BizHawk.Emulation.DiscSystem /// public const string PARENT_DIRECTORY = ".."; - #endregion - - #region Public Properties - /// /// The length of the record in bytes. /// @@ -87,10 +81,6 @@ namespace BizHawk.Emulation.DiscSystem /// public string Name; - #endregion - - #region Construction - /// /// Constructor /// @@ -116,10 +106,6 @@ namespace BizHawk.Emulation.DiscSystem this.Name = null; } - #endregion - - #region File/Directory Methods - /// /// Return true if the record represents a file. /// @@ -138,10 +124,6 @@ namespace BizHawk.Emulation.DiscSystem return ((this.Flags >> 1) & 0x01) == 1; } - #endregion - - #region Parsing - /// /// Parse the record from an array and offset. /// @@ -314,7 +296,5 @@ namespace BizHawk.Emulation.DiscSystem // Seek to end s.Seek(startPosition + this.Length, SeekOrigin.Begin); } - - #endregion } } diff --git a/src/BizHawk.Emulation.DiscSystem/CDFS/ISOVolumeDescriptor.cs b/src/BizHawk.Emulation.DiscSystem/CDFS/ISOVolumeDescriptor.cs index 0f226f722d..cc9e4dba21 100644 --- a/src/BizHawk.Emulation.DiscSystem/CDFS/ISOVolumeDescriptor.cs +++ b/src/BizHawk.Emulation.DiscSystem/CDFS/ISOVolumeDescriptor.cs @@ -10,8 +10,6 @@ namespace BizHawk.Emulation.DiscSystem /// public class ISOVolumeDescriptor { - #region Constants - /// /// We are handling the parsing by reading the entire header and /// extracting the appropriate bytes. @@ -25,17 +23,9 @@ namespace BizHawk.Emulation.DiscSystem private const int LENGTH_TIME = 17; private const int LENGTH_RESERVED = 512; - #endregion - - #region Private Properties - private EndianBitConverter bc = EndianBitConverter.CreateForLittleEndian(); private EndianBitConverter bcBig = EndianBitConverter.CreateForBigEndian(); - #endregion - - #region Public Properties - /// /// The type of this volume description, only 1 and 255 are supported /// @@ -166,10 +156,6 @@ namespace BizHawk.Emulation.DiscSystem /// public int AddressOfPathTable; - #endregion - - #region Construction - /// /// Constructor. /// @@ -217,10 +203,6 @@ namespace BizHawk.Emulation.DiscSystem this.AddressOfPathTable = 0; } - #endregion - - #region Parsing - /// /// Start parsing the volume descriptor header. /// @@ -483,11 +465,7 @@ namespace BizHawk.Emulation.DiscSystem } return false; - } - - #endregion - - #region Type Information + } /// /// Returns true if this is the terminator volume descriptor. @@ -497,8 +475,6 @@ namespace BizHawk.Emulation.DiscSystem { return (this.Type == 255); } - - #endregion } /// @@ -506,8 +482,6 @@ namespace BizHawk.Emulation.DiscSystem /// public class CDIPathNode { - #region Public Properties - /// /// The length of the directory name. /// @@ -536,10 +510,6 @@ namespace BizHawk.Emulation.DiscSystem /// public string Name; - #endregion - - #region Construction - /// /// Empty Constructor /// @@ -548,10 +518,6 @@ namespace BizHawk.Emulation.DiscSystem } - #endregion - - #region Parsing - /* BP Size in bytes Description 1 1 Name size @@ -602,7 +568,5 @@ namespace BizHawk.Emulation.DiscSystem return pathNodes; } - - #endregion } }