diff options
Diffstat (limited to 'src/mame/technos/renegade.cpp')
-rw-r--r-- | src/mame/technos/renegade.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/mame/technos/renegade.cpp b/src/mame/technos/renegade.cpp index 61c4706cf28..0b064a38fc7 100644 --- a/src/mame/technos/renegade.cpp +++ b/src/mame/technos/renegade.cpp @@ -156,12 +156,12 @@ public: void renegade(machine_config &config); void kuniokunb(machine_config &config); - DECLARE_CUSTOM_INPUT_MEMBER(mcu_status_r); + ioport_value mcu_status_r(); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); protected: - virtual void machine_start() override; - virtual void machine_reset() override; + virtual void machine_start() override ATTR_COLD; + virtual void machine_reset() override ATTR_COLD; private: required_device<cpu_device> m_maincpu; @@ -210,9 +210,9 @@ private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); - void renegade_map(address_map &map); - void renegade_nomcu_map(address_map &map); - void renegade_sound_map(address_map &map); + void renegade_map(address_map &map) ATTR_COLD; + void renegade_nomcu_map(address_map &map) ATTR_COLD; + void renegade_sound_map(address_map &map) ATTR_COLD; }; @@ -439,7 +439,7 @@ uint8_t renegade_state::mcu_reset_r() return 0; } -CUSTOM_INPUT_MEMBER(renegade_state::mcu_status_r) +ioport_value renegade_state::mcu_status_r() { if (m_mcu.found()) { @@ -464,11 +464,11 @@ TIMER_DEVICE_CALLBACK_MEMBER(renegade_state::interrupt) { int const scanline = param; - // NMI 8 lines before vsync + // NMI: 8 lines before vsync if (scanline == 265) m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); - // IRQ 16 clocks per frame: once every 16 lines, but increases to 24 lines during vblank + // IRQ: 16 clocks per frame: once every 16 lines, but increases to 24 lines during vblank // (lines 16,40,56,72,88,104,120,136,152,168,184,200,216,232,248,264) if (scanline == 0x10 || (scanline > 0x20 && (scanline & 0xf) == 8)) m_maincpu->set_input_line(0, ASSERT_LINE); @@ -549,8 +549,8 @@ static INPUT_PORTS_START( renegade ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 Left Attack") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 Jump") - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, renegade_state, coin_inserted, 0) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED_MEMBER(DEVICE_SELF, renegade_state, coin_inserted, 1) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(renegade_state::coin_inserted), 0) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(renegade_state::coin_inserted), 1) PORT_START("DSW2") /* DIP2 */ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2") @@ -560,8 +560,8 @@ static INPUT_PORTS_START( renegade ) PORT_DIPSETTING( 0x00, DEF_STR( Very_Hard ) ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_NAME("P1 Right Attack") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 Right Attack") - PORT_BIT( 0x30, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(renegade_state, mcu_status_r) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_VBLANK("screen") + PORT_BIT( 0x30, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(FUNC(renegade_state::mcu_status_r)) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("screen", FUNC(screen_device::vblank)) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_START("DSW1") /* DIP1 */ |