From 8cd06312956e5b482703517bef2ca65466ef3222 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Mon, 10 Sep 2018 19:10:01 +0200 Subject: [PATCH] k056800: removed MCFG macros (nw) --- src/devices/sound/k056800.h | 13 ------------- src/mame/drivers/gticlub.cpp | 8 ++++---- src/mame/drivers/konamigq.cpp | 4 ++-- src/mame/drivers/konamigx.cpp | 4 ++-- src/mame/drivers/nwk-tr.cpp | 4 ++-- src/mame/drivers/ultrsprt.cpp | 4 ++-- src/mame/drivers/zr107.cpp | 8 ++++---- 7 files changed, 16 insertions(+), 29 deletions(-) diff --git a/src/devices/sound/k056800.h b/src/devices/sound/k056800.h index 4964304deb3..ea20ebdb23d 100644 --- a/src/devices/sound/k056800.h +++ b/src/devices/sound/k056800.h @@ -10,18 +10,6 @@ #define MAME_SOUND_K056800_H -/*************************************************************************** - DEVICE CONFIGURATION MACROS -***************************************************************************/ - -#define MCFG_K056800_ADD(tag, clock) \ - MCFG_DEVICE_ADD((tag), K056800, (clock)) - -#define MCFG_K056800_INT_HANDLER(cb) \ - downcast(*device).set_int_handler((DEVCB_##cb)); - - - /*************************************************************************** TYPE DEFINITIONS ***************************************************************************/ @@ -33,7 +21,6 @@ public: k056800_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // configuration helpers - template devcb_base &set_int_handler(Object &&cb) { return m_int_handler.set_callback(std::forward(cb)); } auto int_callback() { return m_int_handler.bind(); } DECLARE_READ8_MEMBER( host_r ); diff --git a/src/mame/drivers/gticlub.cpp b/src/mame/drivers/gticlub.cpp index ec88a735c21..3bfd87943c9 100644 --- a/src/mame/drivers/gticlub.cpp +++ b/src/mame/drivers/gticlub.cpp @@ -1011,8 +1011,8 @@ MACHINE_CONFIG_START(gticlub_state::gticlub) MCFG_K001006_GFX_REGION("gfx1") MCFG_K001006_TEX_LAYOUT(1) - MCFG_K056800_ADD("k056800", XTAL(33'868'800)/2) - MCFG_K056800_INT_HANDLER(INPUTLINE("audiocpu", M68K_IRQ_2)) + K056800(config, m_k056800, XTAL(33'868'800)/2); + m_k056800->int_callback().set_inputline(m_audiocpu, M68K_IRQ_2); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); @@ -1130,8 +1130,8 @@ MACHINE_CONFIG_START(gticlub_state::hangplt) MCFG_K001604_ROZ_OFFSET(16384) MCFG_K001604_PALETTE("palette") - MCFG_K056800_ADD("k056800", XTAL(33'868'800)/2) - MCFG_K056800_INT_HANDLER(INPUTLINE("audiocpu", M68K_IRQ_2)) + K056800(config, m_k056800, XTAL(33'868'800)/2); + m_k056800->int_callback().set_inputline(m_audiocpu, M68K_IRQ_2); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); diff --git a/src/mame/drivers/konamigq.cpp b/src/mame/drivers/konamigq.cpp index 35679c96eee..2709fe85176 100644 --- a/src/mame/drivers/konamigq.cpp +++ b/src/mame/drivers/konamigq.cpp @@ -367,8 +367,8 @@ MACHINE_CONFIG_START(konamigq_state::konamigq) SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); - MCFG_K056800_ADD("k056800", XTAL(18'432'000)) - MCFG_K056800_INT_HANDLER(INPUTLINE("soundcpu", M68K_IRQ_1)) + K056800(config, m_k056800, XTAL(18'432'000)); + m_k056800->int_callback().set_inputline(m_soundcpu, M68K_IRQ_1); MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000)) MCFG_DEVICE_ADDRESS_MAP(0, konamigq_k054539_map) diff --git a/src/mame/drivers/konamigx.cpp b/src/mame/drivers/konamigx.cpp index a606b396202..bd7456e7cbe 100644 --- a/src/mame/drivers/konamigx.cpp +++ b/src/mame/drivers/konamigx.cpp @@ -1685,8 +1685,8 @@ MACHINE_CONFIG_START(konamigx_state::konamigx) MCFG_SOUND_ROUTE(2, "lspeaker", 0.3) MCFG_SOUND_ROUTE(3, "rspeaker", 0.3) - MCFG_K056800_ADD("k056800", XTAL(18'432'000)) - MCFG_K056800_INT_HANDLER(INPUTLINE("soundcpu", M68K_IRQ_1)) + K056800(config, m_k056800, XTAL(18'432'000)); + m_k056800->int_callback().set_inputline(m_soundcpu, M68K_IRQ_1); MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000)) MCFG_DEVICE_ROM("k054539") diff --git a/src/mame/drivers/nwk-tr.cpp b/src/mame/drivers/nwk-tr.cpp index 6695c2b21d4..c9a38b8413b 100644 --- a/src/mame/drivers/nwk-tr.cpp +++ b/src/mame/drivers/nwk-tr.cpp @@ -896,8 +896,8 @@ MACHINE_CONFIG_START(nwktr_state::nwktr) SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); - MCFG_K056800_ADD("k056800", XTAL(16'934'400)) - MCFG_K056800_INT_HANDLER(INPUTLINE("audiocpu", M68K_IRQ_2)) + K056800(config, m_k056800, XTAL(16'934'400)); + m_k056800->int_callback().set_inputline(m_audiocpu, M68K_IRQ_2); MCFG_DEVICE_ADD("rfsnd", RF5C400, XTAL(16'934'400)) // as per Guru readme above MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) diff --git a/src/mame/drivers/ultrsprt.cpp b/src/mame/drivers/ultrsprt.cpp index 5f2b09f50f4..9ee55da84b6 100644 --- a/src/mame/drivers/ultrsprt.cpp +++ b/src/mame/drivers/ultrsprt.cpp @@ -267,8 +267,8 @@ MACHINE_CONFIG_START(ultrsprt_state::ultrsprt) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) /* sound hardware */ - MCFG_K056800_ADD("k056800", XTAL(18'432'000)) - MCFG_K056800_INT_HANDLER(INPUTLINE("audiocpu", M68K_IRQ_6)) + K056800(config, m_k056800, XTAL(18'432'000)); + m_k056800->int_callback().set_inputline(m_audiocpu, M68K_IRQ_6); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); diff --git a/src/mame/drivers/zr107.cpp b/src/mame/drivers/zr107.cpp index 7038f398ceb..74328b8d75b 100644 --- a/src/mame/drivers/zr107.cpp +++ b/src/mame/drivers/zr107.cpp @@ -812,8 +812,8 @@ MACHINE_CONFIG_START(zr107_state::zr107) MCFG_K001006_GFX_REGION("gfx1") MCFG_K001006_TEX_LAYOUT(0) - MCFG_K056800_ADD("k056800", XTAL(18'432'000)) - MCFG_K056800_INT_HANDLER(INPUTLINE("audiocpu", M68K_IRQ_1)) + K056800(config, m_k056800, XTAL(18'432'000)); + m_k056800->int_callback().set_inputline(m_audiocpu, M68K_IRQ_1); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); @@ -890,8 +890,8 @@ MACHINE_CONFIG_START(zr107_state::jetwave) MCFG_K001006_GFX_REGION("gfx1") MCFG_K001006_TEX_LAYOUT(0) - MCFG_K056800_ADD("k056800", XTAL(18'432'000)) - MCFG_K056800_INT_HANDLER(INPUTLINE("audiocpu", M68K_IRQ_1)) + K056800(config, m_k056800, XTAL(18'432'000)); + m_k056800->int_callback().set_inputline(m_audiocpu, M68K_IRQ_1); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right();