From a7ed14cfe1a76dc032596a5eca7e114586ecbc46 Mon Sep 17 00:00:00 2001
From: Asnivor <coding@asnitech.co.uk>
Date: Tue, 13 Mar 2018 14:00:29 +0000
Subject: [PATCH] new IPSG interface ahead of trying to A/B a version of the
 ColecoHawk AY-3-8910

---
 .../BizHawk.Emulation.Cores.csproj            |  1 +
 .../Hardware/Abstraction/IPSG.cs              | 66 +++++++++++++++++++
 .../Hardware/Datacorder/DatacorderDevice.cs   |  2 +-
 .../Hardware/SoundOuput/AY38912.cs            |  2 +-
 .../SinclairSpectrum/Machine/SpectrumBase.cs  |  2 +-
 5 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IPSG.cs

diff --git a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
index 272aae7483..ecdd02e979 100644
--- a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
+++ b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
@@ -258,6 +258,7 @@
     <Compile Include="Computers\Commodore64\User\UserPortDevice.cs" />
     <Compile Include="Computers\SinclairSpectrum\Hardware\Abstraction\IJoystick.cs" />
     <Compile Include="Computers\SinclairSpectrum\Hardware\Abstraction\IPortIODevice.cs" />
+    <Compile Include="Computers\SinclairSpectrum\Hardware\Abstraction\IPSG.cs" />
     <Compile Include="Computers\SinclairSpectrum\Hardware\Input\CursorJoystick.cs" />
     <Compile Include="Computers\SinclairSpectrum\Hardware\Input\SinclairJoystick2.cs" />
     <Compile Include="Computers\SinclairSpectrum\Hardware\Input\SinclairJoystick1.cs" />
diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IPSG.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IPSG.cs
new file mode 100644
index 0000000000..8e8965d7b0
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Abstraction/IPSG.cs
@@ -0,0 +1,66 @@
+using BizHawk.Common;
+using BizHawk.Emulation.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
+{
+    /// <summary>
+    /// Represents a PSG device (in this case an AY-3-891x)
+    /// </summary>
+    public interface IPSG : ISoundProvider
+    {
+        /// <summary>
+        /// Initlization routine
+        /// </summary>
+        /// <param name="sampleRate"></param>
+        /// <param name="tStatesPerFrame"></param>
+        void Init(int sampleRate, int tStatesPerFrame);
+
+        /// <summary>
+        /// Activates a register
+        /// </summary>
+        int SelectedRegister { get; set; }
+
+        /// <summary>
+        /// Writes to the PSG
+        /// </summary>
+        /// <param name="value"></param>
+        void PortWrite(int value);
+
+        /// <summary>
+        /// Reads from the PSG
+        /// </summary>
+        int PortRead();
+
+        /// <summary>
+        /// Resets the PSG
+        /// </summary>
+        void Reset();
+
+        /// <summary>
+        /// Called at the start of a frame
+        /// </summary>
+        void StartFrame();
+
+        /// <summary>
+        /// called at the end of a frame
+        /// </summary>
+        void EndFrame();
+
+        /// <summary>
+        /// Updates the sound based on number of frame cycles
+        /// </summary>
+        /// <param name="frameCycle"></param>
+        void UpdateSound(int frameCycle);
+
+        /// <summary>
+        /// IStatable serialization
+        /// </summary>
+        /// <param name="ser"></param>
+        void SyncState(Serializer ser);
+    }
+}
diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs
index e71a17d8f0..1bcbf2b022 100644
--- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs
+++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs
@@ -594,7 +594,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
                             _machine.Spectrum.OSD_TapePlayingAuto();
                         }
 
-                        _monitorTimeOut = 90;
+                        _monitorTimeOut = 50;
                     }
                 }
                 else
diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/SoundOuput/AY38912.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/SoundOuput/AY38912.cs
index 7443c43dd3..f003ddd6f2 100644
--- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/SoundOuput/AY38912.cs
+++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/SoundOuput/AY38912.cs
@@ -7,7 +7,7 @@ using System.Linq;
 
 namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
 {
-    public class AY38912 : ISoundProvider
+    public class AY38912 : IPSG
     {
         private int _tStatesPerFrame;
         private int _sampleRate;
diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.cs
index c4b241b898..258af9f579 100644
--- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.cs
+++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.cs
@@ -42,7 +42,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
         /// <summary>
         /// Device representing the AY-3-8912 chip found in the 128k and up spectrums
         /// </summary>
-        public AY38912 AYDevice { get; set; }
+        public IPSG AYDevice { get; set; }
 
         /// <summary>
         /// The spectrum keyboard