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/intv_ctrl/ecs_ctrl.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/devices/bus/intv_ctrl/ecs_ctrl.cpp') diff --git a/src/devices/bus/intv_ctrl/ecs_ctrl.cpp b/src/devices/bus/intv_ctrl/ecs_ctrl.cpp index 3f6afda5f4b..e90292de645 100644 --- a/src/devices/bus/intv_ctrl/ecs_ctrl.cpp +++ b/src/devices/bus/intv_ctrl/ecs_ctrl.cpp @@ -145,11 +145,10 @@ static void intvecs_controller(device_slot_interface &device) device.option_add("handctrl", INTV_HANDCTRL); } -void intvecs_ctrls_device::device_add_mconfig(machine_config &config) -{ - INTV_CONTROL_PORT(config, m_hand1, intvecs_controller, "handctrl"); - INTV_CONTROL_PORT(config, m_hand2, intvecs_controller, "handctrl"); -} +MACHINE_CONFIG_START(intvecs_ctrls_device::device_add_mconfig) + MCFG_INTV_CONTROL_PORT_ADD("port1", intvecs_controller, "handctrl") + MCFG_INTV_CONTROL_PORT_ADD("port2", intvecs_controller, "handctrl") +MACHINE_CONFIG_END intvecs_ctrls_device::intvecs_ctrls_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : -- cgit v1.2.3-70-g09d2