ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wonderswan: clear out unused code for clear saveram

This commit is contained in:
goyuken 2014-11-24 18:50:18 +00:00
parent 0e82fff3ff
commit 9c02bf77ba
6 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BizHawk.Emulation.Common/Interfaces/ISettable.cs
View File

@ -6,6 +6,9 @@ using System.Reflection;
namespace BizHawk.Emulation.Common namespace BizHawk.Emulation.Common
{ {
/// <summary>
/// serves as a shim between strongly typed ISettable and consumers
/// </summary>
public class SettingsAdapter public class SettingsAdapter
{ {
public SettingsAdapter(IEmulator e) public SettingsAdapter(IEmulator e)

8
BizHawk.Emulation.Cores/Consoles/WonderSwan/BizSwan.cs
View File

@ -87,14 +87,6 @@ namespace BizHawk.Emulation.Cores.WonderSwan
[DllImport(dd, CallingConvention = cc)] [DllImport(dd, CallingConvention = cc)]
public static extern bool bizswan_saveramsave(IntPtr core, byte[] data, int maxsize); public static extern bool bizswan_saveramsave(IntPtr core, byte[] data, int maxsize);
/// <summary>
/// bad function
/// </summary>
/// <param name="core"></param>
/// <param name="settings">pass EXACTLY the same syncsettings you originally passed on core load, else DRAGONS</param>
[DllImport(dd, CallingConvention = cc)]
public static extern void bizswan_saveramclearhacky(IntPtr core, [In] ref SyncSettings settings);
/// <summary> /// <summary>
/// put non-sync settings, can be done at any time /// put non-sync settings, can be done at any time
/// </summary> /// </summary>

5
BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs
View File

@ -108,10 +108,6 @@ namespace BizHawk.Emulation.Cores.WonderSwan
if (!BizSwan.bizswan_load(Core, file, file.Length, ref ss, ref rotate)) if (!BizSwan.bizswan_load(Core, file, file.Length, ref ss, ref rotate))
throw new InvalidOperationException("bizswan_load() returned FALSE!"); 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.VsyncNum = 3072000; // master CPU clock, also pixel clock
CoreComm.VsyncDen = (144 + 15) * (224 + 32); // 144 vislines, 15 vblank lines; 224 vispixels, 32 hblank pixels 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; Settings _Settings;
SyncSettings _SyncSettings; SyncSettings _SyncSettings;
BizSwan.SyncSettings _DONTTOUCHME;
public class Settings public class Settings
{ {

BIN
output/dll/bizswan.dll
View File

Binary file not shown.

12
wonderswan/system.cpp
View File

@ -304,13 +304,6 @@ namespace MDFN_IEN_WSWAN
NSS(oldbuttons); 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() EXPORT System *bizswan_new()
{ {
return new System(); return new System();
@ -403,11 +396,6 @@ namespace MDFN_IEN_WSWAN
s->SyncState<true>(&loader); s->SyncState<true>(&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)) EXPORT void bizswan_setmemorycallbacks(System *s, void (*rcb)(uint32), void (*ecb)(uint32), void (*wcb)(uint32))
{ {
s->cpu.ReadHook = rcb; s->cpu.ReadHook = rcb;

2
wonderswan/system.h
View File

@ -45,8 +45,6 @@ public:
bool GetMemoryArea(int index, const char *&name, int &size, uint8 *&data); bool GetMemoryArea(int index, const char *&name, int &size, uint8 *&data);
void SaveRamClearHacky(const SyncSettings &s);
public: public:
GFX gfx; GFX gfx;
Memory memory; Memory memory;