6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-22 12:33:29 +00:00
Code Issues Projects Releases Wiki Activity

Give ostensibly clean timing to the CRT.

Browse Source
This commit is contained in:
Thomas Harte 2024-03-21 21:29:53 -04:00
parent bbc0d8b050
commit 66e62857c4
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Machines/Acorn/Archimedes/Video.hpp
View File

@ -154,6 +154,8 @@ struct Video {
clock_divider_); clock_divider_);
if(horizontal_state_.position == horizontal_timing_.period * clock_divider_) { if(horizontal_state_.position == horizontal_timing_.period * clock_divider_) {
horizontal_state_.position = 0;
vertical_state_.increment_position(1); vertical_state_.increment_position(1);
vertical_state_.phase = vertical_state_.phase =
vertical_timing_.phase_after( vertical_timing_.phase_after(
@ -172,7 +174,9 @@ struct Video {
switch(vertical_state_.phase) { switch(vertical_state_.phase) {
case Phase::Sync: new_phase = Phase::Sync; break; case Phase::Sync: new_phase = Phase::Sync; break;
case Phase::Blank: new_phase = Phase::Blank; break; case Phase::Blank: new_phase = Phase::Blank; break;
case Phase::Border: new_phase = Phase::Border; break; case Phase::Border:
new_phase = horizontal_state_.phase == Phase::Display ? Phase::Border : horizontal_state_.phase;
break;
case Phase::Display: case Phase::Display:
new_phase = horizontal_state_.phase; new_phase = horizontal_state_.phase;
break; break;
@ -186,6 +190,8 @@ struct Video {
case Phase::Sync: crt_.output_sync(duration); break; case Phase::Sync: crt_.output_sync(duration); break;
case Phase::Blank: crt_.output_blank(duration); break; case Phase::Blank: crt_.output_blank(duration); break;
case Phase::Display: // TODO: pixels. case Phase::Display: // TODO: pixels.
crt_.output_level<uint16_t>(duration, 0xf888);
break;
case Phase::Border: case Phase::Border:
crt_.output_level<uint16_t>(duration, 0xffff); crt_.output_level<uint16_t>(duration, 0xffff);
break; break;
@ -285,8 +291,9 @@ private:
} }
clock_divider_ = divider; clock_divider_ = divider;
const auto cycles_per_line = static_cast<int>(24'000'000 / (divider * 312 * 50));
crt_.set_new_timing( crt_.set_new_timing(
24'000'000 / (divider * 312 * 50), /* Cycle per line. */ cycles_per_line,
312, /* Height of display. */ 312, /* Height of display. */
Outputs::CRT::PAL::ColourSpace, Outputs::CRT::PAL::ColourSpace,
Outputs::CRT::PAL::ColourCycleNumerator, Outputs::CRT::PAL::ColourCycleNumerator,