diff options
Diffstat (limited to 'src/mame/audio/williams.cpp')
-rw-r--r-- | src/mame/audio/williams.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/mame/audio/williams.cpp b/src/mame/audio/williams.cpp index 515aad3e31a..0eae5aaa1d2 100644 --- a/src/mame/audio/williams.cpp +++ b/src/mame/audio/williams.cpp @@ -176,24 +176,24 @@ void williams_cvsd_sound_device::williams_cvsd_map(address_map &map) //------------------------------------------------- MACHINE_CONFIG_START(williams_cvsd_sound_device::device_add_mconfig) - MCFG_CPU_ADD("cpu", MC6809E, CVSD_MASTER_CLOCK / 4) - MCFG_CPU_PROGRAM_MAP(williams_cvsd_map) + MCFG_DEVICE_ADD("cpu", MC6809E, CVSD_MASTER_CLOCK / 4) + MCFG_DEVICE_PROGRAM_MAP(williams_cvsd_map) MCFG_DEVICE_ADD("pia", PIA6821, 0) - MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("dac", dac_byte_interface, write)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(williams_cvsd_sound_device, talkback_w)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, write)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, williams_cvsd_sound_device, talkback_w)) MCFG_PIA_IRQA_HANDLER(INPUTLINE("cpu", M6809_FIRQ_LINE)) MCFG_PIA_IRQB_HANDLER(INPUTLINE("cpu", INPUT_LINE_NMI)) MCFG_YM2151_ADD("ym2151", CVSD_FM_CLOCK) - MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("pia", pia6821_device, ca1_w)) MCFG_DEVCB_INVERT // IRQ is not true state + MCFG_YM2151_IRQ_HANDLER(WRITELINE("pia", pia6821_device, ca1_w)) MCFG_DEVCB_INVERT // IRQ is not true state MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.10) - MCFG_SOUND_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25) + MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25) MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT) - MCFG_SOUND_ADD("cvsd", HC55516, 0) + MCFG_DEVICE_ADD("cvsd", HC55516, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.60) MACHINE_CONFIG_END @@ -496,23 +496,23 @@ void williams_narc_sound_device::williams_narc_slave_map(address_map &map) MACHINE_CONFIG_START(williams_narc_sound_device::device_add_mconfig) - MCFG_CPU_ADD("cpu0", MC6809E, NARC_MASTER_CLOCK / 4) - MCFG_CPU_PROGRAM_MAP(williams_narc_master_map) + MCFG_DEVICE_ADD("cpu0", MC6809E, NARC_MASTER_CLOCK / 4) + MCFG_DEVICE_PROGRAM_MAP(williams_narc_master_map) - MCFG_CPU_ADD("cpu1", MC6809E, NARC_MASTER_CLOCK / 4) - MCFG_CPU_PROGRAM_MAP(williams_narc_slave_map) + MCFG_DEVICE_ADD("cpu1", MC6809E, NARC_MASTER_CLOCK / 4) + MCFG_DEVICE_PROGRAM_MAP(williams_narc_slave_map) MCFG_YM2151_ADD("ym2151", NARC_FM_CLOCK) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("cpu0", M6809_FIRQ_LINE)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.10) - MCFG_SOUND_ADD("dac1", AD7224, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25) - MCFG_SOUND_ADD("dac2", AD7224, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25) + 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) MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT) MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) - MCFG_SOUND_ADD("cvsd", HC55516, 0) + MCFG_DEVICE_ADD("cvsd", HC55516, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.60) MACHINE_CONFIG_END @@ -751,14 +751,14 @@ void williams_adpcm_sound_device::williams_adpcm_oki_map(address_map &map) //------------------------------------------------- MACHINE_CONFIG_START(williams_adpcm_sound_device::device_add_mconfig) - MCFG_CPU_ADD("cpu", MC6809E, ADPCM_MASTER_CLOCK / 4) - MCFG_CPU_PROGRAM_MAP(williams_adpcm_map) + MCFG_DEVICE_ADD("cpu", MC6809E, ADPCM_MASTER_CLOCK / 4) + MCFG_DEVICE_PROGRAM_MAP(williams_adpcm_map) MCFG_YM2151_ADD("ym2151", ADPCM_FM_CLOCK) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("cpu", M6809_FIRQ_LINE)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.10) - MCFG_SOUND_ADD("dac", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.10) + MCFG_DEVICE_ADD("dac", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.10) MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT) |