From 6b8d370ecbde912aa1ea00756735b40d013b599c Mon Sep 17 00:00:00 2001 From: AJR Date: Tue, 26 Feb 2019 12:33:10 -0500 Subject: [PATCH] a2eauxslot: Fix regression by not nullifying slot pointer in device_start (nw) --- src/devices/bus/a2bus/a2eauxslot.cpp | 13 ++++++------- src/devices/bus/a2bus/a2eauxslot.h | 2 +- 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;