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/z80sio.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'src/devices/machine/z80sio.cpp') diff --git a/src/devices/machine/z80sio.cpp b/src/devices/machine/z80sio.cpp index 8337aeafdf6..82997875f46 100644 --- a/src/devices/machine/z80sio.cpp +++ b/src/devices/machine/z80sio.cpp @@ -242,17 +242,15 @@ DEFINE_DEVICE_TYPE(UPD7201_NEW, upd7201_new_device, "upd7201_new", "NEC uP //------------------------------------------------- // device_add_mconfig - add device configuration //------------------------------------------------- -void z80sio_device::device_add_mconfig(machine_config &config) -{ - Z80SIO_CHANNEL(config, CHANA_TAG, 0); - Z80SIO_CHANNEL(config, CHANB_TAG, 0); -} - -void i8274_new_device::device_add_mconfig(machine_config &config) -{ - I8274_CHANNEL(config, CHANA_TAG, 0); - I8274_CHANNEL(config, CHANB_TAG, 0); -} +MACHINE_CONFIG_START(z80sio_device::device_add_mconfig) + MCFG_DEVICE_ADD(CHANA_TAG, Z80SIO_CHANNEL, 0) + MCFG_DEVICE_ADD(CHANB_TAG, Z80SIO_CHANNEL, 0) +MACHINE_CONFIG_END + +MACHINE_CONFIG_START(i8274_new_device::device_add_mconfig) + MCFG_DEVICE_ADD(CHANA_TAG, I8274_CHANNEL, 0) + MCFG_DEVICE_ADD(CHANB_TAG, I8274_CHANNEL, 0) +MACHINE_CONFIG_END //************************************************************************** -- cgit v1.2.3-70-g09d2