diff options
Diffstat (limited to 'src/devices/bus/spectrum/melodik.cpp')
-rw-r--r-- | src/devices/bus/spectrum/melodik.cpp | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/src/devices/bus/spectrum/melodik.cpp b/src/devices/bus/spectrum/melodik.cpp index 9a6f743a65b..0b77635c051 100644 --- a/src/devices/bus/spectrum/melodik.cpp +++ b/src/devices/bus/spectrum/melodik.cpp @@ -32,6 +32,7 @@ void spectrum_melodik_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)); } //************************************************************************** @@ -64,32 +65,6 @@ void spectrum_melodik_device::device_start() // IMPLEMENTATION //************************************************************************** -READ_LINE_MEMBER(spectrum_melodik_device::romcs) -{ - return m_exp->romcs(); -} - -void spectrum_melodik_device::pre_opcode_fetch(offs_t offset) -{ - m_exp->pre_opcode_fetch(offset); -} - -uint8_t spectrum_melodik_device::mreq_r(offs_t offset) -{ - uint8_t data = 0xff; - - if (m_exp->romcs()) - data &= m_exp->mreq_r(offset); - - return data; -} - -void spectrum_melodik_device::mreq_w(offs_t offset, uint8_t data) -{ - if (m_exp->romcs()) - m_exp->mreq_w(offset, data); -} - uint8_t spectrum_melodik_device::iorq_r(offs_t offset) { uint8_t data = m_exp->iorq_r(offset); @@ -97,7 +72,7 @@ uint8_t spectrum_melodik_device::iorq_r(offs_t offset) switch (offset & 0xc002) { case 0xc000: - data &= m_psg->data_r(); + data = m_psg->data_r(); break; } return data; @@ -108,10 +83,10 @@ void spectrum_melodik_device::iorq_w(offs_t offset, uint8_t data) switch (offset & 0xc002) { case 0x8000: - m_psg->address_w(data); + m_psg->data_w(data); break; case 0xc000: - m_psg->data_w(data); + m_psg->address_w(data); break; } m_exp->iorq_w(offset, data); |