Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-05 08:41:31 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

bagman.cpp, warpwarp.cpp: Replace VBLANK_INT with VBLANK_CALLBACK (nw)

Browse Source
This commit is contained in:
AJR 2018-03-28 12:41:36 -04:00
parent 3b3becbaae
commit 9f3966eb65
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mame/drivers/bagman.cpp
View File

@ -418,10 +418,10 @@ template <unsigned N> CUSTOM_INPUT_MEMBER(squaitsa_state::dial_input_r)
return m_res[N];
}
INTERRUPT_GEN_MEMBER(bagman_state::vblank_irq)
WRITE_LINE_MEMBER(bagman_state::vblank_irq)
{
if (m_irq_mask)
device.execute().set_input_line(0, ASSERT_LINE);
if (state && m_irq_mask)
m_maincpu->set_input_line(0, ASSERT_LINE);
}
@ -431,7 +431,6 @@ MACHINE_CONFIG_START(bagman_state::bagman)
MCFG_CPU_ADD("maincpu", Z80, BAGMAN_H0)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(main_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bagman_state, vblank_irq)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 8H
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(bagman_state, irq_mask_w))
@ -447,6 +446,7 @@ MACHINE_CONFIG_START(bagman_state::bagman)
MCFG_SCREEN_RAW_PARAMS(BAGMAN_HCLK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(bagman_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(bagman_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", bagman)
MCFG_PALETTE_ADD("palette", 64)
@ -510,7 +510,6 @@ MACHINE_CONFIG_START(bagman_state::pickin)
MCFG_CPU_ADD("maincpu", Z80, BAGMAN_H0)
MCFG_CPU_PROGRAM_MAP(pickin_map)
MCFG_CPU_IO_MAP(main_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bagman_state, vblank_irq)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(bagman_state, irq_mask_w))
@ -527,6 +526,7 @@ MACHINE_CONFIG_START(bagman_state::pickin)
MCFG_SCREEN_RAW_PARAMS(BAGMAN_HCLK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(bagman_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(bagman_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", pickin)
MCFG_PALETTE_ADD("palette", 64)
@ -570,7 +570,6 @@ MACHINE_CONFIG_START(bagman_state::botanic)
MCFG_CPU_ADD("maincpu", Z80, BAGMAN_H0)
MCFG_CPU_PROGRAM_MAP(pickin_map)
MCFG_CPU_IO_MAP(main_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bagman_state, vblank_irq)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(bagman_state, irq_mask_w))
@ -587,6 +586,7 @@ MACHINE_CONFIG_START(bagman_state::botanic)
MCFG_SCREEN_RAW_PARAMS(BAGMAN_HCLK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(bagman_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(bagman_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", bagman)
MCFG_PALETTE_ADD("palette", 64)

10
src/mame/drivers/warpwarp.cpp
View File

@ -148,10 +148,10 @@ void warpwarp_state::machine_start()
}
/* Interrupt Gen */
INTERRUPT_GEN_MEMBER(warpwarp_state::vblank_irq)
WRITE_LINE_MEMBER(warpwarp_state::vblank_irq)
{
if (m_ball_on)
device.execute().set_input_line(0, ASSERT_LINE);
if (state && m_ball_on)
m_maincpu->set_input_line(0, ASSERT_LINE);
}
/* B&W Games I/O */
@ -715,7 +715,6 @@ MACHINE_CONFIG_START(warpwarp_state::geebee)
MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK/9) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(geebee_map)
MCFG_CPU_IO_MAP(geebee_port_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", warpwarp_state, vblank_irq)
MCFG_DEVICE_ADD("latch", LS259, 0) // 5N
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(warpwarp_state, lamp_1_w))
@ -732,6 +731,7 @@ MACHINE_CONFIG_START(warpwarp_state::geebee)
MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 272, 264, 0, 224)
MCFG_SCREEN_UPDATE_DRIVER(warpwarp_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(warpwarp_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", 1k)
MCFG_PALETTE_ADD("palette", 4*2)
@ -769,7 +769,6 @@ MACHINE_CONFIG_START(warpwarp_state::bombbee)
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK/9)
MCFG_CPU_PROGRAM_MAP(bombbee_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", warpwarp_state, vblank_irq)
MCFG_DEVICE_ADD("latch", LS259, 0) // 6L on Warp Warp
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(warpwarp_state, lamp_1_w))
@ -788,6 +787,7 @@ MACHINE_CONFIG_START(warpwarp_state::bombbee)
MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 272, 264, 0, 224)
MCFG_SCREEN_UPDATE_DRIVER(warpwarp_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(warpwarp_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", color)

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

@ -55,7 +55,7 @@ protected:
virtual void video_start() override;
DECLARE_PALETTE_INIT(bagman);
INTERRUPT_GEN_MEMBER(vblank_irq);
DECLARE_WRITE_LINE_MEMBER(vblank_irq);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);

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

@ -96,7 +96,7 @@ public:
inline void plot(bitmap_ind16 &bitmap, const rectangle &cliprect, int x, int y, pen_t pen);
void draw_ball(bitmap_ind16 &bitmap, const rectangle &cliprect,pen_t pen);
INTERRUPT_GEN_MEMBER(vblank_irq);
DECLARE_WRITE_LINE_MEMBER(vblank_irq);
void warpwarp(machine_config &config);
void geebee(machine_config &config);
void navarone(machine_config &config);