From 8773b0f0008104c353d344e17c5d93a7a4ea1a1f Mon Sep 17 00:00:00 2001 From: AJR Date: Tue, 18 Oct 2022 17:26:23 -0400 Subject: a2600.cpp: Eliminate legacy tag macros --- src/mame/atari/a2600.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/mame/atari/a2600.cpp b/src/mame/atari/a2600.cpp index 56f8ff47553..69518574b9b 100644 --- a/src/mame/atari/a2600.cpp +++ b/src/mame/atari/a2600.cpp @@ -131,9 +131,6 @@ namespace { static const uint16_t supported_screen_heights[4] = { 262, 312, 328, 342 }; -#define CONTROL1_TAG "joyport1" -#define CONTROL2_TAG "joyport2" - class a2600_base_state : public driver_device { protected: @@ -143,8 +140,8 @@ protected: m_tia(*this, "tia_video"), m_maincpu(*this, "maincpu"), m_riot(*this, "riot"), - m_joy1(*this, CONTROL1_TAG), - m_joy2(*this, CONTROL2_TAG), + m_joy1(*this, "joyport1"), + m_joy2(*this, "joyport2"), m_screen(*this, "screen"), m_xtal(xtal) { } @@ -655,8 +652,8 @@ void a2600_base_state::a2600_base_ntsc(machine_config &config) m_riot->irq_callback().set(FUNC(a2600_state::irq_callback)); #endif - VCS_CONTROL_PORT(config, CONTROL1_TAG, vcs_control_port_devices, "joy"); - VCS_CONTROL_PORT(config, CONTROL2_TAG, vcs_control_port_devices, "joy"); + VCS_CONTROL_PORT(config, m_joy1, vcs_control_port_devices, "joy"); + VCS_CONTROL_PORT(config, m_joy2, vcs_control_port_devices, "joy"); } @@ -697,8 +694,8 @@ void a2600_base_state::a2600_base_pal(machine_config &config) m_riot->irq_callback().set(FUNC(a2600_state::irq_callback)); #endif - VCS_CONTROL_PORT(config, CONTROL1_TAG, vcs_control_port_devices, "joy"); - VCS_CONTROL_PORT(config, CONTROL2_TAG, vcs_control_port_devices, "joy"); + VCS_CONTROL_PORT(config, m_joy1, vcs_control_port_devices, "joy"); + VCS_CONTROL_PORT(config, m_joy2, vcs_control_port_devices, "joy"); } -- cgit v1.2.3