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/bus/nes_ctrl/fckeybrd.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/devices/bus/nes_ctrl/fckeybrd.cpp') diff --git a/src/devices/bus/nes_ctrl/fckeybrd.cpp b/src/devices/bus/nes_ctrl/fckeybrd.cpp index 5633254c8fb..9c81fbea67e 100644 --- a/src/devices/bus/nes_ctrl/fckeybrd.cpp +++ b/src/devices/bus/nes_ctrl/fckeybrd.cpp @@ -123,12 +123,11 @@ ioport_constructor nes_fckeybrd_device::device_input_ports() const // device_add_mconfig - add device configuration //------------------------------------------------- -void nes_fckeybrd_device::device_add_mconfig(machine_config &config) -{ - CASSETTE(config, m_cassette); - m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED); - m_cassette->set_interface("fc_cass"); -} +MACHINE_CONFIG_START(nes_fckeybrd_device::device_add_mconfig) + MCFG_CASSETTE_ADD("tape") + MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED) + MCFG_CASSETTE_INTERFACE("fc_cass") +MACHINE_CONFIG_END //************************************************************************** -- cgit v1.2.3-70-g09d2