From d204b2ecd7a8a13e94a1e11145ec7ebee214abc0 Mon Sep 17 00:00:00 2001 From: AJR Date: Wed, 28 Mar 2018 12:55:13 -0400 Subject: pooyan.cpp, rocnrope.cpp: Replace MCFG_CPU_VBLANK_INT with MCFG_SCREEN_VBLANK_CALLBACK (nw) --- src/mame/drivers/pooyan.cpp | 8 ++++---- src/mame/drivers/rocnrope.cpp | 10 +++++----- src/mame/includes/pooyan.h | 2 +- src/mame/includes/rocnrope.h | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/mame/drivers/pooyan.cpp b/src/mame/drivers/pooyan.cpp index a45a8f749fa..8d289b4538c 100644 --- a/src/mame/drivers/pooyan.cpp +++ b/src/mame/drivers/pooyan.cpp @@ -31,10 +31,10 @@ * *************************************/ -INTERRUPT_GEN_MEMBER(pooyan_state::interrupt) +WRITE_LINE_MEMBER(pooyan_state::vblank_irq) { - if (m_irq_enable) - device.execute().set_input_line(INPUT_LINE_NMI, ASSERT_LINE); + if (state && m_irq_enable) + m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } @@ -198,7 +198,6 @@ MACHINE_CONFIG_START(pooyan_state::pooyan) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2) MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", pooyan_state, interrupt) MCFG_DEVICE_ADD("mainlatch", LS259, 0) // B2 MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(pooyan_state, irq_enable_w)) @@ -218,6 +217,7 @@ MACHINE_CONFIG_START(pooyan_state::pooyan) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(pooyan_state, screen_update) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(pooyan_state, vblank_irq)) MCFG_GFXDECODE_ADD("gfxdecode", "palette", pooyan) MCFG_PALETTE_ADD("palette", 16*16+16*16) diff --git a/src/mame/drivers/rocnrope.cpp b/src/mame/drivers/rocnrope.cpp index a67c0aefebe..08081b9bf94 100644 --- a/src/mame/drivers/rocnrope.cpp +++ b/src/mame/drivers/rocnrope.cpp @@ -41,7 +41,7 @@ WRITE_LINE_MEMBER(rocnrope_state::irq_mask_w) { m_irq_mask = state; if (!m_irq_mask) - m_maincpu->set_input_line(0, CLEAR_LINE); + m_maincpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); } WRITE_LINE_MEMBER(rocnrope_state::coin_counter_1_w) @@ -200,10 +200,10 @@ GFXDECODE_END * *************************************/ -INTERRUPT_GEN_MEMBER(rocnrope_state::vblank_irq) +WRITE_LINE_MEMBER(rocnrope_state::vblank_irq) { - if (m_irq_mask) - device.execute().set_input_line(0, ASSERT_LINE); + if (state && m_irq_mask) + m_maincpu->set_input_line(M6809_IRQ_LINE, ASSERT_LINE); } MACHINE_CONFIG_START(rocnrope_state::rocnrope) @@ -211,7 +211,6 @@ MACHINE_CONFIG_START(rocnrope_state::rocnrope) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", KONAMI1, MASTER_CLOCK / 3 / 4) /* Verified in schematics */ MCFG_CPU_PROGRAM_MAP(rocnrope_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", rocnrope_state, vblank_irq) MCFG_DEVICE_ADD("mainlatch", LS259, 0) // B2 MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(rocnrope_state, flip_screen_w)) @@ -231,6 +230,7 @@ MACHINE_CONFIG_START(rocnrope_state::rocnrope) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(rocnrope_state, screen_update_rocnrope) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(rocnrope_state, vblank_irq)) MCFG_GFXDECODE_ADD("gfxdecode", "palette", rocnrope) MCFG_PALETTE_ADD("palette", 16*16+16*16) diff --git a/src/mame/includes/pooyan.h b/src/mame/includes/pooyan.h index 17f96fa78f2..f80e7599adc 100644 --- a/src/mame/includes/pooyan.h +++ b/src/mame/includes/pooyan.h @@ -46,7 +46,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); - INTERRUPT_GEN_MEMBER(interrupt); + DECLARE_WRITE_LINE_MEMBER(vblank_irq); void pooyan(machine_config &config); void main_map(address_map &map); }; diff --git a/src/mame/includes/rocnrope.h b/src/mame/includes/rocnrope.h index 2c9d12ba521..8504279460f 100644 --- a/src/mame/includes/rocnrope.h +++ b/src/mame/includes/rocnrope.h @@ -41,7 +41,7 @@ public: virtual void video_start() override; DECLARE_PALETTE_INIT(rocnrope); uint32_t screen_update_rocnrope(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - INTERRUPT_GEN_MEMBER(vblank_irq); + DECLARE_WRITE_LINE_MEMBER(vblank_irq); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); void rocnrope(machine_config &config); void rocnrope_map(address_map &map); -- cgit v1.2.3