diff options
Diffstat (limited to 'src/mame/drivers/deadang.cpp')
-rw-r--r-- | src/mame/drivers/deadang.cpp | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/src/mame/drivers/deadang.cpp b/src/mame/drivers/deadang.cpp index 80bbcfbb439..287f1a3fe30 100644 --- a/src/mame/drivers/deadang.cpp +++ b/src/mame/drivers/deadang.cpp @@ -360,8 +360,7 @@ MACHINE_CONFIG_START(deadang_state::deadang) MCFG_DEVICE_OPCODES_MAP(sound_decrypted_opcodes_map) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("seibu_sound", seibu_sound_device, im0_vector_cb) - MCFG_DEVICE_ADD("sei80bu", SEI80BU, 0) - MCFG_DEVICE_ROM("audiocpu") + SEI80BU(config, "sei80bu", 0).set_device_rom_tag("audiocpu"); MCFG_QUANTUM_TIME(attotime::from_hz(60)) // the game stops working with higher interleave rates.. @@ -383,11 +382,12 @@ MACHINE_CONFIG_START(deadang_state::deadang) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) - MCFG_SEIBU_SOUND_CPU("audiocpu") - MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") - MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ym1", ym2203_device, read)) - MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ym1", ym2203_device, write)) + SEIBU_SOUND(config, m_seibu_sound, 0); + m_seibu_sound->int_callback().set_inputline("audiocpu", 0); + m_seibu_sound->set_rom_tag("audiocpu"); + m_seibu_sound->set_rombank_tag("seibu_bank1"); + m_seibu_sound->ym_read_callback().set("ym1", FUNC(ym2203_device::read)); + m_seibu_sound->ym_write_callback().set("ym1", FUNC(ym2203_device::write)); MCFG_DEVICE_ADD("ym1", YM2203, XTAL(14'318'181)/4) MCFG_YM2203_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) @@ -396,11 +396,9 @@ MACHINE_CONFIG_START(deadang_state::deadang) MCFG_DEVICE_ADD("ym2", YM2203, XTAL(14'318'181)/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) - MCFG_DEVICE_ADD("adpcm1", SEIBU_ADPCM, 8000) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) + SEIBU_ADPCM(config, m_adpcm1, 8000).add_route(ALL_OUTPUTS, "mono", 0.40); - MCFG_DEVICE_ADD("adpcm2", SEIBU_ADPCM, 8000) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) + SEIBU_ADPCM(config, m_adpcm2, 8000).add_route(ALL_OUTPUTS, "mono", 0.40); MACHINE_CONFIG_END MACHINE_CONFIG_START(popnrun_state::popnrun) @@ -428,11 +426,8 @@ MACHINE_CONFIG_START(popnrun_state::popnrun) MCFG_DEVICE_REMOVE("adpcm1") MCFG_DEVICE_REMOVE("adpcm2") - MCFG_DEVICE_MODIFY("seibu_sound") - MCFG_SEIBU_SOUND_CPU("audiocpu") - MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") - MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym2151_device, read)) - MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym2151_device, write)) + m_seibu_sound->ym_read_callback().set("ymsnd", FUNC(ym2151_device::read)); + m_seibu_sound->ym_write_callback().set("ymsnd", FUNC(ym2151_device::write)); ym2151_device &ymsnd(YM2151(config, "ymsnd", XTAL(14'318'181)/4)); ymsnd.irq_handler().set(m_seibu_sound, FUNC(seibu_sound_device::fm_irqhandler)); |