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

refactor CoreComm usage in sega cores

This commit is contained in:
adelikat 2020-03-15 09:42:48 -05:00
parent 899f8662c0
commit 79aec475a9
7 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Emulation.Cores/Consoles/SNK/NeoGeoPort.cs
View File

@ -11,7 +11,7 @@ namespace BizHawk.Emulation.Cores.Consoles.SNK
{
[Core("NeoPop", "Thomas Klausner, Mednafen Team", true, true, "0.9.44.1",
"https://mednafen.github.io/releases/", false)]
public class NeoGeoPort : WaterboxCore,
public class NeoGeoPort : WaterboxCore,
ISaveRam, // NGP provides its own saveram interface
ISettable<object, NeoGeoPort.SyncSettings>
{

7
BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.IEmulator.cs
View File

@ -284,8 +284,6 @@ namespace BizHawk.Emulation.Cores.Sega.GGHawkLink
_isLag = false;
}
public CoreComm CoreComm { get; }
public void Dispose()
{
L.Dispose();
@ -383,11 +381,6 @@ namespace BizHawk.Emulation.Cores.Sega.GGHawkLink
R.DiscardSamples();
}
private void GetSamples(short[] samples)
{
}
public void DisposeSound()
{

2
BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.cs
View File

@ -32,8 +32,6 @@ namespace BizHawk.Emulation.Cores.Sega.GGHawkLink
linkSyncSettings = (GGLinkSyncSettings)syncSettings ?? new GGLinkSyncSettings();
_controllerDeck = new GGHawkLinkControllerDeck(GGHawkLinkControllerDeck.DefaultControllerName, GGHawkLinkControllerDeck.DefaultControllerName);
CoreComm = comm;
var temp_set_L = new SMS.SmsSettings();
var temp_set_R = new SMS.SmsSettings();

2
BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IEmulator.cs
View File

@ -170,8 +170,6 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
_isLag = false;
}
public CoreComm CoreComm { get; }
public void Dispose()
{
if (blip_L != null)

11
BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs
View File

@ -29,7 +29,6 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
ServiceProvider = new BasicServiceProvider(this);
Settings = (SmsSettings)settings ?? new SmsSettings();
SyncSettings = (SmsSyncSettings)syncSettings ?? new SmsSyncSettings();
CoreComm = comm;
IsGameGear = game.System == "GG";
IsGameGear_C = game.System == "GG";
@ -47,7 +46,7 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
if (game["PAL"] && Region != DisplayType.PAL)
{
Region = DisplayType.PAL;
CoreComm.Notify("Display was forced to PAL mode for game compatibility.");
comm.Notify("Display was forced to PAL mode for game compatibility.");
}
if (IsGameGear)
@ -64,13 +63,13 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
if (game["Japan"] && _region != SmsSyncSettings.Regions.Japan)
{
_region = SmsSyncSettings.Regions.Japan;
CoreComm.Notify("Region was forced to Japan for game compatibility.");
comm.Notify("Region was forced to Japan for game compatibility.");
}
if (game["Korea"] && _region != SmsSyncSettings.Regions.Korea)
{
_region = SmsSyncSettings.Regions.Korea;
CoreComm.Notify("Region was forced to Korea for game compatibility.");
comm.Notify("Region was forced to Korea for game compatibility.");
}
if ((game.NotInDatabase || game["FM"]) && SyncSettings.EnableFm && !IsGameGear)
@ -183,9 +182,11 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
{
SaveRAM = new byte[int.Parse(game.OptionValue("SRAM"))];
Console.WriteLine(SaveRAM.Length);
}
}
else if (game.NotInDatabase)
{
SaveRAM = new byte[0x8000];
}
SetupMemoryDomains();

2
BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IEmulator.cs
View File

@ -86,8 +86,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
LagCount = 0;
}
public CoreComm CoreComm { get; }
public void Dispose()
{
if (!_disposed)

2
BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs
View File

@ -287,6 +287,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
}
private CoreComm CoreComm { get; }
void CDRead(int lba, IntPtr dest, bool audio)
{
if ((uint)_discIndex < _cds.Length)