summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/snes_ctrl/multitap.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/bus/snes_ctrl/multitap.cpp
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/snes_ctrl/multitap.cpp')
-rw-r--r--src/devices/bus/snes_ctrl/multitap.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/devices/bus/snes_ctrl/multitap.cpp b/src/devices/bus/snes_ctrl/multitap.cpp
index ef630439276..262ef56fd26 100644
--- a/src/devices/bus/snes_ctrl/multitap.cpp
+++ b/src/devices/bus/snes_ctrl/multitap.cpp
@@ -47,13 +47,12 @@ static void snes_multitap(device_slot_interface &device)
// device_add_mconfig - add device configuration
//-------------------------------------------------
-void snes_multitap_device::device_add_mconfig(machine_config &config)
-{
- SNES_CONTROL_PORT(config, m_port1, snes_multitap, "joypad");
- SNES_CONTROL_PORT(config, m_port2, snes_multitap, "joypad");
- SNES_CONTROL_PORT(config, m_port3, snes_multitap, "joypad");
- SNES_CONTROL_PORT(config, m_port4, snes_multitap, "joypad");
-}
+MACHINE_CONFIG_START(snes_multitap_device::device_add_mconfig)
+ MCFG_SNES_CONTROL_PORT_ADD("port1", snes_multitap, "joypad")
+ MCFG_SNES_CONTROL_PORT_ADD("port2", snes_multitap, "joypad")
+ MCFG_SNES_CONTROL_PORT_ADD("port3", snes_multitap, "joypad")
+ MCFG_SNES_CONTROL_PORT_ADD("port4", snes_multitap, "joypad")
+MACHINE_CONFIG_END
//**************************************************************************