summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/nmg5.cpp
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /src/mame/drivers/nmg5.cpp
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/drivers/nmg5.cpp')
-rw-r--r--src/mame/drivers/nmg5.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mame/drivers/nmg5.cpp b/src/mame/drivers/nmg5.cpp
index 29f0938e8b5..86024675c58 100644
--- a/src/mame/drivers/nmg5.cpp
+++ b/src/mame/drivers/nmg5.cpp
@@ -978,14 +978,14 @@ void nmg5_state::machine_reset()
m_input_data = 0;
}
-void nmg5_state::nmg5(machine_config &config)
-{
+MACHINE_CONFIG_START(nmg5_state::nmg5)
+
/* basic machine hardware */
- M68000(config, m_maincpu, 16000000); /* 16 MHz */
+ M68000(config, m_maincpu, 16000000); /* 16 MHz */
m_maincpu->set_addrmap(AS_PROGRAM, &nmg5_state::nmg5_map);
m_maincpu->set_vblank_int("screen", FUNC(nmg5_state::irq6_line_hold));
- Z80(config, m_soundcpu, 4000000); /* 4 MHz */
+ Z80(config, m_soundcpu, 4000000); /* 4 MHz */
m_soundcpu->set_addrmap(AS_PROGRAM, &nmg5_state::nmg5_sound_map);
m_soundcpu->set_addrmap(AS_IO, &nmg5_state::sound_io_map);