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

refactor CoreComm usages in Computer cores

This commit is contained in:
adelikat 2020-03-15 09:10:13 -05:00
parent d6af18accb
commit 9fa59bad42
13 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.Common/RomLoader.cs
View File

@ -954,7 +954,7 @@ namespace BizHawk.Client.Common
using (var ti83AsHawkFile = new HawkFile(ti83BiosPath))
{
var ti83BiosAsRom = new RomGame(ti83AsHawkFile);
var ti83 = new TI83(nextComm, ti83BiosAsRom.GameInfo, ti83Bios, GetCoreSettings<TI83>());
var ti83 = new TI83(ti83BiosAsRom.GameInfo, ti83Bios, GetCoreSettings<TI83>());
ti83.LinkPort.SendFileToCalc(File.OpenRead(path), false);
nextEmulator = ti83;
}

2
BizHawk.Emulation.Cores/Calculator/TI83.IEmulator.cs
View File

@ -80,8 +80,6 @@ namespace BizHawk.Emulation.Cores.Calculators
_isLag = false;
}
public CoreComm CoreComm { get; }
public void Dispose()
{
}

3
BizHawk.Emulation.Cores/Calculator/TI83.cs
View File

@ -14,13 +14,12 @@ namespace BizHawk.Emulation.Cores.Calculators
public partial class TI83 : IEmulator, IVideoProvider, IDebuggable, IInputPollable, ISettable<TI83.TI83Settings, object>
{
[CoreConstructor("TI83")]
public TI83(CoreComm comm, GameInfo game, byte[] rom, object settings)
public TI83(GameInfo game, byte[] rom, object settings)
{
var ser = new BasicServiceProvider(this);
ServiceProvider = ser;
PutSettings((TI83Settings)settings ?? new TI83Settings());
CoreComm = comm;
_cpu.FetchMemory = ReadMemory;
_cpu.ReadMemory = ReadMemory;
_cpu.WriteMemory = WriteMemory;

2
BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.IEmulator.cs
View File

@ -59,8 +59,6 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
_isLag = false;
}
public CoreComm CoreComm { get; }
public void Dispose()
{
if (_machine != null)

2
BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.cs
View File

@ -95,6 +95,8 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
SetupMemoryDomains();
}
internal CoreComm CoreComm { get; }
public Action HardReset;
public Action SoftReset;

2
BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IEmulator.cs
View File

@ -29,8 +29,6 @@ namespace BizHawk.Emulation.Cores.Computers.AppleII
IsLagFrame = false;
}
public CoreComm CoreComm { get; }
public void Dispose()
{
}

1
BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs
View File

@ -32,7 +32,6 @@ namespace BizHawk.Emulation.Cores.Computers.AppleII
{
var ser = new BasicServiceProvider(this);
ServiceProvider = ser;
CoreComm = comm;
_tracer = new TraceBuffer
{

2
BizHawk.Emulation.Cores/Computers/Commodore64/C64.IEmulator.cs
View File

@ -91,8 +91,6 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
_frameCycles = 0;
}
public CoreComm CoreComm { get; }
public void Dispose()
{
if (_board != null)

2
BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs
View File

@ -70,6 +70,8 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
SetupMemoryDomains();
}
private CoreComm CoreComm { get; }
public string RomDetails { get; }
// Currently we will require at least one rom. If multiple they MUST be all the same media type in the same format

4
BizHawk.Emulation.Cores/Computers/MSX/MSX.IEmulator.cs
View File

@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Computers.MSX
public ControllerDefinition ControllerDefinition => current_controller;
public bool FrameAdvance(IController controller, bool render, bool rendersound)
{
{
_controller = controller;
byte ctrl1_byte = 0xFF;
@ -150,8 +150,6 @@ namespace BizHawk.Emulation.Cores.Computers.MSX
_isLag = false;
}
public CoreComm CoreComm { get; }
public void Dispose()
{
if (MSX_Pntr != IntPtr.Zero)

1
BizHawk.Emulation.Cores/Computers/MSX/MSX.cs
View File

@ -18,7 +18,6 @@ namespace BizHawk.Emulation.Cores.Computers.MSX
ServiceProvider = new BasicServiceProvider(this);
Settings = (MSXSettings)settings ?? new MSXSettings();
SyncSettings = (MSXSyncSettings)syncSettings ?? new MSXSyncSettings();
CoreComm = comm;
RomData = rom;
int size = RomData.Length;

2
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.IEmulator.cs
View File

@ -59,8 +59,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
_isLag = false;
}
public CoreComm CoreComm { get; }
public void Dispose()
{
if (_machine != null)

2
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.cs
View File

@ -180,6 +180,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
};
private int diagIndex = 1;
internal CoreComm CoreComm { get; }
private byte[] GetFirmware(int length, params string[] names)
{
if (DiagRom & File.Exists(Directory.GetCurrentDirectory() + diagRoms[diagIndex]))