summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/glasgow.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/glasgow.cpp')
-rw-r--r--src/mame/drivers/glasgow.cpp35
1 files changed, 18 insertions, 17 deletions
diff --git a/src/mame/drivers/glasgow.cpp b/src/mame/drivers/glasgow.cpp
index b11fcb4368a..a8ff923dd62 100644
--- a/src/mame/drivers/glasgow.cpp
+++ b/src/mame/drivers/glasgow.cpp
@@ -311,10 +311,11 @@ static INPUT_PORTS_START( old_keyboard ) //Glasgow,Dallas
INPUT_PORTS_END
-MACHINE_CONFIG_START(glasgow_state::glasgow)
+void glasgow_state::glasgow(machine_config &config)
+{
/* basic machine hardware */
- MCFG_DEVICE_ADD("maincpu", M68000, 12_MHz_XTAL)
- MCFG_DEVICE_PROGRAM_MAP(glasgow_mem)
+ M68000(config, m_maincpu, 12_MHz_XTAL);
+ m_maincpu->set_addrmap(AS_PROGRAM, &glasgow_state::glasgow_mem);
MEPHISTO_SENSORS_BOARD(config, m_board, 0);
@@ -322,30 +323,30 @@ MACHINE_CONFIG_START(glasgow_state::glasgow)
config.set_default_layout(layout_glasgow);
SPEAKER(config, "mono").front_center();
- MCFG_DEVICE_ADD("beeper", BEEP, 44)
- MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ BEEP(config, m_beep, 44).add_route(ALL_OUTPUTS, "mono", 0.50);
- MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_timer", glasgow_state, update_nmi, attotime::from_hz(50))
-MACHINE_CONFIG_END
+ TIMER(config, "nmi_timer").configure_periodic(FUNC(glasgow_state::update_nmi), attotime::from_hz(50));
+}
-MACHINE_CONFIG_START(amsterd_state::amsterd)
+void amsterd_state::amsterd(machine_config &config)
+{
glasgow(config);
/* basic machine hardware */
- MCFG_DEVICE_MODIFY("maincpu")
- MCFG_DEVICE_PROGRAM_MAP(amsterd_mem)
-MACHINE_CONFIG_END
+ m_maincpu->set_addrmap(AS_PROGRAM, &amsterd_state::amsterd_mem);
+}
-MACHINE_CONFIG_START(amsterd_state::dallas32)
+void amsterd_state::dallas32(machine_config &config)
+{
glasgow(config);
/* basic machine hardware */
- MCFG_DEVICE_REPLACE("maincpu", M68020, 14_MHz_XTAL)
- MCFG_DEVICE_PROGRAM_MAP(dallas32_mem)
+ M68020(config.replace(), m_maincpu, 14_MHz_XTAL);
+ m_maincpu->set_addrmap(AS_PROGRAM, &amsterd_state::dallas32_mem);
- MCFG_DEVICE_REMOVE("nmi_timer")
- MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_timer", amsterd_state, update_nmi32, attotime::from_hz(50))
-MACHINE_CONFIG_END
+ config.device_remove("nmi_timer");
+ TIMER(config, "nmi_timer").configure_periodic(FUNC(amsterd_state::update_nmi32), attotime::from_hz(50));
+}
/***************************************************************************