diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs b/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs index 1c48ffba86..65f78c21d4 100644 --- a/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs +++ b/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs @@ -14,7 +14,7 @@ namespace BizHawk.Emulation.Cores.Computers.AppleII isPorted: true, isReleased: false )] - public partial class AppleII : IEmulator + public partial class AppleII : IEmulator, IDriveLight { public AppleII(CoreComm comm, IEnumerable gameInfoSet, IEnumerable romSet, object settings) : this(comm, gameInfoSet.First(), romSet.First(), settings) @@ -120,6 +120,9 @@ namespace BizHawk.Emulation.Cores.Computers.AppleII AppleIIController.BoolButtons.AddRange(ExtraButtons); } + public bool DriveLightEnabled { get { return true; } } + public bool DriveLightOn { get { return _machine.DriveLight; } } + private void FrameAdv(bool render, bool rendersound) { if (Controller["Next Disk"]) diff --git a/ExternalCoreProjects/Virtu/Disk525.cs b/ExternalCoreProjects/Virtu/Disk525.cs index 0dccaf1c2a..eb6cde71a6 100644 --- a/ExternalCoreProjects/Virtu/Disk525.cs +++ b/ExternalCoreProjects/Virtu/Disk525.cs @@ -44,7 +44,7 @@ namespace Jellyfish.Virtu public abstract void WriteTrack(int number, int fraction, byte[] buffer); public string Name { get; private set; } - [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")] + public byte[] Data { get; protected set; } public bool IsWriteProtected { get; private set; } diff --git a/ExternalCoreProjects/Virtu/DiskIIDrive.cs b/ExternalCoreProjects/Virtu/DiskIIDrive.cs index 8dbb6e75b2..8a4b95bb9e 100644 --- a/ExternalCoreProjects/Virtu/DiskIIDrive.cs +++ b/ExternalCoreProjects/Virtu/DiskIIDrive.cs @@ -65,6 +65,7 @@ namespace Jellyfish.Virtu _trackOffset = 0; } + Machine.DriveLight = true; return data; } @@ -83,6 +84,8 @@ namespace Jellyfish.Virtu { _trackOffset = 0; } + + Machine.DriveLight = true; } } diff --git a/ExternalCoreProjects/Virtu/Machine.cs b/ExternalCoreProjects/Virtu/Machine.cs index 47bf00bc15..0b66f69e5c 100644 --- a/ExternalCoreProjects/Virtu/Machine.cs +++ b/ExternalCoreProjects/Virtu/Machine.cs @@ -88,6 +88,7 @@ namespace Jellyfish.Virtu public void BizFrameAdvance(IEnumerable buttons) { Lagged = true; + DriveLight = false; Keyboard.SetKeys(buttons); @@ -195,5 +196,6 @@ namespace Jellyfish.Virtu public DiskIIController BootDiskII { get; private set; } public bool Lagged { get; set; } + public bool DriveLight { get; set; } } } diff --git a/References/Virtu.dll b/References/Virtu.dll index 8777c9db5e..48f84fc0bc 100644 Binary files a/References/Virtu.dll and b/References/Virtu.dll differ