diff options
Diffstat (limited to 'src/devices/machine/i8257.cpp')
-rw-r--r-- | src/devices/machine/i8257.cpp | 55 |
1 files changed, 26 insertions, 29 deletions
diff --git a/src/devices/machine/i8257.cpp b/src/devices/machine/i8257.cpp index a1230ba2145..1b32ad40c6a 100644 --- a/src/devices/machine/i8257.cpp +++ b/src/devices/machine/i8257.cpp @@ -252,29 +252,29 @@ inline void i8257_device::advance() //------------------------------------------------- i8257_device::i8257_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, I8257, tag, owner, clock), - device_execute_interface(mconfig, *this), - m_icount(0), - m_reverse_rw(0), - m_tc(false), - m_msb(0), - m_hreq(CLEAR_LINE), - m_hack(0), - m_ready(1), - m_state(0), - m_current_channel(0), - m_last_channel(0), - m_transfer_mode(0), - m_status(0), - m_request(0), - m_temp(0), - m_out_hrq_cb(*this), - m_out_tc_cb(*this), - m_in_memr_cb(*this), - m_out_memw_cb(*this), - m_in_ior_cb{{*this}, {*this}, {*this}, {*this}}, - m_out_iow_cb{{*this}, {*this}, {*this}, {*this}}, - m_out_dack_cb{{*this}, {*this}, {*this}, {*this}} + : device_t(mconfig, I8257, tag, owner, clock) + , device_execute_interface(mconfig, *this) + , m_icount(0) + , m_reverse_rw(0) + , m_tc(false) + , m_msb(0) + , m_hreq(CLEAR_LINE) + , m_hack(0) + , m_ready(1) + , m_state(0) + , m_current_channel(0) + , m_last_channel(0) + , m_transfer_mode(0) + , m_status(0) + , m_request(0) + , m_temp(0) + , m_out_hrq_cb(*this) + , m_out_tc_cb(*this) + , m_in_memr_cb(*this) + , m_out_memw_cb(*this) + , m_in_ior_cb(*this) + , m_out_iow_cb(*this) + , m_out_dack_cb(*this) { } @@ -294,12 +294,9 @@ void i8257_device::device_start() m_out_tc_cb.resolve_safe(); m_in_memr_cb.resolve_safe(0); m_out_memw_cb.resolve_safe(); - for (auto &cb : m_in_ior_cb) - cb.resolve_safe(0); - for (auto &cb : m_out_iow_cb) - cb.resolve_safe(); - for (auto &cb : m_out_dack_cb) - cb.resolve_safe(); + m_in_ior_cb.resolve_all_safe(0); + m_out_iow_cb.resolve_all_safe(); + m_out_dack_cb.resolve_all_safe(); // state saving save_item(NAME(m_msb)); |