diff --git a/BizHawk.Client.Common/FirmwareManager.cs b/BizHawk.Client.Common/FirmwareManager.cs index f6bbbe3abf..d6dc3040fa 100644 --- a/BizHawk.Client.Common/FirmwareManager.cs +++ b/BizHawk.Client.Common/FirmwareManager.cs @@ -129,8 +129,6 @@ namespace BizHawk.Client.Common /// /// Test to determine whether the supplied firmware file matches something in the firmware database /// - /// - /// public bool CanFileBeImported(string f) { try diff --git a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs index 671fb95c05..38b961c6c1 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs @@ -460,8 +460,6 @@ namespace BizHawk.Client.Common /// /// Returns index of the state right above the given frame /// - /// - /// public int GetStateIndexByFrame(int frame) { return _states.IndexOfKey(GetStateClosestToFrame(frame).Key); @@ -470,8 +468,6 @@ namespace BizHawk.Client.Common /// /// Returns frame of the state at the given index /// - /// - /// public int GetStateFrameByIndex(int index) { // feos: this is called super often by decay diff --git a/BizHawk.Client.DBMan/DATTools/DATConverter.cs b/BizHawk.Client.DBMan/DATTools/DATConverter.cs index bcf1cf67b1..8fc61718ec 100644 --- a/BizHawk.Client.DBMan/DATTools/DATConverter.cs +++ b/BizHawk.Client.DBMan/DATTools/DATConverter.cs @@ -29,8 +29,6 @@ namespace BizHawk.Client.DBMan /// /// Choose output directory /// - /// - /// private void button2_Click(object sender, EventArgs e) { var fbd = new FolderBrowserDialog(); @@ -45,8 +43,6 @@ namespace BizHawk.Client.DBMan /// /// Add import files to the list box /// - /// - /// private void buttonAddFiles_Click(object sender, EventArgs e) { var ofd = new OpenFileDialog(); @@ -70,8 +66,6 @@ namespace BizHawk.Client.DBMan /// /// Removes selected input files from the listbox /// - /// - /// private void buttonRemove_Click(object sender, EventArgs e) { List files = new List(); @@ -90,8 +84,6 @@ namespace BizHawk.Client.DBMan /// /// Attempt to process all selected files /// - /// - /// private void buttonStartProcessing_Click(object sender, EventArgs e) { // initial checks diff --git a/BizHawk.Client.DBMan/DATTools/DATParserBase.cs b/BizHawk.Client.DBMan/DATTools/DATParserBase.cs index 7034724261..a65f72afbc 100644 --- a/BizHawk.Client.DBMan/DATTools/DATParserBase.cs +++ b/BizHawk.Client.DBMan/DATTools/DATParserBase.cs @@ -17,8 +17,6 @@ namespace BizHawk.Client.DBMan /// /// Parses multiple DAT files and returns a single GamesDB format csv string /// - /// - /// public abstract string ParseDAT(string[] filePath); protected List IncomingData = new List(); @@ -170,8 +168,6 @@ namespace BizHawk.Client.DBMan /// /// Used to get the correct system code (that each gamedb csv needs) /// - /// - /// public static string GetSystemCode(SystemType type) { switch (type) diff --git a/BizHawk.Client.DBMan/DATTools/NOINTROParser.cs b/BizHawk.Client.DBMan/DATTools/NOINTROParser.cs index fb0381daa5..6ab083c29d 100644 --- a/BizHawk.Client.DBMan/DATTools/NOINTROParser.cs +++ b/BizHawk.Client.DBMan/DATTools/NOINTROParser.cs @@ -27,8 +27,6 @@ namespace BizHawk.Client.DBMan /// /// Parses multiple DAT files and returns a single GamesDB format csv string /// - /// - /// public override string ParseDAT(string[] filePath) { foreach (var s in filePath) @@ -116,7 +114,6 @@ namespace BizHawk.Client.DBMan /// Detailed info here: https://www.tosecdev.org/tosec-naming-convention /// Guts of this has been reused from here: https://github.com/Asnivor/MedLaunch/blob/master/MedLaunch/_Debug/DATDB/Platforms/TOSEC/StringConverterToSec.cs /// - /// private void ParseNOINTROFlags(GameDB g) { string nameString = g.Name; diff --git a/BizHawk.Client.DBMan/DATTools/TOSECParser.cs b/BizHawk.Client.DBMan/DATTools/TOSECParser.cs index e5137769ed..6a7af48079 100644 --- a/BizHawk.Client.DBMan/DATTools/TOSECParser.cs +++ b/BizHawk.Client.DBMan/DATTools/TOSECParser.cs @@ -27,8 +27,6 @@ namespace BizHawk.Client.DBMan /// /// Parses multiple DAT files and returns a single GamesDB format csv string /// - /// - /// public override string ParseDAT(string[] filePath) { foreach (var s in filePath) @@ -121,7 +119,6 @@ namespace BizHawk.Client.DBMan /// Detailed info here: https://www.tosecdev.org/tosec-naming-convention /// Guts of this has been reused from here: https://github.com/Asnivor/MedLaunch/blob/master/MedLaunch/_Debug/DATDB/Platforms/TOSEC/StringConverterToSec.cs /// - /// private void ParseTOSECFlags(GameDB g) { string nameString = g.Name; diff --git a/BizHawk.Client.EmuHawk/AVOut/AviWriter.cs b/BizHawk.Client.EmuHawk/AVOut/AviWriter.cs index 2cc69d918b..706382c3ec 100644 --- a/BizHawk.Client.EmuHawk/AVOut/AviWriter.cs +++ b/BizHawk.Client.EmuHawk/AVOut/AviWriter.cs @@ -136,7 +136,6 @@ namespace BizHawk.Client.EmuHawk /// opens an avi file for recording with the supplied enumerator used to name files. /// set a video codec token first. /// - /// public void OpenFile(IEnumerator nameProvider) { _nameProvider = nameProvider; diff --git a/BizHawk.Client.EmuHawk/AVOut/FFmpegWriter.cs b/BizHawk.Client.EmuHawk/AVOut/FFmpegWriter.cs index ccb9f64379..999c1deb7f 100644 --- a/BizHawk.Client.EmuHawk/AVOut/FFmpegWriter.cs +++ b/BizHawk.Client.EmuHawk/AVOut/FFmpegWriter.cs @@ -160,7 +160,6 @@ namespace BizHawk.Client.EmuHawk /// /// returns a string containing the commandline sent to ffmpeg and recent console (stderr) output /// - /// private string ffmpeg_geterror() { if (_ffmpeg.StartInfo.RedirectStandardError) diff --git a/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.cs b/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.cs index 510ca56392..bdecd7fedd 100644 --- a/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.cs +++ b/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.cs @@ -43,7 +43,6 @@ namespace BizHawk.Client.EmuHawk /// /// get a list of canned presets /// - /// public static FormatPreset[] GetPresets() { return new[] diff --git a/BizHawk.Client.EmuHawk/AVOut/IVideoWriter.cs b/BizHawk.Client.EmuHawk/AVOut/IVideoWriter.cs index bdaf8c0350..ca93ae6c19 100644 --- a/BizHawk.Client.EmuHawk/AVOut/IVideoWriter.cs +++ b/BizHawk.Client.EmuHawk/AVOut/IVideoWriter.cs @@ -105,7 +105,6 @@ namespace BizHawk.Client.EmuHawk // /// // /// name that command line parameters can refer to // /// -// /// // string ShortName(); } diff --git a/BizHawk.Client.EmuHawk/AVOut/JMDWriter.cs b/BizHawk.Client.EmuHawk/AVOut/JMDWriter.cs index 00286e0120..6acabff970 100644 --- a/BizHawk.Client.EmuHawk/AVOut/JMDWriter.cs +++ b/BizHawk.Client.EmuHawk/AVOut/JMDWriter.cs @@ -267,7 +267,6 @@ namespace BizHawk.Client.EmuHawk /// /// write big endian 16 bit unsigned /// - /// void writeBE16(UInt16 v) { byte[] b = new byte[2]; @@ -279,7 +278,6 @@ namespace BizHawk.Client.EmuHawk /// /// write big endian 32 bit unsigned /// - /// void writeBE32(UInt32 v) { byte[] b = new byte[4]; @@ -293,7 +291,6 @@ namespace BizHawk.Client.EmuHawk /// /// write big endian 64 bit unsigned /// - /// void writeBE64(UInt64 v) { byte[] b = new byte[8]; @@ -309,7 +306,6 @@ namespace BizHawk.Client.EmuHawk /// write variable length value /// encoding is similar to MIDI /// - /// void writeVar(UInt64 v) { byte[] b = new byte[10]; @@ -333,7 +329,6 @@ namespace BizHawk.Client.EmuHawk /// write variable length value /// encoding is similar to MIDI /// - /// private void writeVar(int v) { if (v < 0) @@ -365,7 +360,6 @@ namespace BizHawk.Client.EmuHawk /// actually write a packet to file /// timestamp sequence must be nondecreasing /// - /// void writeActual(JMDPacket j) { if (j.timestamp < timestampoff) @@ -408,7 +402,6 @@ namespace BizHawk.Client.EmuHawk /// assemble JMDPacket and send to packetqueue /// one audio packet is split up into many many JMD packets, since JMD requires only 2 samples (1 left, 1 right) per packet /// - /// public void AddSamples(short[] samples) { if (!stereo) @@ -459,7 +452,6 @@ namespace BizHawk.Client.EmuHawk /// will be written when order-appropriate wrt video /// the sound packets added must be internally ordered (but need not match video order) /// - /// void writesound(JMDPacket j) { while (vstorage.Count > 0) @@ -479,7 +471,6 @@ namespace BizHawk.Client.EmuHawk /// will be written when order-appropriate wrt audio /// the video packets added must be internally ordered (but need not match audio order) /// - /// void writevideo(JMDPacket j) { while (astorage.Count > 0) @@ -593,8 +584,6 @@ namespace BizHawk.Client.EmuHawk /// can be changed in future /// should always match IVideoProvider /// - /// - /// public void SetVideoParameters(int width, int height) { // each frame is dumped independently with its own resolution tag, so we don't care to store this diff --git a/BizHawk.Client.EmuHawk/AVOut/NutMuxer.cs b/BizHawk.Client.EmuHawk/AVOut/NutMuxer.cs index b8d7c772b4..a974785b1b 100644 --- a/BizHawk.Client.EmuHawk/AVOut/NutMuxer.cs +++ b/BizHawk.Client.EmuHawk/AVOut/NutMuxer.cs @@ -24,9 +24,6 @@ namespace BizHawk.Client.EmuHawk private readonly int _capacity; - /// - /// - /// /// total number of buffers to keep around public ReusableBufferPool(int capacity) { @@ -153,8 +150,6 @@ namespace BizHawk.Client.EmuHawk /// /// big endian 64 bit unsigned /// - /// - /// static void WriteBE64(ulong v, Stream stream) { byte[] b = new byte[8]; @@ -169,8 +164,6 @@ namespace BizHawk.Client.EmuHawk /// /// big endian 32 bit unsigned /// - /// - /// static void WriteBE32(uint v, Stream stream) { byte[] b = new byte[4]; @@ -185,8 +178,6 @@ namespace BizHawk.Client.EmuHawk /// /// big endian 32 bit unsigned /// - /// - /// static void WriteBE32(int v, Stream stream) { byte[] b = new byte[4]; @@ -213,7 +204,6 @@ namespace BizHawk.Client.EmuHawk /// /// seems to be different than standard CRC32????? /// - /// /// crc32, nut variant static uint NutCRC32(byte[] buf) { @@ -510,8 +500,6 @@ namespace BizHawk.Client.EmuHawk ReusableBufferPool _pool; - /// - /// /// frame data /// actual length of frame data /// presentation timestamp @@ -562,9 +550,6 @@ namespace BizHawk.Client.EmuHawk /// /// compare two NutFrames by pts /// - /// - /// - /// public static bool operator <=(NutFrame lhs, NutFrame rhs) { BigInteger left = new BigInteger(lhs.pts); @@ -587,7 +572,6 @@ namespace BizHawk.Client.EmuHawk /// /// write out frame, with syncpoint and all headers /// - /// public void WriteData(Stream dest) { dest.Write(data, 0, actual_length); diff --git a/BizHawk.Client.EmuHawk/AVOut/Quantize/OctreeQuantizer.cs b/BizHawk.Client.EmuHawk/AVOut/Quantize/OctreeQuantizer.cs index 5033f6d327..6e57519a29 100644 --- a/BizHawk.Client.EmuHawk/AVOut/Quantize/OctreeQuantizer.cs +++ b/BizHawk.Client.EmuHawk/AVOut/Quantize/OctreeQuantizer.cs @@ -149,7 +149,6 @@ namespace BizHawk.Client.EmuHawk /// /// Add a given color value to the octree /// - /// public void AddColor(int pixel) { // Check if this request is for the same color as the last @@ -267,8 +266,6 @@ namespace BizHawk.Client.EmuHawk /// /// Get the palette index for the passed color /// - /// - /// public int GetPaletteIndex(int pixel) { int ret = -1; diff --git a/BizHawk.Client.EmuHawk/AVOut/WavWriter.cs b/BizHawk.Client.EmuHawk/AVOut/WavWriter.cs index b57f5f846c..195c47b029 100644 --- a/BizHawk.Client.EmuHawk/AVOut/WavWriter.cs +++ b/BizHawk.Client.EmuHawk/AVOut/WavWriter.cs @@ -104,7 +104,6 @@ namespace BizHawk.Client.EmuHawk /// /// open a new underlying stream /// - /// private void opencurrent(Stream next) { file = new BinaryWriter(next, Encoding.ASCII); diff --git a/BizHawk.Client.EmuHawk/CustomControls/GDIRenderer.cs b/BizHawk.Client.EmuHawk/CustomControls/GDIRenderer.cs index 5bbe8445fc..92ef9d86c0 100644 --- a/BizHawk.Client.EmuHawk/CustomControls/GDIRenderer.cs +++ b/BizHawk.Client.EmuHawk/CustomControls/GDIRenderer.cs @@ -125,7 +125,6 @@ namespace BizHawk.Client.EmuHawk.CustomControls /// /// the max width to render the string in /// the number of characters that will fit under restriction - /// public Size MeasureString(string str, Font font, float maxWidth, out int charFit, out int charFitWidth) { SetFont(font); diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.Drawing.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll.Drawing.cs index 8323a367bb..b5a2556f7b 100644 --- a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.Drawing.cs +++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll.Drawing.cs @@ -530,7 +530,6 @@ namespace BizHawk.Client.EmuHawk /// /// Calls QueryItemBkColor callback for all visible cells and fills in the background of those cells. /// - /// private void DoBackGroundCallback(PaintEventArgs e, List visibleColumns) { int startIndex = FirstVisibleRow; diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs index 3cd63c326b..5bab6dc2e7 100644 --- a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs +++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs @@ -289,7 +289,6 @@ namespace BizHawk.Client.EmuHawk /// /// Returns all columns including those that are not visible /// - /// [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public RollColumns AllColumns => _columns; diff --git a/BizHawk.Client.EmuHawk/CustomControls/MsgBox.cs b/BizHawk.Client.EmuHawk/CustomControls/MsgBox.cs index 6a3dad199e..278fc0c73d 100644 --- a/BizHawk.Client.EmuHawk/CustomControls/MsgBox.cs +++ b/BizHawk.Client.EmuHawk/CustomControls/MsgBox.cs @@ -288,7 +288,6 @@ namespace BizHawk.Client.EmuHawk.CustomControls /// /// Paint the System Icon in the top left corner. /// - /// protected override void OnPaint(PaintEventArgs e) { if (m_sysIcon != null) diff --git a/BizHawk.Client.EmuHawk/DisplayManager/DisplaySurface.cs b/BizHawk.Client.EmuHawk/DisplayManager/DisplaySurface.cs index 91e0c23f01..1a053418a3 100644 --- a/BizHawk.Client.EmuHawk/DisplayManager/DisplaySurface.cs +++ b/BizHawk.Client.EmuHawk/DisplayManager/DisplaySurface.cs @@ -141,9 +141,6 @@ namespace BizHawk.Client.EmuHawk /// /// returns a new surface /// - /// - /// - /// public DisplaySurface ToPaddedSurface(int xpad0, int ypad0, int xpad1, int ypad1) { int new_width = Width + xpad0 + xpad1; diff --git a/BizHawk.Client.EmuHawk/IControlMainform.cs b/BizHawk.Client.EmuHawk/IControlMainform.cs index 3716de65b5..4579ee8a0b 100644 --- a/BizHawk.Client.EmuHawk/IControlMainform.cs +++ b/BizHawk.Client.EmuHawk/IControlMainform.cs @@ -42,7 +42,6 @@ /// when a Tool sets WantsToControlRewind /// Returns whether or not the rewind action actually occured /// - /// bool Rewind(); bool WantsToControlRestartMovie { get; } diff --git a/BizHawk.Common/BizInvoke/MemoryBlock.cs b/BizHawk.Common/BizInvoke/MemoryBlock.cs index 7bbdf04f36..b7d938ea11 100644 --- a/BizHawk.Common/BizInvoke/MemoryBlock.cs +++ b/BizHawk.Common/BizInvoke/MemoryBlock.cs @@ -66,7 +66,6 @@ namespace BizHawk.Common.BizInvoke /// /// allocate size bytes at any address /// - /// public MemoryBlock(ulong size) : this(0, size) { @@ -75,8 +74,6 @@ namespace BizHawk.Common.BizInvoke /// /// allocate size bytes starting at a particular address /// - /// - /// public MemoryBlock(ulong start, ulong size) { if (OSTailoredCode.CurrentOS != OSTailoredCode.DistinctOS.Windows) @@ -192,7 +189,6 @@ namespace BizHawk.Common.BizInvoke /// /// take a hash of the current full contents of the block, including unreadable areas /// - /// public byte[] FullHash() { if (!Active) diff --git a/BizHawk.Common/BizInvoke/WaterboxUtils.cs b/BizHawk.Common/BizInvoke/WaterboxUtils.cs index a85a437485..13f2ce5705 100644 --- a/BizHawk.Common/BizInvoke/WaterboxUtils.cs +++ b/BizHawk.Common/BizInvoke/WaterboxUtils.cs @@ -12,9 +12,6 @@ namespace BizHawk.Common.BizInvoke /// /// copy `len` bytes from `src` to `dest` /// - /// - /// - /// public static void CopySome(Stream src, Stream dst, long len) { var buff = new byte[4096]; diff --git a/BizHawk.Common/DeepEquality.cs b/BizHawk.Common/DeepEquality.cs index 04d09b4796..00cf2299a7 100644 --- a/BizHawk.Common/DeepEquality.cs +++ b/BizHawk.Common/DeepEquality.cs @@ -19,7 +19,6 @@ namespace BizHawk.Common /// /// return true if an array type is not 0-based /// - /// private static bool IsNonZeroBaedArray(Type t) { if (!t.IsArray) diff --git a/BizHawk.Common/Extensions/ReflectionExtensions.cs b/BizHawk.Common/Extensions/ReflectionExtensions.cs index 29bdfafd92..505939d717 100644 --- a/BizHawk.Common/Extensions/ReflectionExtensions.cs +++ b/BizHawk.Common/Extensions/ReflectionExtensions.cs @@ -205,7 +205,6 @@ namespace BizHawk.Common.ReflectionExtensions /// /// the address of a field relative to the address an object reference of that type points to. this function is very expensive to call. /// - /// public static IntPtr GetManagedOffset(this FieldInfo field) { Type type = field.DeclaringType; diff --git a/BizHawk.Common/IImportResolver.cs b/BizHawk.Common/IImportResolver.cs index a6130e8c67..ece638c7c3 100644 --- a/BizHawk.Common/IImportResolver.cs +++ b/BizHawk.Common/IImportResolver.cs @@ -16,9 +16,6 @@ namespace BizHawk.Common /// /// Resolve an entry point and throw an exception if that resolution is NULL /// - /// - /// - /// public static IntPtr SafeResolve(this IImportResolver dll, string entryPoint) { var ret = dll.Resolve(entryPoint); diff --git a/BizHawk.Common/SettingsUtil.cs b/BizHawk.Common/SettingsUtil.cs index 6a8e940692..2ce139ebfb 100644 --- a/BizHawk.Common/SettingsUtil.cs +++ b/BizHawk.Common/SettingsUtil.cs @@ -21,7 +21,6 @@ namespace BizHawk.Common /// /// set all properties (not fields!) of obj with a DefaultValueAttribute to that value /// - /// /// the obj to act on public static void SetDefaultValues(T obj) { diff --git a/BizHawk.Common/Win32Hacks.cs b/BizHawk.Common/Win32Hacks.cs index 77960636ff..7a20f6a95d 100644 --- a/BizHawk.Common/Win32Hacks.cs +++ b/BizHawk.Common/Win32Hacks.cs @@ -408,7 +408,6 @@ namespace BizHawk.Common /// /// Functionally the same as WaitOne(), but pumps com messa /// - /// public static void HackyComWaitOne(WaitHandle handle) { uint nativeResult; // result of the native wait API (WaitForMultipleObjects or MsgWaitForMultipleObjectsEx) diff --git a/BizHawk.Emulation.Common/Sound/Utilities/SpeexResampler.cs b/BizHawk.Emulation.Common/Sound/Utilities/SpeexResampler.cs index af0aeb6976..ff25d2276c 100644 --- a/BizHawk.Emulation.Common/Sound/Utilities/SpeexResampler.cs +++ b/BizHawk.Emulation.Common/Sound/Utilities/SpeexResampler.cs @@ -216,7 +216,6 @@ namespace BizHawk.Emulation.Common /// Get the latency in input samples introduced by the resampler. /// /// Resampler state - /// [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] public static extern int speex_resampler_get_input_latency(IntPtr st); @@ -224,7 +223,6 @@ namespace BizHawk.Emulation.Common /// Get the latency in output samples introduced by the resampler. /// /// Resampler state - /// [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] public static extern int speex_resampler_get_output_latency(IntPtr st); diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.Messaging.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.Messaging.cs index b80977c5c2..7f47a0fb50 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.Messaging.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.Messaging.cs @@ -13,8 +13,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Writes a message to the OSD /// - /// - /// public void SendMessage(string message, MessageCategory category) { if (!CheckMessageSettings(category)) @@ -51,7 +49,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Called when certain input presses are detected /// - /// public void OSD_FireInputMessage(string input) { StringBuilder sb = new StringBuilder(); @@ -467,8 +464,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Checks whether message category is allowed to be sent /// - /// - /// public bool CheckMessageSettings(MessageCategory category) { switch (Settings.OSDMessageVerbosity) diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.Util.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.Util.cs index f12acf1514..f51a83db9f 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.Util.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.Util.cs @@ -13,8 +13,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Helper method that returns a single INT32 from a BitArray /// - /// - /// public static int GetIntFromBitArray(BitArray bitArray) { if (bitArray.Length > 32) @@ -28,8 +26,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// POKEs a memory bus address /// - /// - /// public void PokeMemory(ushort addr, byte value) { _machine.WriteBus(addr, value); diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IBeeperDevice.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IBeeperDevice.cs index 2bca3c69eb..42626f6590 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IBeeperDevice.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IBeeperDevice.cs @@ -10,20 +10,16 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Initialisation /// - /// - /// void Init(int sampleRate, int tStatesPerFrame); /// /// Processes an incoming pulse value and adds it to the blipbuffer /// - /// void ProcessPulseValue(bool pulse); /// /// State serialization /// - /// void SyncState(Serializer ser); } } diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IFDDHost.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IFDDHost.cs index 89c99e3eb7..c65f7a6eda 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IFDDHost.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IFDDHost.cs @@ -14,7 +14,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Parses a new disk image and loads it into this floppy drive /// - /// void FDD_LoadDisk(byte[] diskData); /// diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IJoystick.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IJoystick.cs index e1c100a42b..7afe0d007c 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IJoystick.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IJoystick.cs @@ -24,15 +24,11 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Sets the joystick line based on key pressed /// - /// - /// void SetJoyInput(string key, bool isPressed); /// /// Gets the state of a particular joystick binding /// - /// - /// bool GetJoyInput(string key); } } diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IKeyboard.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IKeyboard.cs index 9c78f826d4..194837241f 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IKeyboard.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IKeyboard.cs @@ -36,21 +36,16 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Reads the current line status /// - /// byte ReadCurrentLine(); /// /// Sets the CPC key status /// - /// - /// void SetKeyStatus(string key, bool isPressed); /// /// Gets the status of a CPC key /// - /// - /// bool GetKeyStatus(string key); void SyncState(Serializer ser); diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IPSG.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IPSG.cs index 826cf338b1..2481387986 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IPSG.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IPSG.cs @@ -11,8 +11,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Initlization routine /// - /// - /// void Init(int sampleRate, int tStatesPerFrame); void SetFunction(int data); @@ -27,7 +25,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Writes to the PSG /// - /// void PortWrite(int value); /// @@ -59,13 +56,11 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Updates the sound based on number of frame cycles /// - /// void UpdateSound(int frameCycle); /// /// IStatable serialization /// - /// void SyncState(Serializer ser); } } diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IPortIODevice.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IPortIODevice.cs index 9394bf1d90..01a351f4b4 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IPortIODevice.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Abstraction/IPortIODevice.cs @@ -9,17 +9,11 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Device responds to an IN instruction /// - /// - /// - /// bool ReadPort(ushort port, ref int result); /// /// Device responds to an OUT instruction /// - /// - /// - /// bool WritePort(ushort port, int result); } } diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Datacorder/DatacorderDevice.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Datacorder/DatacorderDevice.cs index d9bb008f20..32adc5dbde 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Datacorder/DatacorderDevice.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Datacorder/DatacorderDevice.cs @@ -29,7 +29,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Initializes the datacorder device /// - /// public void Init(CPCBase machine) { _machine = machine; @@ -296,7 +295,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// TRUE: skip forward /// FALSE: skip backward /// - /// public void SkipBlock(bool skipForward) { int blockCount = _dataBlocks.Count; @@ -354,7 +352,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Inserts a new tape and sets up the tape device accordingly /// - /// public void LoadTape(byte[] tapeData) { // instantiate converters @@ -416,8 +413,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Simulates the spectrum 'EAR' input reading data from the tape /// - /// - /// public bool GetEarBit(long cpuCycle) { // decide how many cycles worth of data we are capturing @@ -768,7 +763,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Device responds to an IN instruction /// - /// public bool ReadPort() { if (TapeIsPlaying) @@ -800,8 +794,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Device responds to an OUT instruction /// - /// - /// public void WritePort(bool state) { // not implemented @@ -821,7 +813,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Bizhawk state serialization /// - /// public void SyncState(Serializer ser) { ser.BeginSection(nameof(DatacorderDevice)); diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDC.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDC.cs index 96815e78f3..3d110314c5 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDC.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDC.cs @@ -2471,7 +2471,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Handles CPU writing to the data register /// - /// private void WriteDataRegister(byte data) { if (!GetBit(MSR_RQM, StatusMain) || GetBit(MSR_DIO, StatusMain)) @@ -2523,9 +2522,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// Returns TRUE if successful. FALSE if otherwise /// Called only in idle phase /// - /// - /// - /// private bool ParseCommandByte(byte cmdByte) { // clear counters @@ -2618,7 +2614,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Parses the first 5 command argument bytes that are of the standard format /// - /// private void ParseParamByteStandard(int index) { byte currByte = CommBuffer[index]; diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDD.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDD.cs index 487048bbc6..248f2fcd0d 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDD.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDD.cs @@ -69,7 +69,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Searches for the requested sector /// - /// private FloppyDisk.Sector GetSector() { FloppyDisk.Sector sector = null; @@ -155,7 +154,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Parses a new disk image and loads it into this floppy drive /// - /// public void FDD_LoadDisk(byte[] diskData) { // we are only going to load into the first drive @@ -335,8 +333,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Moves the head across the disk cylinders /// - /// - /// public void MoveHead(SkipDirection direction, int cylinderCount) { // get total tracks @@ -378,10 +374,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Finds a supplied sector /// - /// - /// - /// - /// public FloppyDisk.Sector FindSector(ref byte[] resBuffer, CommandParameters prms) { int index =CurrentSector; @@ -449,8 +441,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Populates a result buffer /// - /// - /// public void FillResult(ref byte[] resBuffer, CHRN chrn) { // clear results @@ -480,7 +470,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Populates the result buffer with ReadID data /// - /// public void ReadID(ref byte[] resBuffer) { if (CheckDriveStatus() == false) @@ -797,7 +786,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Parses a new disk image and loads it into this floppy drive /// - /// public void FDD_LoadDisk(byte[] diskData) { // try dsk first diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.IPortIODevice.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.IPortIODevice.cs index 6a2c89f506..e58821a477 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.IPortIODevice.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.IPortIODevice.cs @@ -122,9 +122,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Device responds to an IN instruction /// - /// - /// - /// public bool ReadPort(ushort port, ref int data) { BitArray bits = new BitArray(new byte[] { (byte)data }); @@ -165,9 +162,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Device responds to an OUT instruction /// - /// - /// - /// public bool WritePort(ushort port, int data) { BitArray bits = new BitArray(new byte[] { (byte)data }); diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.Timing.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.Timing.cs index 9daed05605..41b4465f44 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.Timing.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.Timing.cs @@ -96,7 +96,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// Returns true if there is no delay /// Returns false if read is to be deferred /// - /// private bool CheckTiming() { // get delta diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.cs index a365a7b796..25f623548d 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.cs @@ -30,7 +30,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Main constructor /// - /// public NECUPD765() { InitCommandList(); diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPS765.Static.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPS765.Static.cs index 24ad458a34..f74d8b4d29 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPS765.Static.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPS765.Static.cs @@ -18,9 +18,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Returns the specified bit value from supplied byte /// - /// - /// - /// public static bool GetBit(int bitNumber, byte dataByte) { if (bitNumber < 0 || bitNumber > 7) @@ -34,8 +31,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Sets the specified bit of the supplied byte to 1 /// - /// - /// public static void SetBit(int bitNumber, ref byte dataByte) { if (bitNumber < 0 || bitNumber > 7) @@ -51,8 +46,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Sets the specified bit of the supplied byte to 0 /// - /// - /// public static void UnSetBit(int bitNumber, ref byte dataByte) { if (bitNumber < 0 || bitNumber > 7) @@ -68,8 +61,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Returns a drive number (0-3) based on the first two bits of the supplied byte /// - /// - /// public static int GetUnitSelect(byte dataByte) { int driveNumber = dataByte & 0x03; @@ -79,8 +70,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Sets the first two bits of a byte based on the supplied drive number (0-3) /// - /// - /// public static void SetUnitSelect(int driveNumber, ref byte dataByte) { switch (driveNumber) diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/AmstradGateArray.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/AmstradGateArray.cs index 110b2ce975..685893689e 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/AmstradGateArray.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/AmstradGateArray.cs @@ -1197,9 +1197,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Device responds to an IN instruction /// - /// - /// - /// public bool ReadPort(ushort port, ref int result) { // gate array is OUT only @@ -1209,9 +1206,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Device responds to an OUT instruction /// - /// - /// - /// public bool WritePort(ushort port, int result) { BitArray portBits = new BitArray(BitConverter.GetBytes(port)); @@ -1306,7 +1300,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// Screenmode is defined at each HSYNC (start of a new character line) /// Therefore we pass the mode in via constructor /// - /// //public CharacterLine(int screenMode) //{ //ScreenMode = screenMode; @@ -1319,7 +1312,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Adds a new horizontal character to the list /// - /// public void AddCharacter(Phase phase) { Phases.Add(phase); diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRCT_6845.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRCT_6845.cs index b68b4e8d21..265214aa8c 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRCT_6845.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRCT_6845.cs @@ -873,7 +873,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Selects a register /// - /// private void RegisterSelect(int data) { SelectedRegister = data & 0x1F; @@ -909,7 +908,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Writes to the currently selected register /// - /// private void WriteRegister(int data) { // 16 and 17 are read only registers on all types @@ -953,7 +951,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Reads from the currently selected register /// - /// private bool ReadRegister(ref int data) { bool addressed = false; @@ -1029,8 +1026,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Reads from the status register /// - /// - /// private bool ReadStatus(ref int data) { bool addressed = false; @@ -1107,9 +1102,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Device responds to an IN instruction /// - /// - /// - /// public bool ReadPort(ushort port, ref int result) { byte portUpper = (byte)(port >> 8); @@ -1143,9 +1135,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Device responds to an OUT instruction /// - /// - /// - /// public bool WritePort(ushort port, int result) { byte portUpper = (byte)(port >> 8); diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRTC6845.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRTC6845.cs index e17d5572e9..c0f7c303f6 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRTC6845.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRTC6845.cs @@ -48,7 +48,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// The only constructor /// - /// public CRTC6845(CRTCType type) { ChipType = type; @@ -363,8 +362,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// CPU (or other device) reads from the 8-bit databus /// - /// - /// public virtual bool ReadPort(ushort port, ref int result) { byte portUpper = (byte)(port >> 8); @@ -398,8 +395,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// CPU (or other device) writes to the 8-bit databus /// - /// - /// public virtual bool WritePort(ushort port, int value) { byte portUpper = (byte)(port >> 8); @@ -496,7 +491,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Selects a specific register /// - /// private void SelectRegister(int value) { var v = (byte)((byte)value & 0x1F); @@ -509,8 +503,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Attempts to read from the currently selected register /// - /// - /// private bool ReadRegister(ref int data) { switch ((int)ChipType) @@ -527,8 +519,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Attempts to write to the currently selected register /// - /// - /// private void WriteRegister(int data) { switch ((int)ChipType) @@ -544,8 +534,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Attempts to read from the internal status register (if present) /// - /// - /// private bool ReadStatus(ref int data) { switch ((int)ChipType) @@ -756,8 +744,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Read Register (HD6845S & UM6845) /// - /// - /// private bool ReadRegister_Type0(ref int data) { // Type 0 - write only register returns 0 when it is read from @@ -805,8 +791,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Read Register (UM6845R) /// - /// - /// private bool ReadRegister_Type1(ref int data) { // Type 1 - write only register returns 0 when it is read from @@ -865,8 +849,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Read Register (MC6845) /// - /// - /// private bool ReadRegister_Type2(ref int data) { switch (AddressRegister) @@ -916,8 +898,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Read Register (AMS40489 & pre-ASIC) /// - /// - /// private bool ReadRegister_Type3_4(ref int data) { // unsure of the register sizes at the moment @@ -984,7 +964,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Write Active Register (HD6845S & UM6845) /// - /// private void WriteRegister_Type0(int data) { byte v = (byte)data; @@ -1022,7 +1001,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Write Active Register (HD6845S & UM6845) /// - /// private void WriteRegister_Type1(int data) { byte v = (byte)data; @@ -1062,7 +1040,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Write Active Register (MC6845) /// - /// private void WriteRegister_Type2(int data) { byte v = (byte)data; @@ -1102,7 +1079,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Write Active Register (MC6845) /// - /// private void WriteRegister_Type3_4(int data) { // unsure of the register sizes at the moment @@ -1132,8 +1108,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// Read Status Register (UM6845R) /// This is fully implemented /// - /// - /// private bool ReadStatus_Type1(ref int data) { // Bit6: Set when latched LPEN strobe input is received / Reset when R17 or R16 is read from @@ -1147,8 +1121,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// Status Register is unavailable but attempts to read will return the currently /// selected register data instead /// - /// - /// private bool ReadStatus_Type3_4(ref int data) { return ReadRegister(ref data); @@ -1158,8 +1130,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// Read Status Register (HD6845S & UM6845) /// No status register available /// - /// - /// private bool ReadStatus_Unavailable(ref int data) { return false; diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRTDevice.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRTDevice.cs index b9d83a4723..c1bc6b89a2 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRTDevice.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRTDevice.cs @@ -306,8 +306,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Adds a single scanline character into the matrix /// - /// - /// public void AddScanlineCharacter(int index, RenderPhase phase, byte vid1, byte vid2, int[] pens) { if (index >= 64) @@ -332,8 +330,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Adds a HSYNC, VSYNC or HSYNC+VSYNC character into the scanline /// - /// - /// private void AddSyncValue(int charIndex, RenderPhase phase) { Characters[charIndex].Phase = phase; @@ -343,8 +339,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Adds a border character into the scanline /// - /// - /// private void AddBorderValue(int charIndex, int colourValue) { Characters[charIndex].Phase = RenderPhase.BORDER; @@ -377,9 +371,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// Adds a display character into the scanline /// Pixel matrix is calculated based on the current ScreenMode /// - /// - /// - /// public void AddDisplayValue(int charIndex, byte vid1, byte vid2, int[] pens) { Characters[charIndex].Phase = RenderPhase.DISPLAY; @@ -521,7 +512,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Returns the number of pixels decoded in this scanline (border and display) /// - /// private int GetPixelCount() { int cnt = 0; diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Input/StandardKeyboard.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Input/StandardKeyboard.cs index 74e1b06d09..993943a333 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Input/StandardKeyboard.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Input/StandardKeyboard.cs @@ -102,7 +102,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Reads the currently selected line /// - /// public byte ReadCurrentLine() { var lin = _currentLine; // - 0x40; @@ -118,8 +117,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Returns the index of the key within the matrix /// - /// - /// public int GetKeyIndexFromMatrix(string key) { int index = Array.IndexOf(KeyboardMatrix, key); @@ -129,8 +126,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Sets key status /// - /// - /// public void SetKeyStatus(string key, bool isPressed) { int index = GetKeyIndexFromMatrix(key); @@ -140,8 +135,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Gets a key's status /// - /// - /// public bool GetKeyStatus(string key) { int index = GetKeyIndexFromMatrix(key); diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/PPI/PPI_8255.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/PPI/PPI_8255.cs index 0f6599c4dd..1e7822e773 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/PPI/PPI_8255.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/PPI/PPI_8255.cs @@ -154,7 +154,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Writes to the control register /// - /// private void OUTControl(int data) { if (data.Bit(7)) @@ -214,7 +213,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Reads from Port A /// - /// private int INPortA() { if (DirPortA == PortDirection.Input) @@ -233,7 +231,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Reads from Port B /// - /// private int INPortB() { if (DirPortB == PortDirection.Input) @@ -279,7 +276,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Reads from Port C /// - /// private int INPortC() { // get the PortC value @@ -349,9 +345,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Device responds to an IN instruction /// - /// - /// - /// public bool ReadPort(ushort port, ref int result) { byte portUpper = (byte)(port >> 8); @@ -396,9 +389,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Device responds to an OUT instruction /// - /// - /// - /// public bool WritePort(ushort port, int result) { byte portUpper = (byte)(port >> 8); diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/SoundOutput/AY38912.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/SoundOutput/AY38912.cs index a1ee410cfb..34057aa8c6 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/SoundOutput/AY38912.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/SoundOutput/AY38912.cs @@ -186,7 +186,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Reads the value from the currently selected register /// - /// public int PortRead() { if (ActiveFunction == 1) @@ -215,7 +214,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Writes to the currently selected register /// - /// public void PortWrite(int value) { switch (ActiveFunction) @@ -363,7 +361,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Updates the audiobuffer based on the current frame t-state /// - /// public void UpdateSound(int frameCycle) { BufferUpdate(frameCycle); @@ -613,8 +610,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Initializes timing information for the frame /// - /// - /// private void InitTiming(int sampleRate, int frameTactCount) { _sampleRate = sampleRate; @@ -636,7 +631,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Updates the audiobuffer based on the current frame t-state /// - /// private void BufferUpdate(int cycle) { if (cycle > _tStatesPerFrame) @@ -822,7 +816,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// State serialization /// - /// public void SyncState(Serializer ser) { ser.BeginSection("PSG-AY"); diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/SoundOutput/Beeper.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/SoundOutput/Beeper.cs index cd2732bb21..e655305d41 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/SoundOutput/Beeper.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/SoundOutput/Beeper.cs @@ -82,8 +82,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Takes an int 0-100 and returns the relevant short volume to output /// - /// - /// private int VolumeConverterIn(int vol) { int maxLimit = short.MaxValue / 3; @@ -95,8 +93,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Takes an short volume and returns the relevant int value 0-100 /// - /// - /// private int VolumeConverterOut(int shortvol) { int maxLimit = short.MaxValue / 3; @@ -134,7 +130,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Processes an incoming pulse value and adds it to the blipbuffer /// - /// public void ProcessPulseValue(bool pulse) { if (!_machine._renderSound) diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC464/CPC464.Memory.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC464/CPC464.Memory.cs index d2b069b5a0..6ba6df3e80 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC464/CPC464.Memory.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC464/CPC464.Memory.cs @@ -16,8 +16,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// Simulates reading from the bus /// ROM paging should be handled here /// - /// - /// public override byte ReadBus(ushort addr) { int divisor = addr / 0x4000; @@ -61,8 +59,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// Simulates writing to the bus /// Writes to the bus ALWAYS go to RAM, regardless of what upper and lower ROMs are paged in /// - /// - /// public override void WriteBus(ushort addr, byte value) { int divisor = addr / 0x4000; @@ -96,8 +92,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Reads a byte of data from a specified memory address /// - /// - /// public override byte ReadMemory(ushort addr) { var data = ReadBus(addr); @@ -108,8 +102,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// Writes a byte of data to a specified memory address /// (with memory contention if appropriate) /// - /// - /// public override void WriteMemory(ushort addr, byte value) { WriteBus(addr, value); @@ -119,8 +111,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Sets up the ROM /// - /// - /// public override void InitROM(RomData[] romData) { foreach (var r in romData) diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC464/CPC464.Port.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC464/CPC464.Port.cs index d51f167e5e..73f6e99746 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC464/CPC464.Port.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC464/CPC464.Port.cs @@ -16,8 +16,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Reads a byte of data from a specified port address /// - /// - /// public override byte ReadPort(ushort port) { BitArray portBits = new BitArray(BitConverter.GetBytes(port)); @@ -58,8 +56,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// Writes a byte of data to a specified port address /// Because of the port decoding, multiple devices can be written to /// - /// - /// public override void WritePort(ushort port, byte value) { BitArray portBits = new BitArray(BitConverter.GetBytes(port)); diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC464/CPC464.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC464/CPC464.cs index 930efa8fcd..e1f1f57511 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC464/CPC464.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC464/CPC464.cs @@ -14,8 +14,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Main constructor /// - /// - /// public CPC464(AmstradCPC cpc, Z80A cpu, List files, bool autoTape, AmstradCPC.BorderType borderType) { CPC = cpc; diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.Memory.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.Memory.cs index 80e52351ac..0f89faff43 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.Memory.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.Memory.cs @@ -16,8 +16,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// Simulates reading from the bus /// ROM and RAM paging should be handled here /// - /// - /// public override byte ReadBus(ushort addr) { int divisor = addr / 0x4000; @@ -127,8 +125,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// Simulates writing to the bus /// Writes to the bus ALWAYS go to RAM, regardless of what upper and lower ROMs are paged in /// - /// - /// public override void WriteBus(ushort addr, byte value) { int divisor = addr / 0x4000; @@ -211,8 +207,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Reads a byte of data from a specified memory address /// - /// - /// public override byte ReadMemory(ushort addr) { var data = ReadBus(addr); @@ -223,8 +217,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// Writes a byte of data to a specified memory address /// (with memory contention if appropriate) /// - /// - /// public override void WriteMemory(ushort addr, byte value) { WriteBus(addr, value); @@ -234,8 +226,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Sets up the ROM /// - /// - /// public override void InitROM(RomData[] romData) { foreach (var r in romData) diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.Port.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.Port.cs index 089bab38b8..86c2fb5536 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.Port.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.Port.cs @@ -17,8 +17,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Reads a byte of data from a specified port address /// - /// - /// public override byte ReadPort(ushort port) { BitArray portBits = new BitArray(BitConverter.GetBytes(port)); @@ -72,8 +70,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// Writes a byte of data to a specified port address /// Because of the port decoding, multiple devices can be written to /// - /// - /// public override void WritePort(ushort port, byte value) { BitArray portBits = new BitArray(BitConverter.GetBytes(port)); diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.cs index c0aae0bf36..d14333524d 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPC6128/CPC6128.cs @@ -14,8 +14,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Main constructor /// - /// - /// public CPC6128(AmstradCPC cpc, Z80A cpu, List files, bool autoTape, AmstradCPC.BorderType borderType) { CPC = cpc; diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Media.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Media.cs index af001c4957..0c3d98f48a 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Media.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Media.cs @@ -105,7 +105,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Called on first instantiation (and subsequent core reboots) /// - /// protected void InitializeMedia(List files) { mediaImages = files; @@ -227,7 +226,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Identifies and sorts the various media types /// - /// private CPCMediaType IdentifyMedia(byte[] data) { // get first 16 bytes as a string diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Memory.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Memory.cs index fca9c18f31..ccfdf22ccc 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Memory.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Memory.cs @@ -71,15 +71,11 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// Simulates reading from the bus /// Paging should be handled here /// - /// - /// public abstract byte ReadBus(ushort addr); /// /// Pushes a value onto the data bus that should be valid as long as the interrupt is true /// - /// - /// public virtual byte PushBus() { return 0xFF; @@ -89,38 +85,29 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// Simulates writing to the bus /// Paging should be handled here /// - /// - /// public abstract void WriteBus(ushort addr, byte value); /// /// Reads a byte of data from a specified memory address /// (with memory contention if appropriate) /// - /// - /// public abstract byte ReadMemory(ushort addr); /// /// Writes a byte of data to a specified memory address /// (with memory contention if appropriate) /// - /// - /// public abstract void WriteMemory(ushort addr, byte value); /// /// Sets up the ROM /// - /// public abstract void InitROM(RomData[] romData); /// /// ULA reads the memory at the specified address /// (No memory contention) /// - /// - /// public virtual byte FetchScreenMemory(ushort addr) { int divisor = addr / 0x4000; diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Port.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Port.cs index ccc61b9165..4cee77f59f 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Port.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Port.cs @@ -14,15 +14,11 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Reads a byte of data from a specified port address /// - /// - /// public abstract byte ReadPort(ushort port); /// /// Writes a byte of data to a specified port address /// - /// - /// public abstract void WritePort(ushort port, byte value); /// @@ -31,8 +27,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// https://web.archive.org/web/20090808085929/http://www.cepece.info/amstrad/docs/iopord.html /// http://www.cpcwiki.eu/index.php/I/O_Port_Summary /// - /// - /// protected virtual PortDevice DecodeINPort(ushort port) { PortDevice dev = PortDevice.Unknown; @@ -67,8 +61,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// https://web.archive.org/web/20090808085929/http://www.cepece.info/amstrad/docs/iopord.html /// http://www.cpcwiki.eu/index.php/I/O_Port_Summary /// - /// - /// protected virtual List DecodeOUTPort(ushort port) { List devs = new List(); diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/GateArrayBase.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/GateArrayBase.cs index cfe9fedf05..31fd0a3573 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/GateArrayBase.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/GateArrayBase.cs @@ -276,7 +276,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Selects the pen /// - /// public virtual void SetPen(BitArray bi) { if (bi[4]) @@ -296,7 +295,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Selects colour for the currently selected pen /// - /// public virtual void SetPenColour(BitArray bi) { byte[] b = new byte[1]; @@ -308,8 +306,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Returns the actual ARGB pen colour value /// - /// - /// public virtual int GetPenColour(int idx) { return CPCHardwarePalette[PenColours[idx]]; @@ -318,7 +314,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Screen mode and ROM config /// - /// public virtual void SetReg2(BitArray bi) { byte[] b = new byte[1]; @@ -361,7 +356,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// Only available on machines with a 64KB memory expansion /// Default assume we dont have this /// - /// public virtual void SetRAM(BitArray bi) { return; @@ -397,9 +391,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Device responds to an IN instruction /// - /// - /// - /// public bool ReadPort(ushort port, ref int result) { // gate array is OUT only @@ -409,9 +400,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Device responds to an OUT instruction /// - /// - /// - /// public bool WritePort(ushort port, int result) { BitArray portBits = new BitArray(BitConverter.GetBytes(port)); diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/CPCExtendedFloppyDisk.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/CPCExtendedFloppyDisk.cs index 34be938128..c83bf7d840 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/CPCExtendedFloppyDisk.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/CPCExtendedFloppyDisk.cs @@ -18,7 +18,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Attempts to parse incoming disk data /// - /// /// /// TRUE: disk parsed /// FALSE: unable to parse disk @@ -149,9 +148,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Takes a double-sided disk byte array and converts into 2 single-sided arrays /// - /// - /// - /// public static bool SplitDoubleSided(byte[] data, List results) { // look for standard magic string @@ -231,7 +227,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// State serlialization /// - /// public override void SyncState(Serializer ser) { ser.BeginSection("Plus3FloppyDisk"); diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/CPCFloppyDisk.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/CPCFloppyDisk.cs index f1f875b95f..54ac222dae 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/CPCFloppyDisk.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/CPCFloppyDisk.cs @@ -18,7 +18,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Attempts to parse incoming disk data /// - /// /// /// TRUE: disk parsed /// FALSE: unable to parse disk @@ -154,9 +153,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Takes a double-sided disk byte array and converts into 2 single-sided arrays /// - /// - /// - /// public static bool SplitDoubleSided(byte[] data, List results) { // look for standard magic string @@ -218,7 +214,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// State serlialization /// - /// public override void SyncState(Serializer ser) { ser.BeginSection("Plus3FloppyDisk"); diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/FloppyDisk.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/FloppyDisk.cs index 4524076517..c8145e910b 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/FloppyDisk.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/FloppyDisk.cs @@ -88,7 +88,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Attempts to parse incoming disk data /// - /// /// /// TRUE: disk parsed /// FALSE: unable to parse disk @@ -183,7 +182,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// Detection routine for shadow of the beast game /// Still cannot get this to work, but at least the game is detected /// - /// public bool DetectShadowOfTheBeast() { if (DiskTracks[0].Sectors.Length != 9) @@ -222,8 +220,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Detect speedlock weak sector /// - /// - /// public bool DetectSpeedlock(ref int[] weak) { // SPEEDLOCK NOTES (-asni 2018-05-01) @@ -287,8 +283,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Detect Alkatraz /// - /// - /// public bool DetectAlkatraz(ref int[] weak) { try @@ -330,8 +324,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Detect Paul Owens /// - /// - /// public bool DetectPaulOwens(ref int[] weak) { try @@ -368,8 +360,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Detect Hexagon copy protection /// - /// - /// public bool DetectHexagon(ref int[] weak) { try @@ -417,7 +407,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// Should be run at the end of the ParseDisk process /// If speedlock is detected the flag is set in the disk image /// - /// protected virtual void SpeedlockDetection() { @@ -515,7 +504,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Returns the track count for the disk /// - /// public virtual int GetTrackCount() { return DiskHeader.NumberOfTracks * DiskHeader.NumberOfSides; @@ -524,8 +512,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Reads the current sector ID info /// - /// - /// public virtual CHRN ReadID(byte trackIndex, byte side, int sectorIndex) { if (side != 0) @@ -578,7 +564,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// State serialization routines /// - /// public abstract void SyncState(Serializer ser); diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/MediaConverter.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/MediaConverter.cs index 3859f20479..435b067a90 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/MediaConverter.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/MediaConverter.cs @@ -39,7 +39,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Serialization method /// - /// public virtual void Read(byte[] data) { throw new NotImplementedException(this.GetType().ToString() + @@ -49,7 +48,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// DeSerialization method /// - /// public virtual void Write(byte[] data) { throw new NotImplementedException(this.GetType().ToString() + @@ -59,7 +57,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Serializer does a quick check, returns TRUE if file is detected as this type /// - /// public virtual bool CheckType(byte[] data) { throw new NotImplementedException(this.GetType().ToString() + @@ -71,8 +68,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Converts an int32 value into a byte array /// - /// - /// public static byte[] GetBytes(int value) { byte[] buf = new byte[4]; @@ -86,9 +81,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Returns an int32 from a byte array based on offset /// - /// - /// - /// public static int GetInt32(byte[] buf, int offsetIndex) { return buf[offsetIndex] | buf[offsetIndex + 1] << 8 | buf[offsetIndex + 2] << 16 | buf[offsetIndex + 3] << 24; @@ -97,9 +89,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Returns an uint16 from a byte array based on offset /// - /// - /// - /// public static ushort GetWordValue(byte[] buf, int offsetIndex) { return (ushort)(buf[offsetIndex] | buf[offsetIndex + 1] << 8); @@ -108,9 +97,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Updates a byte array with a uint16 value based on offset /// - /// - /// - /// public static void SetWordValue(byte[] buf, int offsetIndex, ushort value) { buf[offsetIndex] = (byte)value; @@ -120,8 +106,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Takes a PauseInMilliseconds value and returns the value in T-States /// - /// - /// public static int TranslatePause(int pauseInMS) { // t-states per millisecond @@ -135,8 +119,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Decompresses a byte array that is Z-RLE compressed /// - /// - /// public static void DecompressZRLE(byte[] sourceBuffer, ref byte[] destBuffer) { MemoryStream stream = new MemoryStream(); diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs index 3361d96126..44cee4a43a 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/CDT/CdtConverter.cs @@ -63,8 +63,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// However all timings are based on spectrum timings (3.5Mhz) /// so need to be adjusted for the CPC (4Mhz) /// - /// - /// private TapeDataBlock ConvertClock(TapeDataBlock db) { TapeDataBlock tb = new TapeDataBlock(); @@ -110,7 +108,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Returns TRUE if tzx header is detected /// - /// public override bool CheckType(byte[] data) { /* @@ -147,7 +144,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// DeSerialization method /// - /// public override void Read(byte[] data) { // clear existing tape blocks @@ -207,8 +203,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Processes a TZX block /// - /// - /// private void ProcessBlock(byte[] data, int id) { // process based on detected block ID @@ -1674,9 +1668,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Used to process either a standard or turbo data block /// - /// - /// - /// private TapeDataBlock DecodeDataBlock ( TapeDataBlock block, @@ -1900,9 +1891,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Used to process either a standard or turbo data block /// - /// - /// - /// private TapeDataBlock DecodeDataBlock ( TapeDataBlock block, @@ -1957,7 +1945,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// If neccessary a seperate PAUSE block will be created /// - /// private void CreatePauseBlock(TapeDataBlock original) { if (original.PauseInMS > 0) diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/TapeDataBlock.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/TapeDataBlock.cs index 8b0f9fafbc..56ab7163c1 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/TapeDataBlock.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/TapeDataBlock.cs @@ -88,8 +88,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Adds a single metadata item to the Dictionary /// - /// - /// public void AddMetaData(BlockDescriptorTitle descriptor, string data) { // check whether entry already exists @@ -143,7 +141,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// Returns the data periods as an array /// (primarily to aid in bizhawk state serialization) /// - /// public int[] GetDataPeriodsArray() { return DataPeriods.ToArray(); @@ -153,7 +150,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// Accepts an array of data periods and updates the DataPeriods list accordingly /// (primarily to aid in bizhawk state serialization) /// - /// public void SetDataPeriodsArray(int[] periodArray) { DataPeriods = new List(); @@ -167,7 +163,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Bizhawk state serialization /// - /// public void SyncState(Serializer ser, int blockPosition) { ser.BeginSection("DataBlock" + blockPosition); diff --git a/BizHawk.Emulation.Cores/Computers/AmstradCPC/ROM/RomData.cs b/BizHawk.Emulation.Cores/Computers/AmstradCPC/ROM/RomData.cs index cb37bbb177..9520f50323 100644 --- a/BizHawk.Emulation.Cores/Computers/AmstradCPC/ROM/RomData.cs +++ b/BizHawk.Emulation.Cores/Computers/AmstradCPC/ROM/RomData.cs @@ -35,11 +35,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC /// /// Initialise a RomData object /// - /// - /// - /// - /// - /// public static RomData InitROM(MachineType machineType, byte[] rom, ROMChipType type, int romPosition = 0) { RomData RD = new RomData(); diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IBeeperDevice.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IBeeperDevice.cs index 3988706911..3b8ec3b0a6 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IBeeperDevice.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IBeeperDevice.cs @@ -10,20 +10,16 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Initialisation /// - /// - /// void Init(int sampleRate, int tStatesPerFrame); /// /// Processes an incoming pulse value and adds it to the blipbuffer /// - /// void ProcessPulseValue(bool pulse); /// /// State serialization /// - /// void SyncState(Serializer ser); } } diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IFDDHost.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IFDDHost.cs index a62c6fe567..3bbc0c81d8 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IFDDHost.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IFDDHost.cs @@ -14,7 +14,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Parses a new disk image and loads it into this floppy drive /// - /// void FDD_LoadDisk(byte[] diskData); /// diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IJoystick.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IJoystick.cs index b971e3c412..6e29e02012 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IJoystick.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IJoystick.cs @@ -24,15 +24,11 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Sets the joystick line based on key pressed /// - /// - /// void SetJoyInput(string key, bool isPressed); /// /// Gets the state of a particular joystick binding /// - /// - /// bool GetJoyInput(string key); } } diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IKeyboard.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IKeyboard.cs index 278d39b6fd..085792d874 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IKeyboard.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IKeyboard.cs @@ -43,36 +43,26 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Sets the spectrum key status /// - /// - /// void SetKeyStatus(string key, bool isPressed); /// /// Gets the status of a spectrum key /// - /// - /// bool GetKeyStatus(string key); /// /// Returns the query byte /// - /// - /// byte GetLineStatus(byte lines); /// /// Reads a keyboard byte /// - /// - /// byte ReadKeyboardByte(ushort addr); /// /// Looks up a key in the keyboard matrix and returns the relevent byte value /// - /// - /// byte GetByteFromKeyMatrix(string key); void SyncState(Serializer ser); diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IPSG.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IPSG.cs index 0d54d6a97c..4f1523e70e 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IPSG.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IPSG.cs @@ -11,8 +11,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Initlization routine /// - /// - /// void Init(int sampleRate, int tStatesPerFrame); /// @@ -25,7 +23,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Writes to the PSG /// - /// void PortWrite(int value); /// @@ -57,13 +54,11 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Updates the sound based on number of frame cycles /// - /// void UpdateSound(int frameCycle); /// /// IStatable serialization /// - /// void SyncState(Serializer ser); } } diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IPortIODevice.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IPortIODevice.cs index 4a30e5eaa6..2ca7909fbd 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IPortIODevice.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IPortIODevice.cs @@ -9,17 +9,11 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Device responds to an IN instruction /// - /// - /// - /// bool ReadPort(ushort port, ref int result); /// /// Device responds to an OUT instruction /// - /// - /// - /// bool WritePort(ushort port, int result); } } diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs index e18c3ae68e..7b33813ba9 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs @@ -30,7 +30,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Initializes the datacorder device /// - /// public void Init(SpectrumBase machine) { _machine = machine; @@ -263,7 +262,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// TRUE: skip forward /// FALSE: skip backward /// - /// public void SkipBlock(bool skipForward) { int blockCount = _dataBlocks.Count; @@ -318,7 +316,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Inserts a new tape and sets up the tape device accordingly /// - /// public void LoadTape(byte[] tapeData) { // instantiate converters @@ -463,8 +460,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Simulates the spectrum 'EAR' input reading data from the tape /// - /// - /// public bool GetEarBit(long cpuCycle) { // decide how many cycles worth of data we are capturing @@ -929,9 +924,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Device responds to an IN instruction /// - /// - /// - /// public bool ReadPort(ushort port, ref int result) { if (TapeIsPlaying) @@ -961,9 +953,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Device responds to an OUT instruction /// - /// - /// - /// public bool WritePort(ushort port, int result) { if (!TapeIsPlaying) @@ -981,7 +970,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Bizhawk state serialization /// - /// public void SyncState(Serializer ser) { ser.BeginSection(nameof(DatacorderDevice)); diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs index b06daddf3c..54a2dab8a4 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs @@ -2413,7 +2413,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Handles CPU reading from the data register /// - /// private byte ReadDataRegister() { // default return value @@ -2478,7 +2477,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Handles CPU writing to the data register /// - /// private void WriteDataRegister(byte data) { if (!GetBit(MSR_RQM, StatusMain) || GetBit(MSR_DIO, StatusMain)) @@ -2530,9 +2528,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Returns TRUE if successful. FALSE if otherwise /// Called only in idle phase /// - /// - /// - /// private bool ParseCommandByte(byte cmdByte) { // clear counters @@ -2625,7 +2620,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Parses the first 5 command argument bytes that are of the standard format /// - /// private void ParseParamByteStandard(int index) { byte currByte = CommBuffer[index]; diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDD.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDD.cs index f96ae1938f..e639f6f604 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDD.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDD.cs @@ -69,7 +69,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Searches for the requested sector /// - /// private FloppyDisk.Sector GetSector() { FloppyDisk.Sector sector = null; @@ -155,7 +154,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Parses a new disk image and loads it into this floppy drive /// - /// public void FDD_LoadDisk(byte[] diskData) { // we are only going to load into the first drive @@ -335,8 +333,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Moves the head across the disk cylinders /// - /// - /// public void MoveHead(SkipDirection direction, int cylinderCount) { // get total tracks @@ -378,10 +374,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Finds a supplied sector /// - /// - /// - /// - /// public FloppyDisk.Sector FindSector(ref byte[] resBuffer, CommandParameters prms) { int index =CurrentSector; @@ -449,8 +441,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Populates a result buffer /// - /// - /// public void FillResult(ref byte[] resBuffer, CHRN chrn) { // clear results @@ -480,7 +470,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Populates the result buffer with ReadID data /// - /// public void ReadID(ref byte[] resBuffer) { if (CheckDriveStatus() == false) @@ -797,7 +786,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Parses a new disk image and loads it into this floppy drive /// - /// public void FDD_LoadDisk(byte[] diskData) { // try dsk first diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.IPortIODevice.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.IPortIODevice.cs index 3c53007c0b..7964653bab 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.IPortIODevice.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.IPortIODevice.cs @@ -74,9 +74,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Device responds to an IN instruction /// - /// - /// - /// public bool ReadPort(ushort port, ref int data) { BitArray bits = new BitArray(new byte[] { (byte)data }); @@ -117,9 +114,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Device responds to an OUT instruction /// - /// - /// - /// public bool WritePort(ushort port, int data) { BitArray bits = new BitArray(new byte[] { (byte)data }); diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.Timing.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.Timing.cs index ee4224e8a9..2ef6f4080d 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.Timing.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.Timing.cs @@ -96,7 +96,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Returns true if there is no delay /// Returns false if read is to be deferred /// - /// private bool CheckTiming() { // get delta diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.cs index d0c2c5ad20..c4b8d755a4 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.cs @@ -30,7 +30,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Main constructor /// - /// public NECUPD765() { InitCommandList(); diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPS765.Static.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPS765.Static.cs index 7788bca84c..276bd41ccd 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPS765.Static.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPS765.Static.cs @@ -18,9 +18,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns the specified bit value from supplied byte /// - /// - /// - /// public static bool GetBit(int bitNumber, byte dataByte) { if (bitNumber < 0 || bitNumber > 7) @@ -34,8 +31,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Sets the specified bit of the supplied byte to 1 /// - /// - /// public static void SetBit(int bitNumber, ref byte dataByte) { if (bitNumber < 0 || bitNumber > 7) @@ -51,8 +46,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Sets the specified bit of the supplied byte to 0 /// - /// - /// public static void UnSetBit(int bitNumber, ref byte dataByte) { if (bitNumber < 0 || bitNumber > 7) @@ -68,8 +61,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns a drive number (0-3) based on the first two bits of the supplied byte /// - /// - /// public static int GetUnitSelect(byte dataByte) { int driveNumber = dataByte & 0x03; @@ -79,8 +70,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Sets the first two bits of a byte based on the supplied drive number (0-3) /// - /// - /// public static void SetUnitSelect(int driveNumber, ref byte dataByte) { switch (driveNumber) diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/CursorJoystick.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/CursorJoystick.cs index 68606406ad..45e19d65e0 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/CursorJoystick.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/CursorJoystick.cs @@ -57,8 +57,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Sets the joystick line based on key pressed /// - /// - /// public void SetJoyInput(string key, bool isPressed) { var pos = GetBitPos(key); @@ -84,8 +82,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Gets the state of a particular joystick binding /// - /// - /// public bool GetJoyInput(string key) { var pos = GetBitPos(key); @@ -101,8 +97,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Gets the bit position of a particular joystick binding from the matrix /// - /// - /// public int GetBitPos(string key) { int index = Array.IndexOf(ButtonCollection, key); diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/KempstonJoystick.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/KempstonJoystick.cs index 87cf5f491d..733d33e6b1 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/KempstonJoystick.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/KempstonJoystick.cs @@ -44,8 +44,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Sets the joystick line based on key pressed /// - /// - /// public void SetJoyInput(string key, bool isPressed) { var pos = GetBitPos(key); @@ -58,8 +56,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Gets the state of a particular joystick binding /// - /// - /// public bool GetJoyInput(string key) { var pos = GetBitPos(key); @@ -81,8 +77,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Gets the bit position of a particular joystick binding from the matrix /// - /// - /// public int GetBitPos(string key) { int index = Array.IndexOf(ButtonCollection, key); diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/NullJoystick.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/NullJoystick.cs index 850b371054..ac4fd96c55 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/NullJoystick.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/NullJoystick.cs @@ -43,8 +43,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Sets the joystick line based on key pressed /// - /// - /// public void SetJoyInput(string key, bool isPressed) { var pos = GetBitPos(key); @@ -57,8 +55,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Gets the state of a particular joystick binding /// - /// - /// public bool GetJoyInput(string key) { var pos = GetBitPos(key); @@ -80,8 +76,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Gets the bit position of a particular joystick binding from the matrix /// - /// - /// public int GetBitPos(string key) { int index = Array.IndexOf(ButtonCollection, key); diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick1.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick1.cs index 1b5cc0b779..f96c125153 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick1.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick1.cs @@ -57,8 +57,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Sets the joystick line based on key pressed /// - /// - /// public void SetJoyInput(string key, bool isPressed) { var pos = GetBitPos(key); @@ -84,8 +82,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Gets the state of a particular joystick binding /// - /// - /// public bool GetJoyInput(string key) { var pos = GetBitPos(key); @@ -100,8 +96,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Gets the bit position of a particular joystick binding from the matrix /// - /// - /// public int GetBitPos(string key) { int index = Array.IndexOf(ButtonCollection, key); diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick2.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick2.cs index 4c391b41a8..59c1922372 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick2.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick2.cs @@ -57,8 +57,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Sets the joystick line based on key pressed /// - /// - /// public void SetJoyInput(string key, bool isPressed) { var pos = GetBitPos(key); @@ -84,8 +82,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Gets the state of a particular joystick binding /// - /// - /// public bool GetJoyInput(string key) { var pos = GetBitPos(key); @@ -100,8 +96,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Gets the bit position of a particular joystick binding from the matrix /// - /// - /// public int GetBitPos(string key) { int index = Array.IndexOf(ButtonCollection, key); diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/StandardKeyboard.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/StandardKeyboard.cs index 36a55e3d29..012b4207a4 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/StandardKeyboard.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/StandardKeyboard.cs @@ -188,9 +188,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Device responds to an IN instruction /// - /// - /// - /// public bool ReadPort(ushort port, ref int result) { /* @@ -264,9 +261,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Device responds to an OUT instruction /// - /// - /// - /// public bool WritePort(ushort port, int result) { // not implemented diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/SoundOuput/AY38912.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/SoundOuput/AY38912.cs index e249d0c02a..5f3e12d0ae 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/SoundOuput/AY38912.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/SoundOuput/AY38912.cs @@ -170,7 +170,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Used for snapshot generation /// - /// public int[] ExportRegisters() { return _registers; @@ -223,7 +222,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Reads the value from the currently selected register /// - /// public int PortRead() { return _registers[_activeRegister]; @@ -232,7 +230,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Writes to the currently selected register /// - /// public void PortWrite(int value) { if (_activeRegister >= 0x10) @@ -347,7 +344,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Updates the audiobuffer based on the current frame t-state /// - /// public void UpdateSound(int frameCycle) { BufferUpdate(frameCycle); @@ -595,8 +591,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Initializes timing information for the frame /// - /// - /// private void InitTiming(int sampleRate, int frameTactCount) { _sampleRate = sampleRate; @@ -620,7 +614,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Updates the audiobuffer based on the current frame t-state /// - /// private void BufferUpdate(int cycle) { if (cycle > _tStatesPerFrame) @@ -763,7 +756,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// State serialization /// - /// public void SyncState(Serializer ser) { ser.BeginSection("PSG-AY"); diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/CPUMonitor.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/CPUMonitor.cs index b18ad12a2c..922bea1d84 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/CPUMonitor.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/CPUMonitor.cs @@ -103,7 +103,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Looks up the current BUSRQ address that is about to be signalled on the upcoming cycle /// - /// private ushort AscertainBUSRQAddress() { ushort addr = 0; @@ -172,7 +171,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Running every cycle, this determines whether the upcoming BUSRQ is for an IO operation /// Also processes any contention /// - /// private bool CheckIO() { bool isIO = false; @@ -245,8 +243,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Returns TRUE if the supplied T-cycle within an IO operation has the possibility of being contended /// This can be different based on the emulated ZX Spectrum model /// - /// - /// private bool IsIOCycleContended(int T) { bool lowBitSet = (lastPortAddr & 0x0001) != 0; @@ -384,7 +380,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Called when the first byte of an instruction is fetched /// - /// public void OnExecFetch(ushort firstByte) { // fetch instruction without incrementing pc diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Memory.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Memory.cs index dba9be0182..327e90619b 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Memory.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Memory.cs @@ -41,8 +41,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Simulates reading from the bus (no contention) /// Paging should be handled here /// - /// - /// public override byte ReadBus(ushort addr) { int divisor = addr / 0x4000; @@ -111,8 +109,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Simulates writing to the bus (no contention) /// Paging should be handled here /// - /// - /// public override void WriteBus(ushort addr, byte value) { int divisor = addr / 0x4000; @@ -181,8 +177,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Reads a byte of data from a specified memory address /// (with memory contention if appropriate) /// - /// - /// public override byte ReadMemory(ushort addr) { var data = ReadBus(addr); @@ -192,8 +186,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns the ROM/RAM enum that relates to this particular memory read operation /// - /// - /// public override ZXSpectrum.CDLResult ReadCDL(ushort addr) { var result = new ZXSpectrum.CDLResult(); @@ -262,8 +254,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Writes a byte of data to a specified memory address /// (with memory contention if appropriate) /// - /// - /// public override void WriteMemory(ushort addr, byte value) { WriteBus(addr, value); @@ -272,7 +262,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Checks whether supplied address is in a potentially contended bank /// - /// public override bool IsContended(ushort addr) { var a = addr & 0xc000; @@ -302,7 +291,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns TRUE if there is a contended bank paged in /// - /// public override bool ContendedBankPaged() { switch (RAMPaged) @@ -322,8 +310,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// (No memory contention) /// Will read RAM5 (screen0) by default, unless RAM7 (screen1) is selected as output /// - /// - /// public override byte FetchScreenMemory(ushort addr) { byte value = new byte(); @@ -347,8 +333,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Sets up the ROM /// - /// - /// public override void InitROM(RomData romData) { RomData = romData; diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Port.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Port.cs index d4507749ff..15fdfd9b04 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Port.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.Port.cs @@ -11,8 +11,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Reads a byte of data from a specified port address /// - /// - /// public override byte ReadPort(ushort port) { bool deviceAddressed = true; @@ -79,8 +77,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Writes a byte of data to a specified port address /// - /// - /// public override void WritePort(ushort port, byte value) { // get a BitArray of the port diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.cs index c46e265ccf..c8f201157e 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/Pentagon128K/Pentagon128.cs @@ -14,8 +14,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Main constructor /// - /// - /// public Pentagon128(ZXSpectrum spectrum, Z80A cpu, ZXSpectrum.BorderType borderType, List files, List joysticks) { Spectrum = spectrum; diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs index 18345b0077..08076cb8dc 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs @@ -279,7 +279,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Instantiates the joysticks array /// - /// protected void InitJoysticks(List joys) { List jCollection = new List(); @@ -300,9 +299,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Instantiates a new IJoystick object /// - /// - /// - /// public IJoystick InstantiateJoystick(JoystickType type, int playerNumber) { switch (type) @@ -325,8 +321,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns a IJoystick object depending on the type (or null if not found) /// - /// - /// protected IJoystick LocateUniqueJoystick(JoystickType type) { return JoystickCollection.Where(a => a.JoyType == type).FirstOrDefault(); diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Media.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Media.cs index 46d6a62de2..4ed3a2a499 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Media.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Media.cs @@ -115,7 +115,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Called on first instantiation (and subsequent core reboots) /// - /// protected void InitializeMedia(List files) { mediaImages = files; @@ -240,7 +239,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Identifies and sorts the various media types /// - /// private SpectrumMediaType IdentifyMedia(byte[] data) { // get first 16 bytes as a string diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Memory.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Memory.cs index 475c0cd6bd..ea43ab75f5 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Memory.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Memory.cs @@ -96,15 +96,11 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Simulates reading from the bus /// Paging should be handled here /// - /// - /// public abstract byte ReadBus(ushort addr); /// /// Pushes a value onto the data bus that should be valid as long as the interrupt is true /// - /// - /// public virtual byte PushBus() { return 0xFF; @@ -114,8 +110,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Simulates writing to the bus /// Paging should be handled here /// - /// - /// public virtual void WriteBus(ushort addr, byte value) { throw new NotImplementedException("Must be overriden"); @@ -125,37 +119,28 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Reads a byte of data from a specified memory address /// (with memory contention if appropriate) /// - /// - /// public abstract byte ReadMemory(ushort addr); /// /// Returns the ROM/RAM enum that relates to this particular memory read operation /// - /// - /// public abstract ZXSpectrum.CDLResult ReadCDL(ushort addr); /// /// Writes a byte of data to a specified memory address /// (with memory contention if appropriate) /// - /// - /// public abstract void WriteMemory(ushort addr, byte value); /// /// Sets up the ROM /// - /// public abstract void InitROM(RomData romData); /// /// ULA reads the memory at the specified address /// (No memory contention) /// - /// - /// public virtual byte FetchScreenMemory(ushort addr) { var value = ReadBus((ushort)((addr & 0x3FFF) + 0x4000)); @@ -166,14 +151,12 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Checks whether supplied address is in a potentially contended bank /// - /// public abstract bool IsContended(ushort addr); /// /// Returns TRUE if there is a contended bank paged in /// - /// public abstract bool ContendedBankPaged(); #endregion @@ -183,7 +166,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Detects whether this is a 48k machine (or a 128k in 48k mode) /// - /// public virtual bool IsIn48kMode() { if (this.GetType() == typeof(ZX48) || @@ -201,7 +183,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Used to auto start/stop the tape device when appropriate /// * This isnt really used anymore for tape trap detection * /// - /// public virtual void TestForTapeTraps(int addr) { if (TapeDevice.TapeIsPlaying) diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Port.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Port.cs index 3f5cb5a477..ec3f4b9dce 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Port.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Port.cs @@ -24,15 +24,11 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Reads a byte of data from a specified port address /// - /// - /// public abstract byte ReadPort(ushort port); /// /// Writes a byte of data to a specified port address /// - /// - /// public abstract void WritePort(ushort port, byte value); } } diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ULA.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ULA.cs index 6ab1341a93..d9883a4321 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ULA.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ULA.cs @@ -137,7 +137,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Cycles the ULA clock /// Handles interrupt generation /// - /// public virtual void CycleClock(long totalCycles) { // render the screen @@ -306,7 +305,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Constructor /// - /// public RenderTable(ULA ula, MachineType machineType) { _ula = ula; @@ -318,7 +316,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Initializes the renderer /// - /// private void InitRenderer(MachineType machineType) { for (var t = 0; t < _ula.FrameCycleLength; t++) @@ -549,7 +546,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Renders to the screen buffer based on the current cycle /// - /// public void RenderScreen(int toCycle) { // check boundaries @@ -690,8 +686,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns floating bus value (if available) /// - /// - /// public void ReadFloatingBus(int tstate, ref int result, ushort port) { tstate += FloatingBusOffset; @@ -773,7 +767,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns the contention value for the current t-state /// - /// public int GetContentionValue() { return GetContentionValue((int)_machine.CurrentFrameCycle); @@ -782,7 +775,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns the contention value for the supplied t-state /// - /// public int GetContentionValue(int tstate) { if (tstate >= FrameCycleLength) @@ -797,7 +789,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns the contention value for the supplied t-state /// - /// public int GetPortContentionValue(int tstate) { if (tstate >= FrameCycleLength) diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Memory.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Memory.cs index 5824f782f9..8bb3a0b215 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Memory.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Memory.cs @@ -41,8 +41,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Simulates reading from the bus (no contention) /// Paging should be handled here /// - /// - /// public override byte ReadBus(ushort addr) { int divisor = addr / 0x4000; @@ -111,8 +109,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Simulates writing to the bus (no contention) /// Paging should be handled here /// - /// - /// public override void WriteBus(ushort addr, byte value) { int divisor = addr / 0x4000; @@ -181,8 +177,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Reads a byte of data from a specified memory address /// (with memory contention if appropriate) /// - /// - /// public override byte ReadMemory(ushort addr) { var data = ReadBus(addr); @@ -192,8 +186,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns the ROM/RAM enum that relates to this particular memory read operation /// - /// - /// public override ZXSpectrum.CDLResult ReadCDL(ushort addr) { var result = new ZXSpectrum.CDLResult(); @@ -262,8 +254,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Writes a byte of data to a specified memory address /// (with memory contention if appropriate) /// - /// - /// public override void WriteMemory(ushort addr, byte value) { WriteBus(addr, value); @@ -272,7 +262,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Checks whether supplied address is in a potentially contended bank /// - /// public override bool IsContended(ushort addr) { var a = addr & 0xc000; @@ -302,7 +291,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns TRUE if there is a contended bank paged in /// - /// public override bool ContendedBankPaged() { switch (RAMPaged) @@ -322,8 +310,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// (No memory contention) /// Will read RAM5 (screen0) by default, unless RAM7 (screen1) is selected as output /// - /// - /// public override byte FetchScreenMemory(ushort addr) { byte value = new byte(); @@ -347,8 +333,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Sets up the ROM /// - /// - /// public override void InitROM(RomData romData) { RomData = romData; diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Port.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Port.cs index c1839dcaf3..6c990fe182 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Port.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Port.cs @@ -11,8 +11,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Reads a byte of data from a specified port address /// - /// - /// public override byte ReadPort(ushort port) { bool deviceAddressed = true; @@ -79,8 +77,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Writes a byte of data to a specified port address /// - /// - /// public override void WritePort(ushort port, byte value) { // get a BitArray of the port diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.cs index 2a3884c9b2..5388165142 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.cs @@ -14,8 +14,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Main constructor /// - /// - /// public ZX128(ZXSpectrum spectrum, Z80A cpu, ZXSpectrum.BorderType borderType, List files, List joysticks) { Spectrum = spectrum; diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2/ZX128Plus2.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2/ZX128Plus2.cs index c5f833dfe4..d276e52bb1 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2/ZX128Plus2.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2/ZX128Plus2.cs @@ -14,8 +14,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Main constructor /// - /// - /// public ZX128Plus2(ZXSpectrum spectrum, Z80A cpu, ZXSpectrum.BorderType borderType, List files, List joysticks) : base(spectrum, cpu, borderType, files, joysticks) { diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Memory.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Memory.cs index 52d002ddf1..da344caa71 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Memory.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Memory.cs @@ -62,8 +62,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Simulates reading from the bus (no contention) /// Paging should be handled here /// - /// - /// public override byte ReadBus(ushort addr) { int divisor = addr / 0x4000; @@ -207,8 +205,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Simulates writing to the bus (no contention) /// Paging should be handled here /// - /// - /// public override void WriteBus(ushort addr, byte value) { int divisor = addr / 0x4000; @@ -356,8 +352,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Reads a byte of data from a specified memory address /// (with memory contention if appropriate) /// - /// - /// public override byte ReadMemory(ushort addr) { var data = ReadBus(addr); @@ -373,8 +367,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns the ROM/RAM enum that relates to this particular memory read operation /// - /// - /// public override ZXSpectrum.CDLResult ReadCDL(ushort addr) { var result = new ZXSpectrum.CDLResult(); @@ -518,8 +510,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Writes a byte of data to a specified memory address /// (with memory contention if appropriate) /// - /// - /// public override void WriteMemory(ushort addr, byte value) { // update ULA screen buffer if necessary BEFORE T1 write @@ -551,7 +541,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Checks whether supplied address is in a potentially contended bank /// - /// public override bool IsContended(ushort addr) { var a = addr & 0xc000; @@ -581,7 +570,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns TRUE if there is a contended bank paged in /// - /// public override bool ContendedBankPaged() { switch (RAMPaged) @@ -601,8 +589,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// (No memory contention) /// Will read RAM5 (screen0) by default, unless RAM7 (screen1) is selected as output /// - /// - /// public override byte FetchScreenMemory(ushort addr) { byte value = new byte(); @@ -626,8 +612,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Sets up the ROM /// - /// - /// public override void InitROM(RomData romData) { RomData = romData; diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Port.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Port.cs index 1e3af11048..1ef03898d7 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Port.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Port.cs @@ -11,8 +11,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Reads a byte of data from a specified port address /// - /// - /// public override byte ReadPort(ushort port) { bool deviceAddressed = true; @@ -60,8 +58,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Writes a byte of data to a specified port address /// - /// - /// public override void WritePort(ushort port, byte value) { // get a BitArray of the port diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.cs index ffde2726f7..a05903b7e7 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.cs @@ -14,8 +14,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Main constructor /// - /// - /// public ZX128Plus2a(ZXSpectrum spectrum, Z80A cpu, ZXSpectrum.BorderType borderType, List files, List joysticks) { Spectrum = spectrum; diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Memory.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Memory.cs index cdb5af1444..3fb9cdb2e6 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Memory.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Memory.cs @@ -62,8 +62,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Simulates reading from the bus (no contention) /// Paging should be handled here /// - /// - /// public override byte ReadBus(ushort addr) { int divisor = addr / 0x4000; @@ -207,8 +205,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Simulates writing to the bus (no contention) /// Paging should be handled here /// - /// - /// public override void WriteBus(ushort addr, byte value) { int divisor = addr / 0x4000; @@ -356,8 +352,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Reads a byte of data from a specified memory address /// (with memory contention if appropriate) /// - /// - /// public override byte ReadMemory(ushort addr) { var data = ReadBus(addr); @@ -373,8 +367,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns the ROM/RAM enum that relates to this particular memory read operation /// - /// - /// public override ZXSpectrum.CDLResult ReadCDL(ushort addr) { var result = new ZXSpectrum.CDLResult(); @@ -518,8 +510,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Writes a byte of data to a specified memory address /// (with memory contention if appropriate) /// - /// - /// public override void WriteMemory(ushort addr, byte value) { /* @@ -552,7 +542,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Checks whether supplied address is in a potentially contended bank /// - /// public override bool IsContended(ushort addr) { var a = addr & 0xc000; @@ -582,7 +571,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns TRUE if there is a contended bank paged in /// - /// public override bool ContendedBankPaged() { switch (RAMPaged) @@ -602,8 +590,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// (No memory contention) /// Will read RAM5 (screen0) by default, unless RAM7 (screen1) is selected as output /// - /// - /// public override byte FetchScreenMemory(ushort addr) { byte value = new byte(); @@ -627,8 +613,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Sets up the ROM /// - /// - /// public override void InitROM(RomData romData) { RomData = romData; diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Port.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Port.cs index eb87580a99..35555bb076 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Port.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Port.cs @@ -11,8 +11,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Reads a byte of data from a specified port address /// - /// - /// public override byte ReadPort(ushort port) { bool deviceAddressed = true; @@ -64,8 +62,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Writes a byte of data to a specified port address /// - /// - /// public override void WritePort(ushort port, byte value) { if (port == 0x7ffd) diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.cs index 98576ab5a4..0b4a0a4610 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.cs @@ -14,8 +14,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Main constructor /// - /// - /// public ZX128Plus3(ZXSpectrum spectrum, Z80A cpu, ZXSpectrum.BorderType borderType, List files, List joysticks) { Spectrum = spectrum; diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum16K/ZX16.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum16K/ZX16.cs index 33b26800d1..ef4af265f2 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum16K/ZX16.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum16K/ZX16.cs @@ -13,8 +13,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Main constructor /// - /// - /// public ZX16(ZXSpectrum spectrum, Z80A cpu, ZXSpectrum.BorderType borderType, List files, List joysticks) : base(spectrum, cpu, borderType, files, joysticks) { @@ -44,8 +42,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Simulates reading from the bus (no contention) /// Paging should be handled here /// - /// - /// public override byte ReadBus(ushort addr) { int divisor = addr / 0x4000; @@ -69,8 +65,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Simulates writing to the bus (no contention) /// Paging should be handled here /// - /// - /// public override void WriteBus(ushort addr, byte value) { int divisor = addr / 0x4000; @@ -94,8 +88,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Reads a byte of data from a specified memory address /// (with memory contention if appropriate) /// - /// - /// public override byte ReadMemory(ushort addr) { var data = ReadBus(addr); @@ -105,8 +97,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns the ROM/RAM enum that relates to this particular memory read operation /// - /// - /// public override ZXSpectrum.CDLResult ReadCDL(ushort addr) { var res = new ZXSpectrum.CDLResult(); @@ -128,8 +118,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Writes a byte of data to a specified memory address /// (with memory contention if appropriate) /// - /// - /// public override void WriteMemory(ushort addr, byte value) { WriteBus(addr, value); @@ -138,8 +126,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Sets up the ROM /// - /// - /// public override void InitROM(RomData romData) { RomData = romData; diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Memory.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Memory.cs index f14b35a003..b35cade838 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Memory.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Memory.cs @@ -40,8 +40,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Simulates reading from the bus (no contention) /// Paging should be handled here /// - /// - /// public override byte ReadBus(ushort addr) { int divisor = addr / 0x4000; @@ -65,8 +63,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Simulates writing to the bus (no contention) /// Paging should be handled here /// - /// - /// public override void WriteBus(ushort addr, byte value) { int divisor = addr / 0x4000; @@ -96,8 +92,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Reads a byte of data from a specified memory address /// (with memory contention if appropriate) /// - /// - /// public override byte ReadMemory(ushort addr) { var data = ReadBus(addr); @@ -107,8 +101,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns the ROM/RAM enum that relates to this particular memory read operation /// - /// - /// public override ZXSpectrum.CDLResult ReadCDL(ushort addr) { var res = new ZXSpectrum.CDLResult(); @@ -132,8 +124,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Writes a byte of data to a specified memory address /// (with memory contention if appropriate) /// - /// - /// public override void WriteMemory(ushort addr, byte value) { WriteBus(addr, value); @@ -142,7 +132,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Checks whether supplied address is in a potentially contended bank /// - /// public override bool IsContended(ushort addr) { if ((addr & 49152) == 16384) @@ -153,7 +142,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns TRUE if there is a contended bank paged in /// - /// public override bool ContendedBankPaged() { return false; @@ -162,8 +150,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Sets up the ROM /// - /// - /// public override void InitROM(RomData romData) { RomData = romData; diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Port.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Port.cs index 75aa48425b..d5a4c98831 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Port.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Port.cs @@ -9,8 +9,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Reads a byte of data from a specified port address /// - /// - /// public override byte ReadPort(ushort port) { int result = 0xFF; @@ -62,8 +60,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Writes a byte of data to a specified port address /// - /// - /// public override void WritePort(ushort port, byte value) { // Check whether the low bit is reset diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.cs index caf5ee440f..5c235eb47d 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.cs @@ -15,8 +15,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Main constructor /// - /// - /// public ZX48(ZXSpectrum spectrum, Z80A cpu, ZXSpectrum.BorderType borderType, List files, List joysticks) { Spectrum = spectrum; diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/CPCFormat/CPCExtendedFloppyDisk.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/CPCFormat/CPCExtendedFloppyDisk.cs index a52f1e3bbd..c0647b76e6 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/CPCFormat/CPCExtendedFloppyDisk.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/CPCFormat/CPCExtendedFloppyDisk.cs @@ -18,7 +18,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Attempts to parse incoming disk data /// - /// /// /// TRUE: disk parsed /// FALSE: unable to parse disk @@ -160,9 +159,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Takes a double-sided disk byte array and converts into 2 single-sided arrays /// - /// - /// - /// public static bool SplitDoubleSided(byte[] data, List results) { // look for standard magic string @@ -242,7 +238,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// State serlialization /// - /// public override void SyncState(Serializer ser) { ser.BeginSection("Plus3FloppyDisk"); diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/CPCFormat/CPCFloppyDisk.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/CPCFormat/CPCFloppyDisk.cs index 05d99a88d1..3851019be3 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/CPCFormat/CPCFloppyDisk.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/CPCFormat/CPCFloppyDisk.cs @@ -18,7 +18,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Attempts to parse incoming disk data /// - /// /// /// TRUE: disk parsed /// FALSE: unable to parse disk @@ -165,9 +164,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Takes a double-sided disk byte array and converts into 2 single-sided arrays /// - /// - /// - /// public static bool SplitDoubleSided(byte[] data, List results) { // look for standard magic string @@ -236,7 +232,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// State serlialization /// - /// public override void SyncState(Serializer ser) { ser.BeginSection("Plus3FloppyDisk"); diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/FloppyDisk.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/FloppyDisk.cs index 656609fe19..63f709ab5b 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/FloppyDisk.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/FloppyDisk.cs @@ -88,7 +88,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Attempts to parse incoming disk data /// - /// /// /// TRUE: disk parsed /// FALSE: unable to parse disk @@ -183,7 +182,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Detection routine for shadow of the beast game /// Still cannot get this to work, but at least the game is detected /// - /// public bool DetectShadowOfTheBeast() { if (DiskTracks[0].Sectors.Length != 9) @@ -222,8 +220,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Detect speedlock weak sector /// - /// - /// public bool DetectSpeedlock(ref int[] weak) { // SPEEDLOCK NOTES (-asni 2018-05-01) @@ -287,8 +283,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Detect Alkatraz /// - /// - /// public bool DetectAlkatraz(ref int[] weak) { try @@ -330,8 +324,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Detect Paul Owens /// - /// - /// public bool DetectPaulOwens(ref int[] weak) { try @@ -368,8 +360,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Detect Hexagon copy protection /// - /// - /// public bool DetectHexagon(ref int[] weak) { try @@ -417,7 +407,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Should be run at the end of the ParseDisk process /// If speedlock is detected the flag is set in the disk image /// - /// protected virtual void SpeedlockDetection() { @@ -515,7 +504,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns the track count for the disk /// - /// public virtual int GetTrackCount() { return DiskHeader.NumberOfTracks * DiskHeader.NumberOfSides; @@ -524,8 +512,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Reads the current sector ID info /// - /// - /// public virtual CHRN ReadID(byte trackIndex, byte side, int sectorIndex) { if (side != 0) @@ -578,7 +564,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// State serialization routines /// - /// public abstract void SyncState(Serializer ser); diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/IPFFormat/IPFFloppyDisk.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/IPFFormat/IPFFloppyDisk.cs index 4ebf4ea26b..c1560f3339 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/IPFFormat/IPFFloppyDisk.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/IPFFormat/IPFFloppyDisk.cs @@ -18,7 +18,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Attempts to parse incoming disk data /// - /// /// /// TRUE: disk parsed /// FALSE: unable to parse disk @@ -434,7 +433,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// State serlialization /// - /// public override void SyncState(Serializer ser) { ser.BeginSection("Plus3FloppyDisk"); diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/UDIFormat/UDI1_0FloppyDisk.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/UDIFormat/UDI1_0FloppyDisk.cs index 00297c69b7..d38209f49b 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/UDIFormat/UDI1_0FloppyDisk.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/UDIFormat/UDI1_0FloppyDisk.cs @@ -18,7 +18,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Attempts to parse incoming disk data /// - /// /// /// TRUE: disk parsed /// FALSE: unable to parse disk @@ -77,9 +76,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Takes a double-sided disk byte array and converts into 2 single-sided arrays /// - /// - /// - /// public static bool SplitDoubleSided(byte[] data, List results) { // look for standard magic string @@ -190,7 +186,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// State serlialization /// - /// public override void SyncState(Serializer ser) { ser.BeginSection("Plus3FloppyDisk"); diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/MediaConverter.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/MediaConverter.cs index 74ae9b5c57..1047d2fd1a 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/MediaConverter.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/MediaConverter.cs @@ -41,7 +41,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Serialization method /// - /// public virtual void Read(byte[] data) { throw new NotImplementedException(this.GetType().ToString() + @@ -51,7 +50,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// DeSerialization method /// - /// public virtual void Write(byte[] data) { throw new NotImplementedException(this.GetType().ToString() + @@ -61,7 +59,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Serializer does a quick check, returns TRUE if file is detected as this type /// - /// public virtual bool CheckType(byte[] data) { throw new NotImplementedException(this.GetType().ToString() + @@ -73,8 +70,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Converts an int32 value into a byte array /// - /// - /// public static byte[] GetBytes(int value) { byte[] buf = new byte[4]; @@ -88,9 +83,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns an int32 from a byte array based on offset /// - /// - /// - /// public static int GetInt32(byte[] buf, int offsetIndex) { return buf[offsetIndex] | buf[offsetIndex + 1] << 8 | buf[offsetIndex + 2] << 16 | buf[offsetIndex + 3] << 24; @@ -99,9 +91,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns an int32 from a byte array based on offset (in BIG ENDIAN format) /// - /// - /// - /// public static int GetBEInt32(byte[] buf, int offsetIndex) { byte[] b = new byte[4]; @@ -114,8 +103,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns an int32 from a byte array based on the length of the byte array (in BIG ENDIAN format) /// - /// - /// public static int GetBEInt32FromByteArray(byte[] buf) { byte[] b = buf.Reverse().ToArray(); @@ -146,9 +133,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns an int32 from a byte array based on offset /// - /// - /// - /// public static uint GetUInt32(byte[] buf, int offsetIndex) { return (uint)(buf[offsetIndex] | buf[offsetIndex + 1] << 8 | buf[offsetIndex + 2] << 16 | buf[offsetIndex + 3] << 24); @@ -157,9 +141,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns an uint16 from a byte array based on offset /// - /// - /// - /// public static ushort GetWordValue(byte[] buf, int offsetIndex) { return (ushort)(buf[offsetIndex] | buf[offsetIndex + 1] << 8); @@ -168,9 +149,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Updates a byte array with a uint16 value based on offset /// - /// - /// - /// public static void SetWordValue(byte[] buf, int offsetIndex, ushort value) { buf[offsetIndex] = (byte)value; @@ -180,8 +158,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Takes a PauseInMilliseconds value and returns the value in T-States /// - /// - /// public static int TranslatePause(int pauseInMS) { // t-states per millisecond @@ -195,8 +171,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Decompresses a byte array that is Z-RLE compressed /// - /// - /// public static void DecompressZRLE(byte[] sourceBuffer, ref byte[] destBuffer) { MemoryStream stream = new MemoryStream(); diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Snapshot/SZX/SZX.Methods.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Snapshot/SZX/SZX.Methods.cs index 0c812b9e0d..0f2c25dab0 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Snapshot/SZX/SZX.Methods.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Snapshot/SZX/SZX.Methods.cs @@ -29,8 +29,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Exports state information to a byte array in ZX-State format /// - /// - /// public static byte[] ExportSZX(SpectrumBase machine) { var s = new SZX(machine); diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/CSW/CswConverter.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/CSW/CswConverter.cs index 8f0ae34787..0506b1e232 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/CSW/CswConverter.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/CSW/CswConverter.cs @@ -53,7 +53,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns TRUE if pzx header is detected /// - /// public override bool CheckType(byte[] data) { // CSW Header @@ -80,7 +79,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// DeSerialization method /// - /// public override void Read(byte[] data) { // clear existing tape blocks @@ -242,11 +240,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Processes a CSW v2 data block /// - /// - /// - /// - /// - /// public static void ProcessCSWV2( byte[] srcBuff, ref byte[] destBuff, diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/PZX/PzxConverter.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/PZX/PzxConverter.cs index ed35aadf55..d8eb9e1f07 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/PZX/PzxConverter.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/PZX/PzxConverter.cs @@ -63,7 +63,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns TRUE if pzx header is detected /// - /// public override bool CheckType(byte[] data) { // PZX Header @@ -90,7 +89,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// DeSerialization method /// - /// public override void Read(byte[] data) { // clear existing tape blocks diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TAP/TapConverter.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TAP/TapConverter.cs index a9ab6a895a..ea2cc70f5d 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TAP/TapConverter.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TAP/TapConverter.cs @@ -101,7 +101,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// DeSerialization method /// - /// public override void Read(byte[] data) { /* diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TZX/TzxConverter.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TZX/TzxConverter.cs index 1eca78ec5a..f9bfee53e4 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TZX/TzxConverter.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TZX/TzxConverter.cs @@ -61,7 +61,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns TRUE if tzx header is detected /// - /// public override bool CheckType(byte[] data) { /* @@ -98,7 +97,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// DeSerialization method /// - /// public override void Read(byte[] data) { // clear existing tape blocks @@ -147,8 +145,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Processes a TZX block /// - /// - /// private void ProcessBlock(byte[] data, int id) { // process based on detected block ID @@ -1614,9 +1610,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Used to process either a standard or turbo data block /// - /// - /// - /// private TapeDataBlock DecodeDataBlock ( TapeDataBlock block, @@ -1839,9 +1832,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Used to process either a standard or turbo data block /// - /// - /// - /// private TapeDataBlock DecodeDataBlock ( TapeDataBlock block, @@ -1892,7 +1882,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// If neccessary a seperate PAUSE block will be created /// - /// private void CreatePauseBlock(TapeDataBlock original) { if (original.PauseInMS > 0) diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TapeDataBlock.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TapeDataBlock.cs index ee82000d46..d60267bf76 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TapeDataBlock.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TapeDataBlock.cs @@ -89,8 +89,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Adds a single metadata item to the Dictionary /// - /// - /// public void AddMetaData(BlockDescriptorTitle descriptor, string data) { // check whether entry already exists @@ -144,7 +142,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Returns the data periods as an array /// (primarily to aid in bizhawk state serialization) /// - /// public int[] GetDataPeriodsArray() { return DataPeriods.ToArray(); @@ -154,7 +151,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Accepts an array of data periods and updates the DataPeriods list accordingly /// (primarily to aid in bizhawk state serialization) /// - /// public void SetDataPeriodsArray(int[] periodArray) { DataPeriods = new List(); @@ -168,7 +164,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Bizhawk state serialization /// - /// public void SyncState(Serializer ser, int blockPosition) { ser.BeginSection("DataBlock" + blockPosition); diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/WAV/WavConverter.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/WAV/WavConverter.cs index 030900e3c1..410155a2fa 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/WAV/WavConverter.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/WAV/WavConverter.cs @@ -53,7 +53,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns TRUE if pzx header is detected /// - /// public override bool CheckType(byte[] data) { // WAV Header @@ -75,7 +74,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// DeSerialization method /// - /// public override void Read(byte[] data) { // clear existing tape blocks diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.ISettable.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.ISettable.cs index e03bbc5258..e6274bafb3 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.ISettable.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.ISettable.cs @@ -246,8 +246,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Detailed info to be displayed within the settings UIs /// - /// - /// public static ZXMachineMetaData GetMetaObject(MachineType type) { ZXMachineMetaData m = new ZXMachineMetaData(); @@ -354,8 +352,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Returns machine metadata as a formatted string (to be displayed in a textbox) /// - /// - /// public static string GetMetaString(MachineType type) { var m = GetMetaObject(type); diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Messaging.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Messaging.cs index 4a3a20d6ca..777ce22db4 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Messaging.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Messaging.cs @@ -13,8 +13,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Writes a message to the OSD /// - /// - /// public void SendMessage(string message, MessageCategory category) { if (!CheckMessageSettings(category)) @@ -51,7 +49,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Called when certain input presses are detected /// - /// public void OSD_FireInputMessage(string input) { StringBuilder sb = new StringBuilder(); @@ -438,8 +435,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Checks whether message category is allowed to be sent /// - /// - /// public bool CheckMessageSettings(MessageCategory category) { switch (Settings.OSDMessageVerbosity) diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Util.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Util.cs index 21fd979f96..777269e51e 100644 --- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Util.cs +++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Util.cs @@ -13,8 +13,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Helper method that returns a single INT32 from a BitArray /// - /// - /// public static int GetIntFromBitArray(BitArray bitArray) { if (bitArray.Length > 32) @@ -28,8 +26,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// POKEs a memory bus address /// - /// - /// public void PokeMemory(ushort addr, byte value) { _machine.WriteBus(addr, value); @@ -38,7 +34,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Called by MainForm so that the core label can display a more detailed tooltip about the emulated spectrum model /// - /// public string GetMachineType() { string m = ""; @@ -74,7 +69,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// Called by MainForm - dumps a close approximation of the Spectaculator SZX snapshot format /// DEV use only - this is nowhere near accurate /// - /// public byte[] GetSZXSnapshot() { return SZX.ExportSZX(_machine); @@ -83,10 +77,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum /// /// Utility method to get MemberName from an object /// - /// - /// - /// - /// public static string GetMemberName(Expression> memberAccess) { return ((MemberExpression)memberAccess.Body).Member.Name; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibVBANext.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibVBANext.cs index 2ca23cd040..ca1e532cad 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibVBANext.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibVBANext.cs @@ -63,25 +63,18 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA /// /// create a new context /// - /// [DllImport(dllname, CallingConvention = cc)] public static extern IntPtr Create(); /// /// destroy a context /// - /// [DllImport(dllname, CallingConvention = cc)] public static extern void Destroy(IntPtr g); /// /// load a rom /// - /// - /// - /// - /// - /// /// success [DllImport(dllname, CallingConvention = cc)] public static extern bool LoadRom(IntPtr g, byte[] romfile, uint romfilelen, byte[] biosfile, uint biosfilelen, [In]FrontEndSettings settings); @@ -89,19 +82,15 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA /// /// hard reset /// - /// [DllImport(dllname, CallingConvention = cc)] public static extern void Reset(IntPtr g); /// /// frame advance /// - /// - /// /// 240x160 packed argb32 /// buffer to recieve stereo audio /// number of samples created - /// /// true if lagged [DllImport(dllname, CallingConvention = cc)] public static extern bool FrameAdvance(IntPtr g, Buttons input, int[] videobuffer, short[] audiobuffer, out int numsamp, int[] videopalette); @@ -143,11 +132,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA [UnmanagedFunctionPointer(cc)] public delegate void AddressCallback(uint addr); - /// - /// - /// /// if bit 0 is set, thumb mode - /// [UnmanagedFunctionPointer(cc)] public delegate void TraceCallback(uint addr, uint opcode); diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibmGBA.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibmGBA.cs index e3d817d8c3..b0a4f3ed04 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibmGBA.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibmGBA.cs @@ -87,7 +87,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA /// /// start a savestate operation /// - /// /// private parameter to be passed to BizFinishGetState /// size of buffer to be allocated for BizFinishGetState /// if false, operation failed and BizFinishGetState should not be called diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/IGameboyCommon.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/IGameboyCommon.cs index bc7d54a30e..6ad5fc0fe6 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/IGameboyCommon.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/IGameboyCommon.cs @@ -8,13 +8,9 @@ using System.Threading.Tasks; namespace BizHawk.Emulation.Cores.Consoles.Nintendo.Gameboy { - /// - /// /// current value of register $ff40 (LCDC) public delegate void ScanlineCallback(byte lcdc); - /// - /// /// The image data /// How tall an image is, in pixels. Image is only valid up to that height and must be assumed to be garbage below that. /// The top margin of blank pixels. Just form feeds the printer a certain amount at the top. diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/LibGambatte.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/LibGambatte.cs index 1a05daea20..1fb710656d 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/LibGambatte.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/LibGambatte.cs @@ -9,16 +9,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy /// public static class LibGambatte { - /// - /// - /// /// opaque state pointer [DllImport("libgambatte.dll", CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr gambatte_create(); - /// - /// - /// /// opaque state pointer [DllImport("libgambatte.dll", CallingConvention = CallingConvention.Cdecl)] public static extern void gambatte_destroy(IntPtr core); @@ -104,7 +98,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy /// blit from internal framebuffer to provided framebuffer /// /// opaque state pointer - /// /// in pixels [DllImport("libgambatte.dll", CallingConvention = CallingConvention.Cdecl)] unsafe public static extern void gambatte_blitto(IntPtr core, int* videobuf, int pitch); @@ -112,7 +105,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy /// blit from internal framebuffer to provided framebuffer /// /// opaque state pointer - /// /// in pixels [DllImport("libgambatte.dll", CallingConvention = CallingConvention.Cdecl)] public static extern void gambatte_blitto(IntPtr core, int[] videobuf, int pitch); @@ -136,13 +128,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy SP2_PALETTE = 2 }; - /// - /// - /// /// opaque state pointer /// in [0, 2]: One of BG_PALETTE, SP1_PALETTE and SP2_PALETTE. /// in [0, 3] - /// [DllImport("libgambatte.dll", CallingConvention = CallingConvention.Cdecl)] public static extern void gambatte_setdmgpalettecolor(IntPtr core, PalType palnum, uint colornum, uint rgb32); @@ -181,7 +169,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy /// Sets the callback used for getting input state. /// /// opaque state pointer - /// [DllImport("libgambatte.dll", CallingConvention = CallingConvention.Cdecl)] public static extern void gambatte_setinputgetter(IntPtr core, InputGetter getinput); @@ -301,7 +288,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy /// Returns true if the currently loaded ROM image is treated as having CGB support. /// /// opaque state pointer - /// [DllImport("libgambatte.dll", CallingConvention = CallingConvention.Cdecl)] public static extern bool gambatte_iscgb(IntPtr core); @@ -309,7 +295,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy /// Returns true if a ROM image is loaded. /// /// opaque state pointer - /// [DllImport("libgambatte.dll", CallingConvention = CallingConvention.Cdecl)] public static extern bool gambatte_isloaded(IntPtr core); @@ -340,28 +325,18 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy /// /// new savestate method /// - /// - /// [DllImport("libgambatte.dll", CallingConvention = CallingConvention.Cdecl)] public static extern int gambatte_newstatelen(IntPtr core); /// /// new savestate method /// - /// - /// - /// - /// [DllImport("libgambatte.dll", CallingConvention = CallingConvention.Cdecl)] public static extern bool gambatte_newstatesave(IntPtr core, byte[] data, int len); /// /// new savestate method /// - /// - /// - /// - /// [DllImport("libgambatte.dll", CallingConvention = CallingConvention.Cdecl)] public static extern bool gambatte_newstateload(IntPtr core, byte[] data, int len); diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusAudioApi.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusAudioApi.cs index b7cec664b0..a61fb49b0e 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusAudioApi.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusAudioApi.cs @@ -56,7 +56,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi /// /// Returns currently used sampling rate /// - /// public uint GetSamplingRate() { return (uint)dllGetAudioRate(); @@ -65,7 +64,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi /// /// Returns size of bytes currently in the audio buffer /// - /// public int GetAudioBufferSize() { return dllGetBufferSize(); @@ -76,7 +74,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi /// Afterwards audio buffer is cleared /// buffer.Length must be greater than GetAudioBufferSize() /// - /// public void GetAudioBuffer(short[] buffer) { dllReadAudioBuffer(buffer); diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusCoreApi.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusCoreApi.cs index 3547d5459c..f2670ffe46 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusCoreApi.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusCoreApi.cs @@ -179,7 +179,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi /// A function to use when the core wants to output debug messages /// Use "" /// Use IntPtr.Zero - /// [UnmanagedFunctionPointer(CallingConvention.Cdecl)] delegate m64p_error CoreStartup(int APIVersion, string ConfigPath, string DataPath, string Context, DebugCallback DebugCallback, string context2, IntPtr dummy); CoreStartup m64pCoreStartup; @@ -187,7 +186,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi /// /// Cleans up the core /// - /// [UnmanagedFunctionPointer(CallingConvention.Cdecl)] delegate m64p_error CoreShutdown(); CoreShutdown m64pCoreShutdown; @@ -197,7 +195,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi /// /// The type of plugin that is being connected /// The DLL handle for the plugin - /// [UnmanagedFunctionPointer(CallingConvention.Cdecl)] delegate m64p_error CoreAttachPlugin(m64p_plugin_type PluginType, IntPtr PluginLibHandle); CoreAttachPlugin m64pCoreAttachPlugin; @@ -206,7 +203,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi /// Disconnects a plugin DLL from the core DLL /// /// The type of plugin to be disconnected - /// [UnmanagedFunctionPointer(CallingConvention.Cdecl)] delegate m64p_error CoreDetachPlugin(m64p_plugin_type PluginType); CoreDetachPlugin m64pCoreDetachPlugin; @@ -216,7 +212,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi /// /// The name of the section to open /// A pointer to the pointer to use as the section handle - /// [UnmanagedFunctionPointer(CallingConvention.Cdecl)] delegate m64p_error ConfigOpenSection(string SectionName, ref IntPtr ConfigSectionHandle); ConfigOpenSection m64pConfigOpenSection; @@ -228,7 +223,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi /// The name of the parameter to set /// The type of the parameter /// A pointer to the value to use for the parameter (must be an int right now) - /// [UnmanagedFunctionPointer(CallingConvention.Cdecl)] delegate m64p_error ConfigSetParameter(IntPtr ConfigSectionHandle, string ParamName, m64p_type ParamType, ref int ParamValue); ConfigSetParameter m64pConfigSetParameter; @@ -240,7 +234,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi /// The name of the parameter to set /// The type of the parameter /// A pointer to the value to use for the parameter (must be a string) - /// [UnmanagedFunctionPointer(CallingConvention.Cdecl)] delegate m64p_error ConfigSetParameterStr(IntPtr ConfigSectionHandle, string ParamName, m64p_type ParamType, StringBuilder ParamValue); ConfigSetParameterStr m64pConfigSetParameterStr; @@ -249,7 +242,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi /// Saves the mupen64plus state to the provided buffer /// /// A byte array to use to save the state. Must be at least 16788288 + 1024 bytes - /// [UnmanagedFunctionPointer(CallingConvention.Cdecl)] delegate int savestates_save_bkm(byte[] buffer); savestates_save_bkm m64pCoreSaveState; @@ -258,7 +250,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi /// Loads the mupen64plus state from the provided buffer /// /// A byte array filled with the state to load. Must be at least 16788288 + 1024 bytes - /// [UnmanagedFunctionPointer(CallingConvention.Cdecl)] delegate int savestates_load_bkm(byte[] buffer); savestates_load_bkm m64pCoreLoadState; @@ -332,7 +323,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi /// /// Reads from the "system bus" /// - /// [UnmanagedFunctionPointer(CallingConvention.Cdecl)] public delegate byte biz_read_memory(uint addr); public biz_read_memory m64p_read_memory_8; @@ -340,7 +330,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi /// /// Writes to the "system bus" /// - /// [UnmanagedFunctionPointer(CallingConvention.Cdecl)] public delegate void biz_write_memory(uint addr, byte value); public biz_write_memory m64p_write_memory_8; @@ -353,14 +342,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi /// The DLL handle for the core DLL /// Giving a context to the DebugCallback /// A function to use when the pluging wants to output debug messages - /// [UnmanagedFunctionPointer(CallingConvention.Cdecl)] public delegate m64p_error PluginStartup(IntPtr CoreHandle, string Context, DebugCallback DebugCallback); /// /// Cleans up the plugin /// - /// [UnmanagedFunctionPointer(CallingConvention.Cdecl)] public delegate m64p_error PluginShutdown(); @@ -369,8 +356,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi /// /// Handles a debug message from mupen64plus /// - /// - /// /// The message to display [UnmanagedFunctionPointer(CallingConvention.Cdecl)] public delegate void DebugCallback(IntPtr Context, int level, string Message); diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusInputApi.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusInputApi.cs index 2fa3a412e9..f412ac0b35 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusInputApi.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusInputApi.cs @@ -25,8 +25,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi /// /// Callback to use when mupen64plus wants input /// - /// - /// [UnmanagedFunctionPointer(CallingConvention.Cdecl)] public delegate int InputCallback(int i); InputCallback InpInputCallback; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/APU.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/APU.cs index ae44856892..78bb3379ee 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/APU.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/APU.cs @@ -1355,7 +1355,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES } /// only call in board.ClockCPU() - /// public void ExternalQueue(int value) { cart_sound = value + old_cart_sound; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/DatachBarcode.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/DatachBarcode.cs index 59dddf8770..916b3db9d6 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/DatachBarcode.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/DatachBarcode.cs @@ -228,7 +228,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// /// d3 /// - /// public bool GetOutput() { return output == 8; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs index 16800da327..e47c3925ca 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs @@ -55,7 +55,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// /// use with caution /// - /// public byte[] GetExRAMArray() { return EXRAM; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Namco163Audio.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Namco163Audio.cs index eea85483c9..a3f51e1e3d 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Namco163Audio.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Namco163Audio.cs @@ -15,7 +15,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// /// F800:FFFF /// - /// public void WriteAddr(byte value) { addr = value & 0x7f; @@ -25,7 +24,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// /// 4800:4FFF /// - /// public void WriteData(byte value) { ram[addr] = value; @@ -39,7 +37,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// /// 4800:4FFF /// - /// public byte ReadData() { byte ret = ram[addr]; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SEEPROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SEEPROM.cs index a708bef9e4..7d52d63589 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SEEPROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SEEPROM.cs @@ -221,7 +221,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// read a bit back from eprom, might be mapped in 6000:7fff /// /// bit from NES.DB - /// public bool ReadBit(bool deadbit) { if (!OutEnable) @@ -233,9 +232,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES public byte[] GetSaveRAM() { return rom; } - /// - /// - /// /// 256 byte instead of 128 byte public SEEPROM(bool Big) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/FDS.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/FDS.cs index 960a93dbc1..45fda00fcd 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/FDS.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/FDS.cs @@ -91,7 +91,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// /// should only be called once, before emulation begins /// - /// public void SetDiskImage(byte[] diskimage) { // each FDS format is worse than the last @@ -116,7 +115,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// /// returns the currently set disk image. no effect on emulation (provided the image is not modified). /// - /// public byte[] GetDiskImage() { return diskimage; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/RamAdapter.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/RamAdapter.cs index 77b613a588..6686e53409 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/RamAdapter.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/RamAdapter.cs @@ -98,9 +98,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// /// advance a 16 bit CRC register with 1 new input bit. x.25 standard /// - /// - /// - /// static ushort CCITT(ushort crc, int bit) { int bitc = crc & 1; @@ -113,9 +110,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// /// advance a 16 bit CRC register with 8 new input bits. x.25 standard /// - /// - /// - /// static ushort CCITT_8(ushort crc, byte b) { for (int i = 0; i < 8; i++) @@ -289,8 +283,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// /// memorydomain debugging /// - /// - /// public byte PeekData(long addr) { if (disk != null && disk.Length > addr) @@ -357,7 +349,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// /// data write reg /// - /// public void Write4024(byte value) { bytetransferflag = false; @@ -369,7 +360,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// /// control reg /// - /// public void Write4025(byte value) { if ((value & 1) != 0) // start motor @@ -425,7 +415,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// /// general status reg, some bits are from outside the RamAdapter class /// - /// public byte Read4030() { byte ret = 0; @@ -448,7 +437,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// /// more status stuff /// - /// public byte Read4031() { bytetransferflag = false; @@ -465,7 +453,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// /// more status stuff /// - /// public byte Read4032() { byte ret = 0xff; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/INESPPUViewable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/INESPPUViewable.cs index c3d41a30e3..b9f0aeabfa 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/INESPPUViewable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/INESPPUViewable.cs @@ -14,7 +14,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// /// get the 512 color overall palette in use /// - /// int[] GetPalette(); /// @@ -35,32 +34,26 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// /// get the first 0x3000 bytes of ppu data /// - /// byte[] GetPPUBus(); /// /// get the 32 byte palette ram /// - /// byte[] GetPalRam(); /// /// returns the object attribute memory /// - /// byte[] GetOam(); /// /// return one byte of PPU bus data /// - /// - /// byte PeekPPU(int addr); /// /// get MMC5 extile source data /// - /// byte[] GetExTiles(); /// @@ -71,26 +64,20 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// /// get MMC5 exram for exattr mode /// - /// byte[] GetExRam(); /// /// get memory domain for chr rom; return null if RAM or other N/A. for direct viewing of ROM tiles. /// - /// MemoryDomain GetCHRROM(); /// /// install a callback to run at a particular scanline /// - /// - /// void InstallCallback1(Action cb, int sl); /// /// install a callback to run at a particular scanline /// - /// - /// void InstallCallback2(Action cb, int sl); /// diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.Core.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.Core.cs index 676279ec21..03e977c730 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.Core.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.Core.cs @@ -66,7 +66,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// /// for debugging only! /// - /// public INESBoard GetBoard() { return Board; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NESControllers.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NESControllers.cs index 97ec51fa95..726a7090e9 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NESControllers.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NESControllers.cs @@ -56,9 +56,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// public readonly int OUT2old; - /// - /// - /// /// the old latched $4016 byte /// the new latched $4016 byte public StrobeInfo(byte oldvalue, byte newvalue) @@ -80,19 +77,15 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// /// call whenever $4016 is written /// - /// - /// void Strobe(StrobeInfo s, IController c); /// /// call whenever $4016 is read /// - /// /// bits 0-4 are valid byte ReadA(IController c); // D0:D4 /// /// call whenever $4017 is read /// - /// /// bits 0-4 are valid byte ReadB(IController c); // D0:D4 ControllerDefinition GetDefinition(); @@ -108,13 +101,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// /// read data from $4016 /// - /// /// only bit 1 is valid byte ReadA(IController c); /// /// read data from $4017 /// - /// /// bits 1-4 are valid byte ReadB(IController c); ControllerDefinition GetDefinition(); diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/LibQuickNES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/LibQuickNES.cs index edd891063b..de1f04a45f 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/LibQuickNES.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/LibQuickNES.cs @@ -32,7 +32,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES /// context /// file /// length of file - /// [BizImport(CallingConvention.Cdecl)] public abstract IntPtr qn_loadines(IntPtr e, byte[] data, int length); /// @@ -174,12 +173,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES /// get memory area for debugging /// /// Context - /// - /// - /// - /// - /// - /// [BizImport(CallingConvention.Cdecl)] public abstract bool qn_get_memory_area(IntPtr e, int which, ref IntPtr data, ref int size, ref bool writable, ref IntPtr name); /// @@ -187,7 +180,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES /// /// Context /// 0000:ffff, but non-ram/rom addresses won't work - /// [BizImport(CallingConvention.Cdecl)] public abstract byte qn_peek_prgbus(IntPtr e, int addr); /// @@ -195,7 +187,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES /// /// Context /// 0000:ffff, but non-ram/rom addresses won't work - /// [BizImport(CallingConvention.Cdecl)] public abstract void qn_poke_prgbus(IntPtr e, int addr, byte val); /// @@ -221,7 +212,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES /// set a trace callback to be run on each cycle /// /// Context - /// [BizImport(CallingConvention.Cdecl)] public abstract void qn_set_tracecb(IntPtr e, TraceCallback cb); @@ -241,7 +231,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES /// /// handle "string error" as returned by some quicknes functions /// - /// public static void ThrowStringError(IntPtr p) { if (p == IntPtr.Zero) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesControllerDeck.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesControllerDeck.cs index 46728237c5..8a65fd9a79 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesControllerDeck.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesControllerDeck.cs @@ -96,7 +96,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES /// controller input from user, remapped /// libsnes specific value, sometimes multitap number /// libsnes specific value, sometimes button number - /// short GetState(IController controller, int index, int id); ControllerDefinition Definition { get; } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs index 94e6335b79..e86ee2c289 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs @@ -428,8 +428,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES return result; } - /// - /// /// 0 or 1, corresponding to L and R physical ports on the snes /// LibsnesApi.SNES_DEVICE enum index specifying type of device /// meaningless for most controllers. for multitap, 0-3 for which multitap controller diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/LibPicoDrive.cs b/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/LibPicoDrive.cs index 425e99eb76..096a6f6173 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/LibPicoDrive.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/LibPicoDrive.cs @@ -29,13 +29,9 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.PicoDrive Europe = 8 } - /// - /// - /// /// If TRUE, load a CD and not a cart. /// If TRUE, preallocate 32X data structures. When set to false, /// 32X games will still run, but will not have memory domains - /// [BizImport(CC)] public abstract bool Init(bool cd, bool _32xPreinit, Region regionAutoOrder, Region regionOverride); diff --git a/BizHawk.Emulation.Cores/Consoles/WonderSwan/BizSwan.cs b/BizHawk.Emulation.Cores/Consoles/WonderSwan/BizSwan.cs index 95c8f01167..35a4b51dee 100644 --- a/BizHawk.Emulation.Cores/Consoles/WonderSwan/BizSwan.cs +++ b/BizHawk.Emulation.Cores/Consoles/WonderSwan/BizSwan.cs @@ -15,28 +15,24 @@ namespace BizHawk.Emulation.Cores.WonderSwan /// /// create new instance /// - /// [DllImport(dd, CallingConvention = cc)] public static extern IntPtr bizswan_new(); /// /// delete instance, freeing all associated memory /// - /// [DllImport(dd, CallingConvention = cc)] public static extern void bizswan_delete(IntPtr core); /// /// hard reset /// - /// [DllImport(dd, CallingConvention = cc)] public static extern void bizswan_reset(IntPtr core); /// /// frame advance /// - /// /// input to use on this frame /// true to skip all video rendering /// uint32 video output buffer @@ -50,28 +46,19 @@ namespace BizHawk.Emulation.Cores.WonderSwan /// /// load rom /// - /// - /// - /// - /// /// (out) true if screen is rotated left 90 - /// [DllImport(dd, CallingConvention = cc)] public static extern bool bizswan_load(IntPtr core, byte[] data, int length, [In] ref SyncSettings settings, ref bool IsRotated); /// /// get size of saveram /// - /// - /// [DllImport(dd, CallingConvention = cc)] public static extern int bizswan_saveramsize(IntPtr core); /// /// load saveram into core /// - /// - /// /// should be same as bizswan_saveramsize() /// false if size mismatch [DllImport(dd, CallingConvention = cc)] @@ -80,8 +67,6 @@ namespace BizHawk.Emulation.Cores.WonderSwan /// /// save saveram from core /// - /// - /// /// should be same as bizswan_saveramsize() /// false if size mismatch [DllImport(dd, CallingConvention = cc)] @@ -90,20 +75,13 @@ namespace BizHawk.Emulation.Cores.WonderSwan /// /// put non-sync settings, can be done at any time /// - /// - /// [DllImport(dd, CallingConvention = cc)] public static extern void bizswan_putsettings(IntPtr core, [In] ref Settings settings); /// /// get a memory area /// - /// /// start at 0, increment until return is false - /// - /// - /// - /// [DllImport(dd, CallingConvention = cc)] public static extern bool bizswan_getmemoryarea(IntPtr core, int index, out IntPtr name, out int size, out IntPtr data); @@ -134,9 +112,6 @@ namespace BizHawk.Emulation.Cores.WonderSwan /// /// return a CPU register /// - /// - /// - /// [DllImport(dd, CallingConvention = cc)] public static extern uint bizswan_getnecreg(IntPtr core, NecRegs which); diff --git a/BizHawk.Emulation.Cores/CoreInventory.cs b/BizHawk.Emulation.Cores/CoreInventory.cs index 9f5a5aa905..711219290c 100644 --- a/BizHawk.Emulation.Cores/CoreInventory.cs +++ b/BizHawk.Emulation.Cores/CoreInventory.cs @@ -64,13 +64,6 @@ namespace BizHawk.Emulation.Cores /// /// instatiate an emulator core /// - /// - /// - /// - /// - /// - /// - /// public IEmulator Create ( CoreComm comm, @@ -113,8 +106,6 @@ namespace BizHawk.Emulation.Cores /// /// find a core matching a particular game.system /// - /// - /// public Core this[string system] { get @@ -129,9 +120,6 @@ namespace BizHawk.Emulation.Cores /// /// find a core matching a particular game.system with a particular coreattributes.name /// - /// - /// - /// public Core this[string system, string core] { get @@ -149,8 +137,6 @@ namespace BizHawk.Emulation.Cores /// /// find an exact core type. slow lookup. /// - /// - /// public Core FindByType(Type type) { foreach (List cc in systems.Values) @@ -167,7 +153,6 @@ namespace BizHawk.Emulation.Cores /// /// create a core inventory, collecting all IEmulators from some assembilies /// - /// public CoreInventory(IEnumerable assys) { foreach (var assy in assys) diff --git a/BizHawk.Emulation.Cores/FileID.cs b/BizHawk.Emulation.Cores/FileID.cs index 5b343f7360..d86fe0e53e 100644 --- a/BizHawk.Emulation.Cores/FileID.cs +++ b/BizHawk.Emulation.Cores/FileID.cs @@ -80,9 +80,6 @@ namespace BizHawk.Emulation.Cores /// public int Confidence; - /// - /// - /// public FileIDType FileIDType; /// diff --git a/BizHawk.Emulation.Cores/Sound/MMC5Audio.cs b/BizHawk.Emulation.Cores/Sound/MMC5Audio.cs index 559ed36672..e53e91506a 100644 --- a/BizHawk.Emulation.Cores/Sound/MMC5Audio.cs +++ b/BizHawk.Emulation.Cores/Sound/MMC5Audio.cs @@ -165,11 +165,7 @@ namespace BizHawk.Emulation.Cores.Components private readonly Pulse[] pulse = new Pulse[2]; - /// - /// - /// /// 0x5000..0x5015 - /// public void WriteExp(int addr, byte val) { switch (addr) @@ -231,7 +227,6 @@ namespace BizHawk.Emulation.Cores.Components /// /// call for 8000:bfff reads /// - /// public void ReadROMTrigger(byte val) { if (PCMRead) diff --git a/BizHawk.Emulation.Cores/Sound/OneBitBeeper.cs b/BizHawk.Emulation.Cores/Sound/OneBitBeeper.cs index 9ab9e3e05b..350ccc3187 100644 --- a/BizHawk.Emulation.Cores/Sound/OneBitBeeper.cs +++ b/BizHawk.Emulation.Cores/Sound/OneBitBeeper.cs @@ -57,7 +57,6 @@ namespace BizHawk.Emulation.Cores.Sound /// /// Processes an incoming pulse value /// - /// public void ProcessPulseValue(bool pulse, bool renderSound = true) { if (!renderSound) @@ -110,8 +109,6 @@ namespace BizHawk.Emulation.Cores.Sound /// /// Takes an int 0-100 and returns the relevant short volume to output /// - /// - /// private int VolumeConverterIn(int vol) { int maxLimit = short.MaxValue / 3; @@ -123,8 +120,6 @@ namespace BizHawk.Emulation.Cores.Sound /// /// Takes an short volume and returns the relevant int value 0-100 /// - /// - /// private int VolumeConverterOut(int shortvol) { int maxLimit = short.MaxValue / 3; diff --git a/BizHawk.Emulation.Cores/Sound/SyncSoundMixer.cs b/BizHawk.Emulation.Cores/Sound/SyncSoundMixer.cs index 2052546040..7669caaaf4 100644 --- a/BizHawk.Emulation.Cores/Sound/SyncSoundMixer.cs +++ b/BizHawk.Emulation.Cores/Sound/SyncSoundMixer.cs @@ -110,7 +110,6 @@ namespace BizHawk.Emulation.Cores.Components /// /// Removes an existing ISoundProvider from the SyncSoundMixer /// - /// public void UnPinSource(ISoundProvider source) { var sp = _soundProviders.Where(a => a.SoundProvider == source); @@ -162,7 +161,6 @@ namespace BizHawk.Emulation.Cores.Components /// /// Returns the value of the highest nsamp in the SoundProviders collection /// - /// private int GetHigestSampleCount() { var lookup = _soundProviders.OrderByDescending(x => x.InputNSamp) @@ -297,7 +295,6 @@ namespace BizHawk.Emulation.Cores.Components /// Ensures the output buffer is ready for mixing based on the supplied nsamp value /// Overflow samples will be omitted and underflow samples will be empty air /// - /// public void PrepareOutput(int nsamp) { OutputNSamp = nsamp; diff --git a/BizHawk.Emulation.Cores/Sound/VRC6Alt.cs b/BizHawk.Emulation.Cores/Sound/VRC6Alt.cs index 756982d66b..60f7df8d56 100644 --- a/BizHawk.Emulation.Cores/Sound/VRC6Alt.cs +++ b/BizHawk.Emulation.Cores/Sound/VRC6Alt.cs @@ -14,9 +14,6 @@ namespace BizHawk.Emulation.Cores.Components Action enqueuer; - /// - /// - /// /// frequency of the M2 clock in hz /// a place to dump deltas to public VRC6Alt(Action enqueuer) diff --git a/BizHawk.Emulation.Cores/Waterbox/LibWaterboxCore.cs b/BizHawk.Emulation.Cores/Waterbox/LibWaterboxCore.cs index 0cacab7e64..c3b3e1c647 100644 --- a/BizHawk.Emulation.Cores/Waterbox/LibWaterboxCore.cs +++ b/BizHawk.Emulation.Cores/Waterbox/LibWaterboxCore.cs @@ -111,9 +111,6 @@ namespace BizHawk.Emulation.Cores.Waterbox /// size of the domain /// public long Size; - /// - /// - /// public MemoryDomainFlags Flags; } diff --git a/BizHawk.Emulation.Cores/Waterbox/PeRunner.cs b/BizHawk.Emulation.Cores/Waterbox/PeRunner.cs index d81aac84be..0c69b1a304 100644 --- a/BizHawk.Emulation.Cores/Waterbox/PeRunner.cs +++ b/BizHawk.Emulation.Cores/Waterbox/PeRunner.cs @@ -1154,7 +1154,6 @@ namespace BizHawk.Emulation.Cores.Waterbox /// Adds a file that will appear to the waterbox core's libc. the file will be read only. /// All savestates must have the same file list, so either leave it up forever or remove it during init! /// - /// /// the filename that the unmanaged core will access the file by public void AddReadonlyFile(byte[] data, string name) { @@ -1165,7 +1164,6 @@ namespace BizHawk.Emulation.Cores.Waterbox /// Remove a file previously added by AddReadonlyFile. Frees the internal copy of the filedata, saving memory. /// All savestates must have the same file list, so either leave it up forever or remove it during init! /// - /// public void RemoveReadonlyFile(string name) { _syscalls.RemoveReadonlyFile(name); diff --git a/BizHawk.Emulation.Cores/Waterbox/WaterboxCore.cs b/BizHawk.Emulation.Cores/Waterbox/WaterboxCore.cs index f202a6b3dd..11031bf693 100644 --- a/BizHawk.Emulation.Cores/Waterbox/WaterboxCore.cs +++ b/BizHawk.Emulation.Cores/Waterbox/WaterboxCore.cs @@ -316,7 +316,6 @@ namespace BizHawk.Emulation.Cores.Waterbox /// variables that it needs to. /// the default implementation does nothing /// - /// protected virtual void SaveStateBinaryInternal(BinaryWriter writer) { @@ -327,7 +326,6 @@ namespace BizHawk.Emulation.Cores.Waterbox /// that were in SaveStateBinaryInternal and reset any native pointers. /// the default implementation does nothing /// - /// protected virtual void LoadStateBinaryInternal(BinaryReader reader) { diff --git a/BizHawk.Emulation.Cores/Waterbox/WaterboxUtils.cs b/BizHawk.Emulation.Cores/Waterbox/WaterboxUtils.cs index 4477642d4b..27584b1a0b 100644 --- a/BizHawk.Emulation.Cores/Waterbox/WaterboxUtils.cs +++ b/BizHawk.Emulation.Cores/Waterbox/WaterboxUtils.cs @@ -12,9 +12,6 @@ namespace BizHawk.Emulation.Cores.Waterbox /// /// copy `len` bytes from `src` to `dest` /// - /// - /// - /// public static void CopySome(Stream src, Stream dst, long len) { var buff = new byte[4096]; diff --git a/BizHawk.Emulation.DiscSystem/CDFS/EndianBitConverter.cs b/BizHawk.Emulation.DiscSystem/CDFS/EndianBitConverter.cs index 3ecee543b6..307185eb91 100644 --- a/BizHawk.Emulation.DiscSystem/CDFS/EndianBitConverter.cs +++ b/BizHawk.Emulation.DiscSystem/CDFS/EndianBitConverter.cs @@ -124,10 +124,6 @@ namespace BizHawk.Emulation.DiscSystem /// Returns a byte array of any length /// Not really anything endian going on, but I struggled to find a better place for it /// - /// - /// - /// - /// public byte[] ReadBytes(byte[] buffer, int offset, int length) { return buffer.Skip(offset).Take(length).ToArray(); @@ -137,10 +133,6 @@ namespace BizHawk.Emulation.DiscSystem /// Returns an int32 value from any size byte array /// (careful, data may/will be truncated) /// - /// - /// - /// - /// public int ReadIntValue(byte[] buffer, int offset, int length) { var bytes = buffer.Skip(offset).Take(length).ToArray(); diff --git a/BizHawk.Emulation.DiscSystem/CDFS/ISOFile.cs b/BizHawk.Emulation.DiscSystem/CDFS/ISOFile.cs index e81d6316a4..f07ab2394a 100644 --- a/BizHawk.Emulation.DiscSystem/CDFS/ISOFile.cs +++ b/BizHawk.Emulation.DiscSystem/CDFS/ISOFile.cs @@ -173,7 +173,6 @@ namespace BizHawk.Emulation.DiscSystem /// /// Returns a flat list of all recursed files /// - /// public List> EnumerateAllFilesRecursively() { fileNodes = new List>(); diff --git a/BizHawk.Emulation.DiscSystem/CDFS/ISOVolumeDescriptor.cs b/BizHawk.Emulation.DiscSystem/CDFS/ISOVolumeDescriptor.cs index 14966b9f26..b3ee6f46a7 100644 --- a/BizHawk.Emulation.DiscSystem/CDFS/ISOVolumeDescriptor.cs +++ b/BizHawk.Emulation.DiscSystem/CDFS/ISOVolumeDescriptor.cs @@ -457,8 +457,6 @@ namespace BizHawk.Emulation.DiscSystem /// /// Detect ISO9660 /// - /// - /// public bool GetISO9660(byte[] buffer) { //zero 24-jun-2013 - validate ISO9660 @@ -475,8 +473,6 @@ namespace BizHawk.Emulation.DiscSystem /// /// Detect CD-I /// - /// - /// public bool GetCDI(byte[] buffer) { // CD-Interactive diff --git a/BizHawk.Emulation.DiscSystem/DiscFormats/MDS_Format.cs b/BizHawk.Emulation.DiscSystem/DiscFormats/MDS_Format.cs index 549f906b2d..4023f114ba 100644 --- a/BizHawk.Emulation.DiscSystem/DiscFormats/MDS_Format.cs +++ b/BizHawk.Emulation.DiscSystem/DiscFormats/MDS_Format.cs @@ -109,8 +109,6 @@ namespace BizHawk.Emulation.DiscSystem /// /// Parse mds stream for the header /// - /// - /// public AHeader Parse(Stream stream) { EndianBitConverter bc = EndianBitConverter.CreateForLittleEndian(); diff --git a/Bizware/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/BitmapFontLoader.cs b/Bizware/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/BitmapFontLoader.cs index f25a9d1a47..a1dfb1f748 100644 --- a/Bizware/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/BitmapFontLoader.cs +++ b/Bizware/BizHawk.Bizware.BizwareGL/Borrowed/BitmapFontParser/BitmapFontLoader.cs @@ -54,7 +54,6 @@ namespace Cyotek.Drawing.BitmapFont /// Loads a bitmap font from a text file. /// /// Name of the file to load. - /// public static BitmapFont LoadFontFromTextFile(string fileName) { BitmapFont font; @@ -173,7 +172,6 @@ namespace Cyotek.Drawing.BitmapFont /// Loads a bitmap font from an XML file. /// /// Name of the file to load. - /// public static BitmapFont LoadFontFromXmlFile(Stream stream) { XmlDocument document; @@ -287,7 +285,6 @@ namespace Cyotek.Drawing.BitmapFont /// /// The array of parts. /// The name of the value to return. - /// private static bool GetNamedBool(string[] parts, string name) { return BitmapFontLoader.GetNamedInt(parts, name) != 0; @@ -298,7 +295,6 @@ namespace Cyotek.Drawing.BitmapFont /// /// The array of parts. /// The name of the value to return. - /// private static int GetNamedInt(string[] parts, string name) { return Convert.ToInt32(BitmapFontLoader.GetNamedString(parts, name)); @@ -309,7 +305,6 @@ namespace Cyotek.Drawing.BitmapFont /// /// The array of parts. /// The name of the value to return. - /// private static string GetNamedString(string[] parts, string name) { string result; @@ -348,7 +343,6 @@ namespace Cyotek.Drawing.BitmapFont /// Creates a Padding object from a string representation /// /// The string. - /// private static Padding ParsePadding(string s) { string[] parts; @@ -368,7 +362,6 @@ namespace Cyotek.Drawing.BitmapFont /// Creates a Point object from a string representation /// /// The string. - /// private static Point ParsePoint(string s) { string[] parts; @@ -387,7 +380,6 @@ namespace Cyotek.Drawing.BitmapFont /// /// The string to split. /// The delimiter. - /// private static string[] Split(string s, char delimiter) { string[] results; @@ -439,7 +431,6 @@ namespace Cyotek.Drawing.BitmapFont /// /// Type of the items in the array /// The values. - /// private static T[] ToArray(ICollection values) { T[] result; diff --git a/ExternalCoreProjects/Virtu/Keyboard.cs b/ExternalCoreProjects/Virtu/Keyboard.cs index e598b881a7..8adeb1fcac 100644 --- a/ExternalCoreProjects/Virtu/Keyboard.cs +++ b/ExternalCoreProjects/Virtu/Keyboard.cs @@ -210,13 +210,7 @@ namespace Jellyfish.Virtu 0x7a1a5a1a, // z }; - /// - /// - /// /// 0 - 55 - /// - /// - /// private static int KeyToAscii(int key, bool control, bool shift) { int s = control ? (shift ? 0 : 16) : (shift ? 8 : 24); @@ -270,7 +264,6 @@ namespace Jellyfish.Virtu /// /// Call this at 60hz with all of the currently pressed keys /// - /// public void SetKeys(IEnumerable keynames) { Keys keys = FromStrings(keynames);