summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/audio/taito_en.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/audio/taito_en.cpp')
-rw-r--r--src/mame/audio/taito_en.cpp56
1 files changed, 28 insertions, 28 deletions
diff --git a/src/mame/audio/taito_en.cpp b/src/mame/audio/taito_en.cpp
index 05c8c5e9e09..ad037c092c1 100644
--- a/src/mame/audio/taito_en.cpp
+++ b/src/mame/audio/taito_en.cpp
@@ -196,43 +196,43 @@ WRITE8_MEMBER(taito_en_device::duart_output)
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_START(taito_en_device::device_add_mconfig)
-
+void taito_en_device::device_add_mconfig(machine_config &config)
+{
/* basic machine hardware */
- MCFG_DEVICE_ADD("audiocpu", M68000, XTAL(30'476'100) / 2)
- MCFG_DEVICE_PROGRAM_MAP(en_sound_map)
+ M68000(config, m_audiocpu, XTAL(30'476'100) / 2);
+ m_audiocpu->set_addrmap(AS_PROGRAM, &taito_en_device::en_sound_map);
- MCFG_DEVICE_ADD("esp", ES5510, XTAL(10'000'000)) // from Gun Buster schematics
- MCFG_DEVICE_DISABLE()
+ ES5510(config, m_esp, XTAL(10'000'000)); // from Gun Buster schematics
+ m_esp->set_disable();
- MCFG_DEVICE_ADD("duart68681", MC68681, XTAL(16'000'000) / 4)
- MCFG_MC68681_SET_EXTERNAL_CLOCKS(XTAL(16'000'000)/2/8, XTAL(16'000'000)/2/16, XTAL(16'000'000)/2/16, XTAL(16'000'000)/2/8)
- MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, taito_en_device, duart_irq_handler))
- MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(*this, taito_en_device, duart_output))
+ MC68681(config, m_duart68681, XTAL(16'000'000) / 4);
+ m_duart68681->set_clocks(XTAL(16'000'000)/2/8, XTAL(16'000'000)/2/16, XTAL(16'000'000)/2/16, XTAL(16'000'000)/2/8);
+ m_duart68681->irq_cb().set(FUNC(taito_en_device::duart_irq_handler));
+ m_duart68681->outport_cb().set(FUNC(taito_en_device::duart_output));
MB87078(config, m_mb87078);
m_mb87078->gain_changed().set(FUNC(taito_en_device::mb87078_gain_changed));
- MCFG_DEVICE_ADD("dpram", MB8421, 0) // host accesses this from the other side
+ MB8421(config, "dpram", 0); // host accesses this from the other side
/* sound hardware */
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
- MCFG_DEVICE_ADD("pump", ESQ_5505_5510_PUMP, XTAL(30'476'100) / (2 * 16 * 32))
- MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
- MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
-
- MCFG_DEVICE_ADD("ensoniq", ES5505, XTAL(30'476'100) / 2)
- MCFG_ES5505_REGION0("ensoniq.0")
- MCFG_ES5505_REGION1("ensoniq.0")
- MCFG_ES5505_CHANNELS(4)
- MCFG_SOUND_ROUTE(0, "pump", 1.0, 0)
- MCFG_SOUND_ROUTE(1, "pump", 1.0, 1)
- MCFG_SOUND_ROUTE(2, "pump", 1.0, 2)
- MCFG_SOUND_ROUTE(3, "pump", 1.0, 3)
- MCFG_SOUND_ROUTE(4, "pump", 1.0, 4)
- MCFG_SOUND_ROUTE(5, "pump", 1.0, 5)
- MCFG_SOUND_ROUTE(6, "pump", 1.0, 6)
- MCFG_SOUND_ROUTE(7, "pump", 1.0, 7)
-MACHINE_CONFIG_END
+ ESQ_5505_5510_PUMP(config, m_pump, XTAL(30'476'100) / (2 * 16 * 32));
+ m_pump->add_route(0, "lspeaker", 1.0);
+ m_pump->add_route(1, "rspeaker", 1.0);
+
+ ES5505(config, m_ensoniq, XTAL(30'476'100) / 2);
+ m_ensoniq->set_region0("ensoniq.0");
+ m_ensoniq->set_region1("ensoniq.0");
+ m_ensoniq->set_channels(4);
+ m_ensoniq->add_route(0, "pump", 1.0, 0);
+ m_ensoniq->add_route(1, "pump", 1.0, 1);
+ m_ensoniq->add_route(2, "pump", 1.0, 2);
+ m_ensoniq->add_route(3, "pump", 1.0, 3);
+ m_ensoniq->add_route(4, "pump", 1.0, 4);
+ m_ensoniq->add_route(5, "pump", 1.0, 5);
+ m_ensoniq->add_route(6, "pump", 1.0, 6);
+ m_ensoniq->add_route(7, "pump", 1.0, 7);
+}