From 104511c5b7a6d4cdeddbe07a25fbb1fedc4a198b Mon Sep 17 00:00:00 2001
From: brandman211 <brandman211@gmail.com>
Date: Mon, 9 Jul 2012 05:29:45 +0000
Subject: [PATCH] -Intellivision.cs' constructor initializes the PC to 0x1000.
 -Set up the "official" memory map - see
 http://wiki.intellivision.us/index.php?title=Memory_Map --Things I didn't do:
 ---Accessibility. ---Additional Occupied Memory Ranges. ---Addresses
 Available to Cartridges ---Initialize any of the byte arrays. --Not sure
 which of these I need to do, but clearly the byte arrays have to be
 initialized somewhere to something and there's a lot of gaps in this memory
 map.

---
 BizHawk.Emulation/BizHawk.Emulation.csproj          |  1 +
 .../Consoles/Intellivision/Intellivision.cs         | 13 ++-----------
 BizHawk.MultiClient/MainForm.cs                     |  2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/BizHawk.Emulation/BizHawk.Emulation.csproj b/BizHawk.Emulation/BizHawk.Emulation.csproj
index 6386d1f9a1..d1ec2205ae 100644
--- a/BizHawk.Emulation/BizHawk.Emulation.csproj
+++ b/BizHawk.Emulation/BizHawk.Emulation.csproj
@@ -115,6 +115,7 @@
     <Compile Include="Consoles\GB\MemoryMap.cs" />
     <Compile Include="Consoles\GB\GB.cs" />
     <Compile Include="Consoles\Intellivision\Intellivision.cs" />
+    <Compile Include="Consoles\Intellivision\MemoryMap.cs" />
     <Compile Include="Consoles\Nintendo\NES\APU.cs" />
     <Compile Include="Consoles\Nintendo\NES\BoardSystem.cs" />
     <Compile Include="Consoles\Nintendo\NES\Boards\AVE-NINA.cs" />
diff --git a/BizHawk.Emulation/Consoles/Intellivision/Intellivision.cs b/BizHawk.Emulation/Consoles/Intellivision/Intellivision.cs
index 89ac8e2970..19a8e009fa 100644
--- a/BizHawk.Emulation/Consoles/Intellivision/Intellivision.cs
+++ b/BizHawk.Emulation/Consoles/Intellivision/Intellivision.cs
@@ -3,7 +3,7 @@ using System.IO;
 using System.Collections.Generic;
 using BizHawk.Emulation.CPUs.CP1610;
 
-namespace BizHawk.Emulation.Consoles.Mattel
+namespace BizHawk.Emulation.Consoles.Intellivision
 {
     public sealed partial class Intellivision : IEmulator
     {
@@ -20,20 +20,11 @@ namespace BizHawk.Emulation.Consoles.Mattel
             Cpu = new CP1610();
             Cpu.ReadMemory = ReadMemory;
             Cpu.WriteMemory = WriteMemory;
+			Cpu.RegisterPC = 0x1000;
             
             CoreOutputComm = new CoreOutputComm();
         }
 
-        public byte ReadMemory(ushort addr)
-        {
-            return 0xFF; // TODO you need to implement a memory mapper.
-        }
-
-        public void WriteMemory(ushort addr, byte value)
-        {
-            // TODO
-        }
-
         public void FrameAdvance(bool render)
         {
             Cpu.Execute(999); // execute some cycles. this will do nothing useful until a memory mapper is created.
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index b5172e29e2..a80cb42921 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -15,7 +15,7 @@ using BizHawk.Emulation.Consoles.Nintendo;
 using BizHawk.Emulation.Consoles.Coleco;
 using BizHawk.MultiClient.tools;
 using System.Collections.Generic;
-using BizHawk.Emulation.Consoles.Mattel;
+using BizHawk.Emulation.Consoles.Intellivision;
 
 namespace BizHawk.MultiClient
 {