diff options
Diffstat (limited to 'src/mame/audio/williams.cpp')
-rw-r--r-- | src/mame/audio/williams.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mame/audio/williams.cpp b/src/mame/audio/williams.cpp index 8b5021daeb4..9095683eae1 100644 --- a/src/mame/audio/williams.cpp +++ b/src/mame/audio/williams.cpp @@ -56,9 +56,9 @@ // GLOBAL VARIABLES //************************************************************************** -const device_type WILLIAMS_NARC_SOUND = device_creator<williams_narc_sound_device>; -const device_type WILLIAMS_CVSD_SOUND = device_creator<williams_cvsd_sound_device>; -const device_type WILLIAMS_ADPCM_SOUND = device_creator<williams_adpcm_sound_device>; +DEFINE_DEVICE_TYPE(WILLIAMS_CVSD_SOUND, williams_cvsd_sound_device, "wmscvsd", "Williams CVSD Sound Board") +DEFINE_DEVICE_TYPE(WILLIAMS_NARC_SOUND, williams_narc_sound_device, "wmsnarc", "Williams NARC Sound Board") +DEFINE_DEVICE_TYPE(WILLIAMS_ADPCM_SOUND, williams_adpcm_sound_device, "wmsadpcm", "Williams ADPCM Sound Board") @@ -71,7 +71,7 @@ const device_type WILLIAMS_ADPCM_SOUND = device_creator<williams_adpcm_sound_dev //------------------------------------------------- williams_cvsd_sound_device::williams_cvsd_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, WILLIAMS_CVSD_SOUND, "Williams CVSD Sound Board", tag, owner, clock, "wmscvsd", __FILE__), + : device_t(mconfig, WILLIAMS_CVSD_SOUND, tag, owner, clock), device_mixer_interface(mconfig, *this), m_cpu(*this, "cpu"), m_pia(*this, "pia"), @@ -305,7 +305,7 @@ void williams_cvsd_sound_device::device_timer(emu_timer &timer, device_timer_id //------------------------------------------------- williams_narc_sound_device::williams_narc_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, WILLIAMS_NARC_SOUND, "Williams NARC Sound Board", tag, owner, clock, "wmsnarc", __FILE__), + : device_t(mconfig, WILLIAMS_NARC_SOUND, tag, owner, clock), device_mixer_interface(mconfig, *this), m_cpu0(*this, "cpu0"), m_cpu1(*this, "cpu1"), @@ -678,7 +678,7 @@ void williams_narc_sound_device::device_timer(emu_timer &timer, device_timer_id //------------------------------------------------- williams_adpcm_sound_device::williams_adpcm_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, WILLIAMS_ADPCM_SOUND, "Williams ADPCM Sound Board", tag, owner, clock, "wmsadpcm", __FILE__), + : device_t(mconfig, WILLIAMS_ADPCM_SOUND, tag, owner, clock), device_mixer_interface(mconfig, *this), m_cpu(*this, "cpu"), m_latch(0), @@ -832,7 +832,7 @@ static MACHINE_CONFIG_FRAGMENT( williams_adpcm_sound ) MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT) - MCFG_OKIM6295_ADD("oki", ADPCM_MASTER_CLOCK/8, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified + MCFG_OKIM6295_ADD("oki", ADPCM_MASTER_CLOCK/8, PIN7_HIGH) // clock frequency & pin 7 not verified MCFG_DEVICE_ADDRESS_MAP(AS_0, williams_adpcm_oki_map) MCFG_SOUND_ROUTE(ALL_OUTPUTS, DEVICE_SELF_OWNER, 0.5) MACHINE_CONFIG_END |