summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/stvcd.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/stvcd.cpp
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/machine/stvcd.cpp')
-rw-r--r--src/devices/machine/stvcd.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/devices/machine/stvcd.cpp b/src/devices/machine/stvcd.cpp
index c4b7ada9b9f..09323a7deea 100644
--- a/src/devices/machine/stvcd.cpp
+++ b/src/devices/machine/stvcd.cpp
@@ -78,17 +78,17 @@ stvcd_device::stvcd_device(const machine_config &mconfig, const char *tag, devic
{
}
-void stvcd_device::device_add_mconfig(machine_config &config)
-{
- CDROM(config, "cdrom").set_interface("sat_cdrom");
+MACHINE_CONFIG_START(stvcd_device::device_add_mconfig)
+ MCFG_CDROM_ADD("cdrom")
+ MCFG_CDROM_INTERFACE("sat_cdrom")
- TIMER(config, m_sector_timer).configure_generic(FUNC(stvcd_device::stv_sector_cb));
- TIMER(config, m_sh1_timer).configure_generic(FUNC(stvcd_device::stv_sh1_sim));
+ MCFG_TIMER_DRIVER_ADD("sector_timer", stvcd_device, stv_sector_cb)
+ MCFG_TIMER_DRIVER_ADD("sh1_cmd", stvcd_device, stv_sh1_sim)
- CDDA(config, m_cdda);
- m_cdda->add_route(0, *this, 1.0, AUTO_ALLOC_INPUT, 0);
- m_cdda->add_route(1, *this, 1.0, AUTO_ALLOC_INPUT, 1);
-}
+ MCFG_DEVICE_ADD("cdda", CDDA)
+ MCFG_MIXER_ROUTE(0, *this, 1.0, 0)
+ MCFG_MIXER_ROUTE(1, *this, 1.0, 1)
+MACHINE_CONFIG_END
void stvcd_device::device_start()
{