From 8634d52bed09f9059e77f99952e088607017811f Mon Sep 17 00:00:00 2001 From: goyuken Date: Mon, 1 Sep 2014 21:09:25 +0000 Subject: [PATCH] remove the dummymemorydomainlist as its not needed anymore (if a core has no memory domains, it simply doesn't have the interface) --- BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs | 2 +- .../Interfaces/IMemoryDomains.cs | 2 +- BizHawk.Emulation.Common/MemoryDomain.cs | 12 ------------ BizHawk.Emulation.Cores/LibRetroEmulator.cs | 1 - 4 files changed, 2 insertions(+), 15 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs b/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs index 9aad713fab..61a9f0f575 100644 --- a/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs +++ b/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs @@ -23,7 +23,7 @@ namespace BizHawk.Client.EmuHawk MobileBmpView bg0, bg1, bg2, bg3, bgpal, sppal, sprites, bgtiles16, bgtiles256, sptiles16, sptiles256; - MobileDetailView memory; + // MobileDetailView memory; public bool AskSaveChanges() { return true; } public bool UpdateBefore { get { return true; } } diff --git a/BizHawk.Emulation.Common/Interfaces/IMemoryDomains.cs b/BizHawk.Emulation.Common/Interfaces/IMemoryDomains.cs index 04fe0fcb51..62f1d0ef92 100644 --- a/BizHawk.Emulation.Common/Interfaces/IMemoryDomains.cs +++ b/BizHawk.Emulation.Common/Interfaces/IMemoryDomains.cs @@ -5,7 +5,7 @@ ///The list of all avaialble memory domains /// A memory domain is a byte array that respresents a distinct part of the emulated system. /// By convention the Main Memory is the 1st domain in the list - // All cores sould implement a System Bus domain that represents the standard "Open bus" range for that system, + // All cores sould implement a System Bus domain that represents the standard cpu bus range for that system, /// and a Main Memory which is typically the WRAM space (for instance, on NES - 0000-07FF), /// Other chips, and ram spaces can be added as well. /// Subdomains of another domain are also welcome. diff --git a/BizHawk.Emulation.Common/MemoryDomain.cs b/BizHawk.Emulation.Common/MemoryDomain.cs index 7c4c3a7849..e7018f34d7 100644 --- a/BizHawk.Emulation.Common/MemoryDomain.cs +++ b/BizHawk.Emulation.Common/MemoryDomain.cs @@ -142,18 +142,6 @@ namespace BizHawk.Emulation.Common public class MemoryDomainList : ReadOnlyCollection { - /// - /// creates a minimal valid MemoryDomainList that does nothing - /// - /// - public static MemoryDomainList GetDummyList() - { - MemoryDomain dummy = new MemoryDomain("Dummy", 256, MemoryDomain.Endian.Little, (a) => 0, (a, v) => { }); - List tmp = new List(1); - tmp.Add(dummy); - return new MemoryDomainList(tmp, 0); - } - private readonly int _mainMemoryIndex; public MemoryDomainList(IList domains) diff --git a/BizHawk.Emulation.Cores/LibRetroEmulator.cs b/BizHawk.Emulation.Cores/LibRetroEmulator.cs index 45464de982..66f17105c9 100644 --- a/BizHawk.Emulation.Cores/LibRetroEmulator.cs +++ b/BizHawk.Emulation.Cores/LibRetroEmulator.cs @@ -371,7 +371,6 @@ namespace BizHawk.Emulation.Cores void SetupDebuggingStuff() { - MemoryDomains = MemoryDomainList.GetDummyList(); } public MemoryDomainList MemoryDomains { get; private set; }