diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/spectrum/exp.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/spectrum/exp.cpp')
-rw-r--r-- | src/devices/bus/spectrum/exp.cpp | 63 |
1 files changed, 16 insertions, 47 deletions
diff --git a/src/devices/bus/spectrum/exp.cpp b/src/devices/bus/spectrum/exp.cpp index 850b9f88384..73e1d4a3a9a 100644 --- a/src/devices/bus/spectrum/exp.cpp +++ b/src/devices/bus/spectrum/exp.cpp @@ -43,6 +43,7 @@ device_spectrum_expansion_interface::device_spectrum_expansion_interface(const m spectrum_expansion_slot_device::spectrum_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SPECTRUM_EXPANSION_SLOT, tag, owner, clock), device_slot_interface(mconfig, *this), + m_io(nullptr), m_card(nullptr), m_irq_handler(*this), m_nmi_handler(*this) @@ -86,57 +87,46 @@ void spectrum_expansion_slot_device::device_reset() } //------------------------------------------------- -// romcs -//------------------------------------------------- - -READ_LINE_MEMBER(spectrum_expansion_slot_device::romcs) -{ - if (m_card) - return m_card->romcs(); - else - return 0; -} - -//------------------------------------------------- -// fetch_r +// set_io_space - set address space we are attached to //------------------------------------------------- -void spectrum_expansion_slot_device::opcode_fetch(offs_t offset) +void spectrum_expansion_slot_device::set_io_space(address_space *io) { - if (m_card) - m_card->opcode_fetch(offset); + m_io = io; } //------------------------------------------------- -// iorq_r +// port_fe_r //------------------------------------------------- -uint8_t spectrum_expansion_slot_device::iorq_r(offs_t offset) +READ8_MEMBER(spectrum_expansion_slot_device::port_fe_r) { if (m_card) - return m_card->iorq_r(offset); + return m_card->port_fe_r(space, offset); else return 0xff; } //------------------------------------------------- -// iorq_w +// romcs //------------------------------------------------- -void spectrum_expansion_slot_device::iorq_w(offs_t offset, uint8_t data) +READ_LINE_MEMBER(spectrum_expansion_slot_device::romcs) { if (m_card) - m_card->iorq_w(offset, data); + return m_card->romcs(); + else + return 0; } //------------------------------------------------- // mreq_r //------------------------------------------------- -uint8_t spectrum_expansion_slot_device::mreq_r(offs_t offset) +READ8_MEMBER(spectrum_expansion_slot_device::mreq_r) { if (m_card) - return m_card->mreq_r(offset); + return m_card->mreq_r(space, offset); else return 0xff; } @@ -145,10 +135,10 @@ uint8_t spectrum_expansion_slot_device::mreq_r(offs_t offset) // mreq_w //------------------------------------------------- -void spectrum_expansion_slot_device::mreq_w(offs_t offset, uint8_t data) +WRITE8_MEMBER(spectrum_expansion_slot_device::mreq_w) { if (m_card) - m_card->mreq_w(offset, data); + m_card->mreq_w(space, offset, data); } @@ -158,20 +148,14 @@ void spectrum_expansion_slot_device::mreq_w(offs_t offset, uint8_t data) // slot devices -#include "beta.h" -//#include "disciple.h" #include "intf1.h" #include "intf2.h" #include "fuller.h" #include "kempjoy.h" #include "melodik.h" -#include "mface.h" #include "mikroplus.h" -#include "opus.h" #include "plus2test.h" -//#include "plusd.h" #include "protek.h" -#include "specdrum.h" #include "uslot.h" #include "usource.h" #include "uspeech.h" @@ -179,21 +163,13 @@ void spectrum_expansion_slot_device::mreq_w(offs_t offset, uint8_t data) void spectrum_expansion_devices(device_slot_interface &device) { - device.option_add("beta128", SPECTRUM_BETA128); - //device.option_add("disciple", SPECTRUM_DISCIPLE); device.option_add("intf1", SPECTRUM_INTF1); device.option_add("intf2", SPECTRUM_INTF2); device.option_add("fuller", SPECTRUM_FULLER); device.option_add("kempjoy", SPECTRUM_KEMPJOY); device.option_add("melodik", SPECTRUM_MELODIK); - device.option_add("mface1", SPECTRUM_MFACE1); - device.option_add("mface128", SPECTRUM_MFACE128); device.option_add("mikroplus", SPECTRUM_MIKROPLUS); - device.option_add("mprint", SPECTRUM_MPRINT); - device.option_add("opus", SPECTRUM_OPUS); - //device.option_add("plusd", SPECTRUM_PLUSD); device.option_add("protek", SPECTRUM_PROTEK); - device.option_add("specdrum", SPECTRUM_SPECDRUM); device.option_add("uslot", SPECTRUM_USLOT); device.option_add("usource", SPECTRUM_USOURCE); device.option_add("uspeech", SPECTRUM_USPEECH); @@ -201,22 +177,15 @@ void spectrum_expansion_devices(device_slot_interface &device) void spec128_expansion_devices(device_slot_interface &device) { - device.option_add("beta128", SPECTRUM_BETA128); - //device.option_add("disciple", SPECTRUM_DISCIPLE); device.option_add("intf1", SPECTRUM_INTF1); device.option_add("intf2", SPECTRUM_INTF2); device.option_add("kempjoy", SPECTRUM_KEMPJOY); - device.option_add("mface128", SPECTRUM_MFACE128); device.option_add("mikroplus", SPECTRUM_MIKROPLUS); - device.option_add("mprint", SPECTRUM_MPRINT); - device.option_add("opus", SPECTRUM_OPUS); device.option_add("plus2test", SPECTRUM_PLUS2TEST); device.option_add("protek", SPECTRUM_PROTEK); - device.option_add("specdrum", SPECTRUM_SPECDRUM); } void specpls3_expansion_devices(device_slot_interface &device) { - device.option_add("mface3", SPECTRUM_MFACE3); } |