summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2020-02-29 18:32:29 +1100
committer Vas Crabb <vas@vastheman.com>2020-02-29 18:32:52 +1100
commitf011a9134d0e0c789db24fa25c798fb2ff9e8387 (patch)
tree98bedc32e4a4b9903706d06c693c303bbef97870 /src/devices/machine
parent46676197c5610a258fcd2440589a13a2cb945149 (diff)
clean up crud (nw)
Diffstat (limited to 'src/devices/machine')
-rw-r--r--src/devices/machine/mc6844.cpp11
-rw-r--r--src/devices/machine/mc6844.h4
2 files changed, 6 insertions, 9 deletions
diff --git a/src/devices/machine/mc6844.cpp b/src/devices/machine/mc6844.cpp
index e22c13c670f..a88b497a271 100644
--- a/src/devices/machine/mc6844.cpp
+++ b/src/devices/machine/mc6844.cpp
@@ -86,8 +86,8 @@ mc6844_device::mc6844_device(const machine_config &mconfig, const char *tag, dev
, m_out_drq2_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_in_ior_cb(*this)
+ , m_out_iow_cb(*this)
, m_state(STATE_S0)
, m_icount(0)
{
@@ -105,11 +105,8 @@ void mc6844_device::device_resolve_objects()
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();
-
+ m_in_ior_cb.resolve_all_safe(0);
+ m_out_iow_cb.resolve_all_safe();
}
//-------------------------------------------------
diff --git a/src/devices/machine/mc6844.h b/src/devices/machine/mc6844.h
index e2db601e8e7..242528454a6 100644
--- a/src/devices/machine/mc6844.h
+++ b/src/devices/machine/mc6844.h
@@ -81,8 +81,8 @@ protected:
devcb_write_line m_out_drq2_cb;
devcb_read8 m_in_memr_cb;
devcb_write8 m_out_memw_cb;
- devcb_read8 m_in_ior_cb[4];
- devcb_write8 m_out_iow_cb[4];
+ devcb_read8::array<4> m_in_ior_cb;
+ devcb_write8::array<4> m_out_iow_cb;
/* channel_data structure holds info about each 6844 DMA channel */
struct m6844_channel_data