summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/z80sio.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/z80sio.cpp
parent009cba4fb8102102168ef32870892438327f3705 (diff)
parent598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff)
conflict resolution (nw)
Diffstat (limited to 'src/devices/machine/z80sio.cpp')
-rw-r--r--src/devices/machine/z80sio.cpp20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/devices/machine/z80sio.cpp b/src/devices/machine/z80sio.cpp
index 82997875f46..8337aeafdf6 100644
--- a/src/devices/machine/z80sio.cpp
+++ b/src/devices/machine/z80sio.cpp
@@ -242,15 +242,17 @@ DEFINE_DEVICE_TYPE(UPD7201_NEW, upd7201_new_device, "upd7201_new", "NEC uP
//-------------------------------------------------
// device_add_mconfig - add device configuration
//-------------------------------------------------
-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
+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);
+}
//**************************************************************************