From 5407d752b12ff86a77e629f2c917fdca90e41519 Mon Sep 17 00:00:00 2001 From: adelikat Date: Tue, 8 Apr 2014 00:24:28 +0000 Subject: [PATCH] Atari 2600 - DPC mapper - clean up elapsed cycle monitoring, results now match up with stella at least --- .../Consoles/Atari/2600/Mappers/mDPC.cs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mDPC.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mDPC.cs index 704c25928b..7f17c5c1d5 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mDPC.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mDPC.cs @@ -1,5 +1,4 @@ -using System.Linq; -using BizHawk.Common; +using BizHawk.Common; namespace BizHawk.Emulation.Cores.Atari.Atari2600 { @@ -239,8 +238,8 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 private byte _myRandomNumber; // TOD: something simpler here, don't need both - private int _mySystemCycles; - private int _systemCycles; + //private int _mySystemCycles; + private int _elapsedCycles = 85; // 85 compensates for a slight timing issue when ClockCpu is first run, 85 puts BizHawk back on track with Stella on elapsed timing values // Fractional DPC music OSC clocks unused during the last update private double _myFractionalClocks; @@ -269,7 +268,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 public override void ClockCpu() { - _systemCycles++; + _elapsedCycles++; } private byte ReadMem(ushort addr, bool peek) @@ -485,8 +484,8 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 private void UpdateMusicModeDataFetchers() { // Calculate the number of cycles since the last update - var cycles = _systemCycles - _mySystemCycles; - _mySystemCycles = _systemCycles; + var cycles = _elapsedCycles; + _elapsedCycles = 0; // Calculate the number of DPC OSC clocks since the last update var clocks = ((20000.0 * cycles) / 1193191.66666667) + _myFractionalClocks;