From 16d51b429d883055bd577ba492d3e83f9c5c7075 Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Sat, 7 Sep 2024 16:49:39 -0700
Subject: [PATCH] Actually use IZ80ALink's IRQ/NMI/IRQACK callbacks

---
 src/BizHawk.Emulation.Cores/CPUs/Z80A/Interrupts.cs | 7 -------
 src/BizHawk.Emulation.Cores/CPUs/Z80A/Z80A.cs       | 6 +++---
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/BizHawk.Emulation.Cores/CPUs/Z80A/Interrupts.cs b/src/BizHawk.Emulation.Cores/CPUs/Z80A/Interrupts.cs
index f9eed40c56..66e162d3e4 100644
--- a/src/BizHawk.Emulation.Cores/CPUs/Z80A/Interrupts.cs
+++ b/src/BizHawk.Emulation.Cores/CPUs/Z80A/Interrupts.cs
@@ -36,13 +36,6 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
 			}
 		}
 
-		public Action IRQCallback = () => {};
-		public Action NMICallback = () => {};
-
-		// this will be a few cycles off for now
-		// it should suffice for now until Alyosha returns from hiatus
-		public Action IRQACKCallback = () => {};
-
 		private void NMI_()
 		{
 			PopulateCURINSTR
diff --git a/src/BizHawk.Emulation.Cores/CPUs/Z80A/Z80A.cs b/src/BizHawk.Emulation.Cores/CPUs/Z80A/Z80A.cs
index ecd548c333..76dfd59d4c 100644
--- a/src/BizHawk.Emulation.Cores/CPUs/Z80A/Z80A.cs
+++ b/src/BizHawk.Emulation.Cores/CPUs/Z80A/Z80A.cs
@@ -716,7 +716,7 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
 					break;
 
 				case IORQ:
-					IRQACKCallback();
+					_link.IRQACKCallback();
 					break;
 			}
 
@@ -742,7 +742,7 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
 					iff2 = iff1;
 					iff1 = false;
 					NMI_();
-					NMICallback();
+					_link.NMICallback();
 					instr_pntr = mem_pntr = bus_pntr = irq_pntr = 0;
 
 					temp_R = (byte)(Regs[R] & 0x7F);
@@ -774,7 +774,7 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
 							INTERRUPT_2();
 							break;
 					}
-					IRQCallback();
+					_link.IRQCallback();
 					instr_pntr = mem_pntr = bus_pntr = irq_pntr = 0;
 
 					temp_R = (byte)(Regs[R] & 0x7F);