summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2019-02-26 12:33:10 -0500
committer AJR <ajrhacker@users.noreply.github.com>2019-02-26 12:34:47 -0500
commit6b8d370ecbde912aa1ea00756735b40d013b599c (patch)
tree993658576a0a382e9e5fb1648622e290fde16d5f
parent7514b1aaa9a602daaf43681fc323c7830fe25a17 (diff)
a2eauxslot: Fix regression by not nullifying slot pointer in device_start (nw)
-rw-r--r--src/devices/bus/a2bus/a2eauxslot.cpp13
-rw-r--r--src/devices/bus/a2bus/a2eauxslot.h2
2 files changed, 7 insertions, 8 deletions
diff --git a/src/devices/bus/a2bus/a2eauxslot.cpp b/src/devices/bus/a2bus/a2eauxslot.cpp
index 04dfde3f796..5fab40ba9ae 100644
--- a/src/devices/bus/a2bus/a2eauxslot.cpp
+++ b/src/devices/bus/a2bus/a2eauxslot.cpp
@@ -74,24 +74,23 @@ a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, device_type
}
//-------------------------------------------------
-// device_start - device-specific startup
+// device_resolve_objects - resolve objects that
+// may be needed for other devices to set
+// initial conditions at start time
//-------------------------------------------------
-void a2eauxslot_device::device_start()
+void a2eauxslot_device::device_resolve_objects()
{
// resolve callbacks
m_out_irq_cb.resolve_safe();
m_out_nmi_cb.resolve_safe();
-
- // clear slot
- m_device = nullptr;
}
//-------------------------------------------------
-// device_reset - device-specific reset
+// device_start - device-specific startup
//-------------------------------------------------
-void a2eauxslot_device::device_reset()
+void a2eauxslot_device::device_start()
{
}
diff --git a/src/devices/bus/a2bus/a2eauxslot.h b/src/devices/bus/a2bus/a2eauxslot.h
index 5ce89003c72..4351bc6112a 100644
--- a/src/devices/bus/a2bus/a2eauxslot.h
+++ b/src/devices/bus/a2bus/a2eauxslot.h
@@ -82,8 +82,8 @@ protected:
a2eauxslot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
+ virtual void device_resolve_objects() override;
virtual void device_start() override;
- virtual void device_reset() override;
// internal state
required_address_space m_space;