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

Flags obvious default options within the 6560, Vic-20 and DynamicMachine.

Browse Source
This commit is contained in:
Thomas Harte 2017-11-12 16:41:09 -05:00
parent d6141cb020
commit 5408efe9b5
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Components/6560/6560.hpp
View File

@ -102,7 +102,7 @@ template <class T> class MOS6560 {
Outputs::CRT::DisplayType display_type; Outputs::CRT::DisplayType display_type;
switch(output_mode) { switch(output_mode) {
case OutputMode::PAL: default:
chrominances = pal_chrominances; chrominances = pal_chrominances;
display_type = Outputs::CRT::PAL50; display_type = Outputs::CRT::PAL50;
timing_.cycles_per_line = 71; timing_.cycles_per_line = 71;

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

@ -456,6 +456,10 @@ class ConcreteMachine:
ROM character_rom; ROM character_rom;
ROM kernel_rom; ROM kernel_rom;
switch(region_) { switch(region_) {
default:
character_rom = CharactersEnglish;
kernel_rom = KernelPAL;
break;
case American: case American:
character_rom = CharactersEnglish; character_rom = CharactersEnglish;
kernel_rom = KernelNTSC; kernel_rom = KernelNTSC;
@ -468,10 +472,6 @@ class ConcreteMachine:
character_rom = CharactersJapanese; character_rom = CharactersJapanese;
kernel_rom = KernelJapanese; kernel_rom = KernelJapanese;
break; break;
case European:
character_rom = CharactersEnglish;
kernel_rom = KernelPAL;
break;
case Swedish: case Swedish:
character_rom = CharactersSwedish; character_rom = CharactersSwedish;
kernel_rom = KernelSwedish; kernel_rom = KernelSwedish;

4
Machines/Utility/MachineForTarget.cpp
View File

@ -51,6 +51,8 @@ template<typename T> class TypedDynamicMachine: public ::Machine::DynamicMachine
case StaticAnalyser::Target::Oric: return new TypedDynamicMachine<Oric::Machine>(Oric::Machine::Oric()); case StaticAnalyser::Target::Oric: return new TypedDynamicMachine<Oric::Machine>(Oric::Machine::Oric());
case StaticAnalyser::Target::Vic20: return new TypedDynamicMachine<Commodore::Vic20::Machine>(Commodore::Vic20::Machine::Vic20()); case StaticAnalyser::Target::Vic20: return new TypedDynamicMachine<Commodore::Vic20::Machine>(Commodore::Vic20::Machine::Vic20());
case StaticAnalyser::Target::ZX8081: return new TypedDynamicMachine<ZX8081::Machine>(ZX8081::Machine::ZX8081(target)); case StaticAnalyser::Target::ZX8081: return new TypedDynamicMachine<ZX8081::Machine>(ZX8081::Machine::ZX8081(target));
default: return nullptr;
} }
} }
@ -62,5 +64,7 @@ std::string Machine::NameForTarget(const StaticAnalyser::Target &target) {
case StaticAnalyser::Target::Oric: return "Oric"; case StaticAnalyser::Target::Oric: return "Oric";
case StaticAnalyser::Target::Vic20: return "Vic20"; case StaticAnalyser::Target::Vic20: return "Vic20";
case StaticAnalyser::Target::ZX8081: return "ZX8081"; case StaticAnalyser::Target::ZX8081: return "ZX8081";
default: return "";
} }
} }