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/ctrl.h | 23 ++++++++++++----------- src/devices/bus/intv_ctrl/ecs_ctrl.cpp | 9 ++++----- src/devices/bus/intv_ctrl/ecs_ctrl.h | 22 +++++++++++----------- 3 files changed, 27 insertions(+), 27 deletions(-) (limited to 'src/devices/bus/intv_ctrl') diff --git a/src/devices/bus/intv_ctrl/ctrl.h b/src/devices/bus/intv_ctrl/ctrl.h index 1cf3968f933..4a3ce67a688 100644 --- a/src/devices/bus/intv_ctrl/ctrl.h +++ b/src/devices/bus/intv_ctrl/ctrl.h @@ -41,17 +41,7 @@ class intv_control_port_device : public device_t, { public: // construction/destruction - template - intv_control_port_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&opts, char const *dflt) - : intv_control_port_device(mconfig, tag, owner, 0) - { - option_reset(); - opts(*this); - set_default_option(dflt); - set_fixed(false); - } - - intv_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + intv_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~intv_control_port_device(); DECLARE_READ8_MEMBER( ctrl_r ) { return read_ctrl(); } @@ -68,6 +58,17 @@ protected: // device type definition DECLARE_DEVICE_TYPE(INTV_CONTROL_PORT, intv_control_port_device) + +//************************************************************************** +// INTERFACE CONFIGURATION MACROS +//************************************************************************** + +#define MCFG_INTV_CONTROL_PORT_ADD(_tag, _slot_intf, _def_slot) \ + MCFG_DEVICE_ADD(_tag, INTV_CONTROL_PORT, 0) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) + + + void intv_control_port_devices(device_slot_interface &device); 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) : diff --git a/src/devices/bus/intv_ctrl/ecs_ctrl.h b/src/devices/bus/intv_ctrl/ecs_ctrl.h index 8a723c64949..923b5785358 100644 --- a/src/devices/bus/intv_ctrl/ecs_ctrl.h +++ b/src/devices/bus/intv_ctrl/ecs_ctrl.h @@ -46,17 +46,7 @@ class intvecs_control_port_device : public device_t, { public: // construction/destruction - template - intvecs_control_port_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&opts, char const *dflt) - : intvecs_control_port_device(mconfig, tag, owner, 0) - { - option_reset(); - opts(*this); - set_default_option(dflt); - set_fixed(false); - } - - intvecs_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + intvecs_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~intvecs_control_port_device(); DECLARE_READ8_MEMBER( portA_r ) { return read_portA(); } @@ -78,6 +68,16 @@ protected: DECLARE_DEVICE_TYPE(INTVECS_CONTROL_PORT, intvecs_control_port_device) +//************************************************************************** +// INTERFACE CONFIGURATION MACROS +//************************************************************************** + +#define MCFG_INTVECS_CONTROL_PORT_ADD(_tag, _slot_intf, _def_slot) \ + MCFG_DEVICE_ADD(_tag, INTVECS_CONTROL_PORT, 0) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) + + + void intvecs_control_port_devices(device_slot_interface &device); -- cgit v1.2.3-70-g09d2