diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/devices/machine/mc6844.cpp | 11 | ||||
-rw-r--r-- | src/devices/machine/mc6844.h | 4 | ||||
-rw-r--r-- | src/mame/machine/alfaskop_s41_kb.h | 2 |
3 files changed, 7 insertions, 10 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 diff --git a/src/mame/machine/alfaskop_s41_kb.h b/src/mame/machine/alfaskop_s41_kb.h index 1d99ec82264..de604fd37b4 100644 --- a/src/mame/machine/alfaskop_s41_kb.h +++ b/src/mame/machine/alfaskop_s41_kb.h @@ -30,7 +30,7 @@ protected: virtual tiny_rom_entry const *device_rom_region() const override; required_device<m6802_cpu_device> m_mcu; - required_device<mc6846_device> m_mc6846; + required_device<mc6846_device> m_mc6846; required_ioport_array<6> m_rows; devcb_write_line m_txd_cb; // Callback for KBD-> S41 devcb_write8 m_leds_cb; // Callback for all 8 leds -> layout |