From 1a2b4cb540109d109eda1a43edfc4a64d0d6a8c1 Mon Sep 17 00:00:00 2001 From: Nigel Barnes Date: Sun, 15 Mar 2020 19:11:20 +0000 Subject: Electron Plus 3 and AP3/4 devices updated to use FDC master reset line (nw) --- src/devices/bus/electron/cart/ap34.cpp | 6 +++--- src/devices/bus/electron/plus3.cpp | 10 +++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/devices/bus/electron/cart/ap34.cpp b/src/devices/bus/electron/cart/ap34.cpp index 694df390266..70047b271ed 100644 --- a/src/devices/bus/electron/cart/ap34.cpp +++ b/src/devices/bus/electron/cart/ap34.cpp @@ -25,14 +25,14 @@ DEFINE_DEVICE_TYPE(ELECTRON_AP34, electron_ap34_device, "electron_ap34", "P.R.E. //------------------------------------------------- -// MACHINE_DRIVER( ap34 ) +// FLOPPY_FORMATS( ap34 ) //------------------------------------------------- FLOPPY_FORMATS_MEMBER(electron_ap34_device::floppy_formats) FLOPPY_ACORN_SSD_FORMAT, FLOPPY_ACORN_DSD_FORMAT, FLOPPY_ACORN_ADFS_OLD_FORMAT -FLOPPY_FORMATS_END0 +FLOPPY_FORMATS_END void ap34_floppies(device_slot_interface &device) { @@ -167,5 +167,5 @@ void electron_ap34_device::wd1770_control_w(uint8_t data) //m_slot->nmi_w(!BIT(data, 4)); // bit 5: reset - if (!BIT(data, 5)) m_fdc->soft_reset(); + m_fdc->mr_w(BIT(data, 5)); } diff --git a/src/devices/bus/electron/plus3.cpp b/src/devices/bus/electron/plus3.cpp index 5996e357389..960d7384f33 100644 --- a/src/devices/bus/electron/plus3.cpp +++ b/src/devices/bus/electron/plus3.cpp @@ -27,14 +27,14 @@ DEFINE_DEVICE_TYPE(ELECTRON_PLUS3, electron_plus3_device, "electron_plus3", "Aco //------------------------------------------------- -// MACHINE_DRIVER( plus3 ) +// FLOPPY_FORMATS( plus3 ) //------------------------------------------------- FLOPPY_FORMATS_MEMBER(electron_plus3_device::floppy_formats) FLOPPY_ACORN_SSD_FORMAT, FLOPPY_ACORN_DSD_FORMAT, FLOPPY_ACORN_ADFS_OLD_FORMAT -FLOPPY_FORMATS_END0 +FLOPPY_FORMATS_END void electron_floppies(device_slot_interface &device) { @@ -43,6 +43,10 @@ void electron_floppies(device_slot_interface &device) } +//------------------------------------------------- +// ROM( plus3 ) +//------------------------------------------------- + ROM_START( plus3 ) // Bank 4 Disc ROM_REGION(0x4000, "exp_rom", 0) @@ -188,5 +192,5 @@ void electron_plus3_device::wd1770_status_w(uint8_t data) m_fdc->dden_w(BIT(data, 3)); // bit 5: reset - if (!BIT(data, 5)) m_fdc->soft_reset(); + m_fdc->mr_w(BIT(data, 5)); } -- cgit v1.2.3