diff options
Diffstat (limited to 'src/mame/atari/tempest.cpp')
-rw-r--r-- | src/mame/atari/tempest.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mame/atari/tempest.cpp b/src/mame/atari/tempest.cpp index 226d9a5f6ae..273ab8fcd5b 100644 --- a/src/mame/atari/tempest.cpp +++ b/src/mame/atari/tempest.cpp @@ -322,8 +322,8 @@ public: void tempest(machine_config &config); - DECLARE_CUSTOM_INPUT_MEMBER(tempest_knob_r); - DECLARE_CUSTOM_INPUT_MEMBER(tempest_buttons_r); + ioport_value tempest_knob_r(); + ioport_value tempest_buttons_r(); int clock_r(); protected: @@ -339,8 +339,8 @@ protected: uint8_t rom_ae1f_r(); - virtual void machine_start() override; - void main_map(address_map &map); + virtual void machine_start() override ATTR_COLD; + void main_map(address_map &map) ATTR_COLD; required_device<cpu_device> m_maincpu; required_device<mathbox_device> m_mathbox; @@ -385,12 +385,12 @@ void tempest_state::wdclr_w(uint8_t data) * *************************************/ -CUSTOM_INPUT_MEMBER(tempest_state::tempest_knob_r) +ioport_value tempest_state::tempest_knob_r() { return (m_player_select == 0) ? m_knob_p1->read() : m_knob_p2->read(); } -CUSTOM_INPUT_MEMBER(tempest_state::tempest_buttons_r) +ioport_value tempest_state::tempest_buttons_r() { return (m_player_select == 0) ? m_buttons_p1->read() : m_buttons_p2->read(); } @@ -529,12 +529,12 @@ static INPUT_PORTS_START( tempest ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Diagnostic Step") /* bit 6 is the VG HALT bit. We set it to "low" */ /* per default (busy vector processor). */ - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("avg", avg_device, done_r) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("avg", FUNC(avg_device::done_r)) /* bit 7 is tied to a 3kHz (?) clock */ - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(tempest_state, clock_r) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(FUNC(tempest_state::clock_r)) PORT_START("IN1_DSW0") - PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(tempest_state, tempest_knob_r) + PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(FUNC(tempest_state::tempest_knob_r)) /* The next one is reponsible for cocktail mode. * According to the documentation, this is not a switch, although * it may have been planned to put it on the Math Box PCB, D/E2 ) @@ -555,7 +555,7 @@ static INPUT_PORTS_START( tempest ) PORT_DIPNAME( 0x04, 0x04, "Rating" ) PORT_DIPLOCATION("DE2:2") PORT_DIPSETTING( 0x04, "1, 3, 5, 7, 9" ) PORT_DIPSETTING( 0x00, "tied to high score" ) - PORT_BIT(0x18, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(tempest_state, tempest_buttons_r) + PORT_BIT(0x18, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(FUNC(tempest_state::tempest_buttons_r)) PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) |