diff options
Diffstat (limited to 'src/mame/drivers/zn.cpp')
-rw-r--r-- | src/mame/drivers/zn.cpp | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/src/mame/drivers/zn.cpp b/src/mame/drivers/zn.cpp index b9ae2221cdc..bb7e3f395c1 100644 --- a/src/mame/drivers/zn.cpp +++ b/src/mame/drivers/zn.cpp @@ -412,7 +412,7 @@ MACHINE_CONFIG_START(zn_state::zn1_1mb_vram) SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); - MCFG_GENERIC_LATCH_8_ADD("soundlatch") + GENERIC_LATCH_8(config, m_soundlatch); MCFG_SPU_ADD( "spu", XTAL(67'737'600)/2 ) MCFG_SOUND_ROUTE(0, "lspeaker", 0.35) @@ -459,7 +459,7 @@ MACHINE_CONFIG_START(zn_state::zn2) SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); - MCFG_GENERIC_LATCH_8_ADD("soundlatch") + GENERIC_LATCH_8(config, m_soundlatch); MCFG_SPU_ADD( "spu", XTAL(67'737'600)/2 ) MCFG_SOUND_ROUTE(0, "lspeaker", 0.35) @@ -664,8 +664,7 @@ MACHINE_CONFIG_START(zn_state::coh1000c) MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000c) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000c) - MCFG_DEVICE_MODIFY("soundlatch") - MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE(m_audiocpu, INPUT_LINE_NMI)) + m_soundlatch->data_pending_callback().set_inputline(m_audiocpu, INPUT_LINE_NMI); MCFG_DEVICE_ADD("qsound", QSOUND) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) @@ -690,8 +689,7 @@ MACHINE_CONFIG_START(zn_state::coh1002c) MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000c) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000c) - MCFG_DEVICE_MODIFY("soundlatch") - MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE(m_audiocpu, INPUT_LINE_NMI)) + m_soundlatch->data_pending_callback().set_inputline(m_audiocpu, INPUT_LINE_NMI); MCFG_DEVICE_ADD("qsound", QSOUND) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) @@ -852,8 +850,7 @@ MACHINE_CONFIG_START(zn_state::coh3002c) MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000c) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000c) - MCFG_DEVICE_MODIFY("soundlatch") - MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE(m_audiocpu, INPUT_LINE_NMI)) + m_soundlatch->data_pending_callback().set_inputline(m_audiocpu, INPUT_LINE_NMI); MCFG_DEVICE_ADD("qsound", QSOUND) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) @@ -1147,12 +1144,12 @@ MACHINE_CONFIG_START(zn_state::coh1000ta) MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000ta) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000ta) - MCFG_DEVICE_ADD("ymsnd", YM2610B, XTAL(16'000'000)/2) - MCFG_YM2610_IRQ_HANDLER(INPUTLINE(m_audiocpu, 0)) - MCFG_SOUND_ROUTE(0, "lspeaker", 0.25) - MCFG_SOUND_ROUTE(0, "rspeaker", 0.25) - MCFG_SOUND_ROUTE(1, "lspeaker", 1.0) - MCFG_SOUND_ROUTE(2, "rspeaker", 1.0) + ym2610b_device &ymsnd(YM2610B(config, "ymsnd", 16_MHz_XTAL/2)); + ymsnd.irq_handler().set_inputline(m_audiocpu, 0); + ymsnd.add_route(0, "lspeaker", 0.25); + ymsnd.add_route(0, "rspeaker", 0.25); + ymsnd.add_route(1, "lspeaker", 1.0); + ymsnd.add_route(2, "rspeaker", 1.0); MCFG_MB3773_ADD("mb3773") @@ -2392,13 +2389,13 @@ MACHINE_CONFIG_START(zn_state::coh1001l) MCFG_MACHINE_START_OVERRIDE(zn_state, coh1001l) MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1001l) - MCFG_GENERIC_LATCH_16_ADD("soundlatch16") - MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE(m_audiocpu, 3)) + GENERIC_LATCH_16(config, m_soundlatch16); + m_soundlatch16->data_pending_callback().set_inputline(m_audiocpu, 3); - MCFG_DEVICE_ADD("ymz", YMZ280B, XTAL(16'934'400)) - MCFG_YMZ280B_IRQ_HANDLER(INPUTLINE(m_audiocpu, 2)) - MCFG_SOUND_ROUTE(0, "lspeaker", 0.35) - MCFG_SOUND_ROUTE(1, "rspeaker", 0.35) + ymz280b_device &ymz(YMZ280B(config, "ymz", XTAL(16'934'400))); + ymz.irq_handler().set_inputline(m_audiocpu, 2); + ymz.add_route(0, "lspeaker", 0.35); + ymz.add_route(1, "rspeaker", 0.35); MACHINE_CONFIG_END /* |