From 1a40cc048e1dbda364e8d906a0297063303fb4aa Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sun, 31 Jan 2021 21:41:11 -0500 Subject: [PATCH] Niceties: include AP6 ROM for hard-disk users; show SCSI activity indicator. --- Analyser/Static/Acorn/StaticAnalyser.cpp | 8 +++++++- Machines/Electron/Electron.cpp | 10 +++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Analyser/Static/Acorn/StaticAnalyser.cpp b/Analyser/Static/Acorn/StaticAnalyser.cpp index dcf564567..d5a34167b 100644 --- a/Analyser/Static/Acorn/StaticAnalyser.cpp +++ b/Analyser/Static/Acorn/StaticAnalyser.cpp @@ -144,8 +144,14 @@ Analyser::Static::TargetList Analyser::Static::Acorn::GetTargets(const Media &me // Enable the Acorn ADFS if a mass-storage device is attached; // unlike the Pres ADFS it retains SCSI logic. if(!media.mass_storage_devices.empty()) { - target->has_pres_adfs = false; + target->has_pres_adfs = false; // To override a floppy selection, if one was made. target->has_acorn_adfs = true; + + // Assume some sort of later-era Acorn work is likely to happen; + // so ensure *TYPE, etc are present. + target->has_ap6_rom = true; + target->has_sideways_ram = true; + target->media.mass_storage_devices = media.mass_storage_devices; // Check for a boot option. diff --git a/Machines/Electron/Electron.cpp b/Machines/Electron/Electron.cpp index 65faa203d..2af9cb575 100644 --- a/Machines/Electron/Electron.cpp +++ b/Machines/Electron/Electron.cpp @@ -612,10 +612,14 @@ template class ConcreteMachine: if(activity_observer_) { activity_observer_->register_led(caps_led); activity_observer_->set_led_status(caps_led, caps_led_state_); + } - if(plus3_) { - plus3_->set_activity_observer(observer); - } + if(plus3_) { + plus3_->set_activity_observer(observer); + } + + if(has_scsi_bus) { + scsi_bus_.set_activity_observer(observer); } }