diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2018-03-28 13:14:45 -0400 |
---|---|---|
committer | AJR <ajrhacker@users.noreply.github.com> | 2018-03-28 13:14:49 -0400 |
commit | 73f604fe909d86338d1badb1fb93bf2c208b6a41 (patch) | |
tree | 914c8a3035bc80f18c5710bff83b8e59b63ed217 | |
parent | 78ca953cf6005a02806591e3e8d0e86d03655b2d (diff) |
cclimber.cpp: Replace CPU_VBLANK_INT with SCREEN_VBLANK_CALLBACK (nw)
-rw-r--r-- | src/mame/drivers/cclimber.cpp | 22 | ||||
-rw-r--r-- | src/mame/includes/cclimber.h | 4 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/mame/drivers/cclimber.cpp b/src/mame/drivers/cclimber.cpp index 1da22b6ef42..52bbb1bce02 100644 --- a/src/mame/drivers/cclimber.cpp +++ b/src/mame/drivers/cclimber.cpp @@ -1097,16 +1097,16 @@ static GFXDECODE_START( toprollr ) GFXDECODE_ENTRY( "gfx3", 0x0000, cclimber_charlayout, 24*4, 16 ) GFXDECODE_END -INTERRUPT_GEN_MEMBER(cclimber_state::vblank_irq) +WRITE_LINE_MEMBER(cclimber_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); } -INTERRUPT_GEN_MEMBER(cclimber_state::bagmanf_vblank_irq) +WRITE_LINE_MEMBER(cclimber_state::bagmanf_vblank_irq) { - if(m_nmi_mask) - device.execute().set_input_line(0, HOLD_LINE); + if (state && m_nmi_mask) + m_maincpu->set_input_line(0, HOLD_LINE); } MACHINE_CONFIG_START(cclimber_state::root) @@ -1115,7 +1115,6 @@ MACHINE_CONFIG_START(cclimber_state::root) MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2) /* 3.072 MHz */ MCFG_CPU_PROGRAM_MAP(cclimber_map) MCFG_CPU_IO_MAP(cclimber_portmap) - MCFG_CPU_VBLANK_INT_DRIVER("screen", cclimber_state, vblank_irq) MCFG_DEVICE_ADD("mainlatch", LS259, 0) MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cclimber_state, nmi_mask_w)) @@ -1130,6 +1129,7 @@ MACHINE_CONFIG_START(cclimber_state::root) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(cclimber_state, screen_update_cclimber) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cclimber_state, vblank_irq)) MCFG_GFXDECODE_ADD("gfxdecode", "palette", cclimber) MCFG_PALETTE_ADD("palette", 16*4+8*4) @@ -1185,7 +1185,9 @@ MACHINE_CONFIG_START(cclimber_state::bagmanf) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(bagmanf_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", cclimber_state, bagmanf_vblank_irq) + + MCFG_DEVICE_MODIFY("screen") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cclimber_state, bagmanf_vblank_irq)) MACHINE_CONFIG_END @@ -1196,7 +1198,6 @@ MACHINE_CONFIG_START(cclimber_state::yamato) MCFG_CPU_REPLACE("maincpu", SEGA_315_5018, MASTER_CLOCK/3/2) /* 3.072 MHz */ MCFG_CPU_PROGRAM_MAP(yamato_map) MCFG_CPU_IO_MAP(yamato_portmap) - MCFG_CPU_VBLANK_INT_DRIVER("screen", cclimber_state, vblank_irq) MCFG_CPU_OPCODES_MAP(yamato_decrypted_opcodes_map) MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes") @@ -1228,7 +1229,6 @@ MACHINE_CONFIG_START(cclimber_state::toprollr) MCFG_CPU_REPLACE("maincpu", SEGA_315_5018, MASTER_CLOCK/3/2) /* 3.072 MHz */ MCFG_CPU_PROGRAM_MAP(toprollr_map) MCFG_CPU_IO_MAP(cclimber_portmap) - MCFG_CPU_VBLANK_INT_DRIVER("screen", cclimber_state, vblank_irq) MCFG_CPU_OPCODES_MAP(toprollr_decrypted_opcodes_map) MCFG_SEGACRPT_SET_SIZE(0) MCFG_SEGACRPT_SET_NUMBANKS(3) @@ -1255,7 +1255,6 @@ MACHINE_CONFIG_START(cclimber_state::swimmer) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(swimmer_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", cclimber_state, vblank_irq) MCFG_DEVICE_ADD("mainlatch", LS259, 0) MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cclimber_state, nmi_mask_w)) @@ -1277,6 +1276,7 @@ MACHINE_CONFIG_START(cclimber_state::swimmer) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(cclimber_state, screen_update_swimmer) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cclimber_state, vblank_irq)) MCFG_GFXDECODE_ADD("gfxdecode", "palette", swimmer) MCFG_PALETTE_ADD("palette", 32*8+4*8+1) diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h index f95912a5930..43286416640 100644 --- a/src/mame/includes/cclimber.h +++ b/src/mame/includes/cclimber.h @@ -110,8 +110,8 @@ public: void swimmer_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, gfx_element *gfx); void cclimber_decode(const uint8_t convtable[8][16]); - INTERRUPT_GEN_MEMBER(vblank_irq); - INTERRUPT_GEN_MEMBER(bagmanf_vblank_irq); + DECLARE_WRITE_LINE_MEMBER(vblank_irq); + DECLARE_WRITE_LINE_MEMBER(bagmanf_vblank_irq); void root(machine_config &config); void swimmer(machine_config &config); void guzzler(machine_config &config); |