diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Core.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Core.cs index 7cb5ac2d8b..00279d62fd 100644 --- a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Core.cs +++ b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Core.cs @@ -28,7 +28,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64 private void Init(Region initRegion) { - board = new Motherboard(initRegion); + board = new Motherboard(this, initRegion); InitRoms(); board.Init(); InitMedia(); diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Input.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Input.cs index 13ca9292c4..557ca04bdb 100644 --- a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Input.cs +++ b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Input.cs @@ -32,6 +32,7 @@ public void PollInput() { + _c64.CoreComm.InputCallback.Call(); // scan joysticks pollIndex = 0; for (int j = 0; j < 5; j++) diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Motherboard.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Motherboard.cs index 0eea68e498..95aecd4b6f 100644 --- a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Motherboard.cs +++ b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Motherboard.cs @@ -37,9 +37,12 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64 public bool irq; public bool nmi; - public Motherboard(Region initRegion) + private C64 _c64; + + public Motherboard(C64 c64, Region initRegion) { // note: roms need to be added on their own externally + _c64 = c64; cartPort = new CartridgePort(); cassPort = new CassettePort();