summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/mc68681.cpp
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 22:44:58 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 22:44:58 +0100
commitc24473ddff715ecec2e258a6eb38960cf8c8e98e (patch)
tree8ea44b6396a6129913c0aac13859b5de9965e972 /src/devices/machine/mc68681.cpp
parent009cba4fb8102102168ef32870892438327f3705 (diff)
parent598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff)
conflict resolution (nw)
Diffstat (limited to 'src/devices/machine/mc68681.cpp')
-rw-r--r--src/devices/machine/mc68681.cpp35
1 files changed, 19 insertions, 16 deletions
diff --git a/src/devices/machine/mc68681.cpp b/src/devices/machine/mc68681.cpp
index b60567aa3f7..a3a3b480979 100644
--- a/src/devices/machine/mc68681.cpp
+++ b/src/devices/machine/mc68681.cpp
@@ -268,22 +268,25 @@ void xr68c681_device::device_reset()
m_XTXA = m_XRXA = m_XTXB = m_XRXB = false;
}
-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::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);
+}
void duart_base_device::update_interrupts()
{