diff --git a/BizHawk.Emulation.Common/Interfaces/ISettable.cs b/BizHawk.Emulation.Common/Interfaces/ISettable.cs index cd60d85e6e..856acf5921 100644 --- a/BizHawk.Emulation.Common/Interfaces/ISettable.cs +++ b/BizHawk.Emulation.Common/Interfaces/ISettable.cs @@ -6,6 +6,9 @@ using System.Reflection; namespace BizHawk.Emulation.Common { + /// + /// serves as a shim between strongly typed ISettable and consumers + /// public class SettingsAdapter { public SettingsAdapter(IEmulator e) diff --git a/BizHawk.Emulation.Cores/Consoles/WonderSwan/BizSwan.cs b/BizHawk.Emulation.Cores/Consoles/WonderSwan/BizSwan.cs index b56528c4b7..9aa024bf21 100644 --- a/BizHawk.Emulation.Cores/Consoles/WonderSwan/BizSwan.cs +++ b/BizHawk.Emulation.Cores/Consoles/WonderSwan/BizSwan.cs @@ -87,14 +87,6 @@ namespace BizHawk.Emulation.Cores.WonderSwan [DllImport(dd, CallingConvention = cc)] public static extern bool bizswan_saveramsave(IntPtr core, byte[] data, int maxsize); - /// - /// bad function - /// - /// - /// pass EXACTLY the same syncsettings you originally passed on core load, else DRAGONS - [DllImport(dd, CallingConvention = cc)] - public static extern void bizswan_saveramclearhacky(IntPtr core, [In] ref SyncSettings settings); - /// /// put non-sync settings, can be done at any time /// diff --git a/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs b/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs index ee61a08683..662e16fba3 100644 --- a/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs +++ b/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs @@ -108,10 +108,6 @@ namespace BizHawk.Emulation.Cores.WonderSwan if (!BizSwan.bizswan_load(Core, file, file.Length, ref ss, ref rotate)) throw new InvalidOperationException("bizswan_load() returned FALSE!"); - // adelikat: TODO: ClearSaveRam() doesn't exist anymore, do we still need this? - // for future uses of ClearSaveRam(), it's important that we save this - _DONTTOUCHME = ss; - CoreComm.VsyncNum = 3072000; // master CPU clock, also pixel clock CoreComm.VsyncDen = (144 + 15) * (224 + 32); // 144 vislines, 15 vblank lines; 224 vispixels, 32 hblank pixels @@ -383,7 +379,6 @@ namespace BizHawk.Emulation.Cores.WonderSwan Settings _Settings; SyncSettings _SyncSettings; - BizSwan.SyncSettings _DONTTOUCHME; public class Settings { diff --git a/output/dll/bizswan.dll b/output/dll/bizswan.dll index a696b5bbd2..7c6b69620b 100644 Binary files a/output/dll/bizswan.dll and b/output/dll/bizswan.dll differ diff --git a/wonderswan/system.cpp b/wonderswan/system.cpp index 2af8b6c70c..3a61d3992b 100644 --- a/wonderswan/system.cpp +++ b/wonderswan/system.cpp @@ -304,13 +304,6 @@ namespace MDFN_IEN_WSWAN NSS(oldbuttons); } - void System::SaveRamClearHacky(const SyncSettings &s) - { - // this really shouldn't be done - // be sure to pass the same SyncSettings that the core was originally initialized with! - memory.Init(s); - } - EXPORT System *bizswan_new() { return new System(); @@ -403,11 +396,6 @@ namespace MDFN_IEN_WSWAN s->SyncState(&loader); } - EXPORT void bizswan_saveramclearhacky(System *s, const SyncSettings *settings) - { - s->SaveRamClearHacky(*settings); - } - EXPORT void bizswan_setmemorycallbacks(System *s, void (*rcb)(uint32), void (*ecb)(uint32), void (*wcb)(uint32)) { s->cpu.ReadHook = rcb; diff --git a/wonderswan/system.h b/wonderswan/system.h index beeffe27ff..51dff3972e 100644 --- a/wonderswan/system.h +++ b/wonderswan/system.h @@ -45,8 +45,6 @@ public: bool GetMemoryArea(int index, const char *&name, int &size, uint8 *&data); - void SaveRamClearHacky(const SyncSettings &s); - public: GFX gfx; Memory memory;