intellivision - clean up corefileprovider usage

This commit is contained in:
goyuken 2015-02-05 23:07:48 +00:00
parent 6fb2599320
commit 723a90fb30
1 changed files with 6 additions and 7 deletions

View File

@ -31,9 +31,8 @@ namespace BizHawk.Emulation.Cores.Intellivision
Stic.SetSst(Cpu.GetBusAk()); Stic.SetSst(Cpu.GetBusAk());
} }
public void LoadExecutiveRom(string path) public void LoadExecutiveRom(byte[] erom)
{ {
var erom = File.ReadAllBytes(path);
if (erom.Length != 8192) if (erom.Length != 8192)
{ {
throw new ApplicationException("EROM file is wrong size - expected 8192 bytes"); throw new ApplicationException("EROM file is wrong size - expected 8192 bytes");
@ -46,13 +45,13 @@ namespace BizHawk.Emulation.Cores.Intellivision
} }
} }
public void LoadGraphicsRom(string path) public void LoadGraphicsRom(byte[] grom)
{ {
GraphicsRom = File.ReadAllBytes(path); if (grom.Length != 2048)
if (GraphicsRom.Length != 2048)
{ {
throw new ApplicationException("GROM file is wrong size - expected 2048 bytes"); throw new ApplicationException("GROM file is wrong size - expected 2048 bytes");
} }
GraphicsRom = grom;
} }
[CoreConstructor("INTV")] [CoreConstructor("INTV")]
@ -89,8 +88,8 @@ namespace BizHawk.Emulation.Cores.Intellivision
Cpu.LogData(); Cpu.LogData();
LoadExecutiveRom(CoreComm.CoreFileProvider.GetFirmwarePath("INTV", "EROM", true, "Executive ROM is required.")); LoadExecutiveRom(CoreComm.CoreFileProvider.GetFirmware("INTV", "EROM", true, "Executive ROM is required."));
LoadGraphicsRom(CoreComm.CoreFileProvider.GetFirmwarePath("INTV", "GROM", true, "Graphics ROM is required.")); LoadGraphicsRom(CoreComm.CoreFileProvider.GetFirmware("INTV", "GROM", true, "Graphics ROM is required."));
} }
public IEmulatorServiceProvider ServiceProvider { get; private set; } public IEmulatorServiceProvider ServiceProvider { get; private set; }