6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-04-06 10:38:16 +00:00
Code Issues Projects Releases Wiki Activity

Implements the proper row counter values for > 192 row modes.

Browse Source
This commit is contained in:
Thomas Harte 2018-10-19 22:37:56 -04:00
parent 3b164e5ffe
commit 0822c96ce0
4 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Components/9918/9918.cpp
View File

@ -102,6 +102,7 @@ TMS9918::TMS9918(Personality p):
}
void TMS9918::set_tv_standard(TVStandard standard) {
tv_standard_ = standard;
switch(standard) {
case TVStandard::PAL:
mode_timing_.total_lines = 313;
@ -569,22 +570,30 @@ uint8_t TMS9918::get_current_line() {
? (write_pointer_.row + mode_timing_.total_lines - 1)%mode_timing_.total_lines
: write_pointer_.row;
// This assumes NTSC 192-line. TODO: other modes.
if(source_row >= 0xdb) source_row -= 6;
// printf("Current row: %d -> %d\n", row_, source_row);
if(tv_standard_ == TVStandard::NTSC) {
if(mode_timing_.pixel_lines == 240) {
// NTSC 256x240: 00-FF, 00-06
} else if(mode_timing_.pixel_lines == 224) {
// NTSC 256x224: 00-EA, E5-FF
if(source_row >= 0xeb) source_row -= 6;
} else {
// NTSC 256x192: 00-DA, D5-FF
if(source_row >= 0xdb) source_row -= 6;
}
} else {
if(mode_timing_.pixel_lines == 240) {
// PAL 256x240: 00-FF, 00-0A, D2-FF
if(source_row >= 267) source_row -= 0x39;
} else if(mode_timing_.pixel_lines == 224) {
// PAL 256x224: 00-FF, 00-02, CA-FF
if(source_row >= 259) source_row -= 0x39;
} else {
// PAL 256x192: 00-F2, BA-FF
if(source_row >= 0xf3) source_row -= 0x39;
}
}
return static_cast<uint8_t>(source_row);
/*
TODO: Full proper sequence of current lines:
NTSC 256x192 00-DA, D5-FF
NTSC 256x224 00-EA, E5-FF
NTSC 256x240 00-FF, 00-06
PAL 256x192 00-F2, BA-FF
PAL 256x224 00-FF, 00-02, CA-FF
PAL 256x240 00-FF, 00-0A, D2-FF
*/
}
uint8_t TMS9918::get_latched_horizontal_counter() {

7
Components/9918/9918.hpp
View File

@ -38,13 +38,6 @@ class TMS9918: public Base {
*/
TMS9918(Personality p);
enum TVStandard {
/*! i.e. 50Hz output at around 312.5 lines/field */
PAL,
/*! i.e. 60Hz output at around 262.5 lines/field */
NTSC
};
/*! Sets the TV standard for this TMS, if that is hard-coded in hardware. */
void set_tv_standard(TVStandard standard);

8
Components/9918/Implementation/9918Base.hpp
View File

@ -27,6 +27,13 @@ enum Personality {
GGVDP,
};
enum class TVStandard {
/*! i.e. 50Hz output at around 312.5 lines/field */
PAL,
/*! i.e. 60Hz output at around 262.5 lines/field */
NTSC
};
#define is_sega_vdp(x) x >= SMSVDP
class Base {
@ -69,6 +76,7 @@ class Base {
Personality personality_;
std::unique_ptr<Outputs::CRT::CRT> crt_;
TVStandard tv_standard_ = TVStandard::NTSC;
// Holds the contents of this VDP's connected DRAM.
std::vector<uint8_t> ram_;

2
Machines/MasterSystem/MasterSystem.cpp
View File

@ -149,7 +149,7 @@ class ConcreteMachine:
vdp_.reset(new TI::TMS::TMS9918(model_ == Target::Model::SG1000 ? TI::TMS::TMS9918A : TI::TMS::SMSVDP));
vdp_->set_tv_standard(
(region_ == Target::Region::Europe) ?
TI::TMS::TMS9918::TVStandard::PAL : TI::TMS::TMS9918::TVStandard::NTSC);
TI::TMS::TVStandard::PAL : TI::TMS::TVStandard::NTSC);
get_crt()->set_video_signal(Outputs::CRT::VideoSignal::Composite);
}