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/atapicdr.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/devices/machine/atapicdr.cpp') diff --git a/src/devices/machine/atapicdr.cpp b/src/devices/machine/atapicdr.cpp index 33cb0cb154e..c13b6ff001e 100644 --- a/src/devices/machine/atapicdr.cpp +++ b/src/devices/machine/atapicdr.cpp @@ -30,11 +30,11 @@ atapi_fixed_cdrom_device::atapi_fixed_cdrom_device(const machine_config &mconfig // device_add_mconfig - add device configuration //------------------------------------------------- -void atapi_cdrom_device::device_add_mconfig(machine_config &config) -{ - CDROM(config, "image").set_interface("cdrom"); - CDDA(config, "cdda"); -} +MACHINE_CONFIG_START(atapi_cdrom_device::device_add_mconfig) + MCFG_CDROM_ADD("image") + MCFG_CDROM_INTERFACE("cdrom") + MCFG_DEVICE_ADD("cdda", CDDA) +MACHINE_CONFIG_END void atapi_cdrom_device::device_start() { -- cgit v1.2.3-70-g09d2