1
0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-11 03:25:06 +00:00

Merge pull request #1412 from TomHarte/CRTCType

Specify correct 6845; experiment with vsync.
This commit is contained in:
Thomas Harte
2024-10-18 20:31:45 -04:00
committed by GitHub

View File

@@ -78,8 +78,8 @@ class InterruptTimer {
} }
/// Indicates the leading edge of a new vertical sync. /// Indicates the leading edge of a new vertical sync.
inline void signal_vsync() { inline void set_vsync(bool active) {
reset_counter_ = 2; reset_counter_ = active ? 2 : 0;
} }
/// Indicates that an interrupt acknowledge has been received from the Z80. /// Indicates that an interrupt acknowledge has been received from the Z80.
@@ -311,8 +311,8 @@ class CRTCBusHandler {
// For the interrupt timer: notify the leading edge of vertical sync and the // For the interrupt timer: notify the leading edge of vertical sync and the
// trailing edge of horizontal sync. // trailing edge of horizontal sync.
if(!was_vsync_ && state.vsync) { if(was_vsync_ != state.vsync) {
interrupt_timer_.signal_vsync(); interrupt_timer_.set_vsync(state.vsync);
} }
if(was_hsync_ && !state.hsync) { if(was_hsync_ && !state.hsync) {
interrupt_timer_.signal_hsync(); interrupt_timer_.signal_hsync();
@@ -575,7 +575,7 @@ class CRTCBusHandler {
}; };
using CRTC = Motorola::CRTC::CRTC6845< using CRTC = Motorola::CRTC::CRTC6845<
CRTCBusHandler, CRTCBusHandler,
Motorola::CRTC::Personality::UM6845R, Motorola::CRTC::Personality::HD6845S,
Motorola::CRTC::CursorType::None>; Motorola::CRTC::CursorType::None>;
/*! /*!