From bcd13fe37f24a447b145f57e1281dc6bceafaebb Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Thu, 26 Sep 2024 13:41:34 +1000 Subject: [PATCH] Make `IDriveLight` optional for cores --- .../Base Implementations/NullEmulator.cs | 1 - src/BizHawk.Emulation.Common/Interfaces/Services/IDriveLight.cs | 2 +- src/BizHawk.Emulation.Cores/Calculators/TI83/TI83.cs | 2 +- src/BizHawk.Emulation.Cores/Computers/MSX/MSX.cs | 1 - src/BizHawk.Emulation.Cores/Computers/TIC80/TIC80.cs | 1 - src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs | 2 +- .../Consoles/Atari/A7800Hawk/A7800Hawk.cs | 2 +- src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.cs | 2 +- src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.cs | 2 +- src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs | 2 +- src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.cs | 1 - .../Consoles/Intellivision/Intellivision.cs | 2 +- .../Consoles/Magnavox/Odyssey2/O2Hawk.cs | 1 - src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.cs | 2 +- src/BizHawk.Emulation.Cores/Consoles/Nintendo/Ares64/Ares64.cs | 1 - .../Consoles/Nintendo/BSNES/BsnesCore.cs | 1 - .../Consoles/Nintendo/BSNES/SubBsnesCore.cs | 1 - src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs | 2 +- src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs | 1 - .../Consoles/Nintendo/GBHawkLink/GBHawkLink.cs | 1 - .../Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.cs | 1 - .../Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.cs | 1 - .../Consoles/Nintendo/Gameboy/Gambatte.cs | 1 - .../Consoles/Nintendo/Gameboy/GambatteLink.cs | 1 - src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs | 1 - src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs | 2 +- .../Consoles/Nintendo/QuickNES/QuickNES.cs | 1 - .../Consoles/Nintendo/SNES/LibsnesCore.cs | 1 - src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES9X/Snes9x.cs | 1 - .../Consoles/Nintendo/SameBoy/SameBoy.cs | 1 - .../Consoles/Nintendo/SubGBHawk/SubGBHawk.cs | 1 - .../Consoles/Sega/GGHawkLink/GGHawkLink.cs | 1 - src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs | 1 - src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs | 2 +- src/BizHawk.Emulation.Cores/Libretro/Libretro.cs | 1 - 35 files changed, 12 insertions(+), 35 deletions(-) diff --git a/src/BizHawk.Emulation.Common/Base Implementations/NullEmulator.cs b/src/BizHawk.Emulation.Common/Base Implementations/NullEmulator.cs index 3dd9c8cd79..7215de9bc1 100644 --- a/src/BizHawk.Emulation.Common/Base Implementations/NullEmulator.cs +++ b/src/BizHawk.Emulation.Common/Base Implementations/NullEmulator.cs @@ -11,7 +11,6 @@ namespace BizHawk.Emulation.Common typeof(ICodeDataLogger), typeof(IDebuggable), typeof(IDisassemblable), - typeof(IDriveLight), typeof(IInputPollable), typeof(IMemoryDomains), typeof(IRegionable), diff --git a/src/BizHawk.Emulation.Common/Interfaces/Services/IDriveLight.cs b/src/BizHawk.Emulation.Common/Interfaces/Services/IDriveLight.cs index 16dbc684da..c91973f3e5 100644 --- a/src/BizHawk.Emulation.Common/Interfaces/Services/IDriveLight.cs +++ b/src/BizHawk.Emulation.Common/Interfaces/Services/IDriveLight.cs @@ -4,7 +4,7 @@ /// Specifies an interface for returning the state of a LED drive light such as on Disk and CD Drives, /// If available the client will display a light that turns on and off based on the drive light status /// - public interface IDriveLight : IEmulatorService + public interface IDriveLight : ISpecializedEmulatorService { /// /// Gets a value indicating whether there is currently a Drive light available diff --git a/src/BizHawk.Emulation.Cores/Calculators/TI83/TI83.cs b/src/BizHawk.Emulation.Cores/Calculators/TI83/TI83.cs index af0da3a1f1..8b945309ef 100644 --- a/src/BizHawk.Emulation.Cores/Calculators/TI83/TI83.cs +++ b/src/BizHawk.Emulation.Cores/Calculators/TI83/TI83.cs @@ -6,7 +6,7 @@ using BizHawk.Emulation.Cores.Components.Z80A; namespace BizHawk.Emulation.Cores.Calculators.TI83 { [Core(CoreNames.TI83Hawk, "zeromus")] - [ServiceNotApplicable(new[] { typeof(IBoardInfo), typeof(IDriveLight), typeof(IRegionable), typeof(ISaveRam), typeof(ISoundProvider) })] + [ServiceNotApplicable(new[] { typeof(IBoardInfo), typeof(IRegionable), typeof(ISaveRam), typeof(ISoundProvider) })] public partial class TI83 : TI83Common, IEmulator, IVideoProvider, IDebuggable, IInputPollable { [CoreConstructor(VSystemID.Raw.TI83)] diff --git a/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.cs b/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.cs index 37143bcc82..4d78e9b54d 100644 --- a/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.cs +++ b/src/BizHawk.Emulation.Cores/Computers/MSX/MSX.cs @@ -7,7 +7,6 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Computers.MSX { [Core(CoreNames.MSXHawk, "", isReleased: true)] - [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public partial class MSX : IEmulator, IVideoProvider, ISoundProvider, ISaveRam, IInputPollable, IRegionable, ISettable { [CoreConstructor(VSystemID.Raw.MSX)] diff --git a/src/BizHawk.Emulation.Cores/Computers/TIC80/TIC80.cs b/src/BizHawk.Emulation.Cores/Computers/TIC80/TIC80.cs index 39cb5eb8b7..17afa13aa9 100644 --- a/src/BizHawk.Emulation.Cores/Computers/TIC80/TIC80.cs +++ b/src/BizHawk.Emulation.Cores/Computers/TIC80/TIC80.cs @@ -9,7 +9,6 @@ using BizHawk.Emulation.Cores.Waterbox; namespace BizHawk.Emulation.Cores.Computers.TIC80 { [PortedCore(CoreNames.TIC80, "nesbox", "v1.0.2164", "https://tic80.com/")] - [ServiceNotApplicable(new[] { typeof(IDriveLight), })] public sealed partial class TIC80 : WaterboxCore { private readonly LibTIC80 _core; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs index 4704d1e42f..03b0c3a907 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.cs @@ -5,7 +5,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Atari.Atari2600 { [Core(CoreNames.Atari2600Hawk, "Micro500, Alyosha, adelikat, natt")] - [ServiceNotApplicable(new[] { typeof(IDriveLight), typeof(ISaveRam) })] + [ServiceNotApplicable(new[] { typeof(ISaveRam) })] public partial class Atari2600 : IEmulator, IDebuggable, IInputPollable, IBoardInfo, IRomInfo, IRegionable, ICreateGameDBEntries, ISettable { diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.cs index 098e3a5bb8..2a4948169f 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.cs @@ -6,7 +6,7 @@ using BizHawk.Common.NumberExtensions; namespace BizHawk.Emulation.Cores.Atari.A7800Hawk { [Core(CoreNames.A7800Hawk, "")] - [ServiceNotApplicable(new[] { typeof(IDriveLight), typeof(ISettable<,>) })] + [ServiceNotApplicable(new[] { typeof(ISettable<,>) })] public partial class A7800Hawk : IEmulator, ISaveRam, IDebuggable, IInputPollable, IRegionable, IBoardInfo, ISettable { diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.cs index e897300217..10b9f54805 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/Stella/Stella.cs @@ -13,7 +13,7 @@ namespace BizHawk.Emulation.Cores.Atari.Stella author: "The Stella Team", // portedVersion: "", //TODO portedUrl: "https://stella-emu.github.io")] - [ServiceNotApplicable([ typeof(IDriveLight), typeof(ISaveRam) ])] + [ServiceNotApplicable([ typeof(ISaveRam) ])] public partial class Stella : IRomInfo, IRegionable { [CoreConstructor(VSystemID.Raw.A26)] diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.cs index 45b6e66baa..7c9aebda87 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.cs @@ -9,7 +9,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Atari.Lynx { [PortedCore(CoreNames.Handy, "K. Wilkins, Mednafen Team", "0.9.34.1", "https://mednafen.github.io/releases/")] - [ServiceNotApplicable(new[] { typeof(IDriveLight), typeof(IRegionable), typeof(ISettable<,>) })] + [ServiceNotApplicable(new[] { typeof(IRegionable), typeof(ISettable<,>) })] public partial class Lynx : IEmulator, IVideoProvider, ISoundProvider, ISaveRam, IStatable, IInputPollable { private static readonly LibLynx LibLynx; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs b/src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs index f5dc114f63..0100489a26 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs @@ -4,7 +4,7 @@ using BizHawk.Emulation.Cores.Components.Z80A; namespace BizHawk.Emulation.Cores.ColecoVision { [Core(CoreNames.ColecoHawk, "Vecna")] - [ServiceNotApplicable(new[] { typeof(IDriveLight), typeof(ISaveRam) })] + [ServiceNotApplicable(new[] { typeof(ISaveRam) })] public sealed partial class ColecoVision : IEmulator, IDebuggable, IInputPollable, ISettable { [CoreConstructor(VSystemID.Raw.Coleco)] diff --git a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.cs b/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.cs index 13cfb71718..e7323be3a0 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.cs @@ -5,7 +5,6 @@ using BizHawk.Emulation.Cores.Components.MC6809; namespace BizHawk.Emulation.Cores.Consoles.Vectrex { [Core(CoreNames.VectrexHawk, "")] - [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public partial class VectrexHawk : IEmulator, ISaveRam, IDebuggable, IInputPollable, IRegionable, ISettable { diff --git a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs b/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs index 9a8fc2bd1d..8be17d0153 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs @@ -4,7 +4,7 @@ using BizHawk.Emulation.Cores.Components.CP1610; namespace BizHawk.Emulation.Cores.Intellivision { [Core(CoreNames.IntelliHawk, "BrandonE, Alyosha")] - [ServiceNotApplicable(new[] { typeof(IDriveLight), typeof(IRegionable), typeof(ISaveRam) })] + [ServiceNotApplicable(new[] { typeof(IRegionable), typeof(ISaveRam) })] public sealed partial class Intellivision : IEmulator, IInputPollable, IDisassemblable, IBoardInfo, IDebuggable, ISettable { diff --git a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs b/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs index 68d4388986..a6071ed84b 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs @@ -5,7 +5,6 @@ using BizHawk.Emulation.Cores.Components.I8048; namespace BizHawk.Emulation.Cores.Consoles.O2Hawk { [Core(CoreNames.O2Hawk, "")] - [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public partial class O2Hawk : IEmulator, ISaveRam, IDebuggable, IInputPollable, IRegionable, ISettable, IBoardInfo { // memory domains diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.cs index 6ba13534b7..5752e6cc26 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.cs @@ -13,7 +13,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS { [PortedCore(CoreNames.Encore, "", "nightly-2104", "https://github.com/CasualPokePlayer/encore", singleInstance: true)] - [ServiceNotApplicable([ typeof(IDriveLight), typeof(IRegionable) ])] + [ServiceNotApplicable([ typeof(IRegionable) ])] public partial class Encore { private static DynamicLibraryImportResolver _resolver; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Ares64/Ares64.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Ares64/Ares64.cs index ea00ece41e..af0083adf4 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Ares64/Ares64.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Ares64/Ares64.cs @@ -9,7 +9,6 @@ using BizHawk.Emulation.Cores.Waterbox; namespace BizHawk.Emulation.Cores.Consoles.Nintendo.Ares64 { [PortedCore(CoreNames.Ares64, "ares team, Near", "v138", "https://ares-emu.net/")] - [ServiceNotApplicable(new[] { typeof(IDriveLight), })] public partial class Ares64 : WaterboxCore, IRegionable { private readonly LibAres64 _core; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesCore.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesCore.cs index 0109ea1adb..2cb5ee2eaa 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesCore.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesCore.cs @@ -14,7 +14,6 @@ using BizHawk.Emulation.Cores.Waterbox; namespace BizHawk.Emulation.Cores.Nintendo.BSNES { [PortedCore(CoreNames.Bsnes115, "bsnes team", "v115+", "https://github.com/bsnes-emu/bsnes")] - [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public partial class BsnesCore : IEmulator, IDebuggable, IVideoProvider, ISaveRam, IStatable, IInputPollable, IRegionable, ISettable, IBSNESForGfxDebugger, IBoardInfo { [CoreConstructor(VSystemID.Raw.Satellaview)] diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/SubBsnesCore.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/SubBsnesCore.cs index f84cf5c905..8d8bbd0ca1 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/SubBsnesCore.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/SubBsnesCore.cs @@ -5,7 +5,6 @@ using BizHawk.Emulation.Cores.Nintendo.SNES; namespace BizHawk.Emulation.Cores.Nintendo.BSNES { [PortedCore(CoreNames.SubBsnes115, "")] - [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public class SubBsnesCore : IEmulator, ICycleTiming { [CoreConstructor(VSystemID.Raw.Satellaview)] diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs index 2936b94c6c..12d6d33ce9 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs @@ -5,7 +5,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Nintendo.GBA { [PortedCore(CoreNames.Mgba, "endrift", "0.11", "https://mgba.io/")] - [ServiceNotApplicable(new[] { typeof(IDriveLight), typeof(IRegionable) })] + [ServiceNotApplicable(new[] { typeof(IRegionable) })] public partial class MGBAHawk { private static readonly LibmGBA LibmGBA; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs index 65fcac6854..3dfe82e6bf 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs @@ -20,7 +20,6 @@ using BizHawk.Common.ReflectionExtensions; namespace BizHawk.Emulation.Cores.Nintendo.GBHawk { [Core(CoreNames.GbHawk, "")] - [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public partial class GBHawk : IEmulator, ISaveRam, IDebuggable, IInputPollable, IRegionable, IGameboyCommon, ISettable { diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.cs index 18424d48ae..d89211622a 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.cs @@ -5,7 +5,6 @@ using BizHawk.Emulation.Cores.Nintendo.GBHawk; namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink { [Core(CoreNames.GBHawkLink, "")] - [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public partial class GBHawkLink : IEmulator, ISaveRam, IDebuggable, IStatable, IInputPollable, IRegionable, ILinkable, ISettable, ILinkedGameBoyCommon diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.cs index 7893995d4c..7be261f0dc 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.cs @@ -5,7 +5,6 @@ using BizHawk.Emulation.Cores.Nintendo.GBHawk; namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x { [Core(CoreNames.GBHawkLink3x, "")] - [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public partial class GBHawkLink3x : IEmulator, ISaveRam, IDebuggable, IStatable, IInputPollable, IRegionable, ISettable, ILinkedGameBoyCommon diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.cs index 1201a5382b..b065f92fda 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.cs @@ -5,7 +5,6 @@ using BizHawk.Emulation.Cores.Nintendo.GBHawk; namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x { [Core(CoreNames.GBHawkLink4x, "")] - [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public partial class GBHawkLink4x : IEmulator, ISaveRam, IDebuggable, IStatable, IInputPollable, IRegionable, ISettable, ILinkedGameBoyCommon diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs index 2c841e8c22..f667fa36af 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs @@ -13,7 +13,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy /// a gameboy/gameboy color emulator wrapped around native C++ libgambatte /// [PortedCore(CoreNames.Gambatte, "sinamas/PSR org", "r830", "https://github.com/pokemon-speedrunning/gambatte-core")] - [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public partial class Gameboy : IInputPollable, IRomInfo, IGameboyCommon, ICycleTiming, ILinkable { /// HACK disables BIOS requirement if the environment looks like a test runner... diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs index e66dc3b3c8..64abe61822 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs @@ -7,7 +7,6 @@ using BizHawk.Emulation.Cores.Consoles.Nintendo.Gameboy; namespace BizHawk.Emulation.Cores.Nintendo.Gameboy { [PortedCore(CoreNames.GambatteLink, "sinamas/natt")] - [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public partial class GambatteLink : ILinkable, ILinkedGameBoyCommon, IRomInfo { [CoreConstructor(VSystemID.Raw.GBL)] diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs index db5a6dc4f2..00246257af 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs @@ -7,7 +7,6 @@ using BizHawk.Emulation.Cores.Nintendo.N64.NativeApi; namespace BizHawk.Emulation.Cores.Nintendo.N64 { [PortedCore(CoreNames.Mupen64Plus, "", "2.0", "https://code.google.com/p/mupen64plus/", singleInstance: true)] - [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public partial class N64 : IEmulator, ISaveRam, IDebuggable, IStatable, IInputPollable, IDisassemblable, IRegionable, ISettable { diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs index 8dcc3d0b31..1a69685cf1 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs @@ -18,7 +18,7 @@ using BizHawk.Emulation.Cores.Waterbox; namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS { [PortedCore(CoreNames.MelonDS, "Arisotura", "0.9.5", "https://melonds.kuribo64.net/")] - [ServiceNotApplicable(new[] { typeof(IDriveLight), typeof(IRegionable) })] + [ServiceNotApplicable(new[] { typeof(IRegionable) })] public sealed partial class NDS : WaterboxCore { private readonly LibMelonDS _core; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs index 9acad9ba4d..abf6c4b242 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs @@ -16,7 +16,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES author: "SergioMartin86, kode54, Blargg", portedVersion: "1.0.0", portedUrl: "https://github.com/SergioMartin86/quickerNES")] - [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public sealed partial class QuickNES : IEmulator, IVideoProvider, ISoundProvider, ISaveRam, IInputPollable, IBoardInfo, IVideoLogicalOffsets, IStatable, IDebuggable, ISettable, INESPPUViewable diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs index 0cc511b3c7..bbeeccdefb 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs @@ -18,7 +18,6 @@ using BizHawk.Emulation.Cores.Components.W65816; namespace BizHawk.Emulation.Cores.Nintendo.SNES { [PortedCore(CoreNames.Bsnes, "byuu", "v87", "https://github.com/bsnes-emu/bsnes/tree/v087")] - [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public unsafe partial class LibsnesCore : IEmulator, IVideoProvider, ISaveRam, IStatable, IInputPollable, IRegionable, ICodeDataLogger, IDebuggable, ISettable, IBSNESForGfxDebugger { diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES9X/Snes9x.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES9X/Snes9x.cs index 6d637228cd..cc4b41287c 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES9X/Snes9x.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES9X/Snes9x.cs @@ -8,7 +8,6 @@ using BizHawk.Emulation.Cores.Waterbox; namespace BizHawk.Emulation.Cores.Nintendo.SNES9X { [PortedCore(CoreNames.Snes9X, "", "e49165c", "https://github.com/snes9xgit/snes9x")] - [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public class Snes9x : WaterboxCore, ISettable, IRegionable { diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SameBoy/SameBoy.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SameBoy/SameBoy.cs index dfd5506a1a..a8224f7ea7 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SameBoy/SameBoy.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SameBoy/SameBoy.cs @@ -13,7 +13,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.Sameboy /// a gameboy/gameboy color emulator wrapped around native C libsameboy /// [PortedCore(CoreNames.Sameboy, "LIJI32", "0.16.3", "https://github.com/LIJI32/SameBoy")] - [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public partial class Sameboy : ICycleTiming, IInputPollable, ILinkable, IRomInfo, IBoardInfo, IGameboyCommon { private static readonly LibSameboy LibSameboy; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SubGBHawk/SubGBHawk.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SubGBHawk/SubGBHawk.cs index 4075224687..6ab05e5e4d 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SubGBHawk/SubGBHawk.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SubGBHawk/SubGBHawk.cs @@ -5,7 +5,6 @@ using BizHawk.Emulation.Cores.Consoles.Nintendo.Gameboy; namespace BizHawk.Emulation.Cores.Nintendo.SubGBHawk { [Core(CoreNames.SubGbHawk, "")] - [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public partial class SubGBHawk : IEmulator, IStatable, IInputPollable, ISettable, IDebuggable, ICycleTiming, IGameboyCommon { diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.cs b/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.cs index ed19dc7879..37dcd318b1 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.cs @@ -4,7 +4,6 @@ using BizHawk.Emulation.Cores.Sega.MasterSystem; namespace BizHawk.Emulation.Cores.Sega.GGHawkLink { [Core(CoreNames.GGHawkLink, "", isReleased: false)] - [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public partial class GGHawkLink : IEmulator, ISaveRam, IDebuggable, IStatable, IInputPollable, IRegionable, ILinkable, ISettable { diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs b/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs index 197e55fb6c..92ffbd94c1 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs @@ -13,7 +13,6 @@ using BizHawk.Emulation.Cores.Components.Z80A; namespace BizHawk.Emulation.Cores.Sega.MasterSystem { [Core(CoreNames.SMSHawk, "Vecna")] - [ServiceNotApplicable(new[] { typeof(IDriveLight) })] public partial class SMS : IEmulator, ISoundProvider, ISaveRam, IInputPollable, IRegionable, IDebuggable, ISettable, ICodeDataLogger { diff --git a/src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs b/src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs index 96d3a9846a..80fadbaa5f 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs @@ -6,7 +6,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.WonderSwan { [PortedCore(CoreNames.Cygne, "Dox, Mednafen Team", "1.24.3", "https://mednafen.github.io/releases/")] - [ServiceNotApplicable(new[] { typeof(IDriveLight), typeof(IRegionable) })] + [ServiceNotApplicable(new[] { typeof(IRegionable) })] public partial class WonderSwan : IEmulator, IVideoProvider, ISoundProvider, IInputPollable, IDebuggable { diff --git a/src/BizHawk.Emulation.Cores/Libretro/Libretro.cs b/src/BizHawk.Emulation.Cores/Libretro/Libretro.cs index 7636451cac..7067ba064b 100644 --- a/src/BizHawk.Emulation.Cores/Libretro/Libretro.cs +++ b/src/BizHawk.Emulation.Cores/Libretro/Libretro.cs @@ -11,7 +11,6 @@ namespace BizHawk.Emulation.Cores.Libretro // nb: multiple libretro cores could theoretically be ran at once // but all of them would need to be different cores, a core itself is single instance [PortedCore(CoreNames.Libretro, "CasualPokePlayer", singleInstance: true, isReleased: false)] - [ServiceNotApplicable([ typeof(IDriveLight) ])] public partial class LibretroHost { private static readonly LibretroBridge bridge;