6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-18 01:30:56 +00:00
Code Issues Projects Releases Wiki Activity

Ensures the 6560 is fully initialised by setup_output.

Browse Source
This commit is contained in:
Thomas Harte 2017-11-21 21:24:06 -05:00
parent 8ddc64c82a
commit c6306db47c
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Machines/Commodore/Vic-20/Vic20.cpp
View File

@ -410,17 +410,15 @@ class ConcreteMachine:
needs_configuration_ = true; needs_configuration_ = true;
} }
void configure_memory() { void set_ntsc_6560() {
// Determine PAL/NTSC
if(region_ == American || region_ == Japanese) {
// NTSC
set_clock_rate(1022727); set_clock_rate(1022727);
if(mos6560_) { if(mos6560_) {
mos6560_->set_output_mode(MOS::MOS6560<Commodore::Vic20::Vic6560>::OutputMode::NTSC); mos6560_->set_output_mode(MOS::MOS6560<Commodore::Vic20::Vic6560>::OutputMode::NTSC);
mos6560_->set_clock_rate(1022727); mos6560_->set_clock_rate(1022727);
} }
} else { }
// PAL
void set_pal_6560() {
set_clock_rate(1108404); set_clock_rate(1108404);
if(mos6560_) { if(mos6560_) {
mos6560_->set_output_mode(MOS::MOS6560<Commodore::Vic20::Vic6560>::OutputMode::PAL); mos6560_->set_output_mode(MOS::MOS6560<Commodore::Vic20::Vic6560>::OutputMode::PAL);
@ -428,6 +426,16 @@ class ConcreteMachine:
} }
} }
void configure_memory() {
// Determine PAL/NTSC
if(region_ == American || region_ == Japanese) {
// NTSC
set_ntsc_6560();
} else {
// PAL
set_pal_6560();
}
memset(processor_read_memory_map_, 0, sizeof(processor_read_memory_map_)); memset(processor_read_memory_map_, 0, sizeof(processor_read_memory_map_));
memset(processor_write_memory_map_, 0, sizeof(processor_write_memory_map_)); memset(processor_write_memory_map_, 0, sizeof(processor_write_memory_map_));
memset(mos6560_->video_memory_map, 0, sizeof(mos6560_->video_memory_map)); memset(mos6560_->video_memory_map, 0, sizeof(mos6560_->video_memory_map));
@ -610,6 +618,8 @@ class ConcreteMachine:
void setup_output(float aspect_ratio) override final { void setup_output(float aspect_ratio) override final {
mos6560_.reset(new Vic6560()); mos6560_.reset(new Vic6560());
mos6560_->get_speaker()->set_high_frequency_cut_off(1600); // There is a 1.6Khz low-pass filter in the Vic-20. mos6560_->get_speaker()->set_high_frequency_cut_off(1600); // There is a 1.6Khz low-pass filter in the Vic-20.
// Make a guess: PAL. Without setting a clock rate the 6560 isn't fully set up so contractually something must be set.
set_pal_6560();
} }
void close_output() override final { void close_output() override final {