From a283063f5f0dca75fb81aaffc42520e3b1253ad5 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Mon, 1 Dec 2014 14:21:37 +0000
Subject: [PATCH] some Atari 2600,7800 reorg

---
 .../BizHawk.Emulation.Cores.csproj            |  8 ++++++-
 .../Atari/2600/Atari2600.IInputPollable.cs    | 21 +++++++++++++++++++
 .../Consoles/Atari/2600/Atari2600.cs          |  6 ------
 .../Atari/7800/Atari7800.IInputPollable.cs    | 21 +++++++++++++++++++
 .../Consoles/Atari/7800/Atari7800.cs          |  4 ----
 5 files changed, 49 insertions(+), 11 deletions(-)
 create mode 100644 BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IInputPollable.cs
 create mode 100644 BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.IInputPollable.cs

diff --git a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
index edee8e755e..b88a55cb5e 100644
--- a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
+++ b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
@@ -86,7 +86,7 @@
       <Link>VersionInfo.cs</Link>
     </Compile>
     <Compile Include="Calculator\TI83.IInputPollable.cs">
-        <DependentUpon>TI83.cs</DependentUpon>
+      <DependentUpon>TI83.cs</DependentUpon>
     </Compile>
     <Compile Include="Calculator\TI83.IMemoryDomains.cs">
       <DependentUpon>TI83.cs</DependentUpon>
@@ -162,6 +162,9 @@
     <Compile Include="Consoles\Atari\2600\Atari2600.IDebuggable.cs">
       <DependentUpon>Atari2600.cs</DependentUpon>
     </Compile>
+    <Compile Include="Consoles\Atari\2600\Atari2600.IInputPollable.cs">
+      <DependentUpon>Atari2600.cs</DependentUpon>
+    </Compile>
     <Compile Include="Consoles\Atari\2600\Atari2600.IMemoryDomains.cs">
       <DependentUpon>Atari2600.cs</DependentUpon>
     </Compile>
@@ -219,6 +222,9 @@
     <Compile Include="Consoles\Atari\7800\Atari7800.IDebuggable.cs">
       <DependentUpon>Atari7800.cs</DependentUpon>
     </Compile>
+    <Compile Include="Consoles\Atari\7800\Atari7800.IInputPollable.cs">
+        <DependentUpon>Atari7800.cs</DependentUpon>
+    </Compile>
     <Compile Include="Consoles\Atari\7800\Atari7800.IMemoryDomains.cs">
       <DependentUpon>Atari7800.cs</DependentUpon>
     </Compile>
diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IInputPollable.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IInputPollable.cs
new file mode 100644
index 0000000000..ebf520c533
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IInputPollable.cs
@@ -0,0 +1,21 @@
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Emulation.Cores.Atari.Atari2600
+{
+	public partial class Atari2600 : IInputPollable
+	{
+		public int LagCount
+		{
+			get { return _lagcount; }
+			set { _lagcount = value; }
+		}
+
+		public bool IsLagFrame
+		{
+			get { return _islag; }
+		}
+
+		private bool _islag = true;
+		private int _lagcount;
+	}
+}
diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs
index af93a69a04..5ec78d6507 100644
--- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs
@@ -19,8 +19,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 	public partial class Atari2600 : IEmulator, IMemoryDomains, IStatable, IDebuggable, IInputPollable, ISettable<Atari2600.A2600Settings, Atari2600.A2600SyncSettings>
 	{
 		private readonly GameInfo _game;
-		private bool _islag = true;
-		private int _lagcount;
 		private int _frame;
 
 		[CoreConstructor("A26")]
@@ -70,10 +68,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 
 		public int Frame { get { return _frame; } set { _frame = value; } }
 
-		public int LagCount { get { return _lagcount; } set { _lagcount = value; } }
-
-		public bool IsLagFrame { get { return _islag; } }
-
 		public bool DeterministicEmulation { get; set; }
 
 		public A2600Settings Settings { get; private set; }
diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.IInputPollable.cs b/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.IInputPollable.cs
new file mode 100644
index 0000000000..4ceeceadc3
--- /dev/null
+++ b/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.IInputPollable.cs
@@ -0,0 +1,21 @@
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Emulation.Cores.Atari.Atari7800
+{
+	public partial class Atari7800 : IInputPollable
+	{
+		public int LagCount
+		{
+			get { return _lagcount; }
+			set { _lagcount = value; }
+		}
+
+		public bool IsLagFrame
+		{
+			get { return _islag; }
+		}
+
+		private bool _islag = true;
+		private int _lagcount;
+	}
+}
diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.cs b/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.cs
index d7158adda3..9fc7f5f562 100644
--- a/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.cs
@@ -73,10 +73,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari7800
 		public bool DeterministicEmulation { get; set; }
 
 		public int Frame { get { return _frame; } set { _frame = value; } }
-		public int LagCount { get { return _lagcount; } set { _lagcount = value; } }
-		public bool IsLagFrame { get { return _islag; } }
-		private bool _islag = true;
-		private int _lagcount = 0;
 		private int _frame = 0;
 
 		public void Dispose()