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

Adds support for interlaced output.

Browse Source
This commit is contained in:
Thomas Harte 2021-11-02 14:34:03 -07:00
parent d989825216
commit 1cf1c90511
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Machines/Amiga/Chipset.cpp
View File

@ -171,7 +171,7 @@ template <int cycle> void Chipset::output() {
// Offset by half a line if interlaced and on an odd frame.
const int midline = vertical_blank_height_ >> 1;
if(frame_height_ & 1) {
if(is_long_field_) {
if(y_ < midline - 1 || y_ > midline + 2) {
LINK(blank1, output_blank, blank1);
LINK(sync, output_sync, sync - blank1);
@ -478,7 +478,7 @@ template <bool stop_on_cpu> Chipset::Changes Chipset::run(HalfCycles length) {
fetch_horizontal_ = false;
fetch_stop_ = 0xffff;
if(y_ == frame_height_) {
if(y_ == short_field_height_ + is_long_field_) {
++vsyncs;
interrupt_requests_ |= InterruptMask<InterruptFlag::VerticalBlank>::value;
update_interrupts();
@ -492,6 +492,9 @@ template <bool stop_on_cpu> Chipset::Changes Chipset::run(HalfCycles length) {
for(int c = 0; c < 8; c++) {
sprites_[c].reset_dma();
}
// Toggle next field length if interlaced.
is_long_field_ ^= interlace_;
}
}
assert(line_cycle_ < line_length_ * 4);
@ -628,12 +631,15 @@ void Chipset::perform(const CPU::MC68000::Microcycle &cycle) {
cycle.set_value16(position);
} break;
case Write(0x02a):
case Write(0x02a): // VPOSW
LOG("TODO: write vertical position high " << PADHEX(4) << cycle.value16());
break;
case Write(0x02c):
case Write(0x02c): { // VHPOSW
LOG("TODO: write vertical position low " << PADHEX(4) << cycle.value16());
break;
const uint16_t value = cycle.value16();
is_long_field_ = value & 0x8000;
} break;
// Joystick/mouse input.
case Read(0x00a): // JOY0DAT

3
Machines/Amiga/Chipset.hpp
View File

@ -188,8 +188,9 @@ class Chipset: private ClockingHint::Observer {
// MARK: - Raster position and state.
// Definitions related to PAL/NTSC.
// (Default values are PAL).
int line_length_ = 227;
int frame_height_ = 312;
int short_field_height_ = 312;
int vertical_blank_height_ = 29;
// Current raster position.