From 3e06c32874abbf68298c8dd222fa20b1d50ace96 Mon Sep 17 00:00:00 2001 From: hap Date: Sun, 11 Dec 2022 23:50:38 +0100 Subject: [PATCH] vendetta: change set_vblank_int to screen_vblank --- src/mame/konami/aliens.cpp | 2 +- src/mame/konami/parodius.cpp | 2 +- src/mame/konami/rollerg.cpp | 2 +- src/mame/konami/surpratk.cpp | 2 +- src/mame/konami/vendetta.cpp | 13 ++++++------- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/mame/konami/aliens.cpp b/src/mame/konami/aliens.cpp index 76c5c117761..f9f956e3adb 100644 --- a/src/mame/konami/aliens.cpp +++ b/src/mame/konami/aliens.cpp @@ -17,7 +17,7 @@ Preliminary driver by: #include "k052109.h" #include "konamipt.h" -#include "cpu/m6809/konami.h" // for the callback and the firq irq definition +#include "cpu/m6809/konami.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" diff --git a/src/mame/konami/parodius.cpp b/src/mame/konami/parodius.cpp index b1bc5be69b1..cc6de530c28 100644 --- a/src/mame/konami/parodius.cpp +++ b/src/mame/konami/parodius.cpp @@ -16,7 +16,7 @@ #include "k053251.h" #include "konami_helper.h" -#include "cpu/m6809/konami.h" // for the callback and the firq irq definition +#include "cpu/m6809/konami.h" #include "cpu/z80/z80.h" #include "machine/bankdev.h" #include "machine/watchdog.h" diff --git a/src/mame/konami/rollerg.cpp b/src/mame/konami/rollerg.cpp index c083846b297..81fc40b1e63 100644 --- a/src/mame/konami/rollerg.cpp +++ b/src/mame/konami/rollerg.cpp @@ -17,7 +17,7 @@ #include "k053244_k053245.h" #include "konami_helper.h" -#include "cpu/m6809/konami.h" // for the callback and the firq irq definition +#include "cpu/m6809/konami.h" #include "cpu/z80/z80.h" #include "machine/k053252.h" #include "machine/watchdog.h" diff --git a/src/mame/konami/surpratk.cpp b/src/mame/konami/surpratk.cpp index d054322cd9f..6b46f33a3a9 100644 --- a/src/mame/konami/surpratk.cpp +++ b/src/mame/konami/surpratk.cpp @@ -18,7 +18,7 @@ #include "k053251.h" #include "konami_helper.h" -#include "cpu/m6809/konami.h" // for the callback and the FIRQ IRQ definition +#include "cpu/m6809/konami.h" #include "machine/bankdev.h" #include "machine/watchdog.h" #include "sound/ymopm.h" diff --git a/src/mame/konami/vendetta.cpp b/src/mame/konami/vendetta.cpp index 78d06bea5e0..d59f8752b4c 100644 --- a/src/mame/konami/vendetta.cpp +++ b/src/mame/konami/vendetta.cpp @@ -96,7 +96,7 @@ #include "k054000.h" #include "konami_helper.h" -#include "cpu/m6809/konami.h" // for the callback and the firq irq definition +#include "cpu/m6809/konami.h" #include "cpu/z80/z80.h" #include "machine/eepromser.h" #include "machine/k053252.h" @@ -172,11 +172,10 @@ private: void z80_nmi_w(int state); void z80_irq_w(uint8_t data = 0); uint8_t z80_irq_r(); + void vblank_irq(int state); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - INTERRUPT_GEN_MEMBER(irq); - K052109_CB_MEMBER(vendetta_tile_callback); K052109_CB_MEMBER(esckids_tile_callback); void banking_callback(uint8_t data); @@ -550,10 +549,10 @@ INPUT_PORTS_END ***************************************************************************/ -INTERRUPT_GEN_MEMBER(vendetta_state::irq) +void vendetta_state::vblank_irq(int state) { - if (m_irq_enabled) - device.execute().set_input_line(KONAMI_IRQ_LINE, ASSERT_LINE); + if (state && m_irq_enabled) + m_maincpu->set_input_line(KONAMI_IRQ_LINE, ASSERT_LINE); } void vendetta_state::machine_start() @@ -598,7 +597,6 @@ void vendetta_state::vendetta(machine_config &config) // basic machine hardware KONAMI(config, m_maincpu, XTAL(24'000'000) / 8); // 052001 (verified on PCB) m_maincpu->set_addrmap(AS_PROGRAM, &vendetta_state::main_map); - m_maincpu->set_vblank_int("screen", FUNC(vendetta_state::irq)); m_maincpu->line().set(FUNC(vendetta_state::banking_callback)); Z80(config, m_audiocpu, XTAL(3'579'545)); // verified with PCB @@ -616,6 +614,7 @@ void vendetta_state::vendetta(machine_config &config) screen.set_visarea(13*8, (64-13)*8-1, 2*8, 30*8-1); screen.set_screen_update(FUNC(vendetta_state::screen_update)); screen.set_palette(m_palette); + screen.screen_vblank().set(FUNC(vendetta_state::vblank_irq)); PALETTE(config, m_palette).set_format(palette_device::xBGR_555, 2048); m_palette->enable_shadows();