6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-06 01:28:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #913 from TomHarte/LowerModelTiming

Browse Source 
Brings timings into line with WoS specs.
This commit is contained in:
Thomas Harte 2021-04-16 22:45:54 -04:00 committed by GitHub
commit 53eae873d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Machines/Sinclair/ZXSpectrum/Video.hpp
View File

@ -98,9 +98,9 @@ template <VideoTiming timing> class Video {
.contention_duration = 129 * 2,
// i.e. interrupt is first signalled 14368 cycles before the first video fetch.
.interrupt_time = (228*311 - 14368) * 2,
.interrupt_time = (228*311 - 14360) * 2,
.delays = {
.delays = { // Should start at 14365
2, 1,
0, 0,
14, 13,
@ -115,19 +115,17 @@ template <VideoTiming timing> class Video {
return result;
}
// TODO: fix 48kb and 128kb timings, below.
if constexpr (timing == VideoTiming::OneTwoEightK) {
constexpr Timings result = {
.cycles_per_line = 228 * 2,
.lines_per_frame = 311,
.contention_leadin = 2 * 2,
.contention_leadin = 4 * 2,
.contention_duration = 128 * 2,
.interrupt_time = (228*311 - 14366) * 2,
.interrupt_time = (228*311 - 14357) * 2,
.delays = {
.delays = { // Should start at 14361.
12, 11,
10, 9,
8, 7,
@ -147,12 +145,12 @@ template <VideoTiming timing> class Video {
.cycles_per_line = 224 * 2,
.lines_per_frame = 312,
.contention_leadin = 2 * 2,
.contention_leadin = 4 * 2,
.contention_duration = 128 * 2,
.interrupt_time = (224*312 - 14339) * 2,
.interrupt_time = (224*312 - 14331) * 2,
.delays = {
.delays = { // Should start at 14335.
12, 11,
10, 9,
8, 7,