diff options
Diffstat (limited to 'src/mame/drivers/s4.cpp')
-rw-r--r-- | src/mame/drivers/s4.cpp | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/mame/drivers/s4.cpp b/src/mame/drivers/s4.cpp index 33265e28e2c..d20a91c419c 100644 --- a/src/mame/drivers/s4.cpp +++ b/src/mame/drivers/s4.cpp @@ -430,12 +430,11 @@ TIMER_DEVICE_CALLBACK_MEMBER( s4_state::irq ) m_t_c++; } -void s4_state::s4(machine_config &config) -{ +MACHINE_CONFIG_START(s4_state::s4) /* basic machine hardware */ - M6800(config, m_maincpu, 3580000); - m_maincpu->set_addrmap(AS_PROGRAM, &s4_state::s4_main_map); - TIMER(config, "irq").configure_periodic(FUNC(s4_state::irq), attotime::from_hz(250)); + MCFG_DEVICE_ADD("maincpu", M6800, 3580000) + MCFG_DEVICE_PROGRAM_MAP(s4_main_map) + MCFG_TIMER_DRIVER_ADD_PERIODIC("irq", s4_state, irq, attotime::from_hz(250)) MCFG_MACHINE_RESET_OVERRIDE(s4_state, s4) /* Video */ @@ -481,28 +480,26 @@ void s4_state::s4(machine_config &config) m_pia30->irqb_handler().set_inputline("maincpu", M6800_IRQ_LINE); NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); -} +MACHINE_CONFIG_END -void s4_state::s4a(machine_config &config) -{ +MACHINE_CONFIG_START(s4_state::s4a) s4(config); /* Add the soundcard */ - M6808(config, m_audiocpu, 3580000); - m_audiocpu->set_addrmap(AS_PROGRAM, &s4_state::s4_audio_map); + MCFG_DEVICE_ADD("audiocpu", M6808, 3580000) + MCFG_DEVICE_PROGRAM_MAP(s4_audio_map) MCFG_MACHINE_RESET_OVERRIDE(s4_state, s4a) SPEAKER(config, "speaker").front_center(); - 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); + 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) PIA6821(config, m_pias, 0); m_pias->readpb_handler().set(FUNC(s4_state::sound_r)); m_pias->writepa_handler().set("dac", FUNC(dac_byte_interface::data_w)); m_pias->irqa_handler().set_inputline("audiocpu", M6808_IRQ_LINE); m_pias->irqb_handler().set_inputline("audiocpu", M6808_IRQ_LINE); -} +MACHINE_CONFIG_END /*-------------------------------- |