From aeca800c627feb4902e9917fbc5c92d0309620ce Mon Sep 17 00:00:00 2001 From: feos Date: Sat, 8 Sep 2018 23:42:51 +0300 Subject: [PATCH] c64 state: drop 4MB more now state sizes are either 268 or 277 KB --- .../Computers/Commodore64/Cartridge/Mapper0020.cs | 5 +++-- .../Computers/Commodore64/Serial/Drive1541.cs | 3 ++- .../Computers/Commodore64/Serial/SerialPort.cs | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0020.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0020.cs index b30912e856..32e30b0a73 100644 --- a/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0020.cs +++ b/BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/Mapper0020.cs @@ -309,8 +309,9 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Cartridge public override void SyncState(Serializer ser) { - SaveState.SyncDelta("MediaStateA", ser, _originalMediaA, ref _banksA); - SaveState.SyncDelta("MediaStateB", ser, _originalMediaB, ref _banksB); + // feos: drop these 4MB of useful data from savestates until we learn why it's critical to store it + //SaveState.SyncDelta("MediaStateA", ser, _originalMediaA, ref _banksA); + //SaveState.SyncDelta("MediaStateB", ser, _originalMediaB, ref _banksB); base.SyncState(ser); DriveLightOn = _boardLed; } diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.cs index 3175544d76..9a73ca8868 100644 --- a/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.cs +++ b/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.cs @@ -100,7 +100,8 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Serial ser.Sync("SystemCpuClockNumerator", ref _cpuClockNum); ser.Sync("SystemDriveCpuRatioDifference", ref _ratioDifference); ser.Sync("DriveLightOffTime", ref _driveLightOffTime); - //ser.Sync("TrackImageData", ref _trackImageData, useNull: false); // feos: drop until we know why we save this 400KB thingy + // feos: drop until we know why we save this 400KB thingy + //ser.Sync("TrackImageData", ref _trackImageData, useNull: false); ser.Sync("DiskDensityCounter", ref _diskDensityCounter); ser.Sync("DiskSupplementaryCounter", ref _diskSupplementaryCounter); diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/SerialPort.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/SerialPort.cs index 802d3faa37..95c36d9c9c 100644 --- a/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/SerialPort.cs +++ b/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/SerialPort.cs @@ -56,7 +56,8 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Serial public void SyncState(Serializer ser) { - //_device?.SyncState(ser); // feos: this is already saved by DiskDrive.SyncState(ser); + // feos: this is already saved by DiskDrive.SyncState(ser); + //_device?.SyncState(ser); ser.Sync("Connected", ref _connected); }