diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
index 2623d93ae3..e476798f39 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
@@ -21,12 +21,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
///
/// Create mupen64plus Emulator
///
- /// Core communication object
/// Game information of game to load
/// Rom that should be loaded
/// N64SyncSettings object
[CoreConstructor("N64")]
- public N64(CoreComm comm, GameInfo game, byte[] file, object settings, object syncSettings)
+ public N64(GameInfo game, byte[] file, object settings, object syncSettings)
{
ServiceProvider = new BasicServiceProvider(this);
InputCallbacks = new InputCallbackSystem();
@@ -40,8 +39,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
SaveType = 1;
}
- CoreComm = comm;
-
_syncSettings = (N64SyncSettings)syncSettings ?? new N64SyncSettings();
_settings = (N64Settings)settings ?? new N64Settings();
@@ -94,7 +91,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
// Order is important because the register with the mupen core
_videoProvider = new N64VideoProvider(api, videosettings);
_audioProvider = new N64Audio(api);
- _inputProvider = new N64Input(this.AsInputPollable(), api, comm, this._syncSettings.Controllers);
+ _inputProvider = new N64Input(this.AsInputPollable(), api, _syncSettings.Controllers);
(ServiceProvider as BasicServiceProvider).Register(_videoProvider);
(ServiceProvider as BasicServiceProvider).Register(_audioProvider.Resampler);
@@ -260,8 +257,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
public string SystemId => "N64";
- public CoreComm CoreComm { get; }
-
public DisplayType Region => _display_type;
public ControllerDefinition ControllerDefinition => _inputProvider.ControllerDefinition;
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Input.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Input.cs
index 6a792d5789..654be04533 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Input.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Input.cs
@@ -9,7 +9,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
public class N64Input
{
private readonly mupen64plusInputApi _api;
- public CoreComm CoreComm { get; }
public IController Controller { get; set; }
public bool LastFrameInputPolled { get; set; }
@@ -39,11 +38,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
private readonly IInputPollable _emuCore;
- internal N64Input(IInputPollable emuCore, mupen64plusApi core, CoreComm comm, N64SyncSettings.N64ControllerSettings[] controllerSettings)
+ internal N64Input(IInputPollable emuCore, mupen64plusApi core, N64SyncSettings.N64ControllerSettings[] controllerSettings)
{
_emuCore = emuCore;
_api = new mupen64plusInputApi(core);
- CoreComm = comm;
_api.SetM64PInputCallback(GetControllerInput);