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

MelonDS: Re-work sync settings a bit.

This commit is contained in:
SuuperW 2019-12-23 10:02:51 -06:00
parent cb159e9228
commit 0214f234a8
2 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs
View File

@ -71,7 +71,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
private static extern void FrameAdvance(short buttons, byte touchX, byte touchY);
[CoreConstructor("NDS")]
public MelonDS(byte[] file, CoreComm comm)
public MelonDS(byte[] file, CoreComm comm, object settings, object syncsettings)
{
_serviceProvider = new BasicServiceProvider(this);
ControllerDefinition = new ControllerDefinition();
@ -100,23 +100,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
CoreComm = comm;
CoreComm.NominalWidth = 256;
CoreComm.NominalHeight = 192;
// MelonDS will look for bios + firmware files at specific locations
byte[] fwBytes;
fwBytes = CoreComm.CoreFileProvider.GetFirmware("NDS", "bios7", false);
if (fwBytes != null)
File.WriteAllBytes("melon/bios7.bin", fwBytes);
else
File.Delete("melon/bios7.bin");
fwBytes = CoreComm.CoreFileProvider.GetFirmware("NDS", "bios9", false);
if (fwBytes != null)
File.WriteAllBytes("melon/bios9.bin", fwBytes);
else
File.Delete("melon/bios9.bin");
fwBytes = CoreComm.CoreFileProvider.GetFirmware("NDS", "firmware", false);
if (fwBytes != null)
File.WriteAllBytes("melon/firmware.bin", fwBytes);
else
File.Delete("melon/firmware.bin");
SetUpFiles(syncsettings as MelonSyncSettings);
if (!Init())
throw new Exception("Failed to init NDS.");
@ -126,5 +111,33 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
LoadROM(f, file.Length);
}
}
/// <summary>
/// MelonDS expects bios and firmware files at a specific location.
/// </summary>
private void SetUpFiles(MelonSyncSettings ss)
{
byte[] fwBytes;
fwBytes = CoreComm.CoreFileProvider.GetFirmware("NDS", "bios7", false);
if (fwBytes != null)
File.WriteAllBytes("melon/bios7.bin", fwBytes);
else
File.Delete("melon/bios7.bin");
fwBytes = CoreComm.CoreFileProvider.GetFirmware("NDS", "bios9", false);
if (fwBytes != null)
File.WriteAllBytes("melon/bios9.bin", fwBytes);
else
File.Delete("melon/bios9.bin");
fwBytes = CoreComm.CoreFileProvider.GetFirmware("NDS", "firmware", false);
if (fwBytes != null)
{
ss.data.CopyTo(fwBytes, fwBytes.Length - 0x200); // NDS user settings are included in the firmware file.
File.WriteAllBytes("melon/firmware.bin", fwBytes);
}
else
File.Delete("melon/firmware.bin");
}
}
}

9
BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_Settable.cs
View File

@ -31,17 +31,14 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
public bool PutSyncSettings(MelonSyncSettings o)
{
fixed (byte* ptr = o.data)
SetUserSettings(ptr);
// At present, no sync settings can be modified without requiring a reboot.
// Also all sync settings are in the firmware file, which is modified upon core construction.
// So there's nothing to actually do here.
return true;
}
[DllImport(dllPath)]
private static extern bool GetUserSettings(byte* dst);
[DllImport(dllPath)]
private static extern bool SetUserSettings(byte* src);
[DllImport(dllPath)]
private static extern int getUserSettingsLength();
static int userSettingsLength = getUserSettingsLength();