From 9008bf269a1f68e5c26c24df6a0ea006cf4721c8 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 22 Feb 2020 11:44:13 -0600 Subject: [PATCH] O2 - remove peek/poke methods --- .../Magnavox/Odyssey2/Mappers/MapperBase.cs | 18 +----------------- .../Odyssey2/Mappers/Mapper_Default.cs | 7 ------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/MapperBase.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/MapperBase.cs index 68d5c00431..b8efec1960 100644 --- a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/MapperBase.cs +++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/MapperBase.cs @@ -7,32 +7,16 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk { public O2Hawk Core { get; set; } - public virtual byte ReadMemory(ushort addr) - { - return 0; - } - - public virtual byte PeekMemory(ushort addr) - { - return 0; - } + public virtual byte ReadMemory(ushort addr) => 0; public virtual void WriteMemory(ushort addr, byte value) { } - public virtual void PokeMemory(ushort addr, byte value) - { - } - public virtual void SyncState(Serializer ser) { } - public virtual void Dispose() - { - } - public virtual void Initialize() { } diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/Mapper_Default.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/Mapper_Default.cs index cd46153515..2ec58d3a33 100644 --- a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/Mapper_Default.cs +++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/Mapper_Default.cs @@ -40,8 +40,6 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk } } - public override byte PeekMemory(ushort addr) => ReadMemory(addr); - public override void WriteMemory(ushort addr, byte value) { if (addr < 0x8000) @@ -56,10 +54,5 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk } } } - - public override void PokeMemory(ushort addr, byte value) - { - WriteMemory(addr, value); - } } }