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

Stabilise image, albeit incorrectly.

Browse Source
This commit is contained in:
Thomas Harte 2024-09-30 13:16:03 -04:00
parent 5e3840c5f1
commit 276809f76a
1 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Components/6845/CRTC6845.hpp
View File

@ -239,7 +239,7 @@ template <class BusHandlerT, Personality personality, CursorType cursor_type> cl
hsync_counter_ = 0; hsync_counter_ = 0;
bus_state_.hsync = true; bus_state_.hsync = true;
printf("Row:%d line:%d refresh:%04x\n", bus_state_.row_address, row_counter_, bus_state_.refresh_address); printf("Row:%d line:%d refresh:%04x; eom:%d eof:%d newf:%d\n", bus_state_.row_address, row_counter_, bus_state_.refresh_address, eom_latched_, eof_latched_, new_frame);
} }
// Check for end-of-line. // Check for end-of-line.
@ -250,6 +250,17 @@ template <class BusHandlerT, Personality personality, CursorType cursor_type> cl
character_counter_++; character_counter_++;
} }
//
// End-of-frame.
//
if(new_frame) {
eom_latched_ = eof_latched_ = false;
} else {
eom_latched_ |= character_counter_ == 1 && row_end_hit && row_counter_ == layout_.vertical.total;
eof_latched_ |= character_counter_ == 2 && eom_latched_ && !adjustment_in_progress_;
}
// //
// Vertical. // Vertical.
// //
@ -257,11 +268,9 @@ template <class BusHandlerT, Personality personality, CursorType cursor_type> cl
if(character_total_hit) { if(character_total_hit) {
if(eof_latched_ ) { if(eof_latched_ ) {
bus_state_.row_address = 0; bus_state_.row_address = 0;
eof_latched_ = eom_latched_ = false; eof_latched_ = eom_latched_ = false;
} else if(row_end_hit) { } else if(row_end_hit) {
bus_state_.row_address = 0; bus_state_.row_address = 0;
++row_counter_;
} else if(layout_.interlace_mode_ == InterlaceMode::InterlaceSyncAndVideo) { } else if(layout_.interlace_mode_ == InterlaceMode::InterlaceSyncAndVideo) {
bus_state_.row_address = (bus_state_.row_address + 2) & ~1 & 31; bus_state_.row_address = (bus_state_.row_address + 2) & ~1 & 31;
} else { } else {
@ -269,23 +278,12 @@ template <class BusHandlerT, Personality personality, CursorType cursor_type> cl
} }
} }
// Row counter. row_counter_ = next_row_counter_;
// if(new_frame) { if(new_frame) {
// bus_state_.row_address = 0; next_row_counter_ = 0;
// row_counter_ = 0; } else {
// } else if(row_total_hit && character_total_hit) { next_row_counter_ = row_end_hit && character_total_hit ? (next_row_counter_ + 1) : next_row_counter_;
// ++row_counter_; }
// } else if(character_total_hit) {
// bus_state_.row_address = next_row_address_;
// }
//
// if(row_total_hit) {
// bus_state_.row_address = 0;
// } else if(layout_.interlace_mode_ != InterlaceMode::InterlaceSyncAndVideo || adjustment_in_progress_) {
// next_row_address_ = (bus_state_.row_address + 1) & 31;
// } else {
// next_row_address_ = (bus_state_.row_address + 2) & ~1 & 31;
// }
// Sync. // Sync.
const bool vsync_horizontal = const bool vsync_horizontal =
@ -305,13 +303,6 @@ template <class BusHandlerT, Personality personality, CursorType cursor_type> cl
} }
} }
//
// End-of-frame.
//
eom_latched_ = !new_frame && character_counter_ == 1 && row_end_hit && row_counter_ == layout_.vertical.total;
eof_latched_ = !new_frame && character_counter_ == 2 && eom_latched_ && !adjustment_in_progress_;
// //
// Addressing. // Addressing.
// //
@ -492,7 +483,7 @@ template <class BusHandlerT, Personality personality, CursorType cursor_type> cl
int selected_register_ = 0; int selected_register_ = 0;
uint8_t character_counter_ = 0; uint8_t character_counter_ = 0;
uint8_t row_counter_ = 0; uint8_t row_counter_ = 0, next_row_counter_ = 0;;
bool character_is_visible_ = false, line_is_visible_ = false; bool character_is_visible_ = false, line_is_visible_ = false;