ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Appple II - pass DiskII data to the DiskIIController instead of a hard coded path to read from

This commit is contained in:
adelikat 2015-04-10 00:13:26 +00:00
parent ae341fc81a
commit c72fb5e0a5
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs
View File

@ -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);

11
BizHawk.Emulation.Cores/Computers/AppleII/Virtu/DiskIIController.cs
View File

@ -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()
{

8
BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Machine.cs
View File

@ -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 };