diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2018-03-28 15:13:45 -0400 |
---|---|---|
committer | AJR <ajrhacker@users.noreply.github.com> | 2018-03-28 15:13:47 -0400 |
commit | 86167807063cd18b4d944ce62569d9cfd9cbbd46 (patch) | |
tree | aafe0c4ad2b8c6ad0c1d4f7d702ecea3dfd8c6b3 | |
parent | f39d7df5fee0ff360bc127403c0a6d20131bf0e0 (diff) |
toaplan1.cpp: Use MCFG_SCREEN_VBLANK_CALLBACK instead of MCFG_CPU_VBLANK_INT (nw)
-rw-r--r-- | src/mame/drivers/toaplan1.cpp | 9 | ||||
-rw-r--r-- | src/mame/includes/toaplan1.h | 2 | ||||
-rw-r--r-- | src/mame/machine/toaplan1.cpp | 4 | ||||
-rw-r--r-- | src/mame/video/toaplan1.cpp | 3 |
4 files changed, 6 insertions, 12 deletions
diff --git a/src/mame/drivers/toaplan1.cpp b/src/mame/drivers/toaplan1.cpp index ffe0db02351..4144b29e5aa 100644 --- a/src/mame/drivers/toaplan1.cpp +++ b/src/mame/drivers/toaplan1.cpp @@ -1914,7 +1914,6 @@ MACHINE_CONFIG_START(toaplan1_rallybik_state::rallybik) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) MCFG_CPU_PROGRAM_MAP(rallybik_main_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", toaplan1_state, toaplan1_interrupt) MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'000'000)/8) MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map) @@ -1960,7 +1959,6 @@ MACHINE_CONFIG_START(toaplan1_state::truxton) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) MCFG_CPU_PROGRAM_MAP(truxton_main_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", toaplan1_state, toaplan1_interrupt) MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'000'000)/8) MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map) @@ -1998,7 +1996,6 @@ MACHINE_CONFIG_START(toaplan1_state::hellfire) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) MCFG_CPU_PROGRAM_MAP(hellfire_main_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", toaplan1_state, toaplan1_interrupt) MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'000'000)/8) MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map) @@ -2036,7 +2033,6 @@ MACHINE_CONFIG_START(toaplan1_state::zerowing) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) MCFG_CPU_PROGRAM_MAP(zerowing_main_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", toaplan1_state, toaplan1_interrupt) MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'000'000)/8) MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map) @@ -2074,7 +2070,6 @@ MACHINE_CONFIG_START(toaplan1_state::demonwld) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) MCFG_CPU_PROGRAM_MAP(demonwld_main_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", toaplan1_state, toaplan1_interrupt) MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'000'000)/8) MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map) @@ -2117,7 +2112,6 @@ MACHINE_CONFIG_START(toaplan1_state::samesame) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) MCFG_CPU_PROGRAM_MAP(samesame_main_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", toaplan1_state, toaplan1_interrupt) MCFG_CPU_ADD("audiocpu", Z180, XTAL(28'000'000)/8) /* HD647180XOFS6 CPU */ MCFG_CPU_PROGRAM_MAP(samesame_hd647180_mem_map) @@ -2155,7 +2149,6 @@ MACHINE_CONFIG_START(toaplan1_state::outzone) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) MCFG_CPU_PROGRAM_MAP(outzone_main_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", toaplan1_state, toaplan1_interrupt) MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'000'000)/8) MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map) @@ -2193,7 +2186,6 @@ MACHINE_CONFIG_START(toaplan1_state::outzonecv) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) MCFG_CPU_PROGRAM_MAP(outzonecv_main_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", toaplan1_state, toaplan1_interrupt) MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'000'000)/8) MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map) @@ -2231,7 +2223,6 @@ MACHINE_CONFIG_START(toaplan1_state::vimana) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(vimana_main_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", toaplan1_state, toaplan1_interrupt) MCFG_CPU_ADD("audiocpu", Z180, XTAL(28'000'000)/8) /* HD647180XOFS6 CPU */ MCFG_CPU_PROGRAM_MAP(vimana_hd647180_mem_map) diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h index 0852639f980..f1bf33cb6e9 100644 --- a/src/mame/includes/toaplan1.h +++ b/src/mame/includes/toaplan1.h @@ -142,7 +142,7 @@ public: DECLARE_WRITE_LINE_MEMBER(screen_vblank_toaplan1); DECLARE_WRITE_LINE_MEMBER(screen_vblank_samesame); - INTERRUPT_GEN_MEMBER(toaplan1_interrupt); + void toaplan1_interrupt(); void demonwld_restore_dsp(); void toaplan1_create_tilemaps(); diff --git a/src/mame/machine/toaplan1.cpp b/src/mame/machine/toaplan1.cpp index 1c87fe201ce..6de67320533 100644 --- a/src/mame/machine/toaplan1.cpp +++ b/src/mame/machine/toaplan1.cpp @@ -12,10 +12,10 @@ #include "includes/toaplan1.h" -INTERRUPT_GEN_MEMBER(toaplan1_state::toaplan1_interrupt) +void toaplan1_state::toaplan1_interrupt() { if (m_intenable) - device.execute().set_input_line(4, HOLD_LINE); + m_maincpu->set_input_line(4, HOLD_LINE); } WRITE16_MEMBER(toaplan1_state::toaplan1_intenable_w) diff --git a/src/mame/video/toaplan1.cpp b/src/mame/video/toaplan1.cpp index db50ee4b8b7..190b0a5c6f5 100644 --- a/src/mame/video/toaplan1.cpp +++ b/src/mame/video/toaplan1.cpp @@ -993,6 +993,7 @@ WRITE_LINE_MEMBER(toaplan1_rallybik_state::screen_vblank_rallybik) if (state) { memcpy(m_buffered_spriteram.get(), m_spriteram, m_spriteram.bytes()); + toaplan1_interrupt(); } } @@ -1003,6 +1004,7 @@ WRITE_LINE_MEMBER(toaplan1_state::screen_vblank_toaplan1) { memcpy(m_buffered_spriteram.get(), m_spriteram, m_spriteram.bytes()); memcpy(m_buffered_spritesizeram16.get(), m_spritesizeram16.get(), TOAPLAN1_SPRITESIZERAM_SIZE); + toaplan1_interrupt(); } } @@ -1013,6 +1015,7 @@ WRITE_LINE_MEMBER(toaplan1_state::screen_vblank_samesame) { memcpy(m_buffered_spriteram.get(), m_spriteram, m_spriteram.bytes()); memcpy(m_buffered_spritesizeram16.get(), m_spritesizeram16.get(), TOAPLAN1_SPRITESIZERAM_SIZE); + toaplan1_interrupt(); m_maincpu->set_input_line(M68K_IRQ_2, HOLD_LINE); /* Frame done */ } } |