summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Angelo Salese <angelosa@users.noreply.github.com>2011-12-07 15:03:26 +0000
committer Angelo Salese <angelosa@users.noreply.github.com>2011-12-07 15:03:26 +0000
commitdd3f938e0ba48bdd2ec7fc4d57bdbf4cca84369c (patch)
tree2eac13fb6714e3c1a11ec343c784deb5b69729a6
parent72212fbbba5d9909686d9d03ea99de25a61dae5e (diff)
Fixed IRQ and NMI generation in Joyful Road driver according to schematics [Tomasz Slanina]
-rw-r--r--src/mame/drivers/munchmo.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c
index 1911eeae4d5..0d6e30f0ae3 100644
--- a/src/mame/drivers/munchmo.c
+++ b/src/mame/drivers/munchmo.c
@@ -41,15 +41,15 @@ static WRITE8_HANDLER( mnchmobl_nmi_enable_w )
state->m_nmi_enable = data;
}
-static TIMER_DEVICE_CALLBACK( mnchmobl_interrupt )
+/* trusted thru schematics, NMI and IRQ triggers at vblank, at the same time (!) */
+static INTERRUPT_GEN( mnchmobl_vblank_irq )
{
- munchmo_state *state = timer.machine().driver_data<munchmo_state>();
- int scanline = param;
+ munchmo_state *state = device->machine().driver_data<munchmo_state>();
- if (scanline == 240)
- device_set_input_line(state->m_maincpu, 0, HOLD_LINE);
- else if (state->m_nmi_enable && scanline == 0)
+ if (state->m_nmi_enable)
device_set_input_line(state->m_maincpu, INPUT_LINE_NMI, PULSE_LINE);
+
+ device_set_input_line(state->m_maincpu, 0, HOLD_LINE);
}
static INTERRUPT_GEN( mnchmobl_sound_irq )
@@ -328,7 +328,7 @@ static MACHINE_CONFIG_START( mnchmobl, munchmo_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_15MHz/4) /* ? */
MCFG_CPU_PROGRAM_MAP(mnchmobl_map)
- MCFG_TIMER_ADD_SCANLINE("scantimer", mnchmobl_interrupt, "screen", 0, 1)
+ MCFG_CPU_VBLANK_INT("screen", mnchmobl_vblank_irq)
MCFG_CPU_ADD("audiocpu", Z80, XTAL_15MHz/4) /* ? */
MCFG_CPU_PROGRAM_MAP(sound_map)