6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2026-01-26 06:16:22 +00:00
Code Issues Projects Releases Wiki Activity

Erase TODO, continue to update state without target.

Browse Source
This commit is contained in:
Thomas Harte
2025-09-25 09:25:46 -04:00
parent 3c3c55090a
commit a53adb561e
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Machines/Acorn/BBCMicro/BBCMicro.cpp
View File

@@ -307,10 +307,6 @@ public:
active_collation_.pixels_per_clock = 1 << ((value >> 2) & 0x03);
active_collation_.is_teletext = value & 0x02;
if(active_collation_.is_teletext) {
Logger::error().append("TODO: video control => teletext %d", bool(value & 0x02));
}
flash_mask_ = value & 0x01 ? 7 : 0;
cursor_mask_ = value & 0b1110'0000;
}
@@ -408,23 +404,25 @@ public:
if(!pixel_data_) {
pixel_pointer_ = pixel_data_ = crt_.begin_data(PixelAllocationUnit, 8);
}
if(pixel_pointer_) {
uint16_t address;
const uint16_t address = [&] {
// Teletext address generation.
if(state.refresh.get() & (1 << 13)) {
// Teletext address generation mode.
address = uint16_t(
return uint16_t(
0x3c00 |
((state.refresh.get() & 0x800) << 3) |
(state.refresh.get() & 0x3ff)
);
} else {
address = uint16_t((state.refresh.get() << 3) | (state.line.get() & 7));
if(address & 0x8000) {
address = (address + video_base_) & 0x7fff;
}
}
uint16_t address = uint16_t((state.refresh.get() << 3) | (state.line.get() & 7));
if(address & 0x8000) {
address = (address + video_base_) & 0x7fff;
}
return address;
} ();
if(pixel_pointer_) {
pixel_shifter_ = should_fetch ? ram_[address] : 0;
if(active_collation_.is_teletext) {
if(saa5050_serialiser_.has_output()) {
@@ -454,7 +452,9 @@ public:
}
}
} else {
// TODO: continue to feed SAA5050.
if(active_collation_.is_teletext && should_fetch) {
saa5050_serialiser_.add(ram_[address]);
}
}
}
}