summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/rii/riscii.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/cpu/rii/riscii.cpp')
-rw-r--r--src/devices/cpu/rii/riscii.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/devices/cpu/rii/riscii.cpp b/src/devices/cpu/rii/riscii.cpp
index 2690724e42f..1932ee6afb9 100644
--- a/src/devices/cpu/rii/riscii.cpp
+++ b/src/devices/cpu/rii/riscii.cpp
@@ -65,8 +65,8 @@ riscii_series_device::riscii_series_device(const machine_config &mconfig, device
, m_regs(nullptr)
, m_cache(nullptr)
, m_porta_in_cb(*this)
- , m_port_in_cb{{*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}}
- , m_port_out_cb{{*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}}
+ , m_port_in_cb(*this)
+ , m_port_out_cb(*this)
, m_pcmask((1 << pcbits) - 1)
, m_datastart(datastart)
, m_tbptmask(((1 << (addrbits + 1)) - 1) | (datastart != 0 ? 0x800000 : 0))
@@ -191,10 +191,8 @@ device_memory_interface::space_config_vector riscii_series_device::memory_space_
void riscii_series_device::device_resolve_objects()
{
m_porta_in_cb.resolve_safe(0xff);
- for (auto &cb : m_port_in_cb)
- cb.resolve_safe(0xff);
- for (auto &cb : m_port_out_cb)
- cb.resolve_safe();
+ m_port_in_cb.resolve_all_safe(0xff);
+ m_port_out_cb.resolve_all_safe();
}
void riscii_series_device::device_start()