summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/spectrum/intf1.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/spectrum/intf1.cpp')
-rw-r--r--src/devices/bus/spectrum/intf1.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/devices/bus/spectrum/intf1.cpp b/src/devices/bus/spectrum/intf1.cpp
index bbdf324b2e0..f80a02723ef 100644
--- a/src/devices/bus/spectrum/intf1.cpp
+++ b/src/devices/bus/spectrum/intf1.cpp
@@ -12,6 +12,7 @@
#include "emu.h"
#include "intf1.h"
+#include "softlist_dev.h"
//**************************************************************************
@@ -53,6 +54,7 @@ void spectrum_intf1_device::device_add_mconfig(machine_config &config)
SPECTRUM_EXPANSION_SLOT(config, m_exp, spectrum_expansion_devices, nullptr);
m_exp->irq_handler().set(DEVICE_SELF_OWNER, FUNC(spectrum_expansion_slot_device::irq_w));
m_exp->nmi_handler().set(DEVICE_SELF_OWNER, FUNC(spectrum_expansion_slot_device::nmi_w));
+ m_exp->fb_r_handler().set(DEVICE_SELF_OWNER, FUNC(spectrum_expansion_slot_device::fb_r));
SOFTWARE_LIST(config, "microdrive_list").set_original("spectrum_microdrive");
}
@@ -103,9 +105,9 @@ void spectrum_intf1_device::device_reset()
// IMPLEMENTATION
//**************************************************************************
-READ_LINE_MEMBER(spectrum_intf1_device::romcs)
+bool spectrum_intf1_device::romcs()
{
- return m_romcs | m_exp->romcs();
+ return m_romcs || m_exp->romcs();
}
// the Interface 1 looks for specific bus conditions to enable / disable the expansion overlay ROM
@@ -156,12 +158,6 @@ uint8_t spectrum_intf1_device::mreq_r(offs_t offset)
return data;
}
-void spectrum_intf1_device::mreq_w(offs_t offset, uint8_t data)
-{
- if (m_exp->romcs())
- m_exp->mreq_w(offset, data);
-}
-
uint8_t spectrum_intf1_device::iorq_r(offs_t offset)
{
uint8_t data = 0xff;