From e8989e30e7f141c2fdf1010ee7d75971b9022f77 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 17 Aug 2022 19:10:11 +1000 Subject: sinclair/specpls3.cpp: Improved floppy drive configuration. * Default to a single 3" SSDD drive, allow 3.5" SSDD drives. * specpls3_flop.xml: Corrected interface type for term2a floppy. --- hash/specpls3_flop.xml | 3 ++- src/emu/emuopts.cpp | 9 ++++++--- src/mame/sinclair/specpls3.cpp | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/hash/specpls3_flop.xml b/hash/specpls3_flop.xml index d38a7708acd..d01a61e984d 100644 --- a/hash/specpls3_flop.xml +++ b/hash/specpls3_flop.xml @@ -15747,7 +15747,8 @@ license:CC0 Terminator 2 - Judgment Day (alt) 1991 Ocean Software - + + diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp index 0da23495dc8..5e0e5735a2e 100644 --- a/src/emu/emuopts.cpp +++ b/src/emu/emuopts.cpp @@ -922,9 +922,12 @@ emu_options::software_options emu_options::evaluate_initial_softlist_options(con // we need to find a mountable image slot, but we need to ensure it is a slot // for which we have not already distributed a part to device_image_interface *image = software_list_device::find_mountable_image( - config, - swpart, - [&results](const device_image_interface &candidate) { return results.image.count(candidate.instance_name()) == 0; }); + config, + swpart, + [&results] (const device_image_interface &candidate) + { + return results.image.count(candidate.instance_name()) == 0; + }); // did we find a slot to put this part into? if (image != nullptr) diff --git a/src/mame/sinclair/specpls3.cpp b/src/mame/sinclair/specpls3.cpp index ee78067716b..7d63243909e 100644 --- a/src/mame/sinclair/specpls3.cpp +++ b/src/mame/sinclair/specpls3.cpp @@ -369,6 +369,7 @@ void specpls3_state::plus3_us_w(uint8_t data) static void specpls3_floppies(device_slot_interface &device) { device.option_add("3ssdd", FLOPPY_3_SSDD); + device.option_add("35ssdd", FLOPPY_35_SSDD); } void specpls3_state::floppy_formats(format_registration &fr) @@ -425,7 +426,7 @@ void specpls3_state::spectrum_plus3(machine_config &config) UPD765A(config, m_upd765, 16_MHz_XTAL / 4, true, false); // clocked through SED9420 m_upd765->us_wr_callback().set(FUNC(specpls3_state::plus3_us_w)); FLOPPY_CONNECTOR(config, "upd765:0", specpls3_floppies, "3ssdd", specpls3_state::floppy_formats).enable_sound(true); // internal drive - FLOPPY_CONNECTOR(config, "upd765:1", specpls3_floppies, "3ssdd", specpls3_state::floppy_formats).enable_sound(true); // external drive + FLOPPY_CONNECTOR(config, "upd765:1", specpls3_floppies, nullptr, specpls3_state::floppy_formats).enable_sound(true); // external drive SOFTWARE_LIST(config, "flop_list").set_original("specpls3_flop"); } -- cgit v1.2.3