diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/sms_ctrl/multitap.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/sms_ctrl/multitap.cpp')
-rw-r--r-- | src/devices/bus/sms_ctrl/multitap.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/devices/bus/sms_ctrl/multitap.cpp b/src/devices/bus/sms_ctrl/multitap.cpp index 88dbe01acf4..56e7144cbd5 100644 --- a/src/devices/bus/sms_ctrl/multitap.cpp +++ b/src/devices/bus/sms_ctrl/multitap.cpp @@ -129,16 +129,15 @@ READ32_MEMBER( sms_multitap_device::pixel_r ) } -void sms_multitap_device::device_add_mconfig(machine_config &config) -{ +MACHINE_CONFIG_START(sms_multitap_device::device_add_mconfig) // Controller subports setup, without the TH callback declaration, // because the circuit scheme shows TH of subports without connection. - SMS_CONTROL_PORT(config, m_subctrl1_port, sms_control_port_devices, "joypad"); - m_subctrl1_port->pixel_handler().set(FUNC(sms_multitap_device::pixel_r)); - SMS_CONTROL_PORT(config, m_subctrl2_port, sms_control_port_devices, "joypad"); - m_subctrl2_port->pixel_handler().set(FUNC(sms_multitap_device::pixel_r)); - SMS_CONTROL_PORT(config, m_subctrl3_port, sms_control_port_devices, "joypad"); - m_subctrl3_port->pixel_handler().set(FUNC(sms_multitap_device::pixel_r)); - SMS_CONTROL_PORT(config, m_subctrl4_port, sms_control_port_devices, "joypad"); - m_subctrl4_port->pixel_handler().set(FUNC(sms_multitap_device::pixel_r)); -} + MCFG_SMS_CONTROL_PORT_ADD("ctrl1", sms_control_port_devices, "joypad") + MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(*this, sms_multitap_device, pixel_r)) + MCFG_SMS_CONTROL_PORT_ADD("ctrl2", sms_control_port_devices, "joypad") + MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(*this, sms_multitap_device, pixel_r)) + MCFG_SMS_CONTROL_PORT_ADD("ctrl3", sms_control_port_devices, "joypad") + MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(*this, sms_multitap_device, pixel_r)) + MCFG_SMS_CONTROL_PORT_ADD("ctrl4", sms_control_port_devices, "joypad") + MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(*this, sms_multitap_device, pixel_r)) +MACHINE_CONFIG_END |