From b380514764cf857469bae61c11143a19f79a74c5 Mon Sep 17 00:00:00 2001 From: andreasnaive Date: Mon, 25 Mar 2019 23:13:40 +0100 Subject: Revert "conflict resolution (nw)" This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705. --- src/devices/machine/mc68681.cpp | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) (limited to 'src/devices/machine/mc68681.cpp') 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() { -- cgit v1.2.3-70-g09d2