diff options
Diffstat (limited to 'src/mame/audio/williams.cpp')
-rw-r--r-- | src/mame/audio/williams.cpp | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/src/mame/audio/williams.cpp b/src/mame/audio/williams.cpp index 87758db2d9c..5faa1709614 100644 --- a/src/mame/audio/williams.cpp +++ b/src/mame/audio/williams.cpp @@ -500,27 +500,27 @@ void williams_narc_sound_device::williams_narc_slave_map(address_map &map) //------------------------------------------------- -MACHINE_CONFIG_START(williams_narc_sound_device::device_add_mconfig) - MCFG_DEVICE_ADD("cpu0", MC6809E, NARC_MASTER_CLOCK / 4) - MCFG_DEVICE_PROGRAM_MAP(williams_narc_master_map) +void williams_narc_sound_device::device_add_mconfig(machine_config &config) +{ + MC6809E(config, m_cpu[0], NARC_MASTER_CLOCK / 4); + m_cpu[0]->set_addrmap(AS_PROGRAM, &williams_narc_sound_device::williams_narc_master_map); - MCFG_DEVICE_ADD("cpu1", MC6809E, NARC_MASTER_CLOCK / 4) - MCFG_DEVICE_PROGRAM_MAP(williams_narc_slave_map) + MC6809E(config, m_cpu[1], NARC_MASTER_CLOCK / 4); + m_cpu[1]->set_addrmap(AS_PROGRAM, &williams_narc_sound_device::williams_narc_slave_map); ym2151_device &ym2151(YM2151(config, "ym2151", NARC_FM_CLOCK)); ym2151.irq_handler().set_inputline("cpu0", M6809_FIRQ_LINE); ym2151.add_route(ALL_OUTPUTS, *this, 0.10); - MCFG_DEVICE_ADD("dac1", AD7224, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25) - MCFG_DEVICE_ADD("dac2", AD7224, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25) + AD7224(config, "dac1", 0).add_route(ALL_OUTPUTS, *this, 0.25); + AD7224(config, "dac2", 0).add_route(ALL_OUTPUTS, *this, 0.25); voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref")); vref.set_output(5.0); vref.add_route(0, "dac1", 1.0, DAC_VREF_POS_INPUT); vref.add_route(0, "dac1", -1.0, DAC_VREF_NEG_INPUT); vref.add_route(0, "dac2", 1.0, DAC_VREF_POS_INPUT); vref.add_route(0, "dac2", -1.0, DAC_VREF_NEG_INPUT); - MCFG_DEVICE_ADD("cvsd", HC55516, 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.60) -MACHINE_CONFIG_END + HC55516(config, m_hc55516, 0).add_route(ALL_OUTPUTS, *this, 0.60); +} //------------------------------------------------- @@ -758,24 +758,25 @@ void williams_adpcm_sound_device::williams_adpcm_oki_map(address_map &map) // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_START(williams_adpcm_sound_device::device_add_mconfig) - MCFG_DEVICE_ADD("cpu", MC6809E, ADPCM_MASTER_CLOCK / 4) - MCFG_DEVICE_PROGRAM_MAP(williams_adpcm_map) +void williams_adpcm_sound_device::device_add_mconfig(machine_config &config) +{ + MC6809E(config, m_cpu, ADPCM_MASTER_CLOCK / 4); + m_cpu->set_addrmap(AS_PROGRAM, &williams_adpcm_sound_device::williams_adpcm_map); ym2151_device &ym2151(YM2151(config, "ym2151", ADPCM_FM_CLOCK)); ym2151.irq_handler().set_inputline("cpu", M6809_FIRQ_LINE); ym2151.add_route(ALL_OUTPUTS, *this, 0.10); - MCFG_DEVICE_ADD("dac", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.10) + AD7524(config, "dac", 0).add_route(ALL_OUTPUTS, *this, 0.10); voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref")); vref.set_output(5.0); vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); vref.add_route(0, "dac", -1.0, DAC_VREF_NEG_INPUT); - MCFG_DEVICE_ADD("oki", OKIM6295, ADPCM_MASTER_CLOCK/8, okim6295_device::PIN7_HIGH) // clock frequency & pin 7 not verified - MCFG_DEVICE_ADDRESS_MAP(0, williams_adpcm_oki_map) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.15) -MACHINE_CONFIG_END + okim6295_device &oki(OKIM6295(config, "oki", ADPCM_MASTER_CLOCK/8, okim6295_device::PIN7_HIGH)); // clock frequency & pin 7 not verified + oki.set_addrmap(0, &williams_adpcm_sound_device::williams_adpcm_oki_map); + oki.add_route(ALL_OUTPUTS, *this, 0.15); +} //------------------------------------------------- |