From 47508d50a7a19404788b8dec571ce92e6ea7bf8f Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Fri, 20 Dec 2019 20:49:14 -0500 Subject: [PATCH] Wires through a composite video option for the ST. Which is great and all, except that I've not yet inserted a colour burst. So it's monochrome. --- Machines/Atari/ST/AtariST.cpp | 36 +++++++++++++++++++ Machines/Atari/ST/AtariST.hpp | 3 ++ Machines/Atari/ST/DMAController.cpp | 4 +-- Machines/Atari/ST/Video.cpp | 4 +++ Machines/Atari/ST/Video.hpp | 5 +++ Machines/Utility/MachineForTarget.cpp | 1 + .../StaticAnalyser/CSStaticAnalyser.mm | 1 + 7 files changed, 52 insertions(+), 2 deletions(-) diff --git a/Machines/Atari/ST/AtariST.cpp b/Machines/Atari/ST/AtariST.cpp index 35fc403c0..9d2c00a85 100644 --- a/Machines/Atari/ST/AtariST.cpp +++ b/Machines/Atari/ST/AtariST.cpp @@ -28,6 +28,7 @@ #include "../../../ClockReceiver/JustInTime.hpp" #include "../../../ClockReceiver/ForceInline.hpp" +#include "../../../Configurable/StandardOptions.hpp" #include "../../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp" @@ -40,6 +41,12 @@ namespace Atari { namespace ST { +std::vector> get_options() { + return Configurable::standard_options( + static_cast(Configurable::DisplayRGB | Configurable::DisplayCompositeColour | Configurable::QuickLoadTape) + ); +} + const int CLOCK_RATE = 8021247; using Target = Analyser::Static::Target; @@ -57,6 +64,7 @@ class ConcreteMachine: public Activity::Source, public MediaTarget::Machine, public GI::AY38910::PortHandler, + public Configurable::Device, public Video::RangeObserver { public: ConcreteMachine(const Target &target, const ROMMachine::ROMFetcher &rom_fetcher) : @@ -130,6 +138,10 @@ class ConcreteMachine: video_->set_scan_target(scan_target); } + void set_display_type(Outputs::Display::DisplayType display_type) final { + video_->set_display_type(display_type); + } + Outputs::Speaker::Speaker *get_speaker() final { return &speaker_; } @@ -613,6 +625,30 @@ class ConcreteMachine: void video_did_change_access_range(Video *video) final { video_range_ = video->get_memory_access_range(); } + + // MARK: - Configuration options. + std::vector> get_options() final { + return Atari::ST::get_options(); + } + + void set_selections(const Configurable::SelectionSet &selections_by_option) final { + Configurable::Display display; + if(Configurable::get_display(selections_by_option, display)) { + set_video_signal_configurable(display); + } + } + + Configurable::SelectionSet get_accurate_selections() final { + Configurable::SelectionSet selection_set; + Configurable::append_display_selection(selection_set, Configurable::Display::CompositeColour); + return selection_set; + } + + Configurable::SelectionSet get_user_friendly_selections() final { + Configurable::SelectionSet selection_set; + Configurable::append_display_selection(selection_set, Configurable::Display::RGB); + return selection_set; + } }; } diff --git a/Machines/Atari/ST/AtariST.hpp b/Machines/Atari/ST/AtariST.hpp index 5a4f6a213..6345620cd 100644 --- a/Machines/Atari/ST/AtariST.hpp +++ b/Machines/Atari/ST/AtariST.hpp @@ -16,6 +16,9 @@ namespace Atari { namespace ST { +/// @returns The options available for an Atari ST. +std::vector> get_options(); + class Machine { public: virtual ~Machine(); diff --git a/Machines/Atari/ST/DMAController.cpp b/Machines/Atari/ST/DMAController.cpp index 723ff1248..477a113c9 100644 --- a/Machines/Atari/ST/DMAController.cpp +++ b/Machines/Atari/ST/DMAController.cpp @@ -107,11 +107,11 @@ void DMAController::write(int address, uint16_t value) { // of the byte it is adjusting. case 4: address_ = int((address_ & 0x00ffff) | ((value & 0xff) << 16)); break; case 5: - if((value << 8) ^ address_ & ~(value << 8) & 0x8000) address_ += 0x10000; + if(((value << 8) ^ address_) & ~(value << 8) & 0x8000) address_ += 0x10000; address_ = int((address_ & 0xff00ff) | ((value & 0xff) << 8)); break; case 6: - if(value ^ address_ & ~value & 0x80) address_ += 0x100; + if((value ^ address_) & ~value & 0x80) address_ += 0x100; address_ = int((address_ & 0xffff00) | ((value & 0xfe) << 0)); break; // Lowest bit: discarded. } diff --git a/Machines/Atari/ST/Video.cpp b/Machines/Atari/ST/Video.cpp index 94446c59b..943c865db 100644 --- a/Machines/Atari/ST/Video.cpp +++ b/Machines/Atari/ST/Video.cpp @@ -122,6 +122,10 @@ void Video::set_scan_target(Outputs::Display::ScanTarget *scan_target) { crt_.set_scan_target(scan_target); } +void Video::set_display_type(Outputs::Display::DisplayType display_type) { + crt_.set_display_type(display_type); +} + void Video::run_for(HalfCycles duration) { deferrer_.run_for(duration); } diff --git a/Machines/Atari/ST/Video.hpp b/Machines/Atari/ST/Video.hpp index 971d31ac1..269d92d59 100644 --- a/Machines/Atari/ST/Video.hpp +++ b/Machines/Atari/ST/Video.hpp @@ -37,6 +37,11 @@ class Video { */ void set_scan_target(Outputs::Display::ScanTarget *scan_target); + /*! + Sets the type of output. + */ + void set_display_type(Outputs::Display::DisplayType); + /*! Produces the next @c duration period of pixels. */ diff --git a/Machines/Utility/MachineForTarget.cpp b/Machines/Utility/MachineForTarget.cpp index 9a1622e3b..ece5a9f02 100644 --- a/Machines/Utility/MachineForTarget.cpp +++ b/Machines/Utility/MachineForTarget.cpp @@ -143,6 +143,7 @@ std::map>> Machin options.emplace(std::make_pair(LongNameForTargetMachine(Analyser::Machine::AmstradCPC), AmstradCPC::get_options())); options.emplace(std::make_pair(LongNameForTargetMachine(Analyser::Machine::AppleII), Apple::II::get_options())); + options.emplace(std::make_pair(LongNameForTargetMachine(Analyser::Machine::AtariST), Atari::ST::get_options())); options.emplace(std::make_pair(LongNameForTargetMachine(Analyser::Machine::ColecoVision), Coleco::Vision::get_options())); options.emplace(std::make_pair(LongNameForTargetMachine(Analyser::Machine::Electron), Electron::get_options())); options.emplace(std::make_pair(LongNameForTargetMachine(Analyser::Machine::Macintosh), Apple::Macintosh::get_options())); diff --git a/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm b/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm index 13eab0a63..a73c3e4ea 100644 --- a/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm +++ b/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm @@ -228,6 +228,7 @@ static Analyser::Static::ZX8081::Target::MemoryModel ZX8081MemoryModelFromSize(K case Analyser::Machine::AmstradCPC: return @"CompositeOptions"; case Analyser::Machine::AppleII: return @"AppleIIOptions"; case Analyser::Machine::Atari2600: return @"Atari2600Options"; + case Analyser::Machine::AtariST: return @"CompositeOptions"; case Analyser::Machine::ColecoVision: return @"CompositeOptions"; case Analyser::Machine::Electron: return @"QuickLoadCompositeOptions"; case Analyser::Machine::Macintosh: return @"MacintoshOptions";