summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2018-03-28 18:52:00 -0400
committer AJR <ajrhacker@users.noreply.github.com>2018-03-28 18:52:00 -0400
commit46e70f8c2652f18876be3f593d4d48b435d98ecf (patch)
treec5fa5c87b7fc1dffaf8475b91ad3ba2740417a9d
parent90b896f99255de0edded9eef726d3c5b62ef7dfb (diff)
kchamp.cpp: Use MCFG_SCREEN_VBLANK_CALLBACK instead of MCFG_CPU_VBLANK_INT (nw)
-rw-r--r--src/mame/drivers/kchamp.cpp10
-rw-r--r--src/mame/includes/kchamp.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mame/drivers/kchamp.cpp b/src/mame/drivers/kchamp.cpp
index bd2d3391395..53b9f3186b8 100644
--- a/src/mame/drivers/kchamp.cpp
+++ b/src/mame/drivers/kchamp.cpp
@@ -355,10 +355,10 @@ GFXDECODE_END
-INTERRUPT_GEN_MEMBER(kchamp_state::kc_interrupt)
+WRITE_LINE_MEMBER(kchamp_state::vblank_irq)
{
- if (m_nmi_enable)
- device.execute().set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
+ if (state && m_nmi_enable)
+ m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
}
WRITE_LINE_MEMBER(kchamp_state::msmint)
@@ -410,7 +410,6 @@ MACHINE_CONFIG_START(kchamp_state::kchampvs)
MCFG_CPU_PROGRAM_MAP(kchampvs_map)
MCFG_CPU_IO_MAP(kchampvs_io_map)
MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", kchamp_state, kc_interrupt)
MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(kchampvs_sound_map)
@@ -432,6 +431,7 @@ MACHINE_CONFIG_START(kchamp_state::kchampvs)
MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(kchamp_state, screen_update_kchampvs)
MCFG_SCREEN_PALETTE("palette")
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(kchamp_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", kchamp)
MCFG_PALETTE_ADD("palette", 256)
@@ -469,7 +469,6 @@ MACHINE_CONFIG_START(kchamp_state::kchamp)
MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/4) /* 12MHz / 4 = 3.0 MHz */
MCFG_CPU_PROGRAM_MAP(kchamp_map)
MCFG_CPU_IO_MAP(kchamp_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", kchamp_state, kc_interrupt)
MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/4) /* 12MHz / 4 = 3.0 MHz */
MCFG_CPU_PROGRAM_MAP(kchamp_sound_map)
@@ -492,6 +491,7 @@ MACHINE_CONFIG_START(kchamp_state::kchamp)
MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(kchamp_state, screen_update_kchamp)
MCFG_SCREEN_PALETTE("palette")
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(kchamp_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", kchamp)
MCFG_PALETTE_ADD("palette", 256)
diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h
index cc997ff2c54..f21f4016972 100644
--- a/src/mame/includes/kchamp.h
+++ b/src/mame/includes/kchamp.h
@@ -75,7 +75,7 @@ public:
DECLARE_MACHINE_START(kchamp);
uint32_t screen_update_kchampvs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_kchamp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- INTERRUPT_GEN_MEMBER(kc_interrupt);
+ DECLARE_WRITE_LINE_MEMBER(vblank_irq);
INTERRUPT_GEN_MEMBER(sound_int);
void kchamp_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
void kchampvs_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );