diff options
Diffstat (limited to 'src/mame/drivers/s6.cpp')
-rw-r--r-- | src/mame/drivers/s6.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/mame/drivers/s6.cpp b/src/mame/drivers/s6.cpp index 56160bc2d06..859102df718 100644 --- a/src/mame/drivers/s6.cpp +++ b/src/mame/drivers/s6.cpp @@ -409,10 +409,11 @@ void s6_state::init_s6() m_irq_timer->adjust(attotime::from_ticks(980,3580000/4),1); } -MACHINE_CONFIG_START(s6_state::s6) +void s6_state::s6(machine_config &config) +{ /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", M6808, 3580000) // 6802 or 6808 could be used here - MCFG_DEVICE_PROGRAM_MAP(s6_main_map) + M6808(config, m_maincpu, 3580000); // 6802 or 6808 could be used here + m_maincpu->set_addrmap(AS_PROGRAM, &s6_state::s6_main_map); MCFG_MACHINE_RESET_OVERRIDE(s6_state, s6) /* Video */ @@ -458,17 +459,17 @@ MACHINE_CONFIG_START(s6_state::s6) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); /* Add the soundcard */ - MCFG_DEVICE_ADD("audiocpu", M6802, 3580000) - MCFG_DEVICE_PROGRAM_MAP(s6_audio_map) + M6802(config, m_audiocpu, 3580000); + m_audiocpu->set_addrmap(AS_PROGRAM, &s6_state::s6_audio_map); SPEAKER(config, "speaker").front_center(); - MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) - 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) + MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.5); + voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref")); + vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); + vref.add_route(0, "dac", -1.0, DAC_VREF_NEG_INPUT); SPEAKER(config, "speech").front_center(); - MCFG_DEVICE_ADD("hc55516", HC55516, 0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 1.00) + HC55516(config, m_hc55516, 0).add_route(ALL_OUTPUTS, "speech", 1.00); PIA6821(config, m_pias, 0); m_pias->readpb_handler().set(FUNC(s6_state::sound_r)); @@ -477,7 +478,7 @@ MACHINE_CONFIG_START(s6_state::s6) m_pias->cb2_handler().set(m_hc55516, FUNC(hc55516_device::clock_w)); m_pias->irqa_handler().set_inputline(m_audiocpu, M6802_IRQ_LINE); // FIXME: needs an input merger m_pias->irqb_handler().set_inputline(m_audiocpu, M6802_IRQ_LINE); -MACHINE_CONFIG_END +} /*-------------------------------- |