From 9976426baf185d5d3db2811ad7395e9b8a6656eb Mon Sep 17 00:00:00 2001 From: AJR Date: Wed, 28 Mar 2018 16:03:24 -0400 Subject: [PATCH] brkthru.cpp: Use MCFG_SCREEN_VBLANK_CALLBACK instead of MCFG_CPU_VBLANK_INT (nw) --- src/mame/drivers/brkthru.cpp | 10 +++++----- src/mame/includes/brkthru.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mame/drivers/brkthru.cpp b/src/mame/drivers/brkthru.cpp index 8f161310042..3c389b6375d 100644 --- a/src/mame/drivers/brkthru.cpp +++ b/src/mame/drivers/brkthru.cpp @@ -367,10 +367,10 @@ void brkthru_state::machine_reset() m_nmi_mask = 0; } -INTERRUPT_GEN_MEMBER(brkthru_state::vblank_irq) +WRITE_LINE_MEMBER(brkthru_state::vblank_irq) { - if(m_nmi_mask) - device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); + if (state && m_nmi_mask) + m_maincpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); } MACHINE_CONFIG_START(brkthru_state::brkthru) @@ -378,7 +378,6 @@ MACHINE_CONFIG_START(brkthru_state::brkthru) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", MC6809E, MASTER_CLOCK/8) /* 1.5 MHz ? */ MCFG_CPU_PROGRAM_MAP(brkthru_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", brkthru_state, vblank_irq) MCFG_CPU_ADD("audiocpu", MC6809, MASTER_CLOCK/2) /* 1.5 MHz ? */ MCFG_CPU_PROGRAM_MAP(sound_map) @@ -395,6 +394,7 @@ MACHINE_CONFIG_START(brkthru_state::brkthru) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 384, 8, 248, 272, 8, 248) MCFG_SCREEN_UPDATE_DRIVER(brkthru_state, screen_update_brkthru) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(brkthru_state, vblank_irq)) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -419,7 +419,6 @@ MACHINE_CONFIG_START(brkthru_state::darwin) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */ MCFG_CPU_PROGRAM_MAP(darwin_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", brkthru_state, vblank_irq) MCFG_CPU_ADD("audiocpu", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */ MCFG_CPU_PROGRAM_MAP(sound_map) @@ -447,6 +446,7 @@ MACHINE_CONFIG_START(brkthru_state::darwin) tuned by Shingo SUZUKI(VSyncMAME Project) 2000/10/19 */ MCFG_SCREEN_UPDATE_DRIVER(brkthru_state, screen_update_brkthru) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(brkthru_state, vblank_irq)) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/includes/brkthru.h b/src/mame/includes/brkthru.h index 8e5944e118c..296b4442086 100644 --- a/src/mame/includes/brkthru.h +++ b/src/mame/includes/brkthru.h @@ -56,7 +56,7 @@ public: virtual void video_start() override; DECLARE_PALETTE_INIT(brkthru); uint32_t screen_update_brkthru(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, int prio ); void brkthru(machine_config &config); void darwin(machine_config &config);