summaryrefslogtreecommitdiffstatshomepage
path: root/src/zexall
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/zexall
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/zexall')
-rw-r--r--src/zexall/zexall.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/zexall/zexall.cpp b/src/zexall/zexall.cpp
index f9fff9b2526..f05b20ca12f 100644
--- a/src/zexall/zexall.cpp
+++ b/src/zexall/zexall.cpp
@@ -141,12 +141,11 @@ INPUT_PORTS_END
Machine Drivers
******************************************************************************/
-void zexall_state::zexall(machine_config &config)
-{
+MACHINE_CONFIG_START(zexall_state::zexall)
/* basic machine hardware */
- Z80(config, m_maincpu, XTAL(3'579'545));
- m_maincpu->set_addrmap(AS_PROGRAM, &zexall_state::z80_mem);
-}
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(z80_mem)
+MACHINE_CONFIG_END
/******************************************************************************