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

Inline remaining CFP.GetFirmware shim

This commit is contained in:
YoshiRulz 2021-07-19 09:15:05 +10:00
parent 70037ee0fc
commit 0892fb8733
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
27 changed files with 52 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/BizHawk.Emulation.Common/Extensions.cs
View File

@ -480,14 +480,6 @@ namespace BizHawk.Emulation.Common
public static AxisSpec With(this in AxisSpec spec, Range<int> range, int neutral) => new AxisSpec(range, neutral, spec.IsReversed, spec.Constraint); public static AxisSpec With(this in AxisSpec spec, Range<int> range, int neutral) => new AxisSpec(range, neutral, spec.IsReversed, spec.Constraint);
/// <param name="msg">message to show on failure, either in an exception iff <paramref name="required"/>, or in a warning dialog otherwise</param>
/// <exception cref="MissingFirmwareException">if not found and <paramref name="required"/> is <see langword="true"/></exception>
/// <remarks>TODO inline</remarks>
public static byte[] GetFirmware(this ICoreFileProvider cfp, string sysID, string firmwareID, bool required, string msg = null)
=> required
? cfp.GetFirmwareOrThrow(new(sysID, firmwareID), msg)
: cfp.GetFirmware(new(sysID, firmwareID), msg);
public static string SystemIDToDisplayName(string sysID) public static string SystemIDToDisplayName(string sysID)
=> SystemIDDisplayNames.TryGetValue(sysID, out var dispName) ? dispName : string.Empty; => SystemIDDisplayNames.TryGetValue(sysID, out var dispName) ? dispName : string.Empty;
} }

2
src/BizHawk.Emulation.Cores/Calculator/TI83.cs
View File

@ -26,7 +26,7 @@ namespace BizHawk.Emulation.Cores.Calculators
_cpu.NMICallback = NMICallback; _cpu.NMICallback = NMICallback;
_cpu.MemoryCallbacks = MemoryCallbacks; _cpu.MemoryCallbacks = MemoryCallbacks;
_rom = lp.Comm.CoreFileProvider.GetFirmware("TI83", "Rom", true); _rom = lp.Comm.CoreFileProvider.GetFirmwareOrThrow(new("TI83", "Rom"));
LinkPort = new TI83LinkPort(this); LinkPort = new TI83LinkPort(this);
HardReset(); HardReset();

2
src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.cs
View File

