From a44729fdfa9161c79eb2d1983bcf9c1ffed51a04 Mon Sep 17 00:00:00 2001 From: AJR Date: Fri, 8 Feb 2019 14:46:49 -0500 Subject: amiga/zorro: Be more consistent about resolving callbacks (nw) --- src/devices/bus/amiga/zorro/zorro.cpp | 24 ++++++++++++------------ src/devices/bus/amiga/zorro/zorro.h | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/devices/bus/amiga/zorro/zorro.cpp b/src/devices/bus/amiga/zorro/zorro.cpp index af0bff3b45b..b4f06507d55 100644 --- a/src/devices/bus/amiga/zorro/zorro.cpp +++ b/src/devices/bus/amiga/zorro/zorro.cpp @@ -84,10 +84,6 @@ void zorro_device::device_resolve_objects() void zorro_device::device_start() { - // resolve callbacks - m_ovr_handler.resolve_safe(); - m_int2_handler.resolve_safe(); - m_int6_handler.resolve_safe(); } // from slot device @@ -121,16 +117,18 @@ exp_slot_device::exp_slot_device(const machine_config &mconfig, device_type 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 exp_slot_device::device_start() +void exp_slot_device::device_resolve_objects() { // resolve callbacks m_ipl_handler.resolve_safe(); - // call base device start - zorro_device::device_start(); + // call base device + zorro_device::device_resolve_objects(); } //------------------------------------------------- @@ -196,10 +194,12 @@ zorro2_device::~zorro2_device() } //------------------------------------------------- -// 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 zorro2_device::device_start() +void zorro2_device::device_resolve_objects() { // resolve callbacks m_eint1_handler.resolve_safe(); @@ -207,8 +207,8 @@ void zorro2_device::device_start() m_eint5_handler.resolve_safe(); m_eint7_handler.resolve_safe(); - // call base device start - zorro_device::device_start(); + // call base device + zorro_device::device_resolve_objects(); } //------------------------------------------------- diff --git a/src/devices/bus/amiga/zorro/zorro.h b/src/devices/bus/amiga/zorro/zorro.h index f0f3348c3c4..4ad72da638b 100644 --- a/src/devices/bus/amiga/zorro/zorro.h +++ b/src/devices/bus/amiga/zorro/zorro.h @@ -254,7 +254,7 @@ protected: exp_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); // device-level overrides - virtual void device_start() override; + virtual void device_resolve_objects() override; virtual void device_reset() override; private: @@ -298,7 +298,7 @@ protected: zorro2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); // device-level overrides - virtual void device_start() override; + virtual void device_resolve_objects() override; virtual void device_reset() override; private: -- cgit v1.2.3