From a21297f16a480d6b19ad84b71924be84350395d2 Mon Sep 17 00:00:00 2001 From: Brian Armstrong Date: Thu, 6 Jun 2019 02:14:09 -0700 Subject: [PATCH] more flags --- BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/MemoryMap.cs | 6 ++++-- BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.cs | 3 ++- .../Consoles/Sega/GGHawkLink/GGHawkLink.cs | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/MemoryMap.cs b/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/MemoryMap.cs index dc94847b60..3d28d0d5e6 100644 --- a/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/MemoryMap.cs +++ b/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/MemoryMap.cs @@ -20,7 +20,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Vectrex { public byte ReadMemory(ushort addr) { - MemoryCallbacks.CallReads(addr, "System Bus"); + uint flags = (uint)MemoryCallbackFlags.AccessRead; + MemoryCallbacks.CallMemoryCallbacks(addr, 0, flags, "System Bus"); if (addr < 0x8000) { @@ -54,7 +55,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Vectrex public void WriteMemory(ushort addr, byte value) { - MemoryCallbacks.CallWrites(addr, "System Bus"); + uint flags = (uint)MemoryCallbackFlags.AccessWrite; + MemoryCallbacks.CallMemoryCallbacks(addr, value, flags, "System Bus"); if (addr < 0x8000) { diff --git a/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.cs b/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.cs index 442924488f..6e297f9b6a 100644 --- a/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.cs +++ b/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.cs @@ -123,7 +123,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Vectrex private void ExecFetch(ushort addr) { - MemoryCallbacks.CallExecutes(addr, "System Bus"); + uint flags = (uint)MemoryCallbackFlags.AccessExecute; + MemoryCallbacks.CallMemoryCallbacks(addr, 0, flags, "System Bus"); } private void Setup_Mapper() diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.cs b/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.cs index 1401820939..9f58497577 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.cs @@ -90,7 +90,8 @@ namespace BizHawk.Emulation.Cores.Sega.GGHawkLink private void ExecFetch(ushort addr) { - MemoryCallbacks.CallExecutes(addr, "System Bus"); + uint flags = (uint)MemoryCallbackFlags.AccessExecute; + MemoryCallbacks.CallMemoryCallbacks(addr, 0, flags, "System Bus"); } } }