Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-05 13:54:42 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

mario.cpp: Replace MCFG_CPU_VBLANK_INT with MCFG_SCREEN_VBLANK_CALLBACK (nw)

Browse Source
This commit is contained in:
AJR 2018-03-28 13:08:26 -04:00
parent 5331619114
commit 78ca953cf6
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mame/drivers/mario.cpp
View File

@ -329,10 +329,10 @@ GFXDECODE_END
* *
*************************************/ *************************************/
INTERRUPT_GEN_MEMBER(mario_state::vblank_irq) WRITE_LINE_MEMBER(mario_state::vblank_irq)
{ {
if(m_nmi_mask) if (state && m_nmi_mask)
device.execute().set_input_line(INPUT_LINE_NMI, ASSERT_LINE); m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
} }
MACHINE_CONFIG_START(mario_state::mario_base) MACHINE_CONFIG_START(mario_state::mario_base)
@ -341,7 +341,6 @@ MACHINE_CONFIG_START(mario_state::mario_base)
MCFG_CPU_ADD("maincpu", Z80, Z80_CLOCK) /* verified on pcb */ MCFG_CPU_ADD("maincpu", Z80, Z80_CLOCK) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(mario_map) MCFG_CPU_PROGRAM_MAP(mario_map)
MCFG_CPU_IO_MAP(mario_io_map) MCFG_CPU_IO_MAP(mario_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", mario_state, vblank_irq)
/* devices */ /* devices */
MCFG_DEVICE_ADD("z80dma", Z80DMA, Z80_CLOCK) MCFG_DEVICE_ADD("z80dma", Z80DMA, Z80_CLOCK)
@ -364,6 +363,8 @@ MACHINE_CONFIG_START(mario_state::mario_base)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(mario_state, screen_update) MCFG_SCREEN_UPDATE_DRIVER(mario_state, screen_update)
MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mario_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", mario) MCFG_GFXDECODE_ADD("gfxdecode", "palette", mario)
MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_INIT_OWNER(mario_state, mario) MCFG_PALETTE_INIT_OWNER(mario_state, mario)

2
src/mame/includes/mario.h
View File

@ -131,7 +131,7 @@ public:
virtual void sound_reset() override; virtual void sound_reset() override;
DECLARE_PALETTE_INIT(mario); DECLARE_PALETTE_INIT(mario);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(vblank_irq); DECLARE_WRITE_LINE_MEMBER(vblank_irq);
DECLARE_WRITE8_MEMBER(mario_sh_sound_w); DECLARE_WRITE8_MEMBER(mario_sh_sound_w);
DECLARE_WRITE8_MEMBER(mario_sh1_w); DECLARE_WRITE8_MEMBER(mario_sh1_w);
DECLARE_WRITE8_MEMBER(mario_sh2_w); DECLARE_WRITE8_MEMBER(mario_sh2_w);