summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/mc68681.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/devices/machine/mc68681.cpp
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/machine/mc68681.cpp')
-rw-r--r--src/devices/machine/mc68681.cpp35
1 files changed, 16 insertions, 19 deletions
diff --git a/src/devices/machine/mc68681.cpp b/src/devices/machine/mc68681.cpp
index a3a3b480979..b60567aa3f7 100644
--- a/src/devices/machine/mc68681.cpp
+++ b/src/devices/machine/mc68681.cpp
@@ -268,25 +268,22 @@ void xr68c681_device::device_reset()
m_XTXA = m_XRXA = m_XTXB = m_XRXB = false;
}
-void duart_base_device::device_add_mconfig(machine_config &config)
-{
- DUART_CHANNEL(config, CHANA_TAG, 0);
- DUART_CHANNEL(config, CHANB_TAG, 0);
-}
-
-void sc28c94_device::device_add_mconfig(machine_config &config)
-{
- DUART_CHANNEL(config, CHANA_TAG, 0);
- DUART_CHANNEL(config, CHANB_TAG, 0);
- DUART_CHANNEL(config, CHANC_TAG, 0);
- DUART_CHANNEL(config, CHAND_TAG, 0);
-}
-
-void mc68340_duart_device::device_add_mconfig(machine_config &config)
-{
- DUART_CHANNEL(config, CHANA_TAG, 0);
- DUART_CHANNEL(config, CHANB_TAG, 0);
-}
+MACHINE_CONFIG_START(duart_base_device::device_add_mconfig)
+ MCFG_DEVICE_ADD(CHANA_TAG, DUART_CHANNEL, 0)
+ MCFG_DEVICE_ADD(CHANB_TAG, DUART_CHANNEL, 0)
+MACHINE_CONFIG_END
+
+MACHINE_CONFIG_START(sc28c94_device::device_add_mconfig)
+ MCFG_DEVICE_ADD(CHANA_TAG, DUART_CHANNEL, 0)
+ MCFG_DEVICE_ADD(CHANB_TAG, DUART_CHANNEL, 0)
+ MCFG_DEVICE_ADD(CHANC_TAG, DUART_CHANNEL, 0)
+ MCFG_DEVICE_ADD(CHAND_TAG, DUART_CHANNEL, 0)
+MACHINE_CONFIG_END
+
+MACHINE_CONFIG_START(mc68340_duart_device::device_add_mconfig)
+ MCFG_DEVICE_ADD(CHANA_TAG, DUART_CHANNEL, 0)
+ MCFG_DEVICE_ADD(CHANB_TAG, DUART_CHANNEL, 0)
+MACHINE_CONFIG_END
void duart_base_device::update_interrupts()
{