summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/s7.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/s7.cpp')
-rw-r--r--src/mame/drivers/s7.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mame/drivers/s7.cpp b/src/mame/drivers/s7.cpp
index 3fdd8777e22..8de3f2b85e3 100644
--- a/src/mame/drivers/s7.cpp
+++ b/src/mame/drivers/s7.cpp
@@ -434,10 +434,11 @@ void s7_state::init_s7()
m_irq_timer->adjust(attotime::from_ticks(980,3580000/4),1);
}
-MACHINE_CONFIG_START(s7_state::s7)
+void s7_state::s7(machine_config &config)
+{
/* basic machine hardware */
- MCFG_DEVICE_ADD("maincpu", M6808, 3580000)
- MCFG_DEVICE_PROGRAM_MAP(s7_main_map)
+ M6808(config, m_maincpu, 3580000);
+ m_maincpu->set_addrmap(AS_PROGRAM, &s7_state::s7_main_map);
MCFG_MACHINE_RESET_OVERRIDE(s7_state, s7)
/* Video */
@@ -493,19 +494,18 @@ MACHINE_CONFIG_START(s7_state::s7)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
/* Add the soundcard */
- MCFG_DEVICE_ADD("audiocpu", M6808, 3580000)
- MCFG_DEVICE_PROGRAM_MAP(s7_audio_map)
+ M6808(config, m_audiocpu, 3580000);
+ m_audiocpu->set_addrmap(AS_PROGRAM, &s7_state::s7_audio_map);
SPEAKER(config, "speaker").front_center();
- MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.5);
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);
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(s7_state::sound_r));
@@ -516,7 +516,7 @@ MACHINE_CONFIG_START(s7_state::s7)
m_pias->cb2_handler().set(m_hc55516, FUNC(hc55516_device::clock_w));
m_pias->irqa_handler().set_inputline(m_audiocpu, M6808_IRQ_LINE); // FIXME: needs an input merger
m_pias->irqb_handler().set_inputline(m_audiocpu, M6808_IRQ_LINE);
-MACHINE_CONFIG_END
+}