From 39c5164a399ad91ed6a4687f5ff1e39a3d8c7a01 Mon Sep 17 00:00:00 2001 From: cam900 Date: Tue, 6 Nov 2018 19:07:57 +0900 Subject: c117.cpp : Remove MCFG macros --- src/mame/drivers/namcos1.cpp | 8 ++++---- src/mame/machine/c117.cpp | 4 ++-- src/mame/machine/c117.h | 13 +------------ 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/src/mame/drivers/namcos1.cpp b/src/mame/drivers/namcos1.cpp index 4e6f2467ff8..6f88c5815ca 100644 --- a/src/mame/drivers/namcos1.cpp +++ b/src/mame/drivers/namcos1.cpp @@ -1044,10 +1044,10 @@ MACHINE_CONFIG_START(namcos1_state::ns1) m_mcu->out_p2_cb().set(FUNC(namcos1_state::dac_gain_w)); m_mcu->set_vblank_int("screen", FUNC(namcos1_state::irq0_line_assert)); - MCFG_DEVICE_ADD("c117", NAMCO_C117, 0) - MCFG_DEVICE_PROGRAM_MAP(virtual_map) - MCFG_CUS117_CPUS("maincpu", "subcpu") - MCFG_CUS117_SUBRES_CB(WRITELINE(*this, namcos1_state, subres_w)) + NAMCO_C117(config, m_c117, 0); + m_c117->set_addrmap(AS_PROGRAM, &namcos1_state::virtual_map); + m_c117->set_cpu_tags("maincpu", "subcpu"); + m_c117->subres_cb().set(FUNC(namcos1_state::subres_w)); // heavy sync required to prevent CPUs from fighting for video RAM access and going into deadlocks MCFG_QUANTUM_TIME(attotime::from_hz(38400)) diff --git a/src/mame/machine/c117.cpp b/src/mame/machine/c117.cpp index e82122c1bb6..51c61357b5a 100644 --- a/src/mame/machine/c117.cpp +++ b/src/mame/machine/c117.cpp @@ -33,8 +33,8 @@ DEFINE_DEVICE_TYPE(NAMCO_C117, namco_c117_device, "namco_c117", "Namco C117 MMU" // namco_c117_device - constructor //------------------------------------------------- -namco_c117_device::namco_c117_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, NAMCO_C117, tag, owner, clock), +namco_c117_device::namco_c117_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : + device_t(mconfig, NAMCO_C117, tag, owner, clock), device_memory_interface(mconfig, *this), m_subres_cb(*this), m_program_config("program", ENDIANNESS_BIG, 8, 23), diff --git a/src/mame/machine/c117.h b/src/mame/machine/c117.h index 9432aa845c2..790c76b9900 100644 --- a/src/mame/machine/c117.h +++ b/src/mame/machine/c117.h @@ -9,17 +9,6 @@ #include "machine/watchdog.h" -//************************************************************************** -// INTERFACE CONFIGURATION MACROS -//************************************************************************** - -#define MCFG_CUS117_CPUS(_maincpu, _subcpu) \ - downcast(*device).set_cpu_tags(_maincpu, _subcpu); - -#define MCFG_CUS117_SUBRES_CB(_devcb) \ - downcast(*device).set_subres_cb(DEVCB_##_devcb); - - //*************************************************************************** // TYPE DEFINITIONS //*************************************************************************** @@ -38,7 +27,7 @@ public: m_maincpu_tag = maintag; m_subcpu_tag = subtag; } - template devcb_base &set_subres_cb(Object &&cb) { return m_subres_cb.set_callback(std::forward(cb)); } + auto subres_cb() { return m_subres_cb.bind(); } DECLARE_READ8_MEMBER(main_r); DECLARE_READ8_MEMBER(sub_r); -- cgit v1.2.3