summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/datum.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/datum.cpp
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/drivers/datum.cpp')
-rw-r--r--src/mame/drivers/datum.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/mame/drivers/datum.cpp b/src/mame/drivers/datum.cpp
index 6b957acd9a1..d774b737b66 100644
--- a/src/mame/drivers/datum.cpp
+++ b/src/mame/drivers/datum.cpp
@@ -182,11 +182,10 @@ WRITE8_MEMBER( datum_state::pb_w )
}
-void datum_state::datum(machine_config &config)
-{
+MACHINE_CONFIG_START(datum_state::datum)
/* basic machine hardware */
- M6802(config, m_maincpu, XTAL(4'000'000)); // internally divided to 1 MHz
- m_maincpu->set_addrmap(AS_PROGRAM, &datum_state::datum_mem);
+ MCFG_DEVICE_ADD("maincpu",M6802, XTAL(4'000'000)) // internally divided to 1 MHz
+ MCFG_DEVICE_PROGRAM_MAP(datum_mem)
/* video hardware */
config.set_default_layout(layout_datum);
@@ -203,8 +202,8 @@ void datum_state::datum(machine_config &config)
pia2.irqa_handler().set_inputline("maincpu", M6802_IRQ_LINE);
pia2.irqb_handler().set_inputline("maincpu", M6802_IRQ_LINE);
- ACIA6850(config, "acia", 0); // rs232
-}
+ MCFG_DEVICE_ADD("acia", ACIA6850, 0) // rs232
+MACHINE_CONFIG_END
/* ROM definition */