summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/spectrum/exp.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/spectrum/exp.cpp')
-rw-r--r--src/devices/bus/spectrum/exp.cpp72
1 files changed, 46 insertions, 26 deletions
diff --git a/src/devices/bus/spectrum/exp.cpp b/src/devices/bus/spectrum/exp.cpp
index 09ad184f475..e888e5bb01b 100644
--- a/src/devices/bus/spectrum/exp.cpp
+++ b/src/devices/bus/spectrum/exp.cpp
@@ -43,7 +43,6 @@ 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(*this, finder_base::DUMMY_TAG, -1),
m_card(nullptr),
m_irq_handler(*this),
m_nmi_handler(*this)
@@ -52,23 +51,6 @@ spectrum_expansion_slot_device::spectrum_expansion_slot_device(const machine_con
//-------------------------------------------------
-// device_config_complete - perform any
-// operations now that the configuration is
-// complete
-//-------------------------------------------------
-
-void spectrum_expansion_slot_device::device_config_complete()
-{
- // for passthrough connectors, use the parent slot's I/O space
- if (m_io.finder_tag() == finder_base::DUMMY_TAG && dynamic_cast<device_spectrum_expansion_interface *>(owner()) != nullptr)
- {
- auto parent = dynamic_cast<spectrum_expansion_slot_device *>(owner()->owner());
- if (parent != nullptr)
- m_io.set_tag(parent->m_io, parent->m_io.spacenum());
- }
-}
-
-//-------------------------------------------------
// device_validity_check - device-specific checks
//-------------------------------------------------
@@ -104,27 +86,47 @@ void spectrum_expansion_slot_device::device_reset()
}
//-------------------------------------------------
-// port_fe_r
+// romcs
//-------------------------------------------------
-uint8_t spectrum_expansion_slot_device::port_fe_r(offs_t offset)
+READ_LINE_MEMBER(spectrum_expansion_slot_device::romcs)
{
if (m_card)
- return m_card->port_fe_r(offset);
+ return m_card->romcs();
else
- return 0xff;
+ return 0;
}
//-------------------------------------------------
-// romcs
+// fetch_r
//-------------------------------------------------
-READ_LINE_MEMBER(spectrum_expansion_slot_device::romcs)
+void spectrum_expansion_slot_device::opcode_fetch(offs_t offset)
{
if (m_card)
- return m_card->romcs();
+ m_card->opcode_fetch(offset);
+}
+
+//-------------------------------------------------
+// iorq_r
+//-------------------------------------------------
+
+uint8_t spectrum_expansion_slot_device::iorq_r(offs_t offset)
+{
+ if (m_card)
+ return m_card->iorq_r(offset);
else
- return 0;
+ return 0xff;
+}
+
+//-------------------------------------------------
+// iorq_w
+//-------------------------------------------------
+
+void spectrum_expansion_slot_device::iorq_w(offs_t offset, uint8_t data)
+{
+ if (m_card)
+ m_card->iorq_w(offset, data);
}
//-------------------------------------------------
@@ -156,13 +158,18 @@ 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 "uslot.h"
#include "usource.h"
@@ -171,12 +178,20 @@ void spectrum_expansion_slot_device::mreq_w(offs_t offset, uint8_t data)
void spectrum_expansion_devices(device_slot_interface &device)
{
+ //device.option_add("beta", SPECTRUM_BETA);
+ //device.option_add("betaplus", SPECTRUM_BETAPLUS);
+ //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("uslot", SPECTRUM_USLOT);
device.option_add("usource", SPECTRUM_USOURCE);
@@ -185,15 +200,20 @@ 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("plus2test", SPECTRUM_PLUS2TEST);
device.option_add("protek", SPECTRUM_PROTEK);
}
void specpls3_expansion_devices(device_slot_interface &device)
{
+ device.option_add("mface3", SPECTRUM_MFACE3);
}