From bb2fafec63eb9b74d26aee99ae9b6988758840b0 Mon Sep 17 00:00:00 2001
From: saxxonpike <saxxonpike@gmail.com>
Date: Sat, 3 Nov 2012 14:23:44 +0000
Subject: [PATCH] c64- connect CIA2 port A and B to MemBus

---
 .../Computers/Commodore64/C64.core.cs         |  6 +++++-
 .../Computers/Commodore64/MemBus.cs           | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Emulation/Computers/Commodore64/C64.core.cs b/BizHawk.Emulation/Computers/Commodore64/C64.core.cs
index 16fcecfad3..002b061350 100644
--- a/BizHawk.Emulation/Computers/Commodore64/C64.core.cs
+++ b/BizHawk.Emulation/Computers/Commodore64/C64.core.cs
@@ -44,12 +44,16 @@ namespace BizHawk.Emulation.Computers.Commodore64
             // initialize memory (this must be done AFTER all other chips are initialized)
             string romPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), "C64Kernal");
             mem = new MemoryBus(romPath, vic, sid, cia1, cia2);
+            cia2.ReadPortA = mem.CIA2ReadPortA;
+            cia2.ReadPortB = mem.CIA2ReadPortB;
+            cia2.WritePortA = mem.CIA2WritePortA;
+            cia2.WritePortB = mem.CIA2WritePortB;
 
             // initialize media
             Cartridge cart = new Cartridge(inputFile);
             if (cart.valid)
             {
-                //mem.ApplyCartridge(cart);
+                mem.ApplyCartridge(cart);
             }
 
             // initialize cpu (hard reset vector)
diff --git a/BizHawk.Emulation/Computers/Commodore64/MemBus.cs b/BizHawk.Emulation/Computers/Commodore64/MemBus.cs
index c3d71ee455..24d5dd476d 100644
--- a/BizHawk.Emulation/Computers/Commodore64/MemBus.cs
+++ b/BizHawk.Emulation/Computers/Commodore64/MemBus.cs
@@ -58,6 +58,7 @@ namespace BizHawk.Emulation.Computers.Commodore64
         // ram
         public byte[] colorRam;
         public byte[] ram;
+        public int vicOffset;
 
         // registers
         public byte busData;
@@ -100,6 +101,24 @@ namespace BizHawk.Emulation.Computers.Commodore64
             UpdateLayout();
         }
 
+        public byte CIA2ReadPortA()
+        {
+            return 0;
+        }
+
+        public byte CIA2ReadPortB()
+        {
+            return 0;
+        }
+
+        public void CIA2WritePortA(byte val, byte direction)
+        {
+        }
+
+        public void CIA2WritePortB(byte val, byte direction)
+        {
+        }
+
         public MemoryBusDesignation GetDesignation(ushort addr)
         {
             MemoryBusDesignation result;