@ -144,7 +144,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
return embeddedRom; return embeddedRom;
// Embedded ROM not found, maybe this is a peripheral ROM? // Embedded ROM not found, maybe this is a peripheral ROM?
var result = names.Select(n => CoreComm.CoreFileProvider.GetFirmware("AmstradCPC", n, false)).FirstOrDefault(b => b != null && b.Length == length); var result = names.Select(n => CoreComm.CoreFileProvider.GetFirmware(new("AmstradCPC", n))).FirstOrDefault(b => b != null && b.Length == length);
if (result == null) if (result == null)
{ {
throw new MissingFirmwareException($"At least one of these firmwares is required: {string.Join(", ", names)}"); throw new MissingFirmwareException($"At least one of these firmwares is required: {string.Join(", ", names)}");

6
src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs
View File

@ -31,10 +31,8 @@ namespace BizHawk.Emulation.Cores.Computers.AppleII
_disk1 = _romSet[0]; _disk1 = _romSet[0];
_appleIIRom = lp.Comm.CoreFileProvider.GetFirmware( _appleIIRom = lp.Comm.CoreFileProvider.GetFirmwareOrThrow(new(SystemId, "AppleIIe"), "The Apple IIe BIOS firmware is required");
SystemId, "AppleIIe", true, "The Apple IIe BIOS firmware is required"); _diskIIRom = lp.Comm.CoreFileProvider.GetFirmwareOrThrow(new(SystemId, "DiskII"), "The DiskII firmware is required");
_diskIIRom = lp.Comm.CoreFileProvider.GetFirmware(
SystemId, "DiskII", true, "The DiskII firmware is required");
_machine = new Components(_appleIIRom, _diskIIRom); _machine = new Components(_appleIIRom, _diskIIRom);

2
src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs
View File

@ -241,7 +241,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
private byte[] GetFirmware(int length, params string[] names) private byte[] GetFirmware(int length, params string[] names)
{ {
var result = names.Select(n => CoreComm.CoreFileProvider.GetFirmware("C64", n, false)).FirstOrDefault(b => b != null && b.Length == length); var result = names.Select(n => CoreComm.CoreFileProvider.GetFirmware(new("C64", n))).FirstOrDefault(b => b != null && b.Length == length);
if (result == null) if (result == null)
{ {
throw new MissingFirmwareException($"At least one of these firmwares is required: {string.Join(", ", names)}"); throw new MissingFirmwareException($"At least one of these firmwares is required: {string.Join(", ", names)}");

4
src/BizHawk.Emulation.Cores/Computers/MSX/MSX.cs
View File

@ -53,9 +53,9 @@ namespace BizHawk.Emulation.Cores.Computers.MSX
} }
} }
Bios = comm.CoreFileProvider.GetFirmware("MSX", "bios_jp", false, "BIOS Not Found, Cannot Load"); Bios = comm.CoreFileProvider.GetFirmware(new("MSX", "bios_jp"), "BIOS Not Found, Cannot Load")
?? comm.CoreFileProvider.GetFirmwareOrThrow(new("MSX", "bios_test_ext"), "BIOS Not Found, Cannot Load");
if (Bios == null) { Bios = comm.CoreFileProvider.GetFirmware("MSX", "bios_test_ext", true, "BIOS Not Found, Cannot Load"); }
//Basic = comm.CoreFileProvider.GetFirmware("MSX", "basic_test", true, "BIOS Not Found, Cannot Load"); //Basic = comm.CoreFileProvider.GetFirmware("MSX", "basic_test", true, "BIOS Not Found, Cannot Load");

2
src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.cs
View File

@ -208,7 +208,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
return embeddedRom; return embeddedRom;
// Embedded ROM not found, maybe this is a peripheral ROM? // Embedded ROM not found, maybe this is a peripheral ROM?
var result = names.Select(n => CoreComm.CoreFileProvider.GetFirmware("ZXSpectrum", n, false)).FirstOrDefault(b => b != null && b.Length == length); var result = names.Select(n => CoreComm.CoreFileProvider.GetFirmware(new("ZXSpectrum", n))).FirstOrDefault(b => b != null && b.Length == length);
if (result == null) if (result == null)
{ {
throw new MissingFirmwareException($"At least one of these firmwares is required: {string.Join(", ", names)}"); throw new MissingFirmwareException($"At least one of these firmwares is required: {string.Join(", ", names)}");

6
src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.cs
View File

@ -91,9 +91,9 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
_syncSettings = (A7800SyncSettings)syncSettings ?? new A7800SyncSettings(); _syncSettings = (A7800SyncSettings)syncSettings ?? new A7800SyncSettings();
_controllerDeck = new A7800HawkControllerDeck(_syncSettings.Port1, _syncSettings.Port2); _controllerDeck = new A7800HawkControllerDeck(_syncSettings.Port1, _syncSettings.Port2);
byte[] highscoreBios = comm.CoreFileProvider.GetFirmware("A78", "Bios_HSC", false, "Some functions may not work without the high score BIOS."); var highscoreBios = comm.CoreFileProvider.GetFirmware(new("A78", "Bios_HSC"), "Some functions may not work without the high score BIOS.");
byte[] palBios = comm.CoreFileProvider.GetFirmware("A78", "Bios_PAL", false, "The game will not run if the correct region BIOS is not available."); var palBios = comm.CoreFileProvider.GetFirmware(new("A78", "Bios_PAL"), "The game will not run if the correct region BIOS is not available.");
byte[] ntscBios = comm.CoreFileProvider.GetFirmware("A78", "Bios_NTSC", false, "The game will not run if the correct region BIOS is not available."); var ntscBios = comm.CoreFileProvider.GetFirmware(new("A78", "Bios_NTSC"), "The game will not run if the correct region BIOS is not available.");
byte[] header = new byte[128]; byte[] header = new byte[128];
bool is_header = false; bool is_header = false;

2
src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.cs
View File

@ -16,7 +16,7 @@ namespace BizHawk.Emulation.Cores.Atari.Lynx
{ {
ServiceProvider = new BasicServiceProvider(this); ServiceProvider = new BasicServiceProvider(this);
byte[] bios = comm.CoreFileProvider.GetFirmware("Lynx", "Boot", true, "Boot rom is required"); var bios = comm.CoreFileProvider.GetFirmwareOrThrow(new("Lynx", "Boot"), "Boot rom is required");
if (bios.Length != 512) if (bios.Length != 512)
{ {
throw new MissingFirmwareException("Lynx Bootrom must be 512 bytes!"); throw new MissingFirmwareException("Lynx Bootrom must be 512 bytes!");

2
src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs
View File

@ -39,7 +39,7 @@ namespace BizHawk.Emulation.Cores.ColecoVision
ser.Register<IStatable>(new StateSerializer(SyncState)); ser.Register<IStatable>(new StateSerializer(SyncState));
// TODO: hack to allow bios-less operation would be nice, no idea if its feasible // TODO: hack to allow bios-less operation would be nice, no idea if its feasible
_biosRom = comm.CoreFileProvider.GetFirmware("Coleco", "Bios", true, "Coleco BIOS file is required."); _biosRom = comm.CoreFileProvider.GetFirmwareOrThrow(new("Coleco", "Bios"), "Coleco BIOS file is required.");
// gamedb can overwrite the SyncSettings; this is ok // gamedb can overwrite the SyncSettings; this is ok
if (game["NoSkip"]) if (game["NoSkip"])

4
src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.cs
View File

@ -27,8 +27,8 @@ namespace BizHawk.Emulation.Cores.Consoles.ChannelF
_tracer = new TraceBuffer { Header = CPU.TraceHeader }; _tracer = new TraceBuffer { Header = CPU.TraceHeader };
byte[] bios01 = comm.CoreFileProvider.GetFirmware("ChannelF", "ChannelF_sl131253", true); var bios01 = comm.CoreFileProvider.GetFirmwareOrThrow(new("ChannelF", "ChannelF_sl131253"));
byte[] bios02 = comm.CoreFileProvider.GetFirmware("ChannelF", "ChannelF_sl131254", true); var bios02 = comm.CoreFileProvider.GetFirmwareOrThrow(new("ChannelF", "ChannelF_sl131254"));
BIOS01 = bios01; BIOS01 = bios01;
BIOS02 = bios02; BIOS02 = bios02;

10
src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.cs
View File

@ -49,14 +49,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Vectrex
_syncSettings = (VectrexSyncSettings)syncSettings ?? new VectrexSyncSettings(); _syncSettings = (VectrexSyncSettings)syncSettings ?? new VectrexSyncSettings();
_controllerDeck = new VectrexHawkControllerDeck(_syncSettings.Port1, _syncSettings.Port2); _controllerDeck = new VectrexHawkControllerDeck(_syncSettings.Port1, _syncSettings.Port2);
byte[] Bios = null; /*var Bios =*/ _bios = comm.CoreFileProvider.GetFirmwareOrThrow(new("VEC", "Bios"), "BIOS Not Found, Cannot Load");
byte[] Mine = null; /*var Mine =*/ minestorm = comm.CoreFileProvider.GetFirmwareOrThrow(new("VEC", "Minestorm"), "Minestorm Not Found, Cannot Load");
Bios = comm.CoreFileProvider.GetFirmware("VEC", "Bios", true, "BIOS Not Found, Cannot Load");
_bios = Bios;
Mine = comm.CoreFileProvider.GetFirmware("VEC", "Minestorm", true, "Minestorm Not Found, Cannot Load");
minestorm = Mine;
Console.WriteLine("SHA1:" + rom.HashSHA1(0, rom.Length)); Console.WriteLine("SHA1:" + rom.HashSHA1(0, rom.Length));

4
src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs
View File

@ -55,8 +55,8 @@ namespace BizHawk.Emulation.Cores.Intellivision
Connect(); Connect();
LoadExecutiveRom(comm.CoreFileProvider.GetFirmware("INTV", "EROM", true, "Executive ROM is required.")); LoadExecutiveRom(comm.CoreFileProvider.GetFirmwareOrThrow(new("INTV", "EROM"), "Executive ROM is required."));
LoadGraphicsRom(comm.CoreFileProvider.GetFirmware("INTV", "GROM", true, "Graphics ROM is required.")); LoadGraphicsRom(comm.CoreFileProvider.GetFirmwareOrThrow(new("INTV", "GROM"), "Graphics ROM is required."));
_tracer = new TraceBuffer { Header = _cpu.TraceHeader }; _tracer = new TraceBuffer { Header = _cpu.TraceHeader };
ser.Register<ITraceable>(_tracer); ser.Register<ITraceable>(_tracer);

11
src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs
View File

@ -63,16 +63,7 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
_controllerDeck = new O2HawkControllerDeck("O2 Controller", "O2 Controller", is_G7400); _controllerDeck = new O2HawkControllerDeck("O2 Controller", "O2 Controller", is_G7400);
if (is_G7400) _bios = comm.CoreFileProvider.GetFirmwareOrThrow(new("O2", is_G7400 ? "BIOS-G7400" : "BIOS-O2"), "BIOS Not Found, Cannot Load");
{
_bios = comm.CoreFileProvider.GetFirmware("O2", "BIOS-G7400", true, "BIOS Not Found, Cannot Load")
?? throw new MissingFirmwareException("Missing G7400 Bios");
}
else
{
_bios = comm.CoreFileProvider.GetFirmware("O2", "BIOS-O2", true, "BIOS Not Found, Cannot Load")
?? throw new MissingFirmwareException("Missing Odyssey2 Bios");
}
Buffer.BlockCopy(rom, 0x100, header, 0, 0x50); Buffer.BlockCopy(rom, 0x100, header, 0, 0x50);

10
src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesCore.cs
View File

@ -45,8 +45,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.BSNES
} }
sgbRomData = _syncSettings.UseSGB2 sgbRomData = _syncSettings.UseSGB2
? CoreComm.CoreFileProvider.GetFirmware("SNES", "Rom_SGB2", true, "SGB2 Rom is required for SGB2 emulation.") ? CoreComm.CoreFileProvider.GetFirmwareOrThrow(new("SNES", "Rom_SGB2"), "SGB2 Rom is required for SGB2 emulation.")
: CoreComm.CoreFileProvider.GetFirmware("SNES", "Rom_SGB", true, "SGB1 Rom is required for SGB1 emulation."); : CoreComm.CoreFileProvider.GetFirmwareOrThrow(new("SNES", "Rom_SGB"), "SGB1 Rom is required for SGB1 emulation.");
game.FirmwareHash = sgbRomData.HashSHA1(); game.FirmwareHash = sgbRomData.HashSHA1();
} }
@ -241,7 +241,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.BSNES
} }
string ret = ""; string ret = "";
var data = CoreComm.CoreFileProvider.GetFirmware(firmwareSystem, firmwareId, required, "Game may function incorrectly without the requested firmware."); FirmwareID fwid = new(firmwareSystem, firmwareId);
const string MISSING_FIRMWARE_MSG = "Game may function incorrectly without the requested firmware.";
var data = required
? CoreComm.CoreFileProvider.GetFirmwareOrThrow(fwid, MISSING_FIRMWARE_MSG)
: CoreComm.CoreFileProvider.GetFirmware(fwid, MISSING_FIRMWARE_MSG);
if (data != null) if (data != null)
{ {
ret = hint; ret = hint;

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs
View File

@ -29,7 +29,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
_settings = settings ?? new Settings(); _settings = settings ?? new Settings();
DeterministicEmulation = deterministic; DeterministicEmulation = deterministic;
byte[] bios = comm.CoreFileProvider.GetFirmware("GBA", "Bios", false); var bios = comm.CoreFileProvider.GetFirmware(new("GBA", "Bios"));
DeterministicEmulation &= bios != null; DeterministicEmulation &= bios != null;
if (DeterministicEmulation != deterministic) if (DeterministicEmulation != deterministic)

8
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs
View File

@ -134,24 +134,24 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{ {
if (game.System == "GB") if (game.System == "GB")
{ {
Bios = comm.CoreFileProvider.GetFirmware("GB", "World", true, "BIOS Not Found, Cannot Load"); Bios = comm.CoreFileProvider.GetFirmwareOrThrow(new("GB", "World"), "BIOS Not Found, Cannot Load");
ppu = new GB_PPU(); ppu = new GB_PPU();
} }
else else
{ {
Bios = comm.CoreFileProvider.GetFirmware("GBC", "World", true, "BIOS Not Found, Cannot Load"); Bios = comm.CoreFileProvider.GetFirmwareOrThrow(new("GBC", "World"), "BIOS Not Found, Cannot Load");
ppu = new GBC_PPU(); ppu = new GBC_PPU();
is_GBC = true; is_GBC = true;
} }
} }
else if (_syncSettings.ConsoleMode == GBSyncSettings.ConsoleModeType.GB) else if (_syncSettings.ConsoleMode == GBSyncSettings.ConsoleModeType.GB)
{ {
Bios = comm.CoreFileProvider.GetFirmware("GB", "World", true, "BIOS Not Found, Cannot Load"); Bios = comm.CoreFileProvider.GetFirmwareOrThrow(new("GB", "World"), "BIOS Not Found, Cannot Load");
ppu = new GB_PPU(); ppu = new GB_PPU();
} }
else else
{ {
Bios = comm.CoreFileProvider.GetFirmware("GBC", "World", true, "BIOS Not Found, Cannot Load"); Bios = comm.CoreFileProvider.GetFirmwareOrThrow(new("GBC", "World"), "BIOS Not Found, Cannot Load");
ppu = new GBC_PPU(); ppu = new GBC_PPU();
is_GBC = true; is_GBC = true;
} }

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
View File

@ -90,7 +90,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
if (_syncSettings.EnableBIOS) if (_syncSettings.EnableBIOS)
{ {
bios = comm.CoreFileProvider.GetFirmware(biosSystemId, biosId, true, "BIOS Not Found, Cannot Load. Change SyncSettings to run without BIOS."); bios = comm.CoreFileProvider.GetFirmwareOrThrow(new(biosSystemId, biosId), "BIOS Not Found, Cannot Load. Change SyncSettings to run without BIOS.");
if (LibGambatte.gambatte_loadbios(GambatteState, bios, (uint)bios.Length) != 0) if (LibGambatte.gambatte_loadbios(GambatteState, bios, (uint)bios.Length) != 0)
{ {
throw new InvalidOperationException($"{nameof(LibGambatte.gambatte_loadbios)}() returned non-zero (bios error)"); throw new InvalidOperationException($"{nameof(LibGambatte.gambatte_loadbios)}() returned non-zero (bios error)");

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Sameboy.cs
View File

@ -82,7 +82,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.Gameboy
_settings = settings ?? new Settings(); _settings = settings ?? new Settings();
var bios = _syncSettings.UseRealBIOS && !sgb var bios = _syncSettings.UseRealBIOS && !sgb
? comm.CoreFileProvider.GetFirmware(_cgb ? "GBC" : "GB", "World", true) ? comm.CoreFileProvider.GetFirmwareOrThrow(new(_cgb ? "GBC" : "GB", "World"))
: Util.DecompressGzipFile(new MemoryStream(_cgb ? Resources.SameboyCgbBoot.Value : Resources.SameboyDmgBoot.Value)); : Util.DecompressGzipFile(new MemoryStream(_cgb ? Resources.SameboyCgbBoot.Value : Resources.SameboyDmgBoot.Value));
var spc = sgb var spc = sgb

6
src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs
View File

@ -130,7 +130,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
byte[] fwBytes; byte[] fwBytes;
bool missingAny = false; bool missingAny = false;
fwBytes = CoreComm.CoreFileProvider.GetFirmware("NDS", "bios7", false); fwBytes = CoreComm.CoreFileProvider.GetFirmware(new("NDS", "bios7"));
if (fwBytes != null) if (fwBytes != null)
File.WriteAllBytes("melon/bios7.bin", fwBytes); File.WriteAllBytes("melon/bios7.bin", fwBytes);
else else
@ -139,7 +139,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
missingAny = true; missingAny = true;
} }
fwBytes = CoreComm.CoreFileProvider.GetFirmware("NDS", "bios9", false); fwBytes = CoreComm.CoreFileProvider.GetFirmware(new("NDS", "bios9"));
if (fwBytes != null) if (fwBytes != null)
File.WriteAllBytes("melon/bios9.bin", fwBytes); File.WriteAllBytes("melon/bios9.bin", fwBytes);
else else
@ -148,7 +148,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
missingAny = true; missingAny = true;
} }
fwBytes = CoreComm.CoreFileProvider.GetFirmware("NDS", "firmware", false); fwBytes = CoreComm.CoreFileProvider.GetFirmware(new("NDS", "firmware"));
if (fwBytes != null) if (fwBytes != null)
File.WriteAllBytes("melon/firmware.bin", fwBytes); File.WriteAllBytes("melon/firmware.bin", fwBytes);
else else

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
View File

@ -19,7 +19,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
var ser = new BasicServiceProvider(this); var ser = new BasicServiceProvider(this);
ServiceProvider = ser; ServiceProvider = ser;
byte[] fdsBios = comm.CoreFileProvider.GetFirmware("NES", "Bios_FDS", false); var fdsBios = comm.CoreFileProvider.GetFirmware(new("NES", "Bios_FDS"));
if (fdsBios != null && fdsBios.Length == 40976) if (fdsBios != null && fdsBios.Length == 40976)
{ {
comm.ShowMessage("Your FDS BIOS is a bad dump. BizHawk will attempt to use it, but no guarantees! You should find a new one."); comm.ShowMessage("Your FDS BIOS is a bad dump. BizHawk will attempt to use it, but no guarantees! You should find a new one.");

4
src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
View File

@ -54,7 +54,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
throw new CGBNotSupportedException(); throw new CGBNotSupportedException();
} }
sgbRomData = CoreComm.CoreFileProvider.GetFirmware("SNES", "Rom_SGB", true, "SGB Rom is required for SGB emulation."); sgbRomData = CoreComm.CoreFileProvider.GetFirmwareOrThrow(new("SNES", "Rom_SGB"), "SGB Rom is required for SGB emulation.");
game.FirmwareHash = sgbRomData.HashSHA1(); game.FirmwareHash = sgbRomData.HashSHA1();
} }
@ -327,7 +327,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
} }
string ret; string ret;
var data = CoreComm.CoreFileProvider.GetFirmware("SNES", firmwareId, false, "Game may function incorrectly without the requested firmware."); var data = CoreComm.CoreFileProvider.GetFirmware(new("SNES", firmwareId), "Game may function incorrectly without the requested firmware.");
if (data != null) if (data != null)
{ {
ret = hint; ret = hint;

12
src/BizHawk.Emulation.Cores/Consoles/Sega/PicoDrive/PicoDrive.cs
View File

@ -35,9 +35,9 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.PicoDrive
SystemId = "GEN" SystemId = "GEN"
}) })
{ {
var biosg = comm.CoreFileProvider.GetFirmware("32X", "G", false); var biosg = comm.CoreFileProvider.GetFirmware(new("32X", "G"));
var biosm = comm.CoreFileProvider.GetFirmware("32X", "M", false); var biosm = comm.CoreFileProvider.GetFirmware(new("32X", "M"));
var bioss = comm.CoreFileProvider.GetFirmware("32X", "S", false); var bioss = comm.CoreFileProvider.GetFirmware(new("32X", "S"));
var has32xBios = biosg != null && biosm != null && bioss != null; var has32xBios = biosg != null && biosm != null && bioss != null;
if (deterministic && !has32xBios) if (deterministic && !has32xBios)
throw new InvalidOperationException("32X BIOS files are required for deterministic mode"); throw new InvalidOperationException("32X BIOS files are required for deterministic mode");
@ -68,9 +68,9 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.PicoDrive
} }
if (cd != null) if (cd != null)
{ {
_exe.AddReadonlyFile(comm.CoreFileProvider.GetFirmware("GEN", "CD_BIOS_EU", true), "cd.eu"); _exe.AddReadonlyFile(comm.CoreFileProvider.GetFirmwareOrThrow(new("GEN", "CD_BIOS_EU")), "cd.eu");
_exe.AddReadonlyFile(comm.CoreFileProvider.GetFirmware("GEN", "CD_BIOS_US", true), "cd.us"); _exe.AddReadonlyFile(comm.CoreFileProvider.GetFirmwareOrThrow(new("GEN", "CD_BIOS_US")), "cd.us");
_exe.AddReadonlyFile(comm.CoreFileProvider.GetFirmware("GEN", "CD_BIOS_JP", true), "cd.jp"); _exe.AddReadonlyFile(comm.CoreFileProvider.GetFirmwareOrThrow(new("GEN", "CD_BIOS_JP")), "cd.jp");
_exe.AddReadonlyFile(gpgx.GPGX.GetCDData(cd), "toc"); _exe.AddReadonlyFile(gpgx.GPGX.GetCDData(cd), "toc");
_cd = cd; _cd = cd;
_cdReader = new DiscSectorReader(_cd); _cdReader = new DiscSectorReader(_cd);

2
src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs
View File

@ -161,7 +161,7 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
} }
else if (game.System == "SMS" && !game["GG_in_SMS"]) else if (game.System == "SMS" && !game["GG_in_SMS"])
{ {
BiosRom = comm.CoreFileProvider.GetFirmware("SMS", _region.ToString(), false); BiosRom = comm.CoreFileProvider.GetFirmware(new("SMS", _region.ToString()));
if (BiosRom == null) if (BiosRom == null)
{ {

2
src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs
View File

@ -234,7 +234,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
if (firmwareID != null) if (firmwareID != null)
{ {
// this path will be the most common PEBKAC error, so be a bit more vocal about the problem // this path will be the most common PEBKAC error, so be a bit more vocal about the problem
srcdata = CoreComm.CoreFileProvider.GetFirmware("GEN", firmwareID, false, "GPGX firmwares are usually required."); srcdata = CoreComm.CoreFileProvider.GetFirmware(new("GEN", firmwareID), "GPGX firmwares are usually required.");
if (srcdata == null) if (srcdata == null)
{ {
Console.WriteLine("Frontend couldn't satisfy firmware request GEN:{0}", firmwareID); Console.WriteLine("Frontend couldn't satisfy firmware request GEN:{0}", firmwareID);

2
src/BizHawk.Emulation.Cores/Consoles/Sony/PS2/DobieStation.cs
View File

@ -47,7 +47,7 @@ namespace BizHawk.Emulation.Cores.Sony.PS2
SkipMemoryConsistencyCheck = lp.Comm.CorePreferences.HasFlag(CoreComm.CorePreferencesFlags.WaterboxMemoryConsistencyCheck), SkipMemoryConsistencyCheck = lp.Comm.CorePreferences.HasFlag(CoreComm.CorePreferencesFlags.WaterboxMemoryConsistencyCheck),
}, new[] { _cdCallback }); }, new[] { _cdCallback });
var bios = lp.Comm.CoreFileProvider.GetFirmware("PS2", "BIOS", true); var bios = lp.Comm.CoreFileProvider.GetFirmwareOrThrow(new("PS2", "BIOS"));
_exe.AddReadonlyFile(new byte[0x840000], "MEMCARD0"); _exe.AddReadonlyFile(new byte[0x840000], "MEMCARD0");
var worked = _core.Initialize(bios, var worked = _core.Initialize(bios,

2
src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
View File

@ -182,7 +182,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
} }
//TODO - known bad firmwares are a no-go. we should refuse to boot them. (that's the mednafen policy) //TODO - known bad firmwares are a no-go. we should refuse to boot them. (that's the mednafen policy)
byte[] firmware = comm.CoreFileProvider.GetFirmware("PSX", firmwareRegion, true, "A PSX `" + firmwareRegion + "` region bios file is required"); var firmware = comm.CoreFileProvider.GetFirmwareOrThrow(new("PSX", firmwareRegion), $"A PSX `{firmwareRegion}` region bios file is required");
//create the instance //create the instance
fixed (byte* pFirmware = firmware) fixed (byte* pFirmware = firmware)