summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/z80sio.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/z80sio.cpp
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/machine/z80sio.cpp')
-rw-r--r--src/devices/machine/z80sio.cpp20
1 files changed, 9 insertions, 11 deletions
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
//**************************************************************************