From 78ca953cf6005a02806591e3e8d0e86d03655b2d Mon Sep 17 00:00:00 2001 From: AJR Date: Wed, 28 Mar 2018 13:08:26 -0400 Subject: mario.cpp: Replace MCFG_CPU_VBLANK_INT with MCFG_SCREEN_VBLANK_CALLBACK (nw) --- src/mame/drivers/mario.cpp | 9 +++++---- src/mame/includes/mario.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mame/drivers/mario.cpp b/src/mame/drivers/mario.cpp index 829ea517a34..efdc3a5d876 100644 --- a/src/mame/drivers/mario.cpp +++ b/src/mame/drivers/mario.cpp @@ -329,10 +329,10 @@ GFXDECODE_END * *************************************/ -INTERRUPT_GEN_MEMBER(mario_state::vblank_irq) +WRITE_LINE_MEMBER(mario_state::vblank_irq) { - if(m_nmi_mask) - device.execute().set_input_line(INPUT_LINE_NMI, ASSERT_LINE); + if (state && m_nmi_mask) + m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } MACHINE_CONFIG_START(mario_state::mario_base) @@ -341,7 +341,6 @@ MACHINE_CONFIG_START(mario_state::mario_base) MCFG_CPU_ADD("maincpu", Z80, Z80_CLOCK) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(mario_map) MCFG_CPU_IO_MAP(mario_io_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", mario_state, vblank_irq) /* devices */ MCFG_DEVICE_ADD("z80dma", Z80DMA, Z80_CLOCK) @@ -364,6 +363,8 @@ MACHINE_CONFIG_START(mario_state::mario_base) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) MCFG_SCREEN_UPDATE_DRIVER(mario_state, screen_update) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mario_state, vblank_irq)) + MCFG_GFXDECODE_ADD("gfxdecode", "palette", mario) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(mario_state, mario) diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h index e506aa92f84..12509fc39c4 100644 --- a/src/mame/includes/mario.h +++ b/src/mame/includes/mario.h @@ -131,7 +131,7 @@ public: virtual void sound_reset() override; DECLARE_PALETTE_INIT(mario); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - INTERRUPT_GEN_MEMBER(vblank_irq); + DECLARE_WRITE_LINE_MEMBER(vblank_irq); DECLARE_WRITE8_MEMBER(mario_sh_sound_w); DECLARE_WRITE8_MEMBER(mario_sh1_w); DECLARE_WRITE8_MEMBER(mario_sh2_w); -- cgit v1.2.3