summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/mcs48
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2020-02-07 15:28:57 +1100
committer Vas Crabb <vas@vastheman.com>2020-02-07 15:28:57 +1100
commit927906163401b32433f18d2d92c72f196bc1f7f8 (patch)
tree6f04e361cf1b575cee3d5afccdd4131ce16eba79 /src/devices/cpu/mcs48
parent8cc243d562ef07485c63becf6cf6545ef092fafa (diff)
sweeten most of the remaining arrays of delegates (nw)
Diffstat (limited to 'src/devices/cpu/mcs48')
-rw-r--r--src/devices/cpu/mcs48/mcs48.cpp18
-rw-r--r--src/devices/cpu/mcs48/mcs48.h10
2 files changed, 13 insertions, 15 deletions
diff --git a/src/devices/cpu/mcs48/mcs48.cpp b/src/devices/cpu/mcs48/mcs48.cpp
index 3c41c8af987..b438dff57c4 100644
--- a/src/devices/cpu/mcs48/mcs48.cpp
+++ b/src/devices/cpu/mcs48/mcs48.cpp
@@ -92,10 +92,11 @@
***************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "mcs48.h"
#include "mcs48dsm.h"
+#include "debugger.h"
+
/***************************************************************************
CONSTANTS
@@ -218,11 +219,11 @@ mcs48_cpu_device::mcs48_cpu_device(const machine_config &mconfig, device_type ty
, m_data_config("data", ENDIANNESS_LITTLE, 8, ( ( ram_size == 64 ) ? 6 : ( ( ram_size == 128 ) ? 7 : 8 ) ), 0
, (ram_size == 64) ? address_map_constructor(FUNC(mcs48_cpu_device::data_6bit), this) : (ram_size == 128) ? address_map_constructor(FUNC(mcs48_cpu_device::data_7bit), this) : address_map_constructor(FUNC(mcs48_cpu_device::data_8bit), this))
, m_io_config("io", ENDIANNESS_LITTLE, 8, 8, 0)
- , m_port_in_cb{{*this}, {*this}}
- , m_port_out_cb{{*this}, {*this}}
+ , m_port_in_cb(*this)
+ , m_port_out_cb(*this)
, m_bus_in_cb(*this)
, m_bus_out_cb(*this)
- , m_test_in_cb{{*this}, {*this}}
+ , m_test_in_cb(*this)
, m_t0_clk_func(*this)
, m_prog_out_cb(*this)
, m_psw(0)
@@ -1119,14 +1120,11 @@ void mcs48_cpu_device::device_start()
m_io = (m_feature_mask & EXT_BUS_FEATURE) != 0 ? &space(AS_IO) : nullptr;
// resolve callbacks
- 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();
m_bus_in_cb.resolve_safe(0xff);
m_bus_out_cb.resolve_safe();
- for (auto &cb : m_test_in_cb)
- cb.resolve_safe(0);
+ m_test_in_cb.resolve_all_safe(0);
m_prog_out_cb.resolve_safe();
/* set up the state table */
diff --git a/src/devices/cpu/mcs48/mcs48.h b/src/devices/cpu/mcs48/mcs48.h
index 66583c847cd..73f15090dae 100644
--- a/src/devices/cpu/mcs48/mcs48.h
+++ b/src/devices/cpu/mcs48/mcs48.h
@@ -175,12 +175,12 @@ protected:
address_space_config m_data_config;
address_space_config m_io_config;
- devcb_read8 m_port_in_cb[2];
- devcb_write8 m_port_out_cb[2];
- devcb_read8 m_bus_in_cb;
- devcb_write8 m_bus_out_cb;
+ devcb_read8::array<2> m_port_in_cb;
+ devcb_write8::array<2> m_port_out_cb;
+ devcb_read8 m_bus_in_cb;
+ devcb_write8 m_bus_out_cb;
- devcb_read_line m_test_in_cb[2];
+ devcb_read_line::array<2> m_test_in_cb;
clock_update_delegate m_t0_clk_func;
devcb_write_line m_prog_out_cb;