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

Converted remaining spaces to real tabs.

Browse Source
This commit is contained in:
Thomas Harte 2015-07-30 20:51:32 -04:00
parent 1fa7a77793
commit 20c2d98b9a
6 changed files with 218 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OSBindings/Mac/Clock SignalUITests/Clock_SignalUITests.swift
View File

@ -34,5 +34,4 @@ class Clock_SignalUITests: XCTestCase {
// Use recording to get started writing UI tests. // Use recording to get started writing UI tests.
// Use XCTAssert and related functions to verify your tests produce the correct results. // Use XCTAssert and related functions to verify your tests produce the correct results.
} }
} }

9
Outputs/CRT.cpp
View File

@ -12,8 +12,8 @@
using namespace Outputs; using namespace Outputs;
static const uint32_t kCRTFixedPointRange = 0xefffffff; static const uint32_t kCRTFixedPointRange = 0xf8ffffff;
static const uint32_t kCRTFixedPointOffset = 0x08000000; static const uint32_t kCRTFixedPointOffset = 0x00800000;
#define kRetraceXMask 0x01 #define kRetraceXMask 0x01
#define kRetraceYMask 0x02 #define kRetraceYMask 0x02
@ -117,14 +117,17 @@ CRT::SyncEvent CRT::next_vertical_sync_event(bool vsync_is_charging, int cycles_
// will an acceptable vertical sync be triggered? // will an acceptable vertical sync be triggered?
if (vsync_is_charging && !_vretrace_counter) { if (vsync_is_charging && !_vretrace_counter) {
if (_sync_capacitor_charge_level < _sync_capacitor_charge_threshold && _sync_capacitor_charge_level + proposedSyncTime >= _sync_capacitor_charge_threshold) { if (_sync_capacitor_charge_level < _sync_capacitor_charge_threshold && _sync_capacitor_charge_level + proposedSyncTime >= _sync_capacitor_charge_threshold) {
uint32_t proposed_sync_y = _rasterPosition.y + (_sync_capacitor_charge_threshold - _sync_capacitor_charge_level) * _scanSpeed.y;
if(proposed_sync_y > (kCRTFixedPointRange * 15) >> 4) {
proposedSyncTime = _sync_capacitor_charge_threshold - _sync_capacitor_charge_level; proposedSyncTime = _sync_capacitor_charge_threshold - _sync_capacitor_charge_level;
proposedEvent = SyncEvent::StartVSync; proposedEvent = SyncEvent::StartVSync;
} }
} }
}
// will an ongoing vertical sync end? // will an ongoing vertical sync end?
if (_vretrace_counter > 0) { if (_vretrace_counter > 0) {
// && _rasterPosition.y > ((kCRTFixedPointRange * 3) >> 2))
if (_vretrace_counter < proposedSyncTime) { if (_vretrace_counter < proposedSyncTime) {
proposedSyncTime = _vretrace_counter; proposedSyncTime = _vretrace_counter;
proposedEvent = SyncEvent::EndVSync; proposedEvent = SyncEvent::EndVSync;