[C64] Move SaveRam implementation to its own partial

src/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.SaveRam.cs

@@ -0,0 +1,103 @@
+using System.IO;
+
+using BizHawk.Common;
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Emulation.Cores.Computers.Commodore64.Serial;
+
+public sealed partial class Drive1541 : ISaveRam
+{
+	// ISaveRam implementation
+
+	// this is some extra state used to keep savestate size down, as most tracks don't get used
+	// we keep it here for all disks as we need to remember it when swapping disks around
+	// _usedDiskTracks.Length also doubles as a way to remember the disk count
+	private bool[][] _usedDiskTracks;
+	private byte[,][] _diskDeltas;
+	private readonly Func<int> _getCurrentDiskNumber;
+
+	public void InitSaveRam(int diskCount)
+	{
+		_usedDiskTracks = new bool[diskCount][];
+		_diskDeltas = new byte[diskCount, 84][];
+		for (var i = 0; i < diskCount; i++)
+		{
+			_usedDiskTracks[i] = new bool[84];
+		}
+	}
+
+	public bool SaveRamModified => true;
+
+	public byte[] CloneSaveRam()
+	{
+		SaveDeltas(); // update the current deltas
+
+		using var ms = new MemoryStream();
+		using var bw = new BinaryWriter(ms);
+		bw.Write(_usedDiskTracks.Length);
+		for (var i = 0; i < _usedDiskTracks.Length; i++)
+		{
+			bw.WriteByteBuffer(_usedDiskTracks[i]
+				.ToUByteBuffer());
+			for (var j = 0; j < 84; j++)
+			{
+				bw.WriteByteBuffer(_diskDeltas[i, j]);
+			}
+		}
+
+		return ms.ToArray();
+	}
+
+	public void StoreSaveRam(byte[] data)
+	{
+		using var ms = new MemoryStream(data, false);
+		using var br = new BinaryReader(ms);
+
+		var ndisks = br.ReadInt32();
+		if (ndisks != _usedDiskTracks.Length)
+		{
+			throw new InvalidOperationException("Disk count mismatch!");
+		}
+
+		ResetDeltas();
+
+		for (var i = 0; i < _usedDiskTracks.Length; i++)
+		{
+			_usedDiskTracks[i] = br.ReadByteBuffer(returnNull: false)!.ToBoolBuffer();
+			for (var j = 0; j < 84; j++)
+			{
+				_diskDeltas[i, j] = br.ReadByteBuffer(returnNull: true);
+			}
+		}
+
+		_disk?.AttachTracker(_usedDiskTracks[_getCurrentDiskNumber()]);
+		LoadDeltas(); // load up new deltas
+		_usedDiskTracks[_getCurrentDiskNumber()][_trackNumber] = true; // make sure this gets set to true now
+	}
+
+	public void SaveDeltas()
+	{
+		_disk?.DeltaUpdate((tracknum, original, current) =>
+		{
+			_diskDeltas[_getCurrentDiskNumber(), tracknum] = DeltaSerializer.GetDelta<int>(original, current)
+				.ToArray();
+		});
+	}
+
+	public void LoadDeltas()
+	{
+		_disk?.DeltaUpdate((tracknum, original, current) =>
+		{
+			DeltaSerializer.ApplyDelta<int>(original, current, _diskDeltas[_getCurrentDiskNumber(), tracknum]);
+		});
+	}
+
+	private void ResetDeltas()
+	{
+		_disk?.DeltaUpdate(static (_, original, current) =>
+		{
+			original.AsSpan()
+				.CopyTo(current);
+		});
+	}
+}

src/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.cs

@@ -1,14 +1,11 @@
-using System.IO;
-
 using BizHawk.Common;
-using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Cores.Components.M6502;
 using BizHawk.Emulation.Cores.Computers.Commodore64.Media;
 using BizHawk.Emulation.Cores.Computers.Commodore64.MOS;
 
 namespace BizHawk.Emulation.Cores.Computers.Commodore64.Serial
 {
-	public sealed partial class Drive1541 : SerialPortDevice, ISaveRam
+	public sealed partial class Drive1541 : SerialPortDevice
 	{
 		private Disk _disk;
 		private int _bitHistory;
@@ -258,95 +255,5 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Serial
 			_diskBits = 0;
 		}
 
-		// ISaveRam implementation
-
-		// this is some extra state used to keep savestate size down, as most tracks don't get used
-		// we keep it here for all disks as we need to remember it when swapping disks around
-		// _usedDiskTracks.Length also doubles as a way to remember the disk count
-		private bool[][] _usedDiskTracks;
-		private byte[,][] _diskDeltas;
-		private readonly Func<int> _getCurrentDiskNumber;
-
-		public void InitSaveRam(int diskCount)
-		{
-			_usedDiskTracks = new bool[diskCount][];
-			_diskDeltas = new byte[diskCount, 84][];
-			for (var i = 0; i < diskCount; i++)
-			{
-				_usedDiskTracks[i] = new bool[84];
-			}
-		}
-
-		public bool SaveRamModified => true;
-
-		public byte[] CloneSaveRam()
-		{
-			SaveDeltas(); // update the current deltas
-
-			using var ms = new MemoryStream();
-			using var bw = new BinaryWriter(ms);
-			bw.Write(_usedDiskTracks.Length);
-			for (var i = 0; i < _usedDiskTracks.Length; i++)
-			{
-				bw.WriteByteBuffer(_usedDiskTracks[i].ToUByteBuffer());
-				for (var j = 0; j < 84; j++)
-				{
-					bw.WriteByteBuffer(_diskDeltas[i, j]);
-				}
-			}
-
-			return ms.ToArray();
-		}
-
-		public void StoreSaveRam(byte[] data)
-		{
-			using var ms = new MemoryStream(data, false);
-			using var br = new BinaryReader(ms);
-
-			var ndisks = br.ReadInt32();
-			if (ndisks != _usedDiskTracks.Length)
-			{
-				throw new InvalidOperationException("Disk count mismatch!");
-			}
-
-			ResetDeltas();
-
-			for (var i = 0; i < _usedDiskTracks.Length; i++)
-			{
-				_usedDiskTracks[i] = br.ReadByteBuffer(returnNull: false)!.ToBoolBuffer();
-				for (var j = 0; j < 84; j++)
-				{
-					_diskDeltas[i, j] = br.ReadByteBuffer(returnNull: true);
-				}
-			}
-
-			_disk?.AttachTracker(_usedDiskTracks[_getCurrentDiskNumber()]);
-			LoadDeltas(); // load up new deltas
-			_usedDiskTracks[_getCurrentDiskNumber()][_trackNumber] = true; // make sure this gets set to true now
-		}
-
-		public void SaveDeltas()
-		{
-			_disk?.DeltaUpdate((tracknum, original, current) =>
-			{
-				_diskDeltas[_getCurrentDiskNumber(), tracknum] = DeltaSerializer.GetDelta<int>(original, current).ToArray();
-			});
-		}
-
-		public void LoadDeltas()
-		{
-			_disk?.DeltaUpdate((tracknum, original, current) =>
-			{
-				DeltaSerializer.ApplyDelta<int>(original, current, _diskDeltas[_getCurrentDiskNumber(), tracknum]);
-			});
-		}
-
-		private void ResetDeltas()
-		{
-			_disk?.DeltaUpdate(static (_, original, current) =>
-			{
-				original.AsSpan().CopyTo(current);
-			});
-		}
 	}
 }