6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-27 16:31:31 +00:00
Code Issues Projects Releases Wiki Activity

Attempts to start producing actual video.

Browse Source
This commit is contained in:
Thomas Harte 2019-10-10 22:46:58 -04:00
parent 2581b520af
commit c5ebf75351
4 changed files with 61 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Components/68901/MFP68901.cpp
View File

@ -8,6 +8,7 @@
#include "MFP68901.hpp"
#define LOG_PREFIX "[MFP] "
#include "../../Outputs/Log.hpp"
using namespace Motorola::MFP68901;
@ -38,7 +39,7 @@ uint8_t MFP68901::read(int address) {
case 0x16: LOG("Read: transmitter status"); break;
case 0x17: LOG("Read: USART data"); break;
}
return 0xff;
return 0x00;
}
void MFP68901::write(int address, uint8_t value) {

1
Machines/AtariST/AtariST.cpp
View File

@ -45,6 +45,7 @@ class ConcreteMachine:
speaker_.set_input_rate(CLOCK_RATE / 4);
ram_.resize(512 * 512);
video_->set_ram(ram_.data());
Memory::Fuzz(ram_);
std::vector<ROMMachine::ROM> rom_descriptions = {

54
Machines/AtariST/Video.cpp
View File

@ -53,6 +53,10 @@ Video::Video() :
crt_(1024, 1, Outputs::Display::Type::PAL50, Outputs::Display::InputDataType::Red4Green4Blue4) {
}
void Video::set_ram(uint16_t *ram) {
ram_ = ram;
}
void Video::set_scan_target(Outputs::Display::ScanTarget *scan_target) {
crt_.set_scan_target(scan_target);
}
@ -82,13 +86,42 @@ void Video::run_for(HalfCycles duration) {
Period(mode_params.end_of_blank, mode_params.start_of_output, output_border);
if(x >= mode_params.start_of_output && x < mode_params.end_of_output) {
if(x == mode_params.start_of_output) {
// TODO: resolutions other than 320.
pixel_pointer_ = reinterpret_cast<uint16_t *>(crt_.begin_data(320));
}
const auto target = std::min(mode_params.end_of_output, final_x);
x = target;
while(x < target) {
if(!(x&31) && pixel_pointer_) {
uint16_t source[4] = {
ram_[current_address_ + 0],
ram_[current_address_ + 1],
ram_[current_address_ + 2],
ram_[current_address_ + 3],
};
current_address_ += 4;
for(int c = 0; c < 16; ++c) {
*pixel_pointer_ = palette_[
((source[0] >> 12) & 0x8) |
((source[1] >> 13) & 0x4) |
((source[2] >> 14) & 0x2) |
((source[3] >> 15) & 0x1)
];
source[0] <<= 1;
source[1] <<= 1;
source[2] <<= 1;
source[3] <<= 1;
++pixel_pointer_;
}
}
++x;
}
if(x == mode_params.end_of_output) {
uint16_t *colour_pointer = reinterpret_cast<uint16_t *>(crt_.begin_data(1));
if(colour_pointer) *colour_pointer = 0xffff;
crt_.output_level(mode_params.end_of_output - mode_params.start_of_output);
crt_.output_data(mode_params.end_of_output - mode_params.start_of_output, 320);
pixel_pointer_ = nullptr;
}
}
@ -114,6 +147,7 @@ void Video::run_for(HalfCycles duration) {
if(x == mode_params.line_length) {
x = 0;
y = (y + 1) % mode_params.lines_per_frame;
if(!y) current_address_ = base_address_;
}
}
@ -188,6 +222,14 @@ HalfCycles Video::get_next_sequence_point() {
uint8_t Video::read(int address) {
LOG("[Video] read " << (address & 0x3f));
address &= 0x3f;
switch(address) {
case 0x00: return uint8_t(base_address_ >> 16);
case 0x01: return uint8_t(base_address_ >> 8);
case 0x02: return uint8_t(current_address_ >> 16);
case 0x03: return uint8_t(current_address_ >> 8);
case 0x04: return uint8_t(current_address_);
}
return 0xff;
}
@ -197,6 +239,10 @@ void Video::write(int address, uint8_t value) {
switch(address) {
default: break;
// Start address.
case 0x00: base_address_ = (base_address_ & 0x00ffff) | (value << 16); break;
case 0x01: base_address_ = (base_address_ & 0xff00ff) | (value << 8); break;
// Palette.
case 0x20: case 0x21: case 0x22: case 0x23:
case 0x24: case 0x25: case 0x26: case 0x27:

8
Machines/AtariST/Video.hpp
View File

@ -39,6 +39,8 @@ class Video {
bool vsync();
bool display_enabled();
void set_ram(uint16_t *);
uint8_t read(int address);
void write(int address, uint8_t value);
@ -46,6 +48,12 @@ class Video {
Outputs::CRT::CRT crt_;
uint16_t palette_[16];
int base_address_ = 0;
int current_address_ = 0;
uint16_t *ram_;
uint16_t line_buffer_[256];
uint16_t *pixel_pointer_;
int x = 0, y = 0;
void output_border(int duration);