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