From 45c37ddc47009e97b2a8f652169ca5ba97556f62 Mon Sep 17 00:00:00 2001
From: Asnivor <coding@asnitech.co.uk>
Date: Tue, 8 May 2018 20:37:47 +0100
Subject: [PATCH] ZXHawk: Removed IO port contention for now (this fixes the
 slow beeper music problem). Will re-implement properly later - #1158

---
 .../Computers/SinclairSpectrum/Machine/SpectrumBase.Port.cs     | 2 ++
 .../Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Port.cs            | 2 +-
 .../Machine/ZXSpectrum128KPlus3/ZX128Plus3.Port.cs              | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Port.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Port.cs
index 3b53dd28e3..13e5d5ec5c 100644
--- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Port.cs
+++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Port.cs
@@ -52,6 +52,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
         /// <param name="addr"></param>
         public virtual void ContendPortAddress(ushort addr)
         {
+            return;
+
             /*
             It takes four T states for the Z80 to read a value from an I/O port, or write a value to a port. As is the case with memory access, 
             this can be lengthened by the ULA. There are two effects which occur here:
diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Port.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Port.cs
index 4568de663d..64ec430ef0 100644
--- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Port.cs
+++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Port.cs
@@ -287,7 +287,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
         /// <param name="addr"></param>
         public override void ContendPortAddress(ushort addr)
         {
-            CPU.TotalExecutedCycles += 4;
+            //CPU.TotalExecutedCycles += 4;
         }
     }
 }
diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Port.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Port.cs
index ec718c8343..5aed81dd52 100644
--- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Port.cs
+++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Port.cs
@@ -220,7 +220,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
         /// <param name="addr"></param>
         public override void ContendPortAddress(ushort addr)
         {
-            CPU.TotalExecutedCycles += 4;
+            //CPU.TotalExecutedCycles += 4;
         }
     }
 }