6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-26 15:32:04 +00:00
Code Issues Projects Releases Wiki Activity

It appears the +2a and +3 have a different clock rate.

Browse Source
This commit is contained in:
Thomas Harte 2021-03-18 12:41:24 -04:00
parent c353923557
commit 5664e81d48
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp
View File

@ -26,10 +26,6 @@
#include <array>
namespace {
const unsigned int ClockRate = 3'500'000;
}
namespace Sinclair {
namespace ZXSpectrum {
@ -48,8 +44,8 @@ template<Model model> class ConcreteMachine:
mixer_(ay_, audio_toggle_),
speaker_(mixer_)
{
set_clock_rate(ClockRate);
speaker_.set_input_rate(float(ClockRate) / 2.0f);
set_clock_rate(clock_rate());
speaker_.set_input_rate(float(clock_rate()) / 2.0f);
// With only the +2a and +3 currently supported, the +3 ROM is always
// the one required.
@ -69,6 +65,12 @@ template<Model model> class ConcreteMachine:
audio_queue_.flush();
}
static constexpr unsigned int clock_rate() {
// constexpr unsigned int ClockRate = 3'500'000;
constexpr unsigned int Plus3ClockRate = 3'546'900;
return Plus3ClockRate;
}
// MARK: - TimedMachine
void run_for(const Cycles cycles) override {
@ -114,8 +116,8 @@ template<Model model> class ConcreteMachine:
break;
case PartialMachineCycle::Output:
// Test for port FE.
if(!(address&1)) {
// TODO: rest of port FE.
update_audio();
audio_toggle_.set_output(*cycle.value & 0x10);
@ -124,6 +126,14 @@ template<Model model> class ConcreteMachine:
// b4: tape and speaker output
}
// Test for classic 128kb paging.
// if(!(address&0x8002)) {
// }
// Test for +2a/+3 paging.
// if((address & 0xc002) == 0x4000) {
// }
switch(address) {
default: break;