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

Merge pull request #221 from TomHarte/6845UpCount

Browse Source 
Regularises the 6845 sync counters
This commit is contained in:
Thomas Harte 2017-08-26 12:51:39 -04:00 committed by GitHub
commit 1017bb9f6b
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Components/6845/CRTC6845.hpp
View File

@ -79,17 +79,15 @@ template <class T> class CRTC6845 {
int cyles_remaining = cycles.as_int(); int cyles_remaining = cycles.as_int();
while(cyles_remaining--) { while(cyles_remaining--) {
// check for end of horizontal sync // check for end of horizontal sync
if(hsync_down_counter_) { if(bus_state_.hsync) {
hsync_down_counter_--; hsync_counter_ = (hsync_counter_ + 1) & 15;
if(!hsync_down_counter_) { bus_state_.hsync = hsync_counter_ != (registers_[3] & 15);
bus_state_.hsync = false;
}
} }
// check for start of horizontal sync // check for start of horizontal sync
if(character_counter_ == registers_[2]) { if(character_counter_ == registers_[2]) {
hsync_down_counter_ = registers_[3] & 15; hsync_counter_ = 0;
if(hsync_down_counter_) bus_state_.hsync = true; if(registers_[3] & 15) bus_state_.hsync = true;
} }
// check for end of visible characters // check for end of visible characters
@ -123,9 +121,9 @@ template <class T> class CRTC6845 {
inline void do_end_of_line() { inline void do_end_of_line() {
// check for end of vertical sync // check for end of vertical sync
if(vsync_down_counter_) { if(bus_state_.vsync) {
vsync_down_counter_--; vsync_counter_ = (vsync_counter_ + 1) & 15;
if(!vsync_down_counter_) { if(vsync_counter_ == (registers_[3] >> 4)) {
bus_state_.vsync = false; bus_state_.vsync = false;
} }
} }
@ -156,8 +154,7 @@ template <class T> class CRTC6845 {
// check for start of vertical sync // check for start of vertical sync
if(line_counter_ == registers_[7]) { if(line_counter_ == registers_[7]) {
bus_state_.vsync = true; bus_state_.vsync = true;
vsync_down_counter_ = registers_[3] >> 4; vsync_counter_ = 0;
if(!vsync_down_counter_) vsync_down_counter_ = 16;
} }
// check for end of visible lines // check for end of visible lines
@ -194,8 +191,8 @@ template <class T> class CRTC6845 {
bool character_is_visible_, line_is_visible_; bool character_is_visible_, line_is_visible_;
int hsync_down_counter_; int hsync_counter_;
int vsync_down_counter_; int vsync_counter_;
bool is_in_adjustment_period_; bool is_in_adjustment_period_;
uint16_t line_address_; uint16_t line_address_;