diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs index d9560a2a9b..80f5cc85d5 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs @@ -133,7 +133,31 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx srcdata = romfile; else { - // use corecomm for firmware requests + // use fromtend firmware interface + + string firmwareID = null; + switch (filename) + { + case "CD_BIOS_EU": firmwareID = "CD_BIOS_EU"; break; + case "CD_BIOS_JP": firmwareID = "CD_BIOS_JP"; break; + case "CD_BIOS_US": firmwareID = "CD_BIOS_US"; break; + default: + break; + } + if (firmwareID != null) + { + srcdata = CoreComm.CoreFileProvider.GetFirmware("GEN", firmwareID, false); + if (srcdata == null) + { + Console.WriteLine("Frontend couldn't satisfy firmware request GEN:{0}", firmwareID); + return 0; + } + } + else + { + Console.WriteLine("Unrecognized firmware request {0}", filename); + return 0; + } } if (srcdata != null) @@ -171,9 +195,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx throw new Exception("gpgx_get_control() failed"); ControlConverter = new GPGXControlConverter(input); - ControllerDefinition = ControlConverter.ControllerDef; - } #endregion diff --git a/genplus-gx/cinterface/cinterface.c b/genplus-gx/cinterface/cinterface.c index ebf813cb82..a999a047d9 100644 --- a/genplus-gx/cinterface/cinterface.c +++ b/genplus-gx/cinterface/cinterface.c @@ -13,15 +13,15 @@ #include "md_ntsc.h" #include "sms_ntsc.h" -char GG_ROM[256] = "GG_ROM"; -char AR_ROM[256] = "AR_ROM"; -char SK_ROM[256] = "SK_ROM"; -char SK_UPMEM[256] = "SK_UPMEM"; -char GG_BIOS[256] = "GG_BIOS"; -char CD_BIOS_EU[256] = "CD_BIOS_EU"; +char GG_ROM[256] = "GG_ROM"; // game genie rom +char AR_ROM[256] = "AR_ROM"; // actin replay rom +char SK_ROM[256] = "SK_ROM"; // sanic and knuckles +char SK_UPMEM[256] = "SK_UPMEM"; // sanic and knuckles +char GG_BIOS[256] = "GG_BIOS"; // game gear bootrom +char CD_BIOS_EU[256] = "CD_BIOS_EU"; // cd bioses char CD_BIOS_US[256] = "CD_BIOS_US"; char CD_BIOS_JP[256] = "CD_BIOS_JP"; -char MS_BIOS_US[256] = "MS_BIOS_US"; +char MS_BIOS_US[256] = "MS_BIOS_US"; // master system bioses char MS_BIOS_EU[256] = "MS_BIOS_EU"; char MS_BIOS_JP[256] = "MS_BIOS_JP";