From 2200b05dc26f02afc546d9005eccff7e7aefb9e6 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 11 Apr 2014 01:05:50 +0000
Subject: [PATCH] Atari 2600 - DPC memory domain (added when using the DPC
 mapper)

---
 .../Consoles/Atari/2600/Atari2600.cs               | 14 +++++++++++++-
 .../Consoles/Atari/2600/Mappers/mDPC.cs            |  2 +-
 .../Consoles/Atari/2600/Mappers/mSB.cs             |  9 ---------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs
index ddc2749d00..0cb6ecdb65 100644
--- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs
@@ -49,7 +49,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 					addr => _mapper.PeekMemory((ushort) addr),
 					(addr, value) => { })
 			};
-			MemoryDomains = new MemoryDomainList(domains);
+
 			CoreComm.CpuTraceAvailable = true;
 			Rom = rom;
 			_game = game;
@@ -61,6 +61,18 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 
 			Console.WriteLine("Game uses mapper " + game.GetOptionsDict()["m"]);
 			RebootCore();
+
+			if (_mapper is mDPC) // TODO: also mDPCPlus
+			{
+				domains.Add(new MemoryDomain(
+					"DPC",
+					2048,
+					MemoryDomain.Endian.Little,
+					addr => (_mapper as mDPC).DspData[addr],
+					(addr, value) => (_mapper as mDPC).DspData[addr] = value));
+			}
+
+			MemoryDomains = new MemoryDomainList(domains);
 		}
 
 		public string SystemId { get { return "A26"; } }
diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mDPC.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mDPC.cs
index d120528aa9..b4ba3a3484 100644
--- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mDPC.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mDPC.cs
@@ -237,7 +237,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 		private float _fractionalClocks; // Fractional DPC music OSC clocks unused during the last update
 
 		private byte[] _dspData;
-		private byte[] DspData
+		public byte[] DspData
 		{
 			get
 			{
diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mSB.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mSB.cs
index 5ab44bdc7a..67dca13877 100644
--- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mSB.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mSB.cs
@@ -66,15 +66,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 			{
 				_bank4K = temp & myStartBank;
 			}
-			//switch (addr & 0x1840)
-			//{
-			//	case 0x0800:
-			//		_bank4K = 0;
-			//		break;
-			//	case 0x0840:
-			//		_bank4K = 1;
-			//		break;
-			//}
 		}
 	}
 }