From c72fb5e0a555f7e4aae7f093be65b5e9c6ca04f3 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 10 Apr 2015 00:13:26 +0000
Subject: [PATCH] Appple II - pass DiskII data to the DiskIIController instead
 of a hard coded path to read from

---
 BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs  |  2 +-
 .../Computers/AppleII/Virtu/DiskIIController.cs       | 11 ++++-------
 .../Computers/AppleII/Virtu/Machine.cs                |  8 +++++---
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs b/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs
index e784c2e29b..8a4f81548e 100644
--- a/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs
+++ b/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs
@@ -29,7 +29,7 @@ namespace BizHawk.Emulation.Cores.Computers.AppleII
 			_diskIIRom = comm.CoreFileProvider.GetFirmware(
 				SystemId, "DiskII", true, "The DiskII firmware is required");
 
-			_machine = new Machine();
+			_machine = new Machine(_diskIIRom);
 			
 			var vidService = new BizVideoService(_machine);
 			_soundService = new BizAudioService(_machine);
diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/DiskIIController.cs b/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/DiskIIController.cs
index d64b426399..99d579ed8c 100644
--- a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/DiskIIController.cs
+++ b/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/DiskIIController.cs
@@ -9,10 +9,11 @@ namespace Jellyfish.Virtu
 {
     public sealed class DiskIIController : PeripheralCard
     {
-        public DiskIIController(Machine machine) : 
+        public DiskIIController(Machine machine, byte[] diskIIRom) : 
             base(machine)
         {
-            Drive1 = new DiskIIDrive(machine);
+			_romRegionC1C7 = diskIIRom;
+			Drive1 = new DiskIIDrive(machine);
             Drive2 = new DiskIIDrive(machine);
 
             Drives = new Collection<DiskIIDrive> { Drive1, Drive2 };
@@ -20,11 +21,7 @@ namespace Jellyfish.Virtu
             BootDrive = Drive1;
         }
 
-        public override void Initialize()
-        {
-					//TODO lol!!
-            StorageService.LoadResource("c:\\apple\\DiskII.rom", stream => stream.ReadBlock(_romRegionC1C7));
-        }
+        public override void Initialize() { }
 
         public override void Reset()
         {
diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Machine.cs b/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Machine.cs
index 99f9d59207..1404d4f6c5 100644
--- a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Machine.cs
+++ b/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Machine.cs
@@ -64,9 +64,11 @@ namespace Jellyfish.Virtu
 
     public sealed class Machine : IDisposable
     {
-        public Machine()
+        public Machine(byte[] diskIIRom)
         {
-            Events = new MachineEvents();
+            
+
+			Events = new MachineEvents();
             Services = new MachineServices();
 
             Cpu = new Cpu(this);
@@ -84,7 +86,7 @@ namespace Jellyfish.Virtu
             Slot3 = emptySlot;
             Slot4 = emptySlot;
             Slot5 = emptySlot;
-            Slot6 = new DiskIIController(this);
+            Slot6 = new DiskIIController(this, diskIIRom);
             Slot7 = emptySlot;
 
             Slots = new Collection<PeripheralCard> { null, Slot1, Slot2, Slot3, Slot4, Slot5, Slot6, Slot7 };