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

dynax.cpp: Replace CPU_VBLANK_INT with SCREEN_VBLANK_CALLBACK (nw)

Browse Source
This commit is contained in:
AJR 2018-03-28 13:56:43 -04:00
parent c3d0131b22
commit 967a4eeeb0
3 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mame/drivers/ddenlovr.cpp
View File

@ -4399,8 +4399,7 @@ MACHINE_CONFIG_START(ddenlovr_state::htengoku)
MCFG_CPU_ADD("maincpu",Z80,20000000 / 4)
MCFG_CPU_PROGRAM_MAP(htengoku_mem_map)
MCFG_CPU_IO_MAP(htengoku_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", ddenlovr_state, sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
MCFG_DEVICE_ADD("bankdev", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(htengoku_banked_map)
@ -4431,6 +4430,7 @@ MACHINE_CONFIG_START(ddenlovr_state::htengoku)
MCFG_SCREEN_UPDATE_DRIVER(ddenlovr_state, screen_update_htengoku)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(ddenlovr_state, sprtmtch_vblank_w))
MCFG_PALETTE_ADD("palette", 16*256)

53
src/mame/drivers/dynax.cpp
View File

@ -128,9 +128,10 @@ WRITE_LINE_MEMBER(dynax_state::blitter_ack_w)
}
}
INTERRUPT_GEN_MEMBER(dynax_state::sprtmtch_vblank_interrupt)
WRITE_LINE_MEMBER(dynax_state::sprtmtch_vblank_w)
{
m_mainirq->rst2_w(1);
if (state)
m_mainirq->rst2_w(1);
}
@ -170,9 +171,13 @@ WRITE_LINE_MEMBER(dynax_state::jantouki_blitter2_ack_w)
}
}
INTERRUPT_GEN_MEMBER(dynax_state::jantouki_vblank_interrupt)
WRITE_LINE_MEMBER(dynax_state::jantouki_vblank_w)
{
m_mainirq->rst4_w(1);
if (state)
{
m_mainirq->rst4_w(1);
m_soundirq->rst4_w(1);
}
}
@ -180,11 +185,6 @@ INTERRUPT_GEN_MEMBER(dynax_state::jantouki_vblank_interrupt)
Jantouki - Sound CPU
***************************************************************************/
INTERRUPT_GEN_MEMBER(dynax_state::jantouki_sound_vblank_interrupt)
{
m_soundirq->rst4_w(1);
}
WRITE8_MEMBER(dynax_state::jantouki_sound_vblank_ack_w)
{
m_soundirq->rst4_w(0);
@ -4203,8 +4203,7 @@ MACHINE_CONFIG_START(dynax_state::cdracula)
MCFG_CPU_ADD("maincpu", Z80, XTAL(21'477'272)/4) /* 5.3693175MHz measured */
MCFG_CPU_PROGRAM_MAP(cdracula_mem_map)
MCFG_CPU_IO_MAP(cdracula_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dynax_state, sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
MCFG_MACHINE_START_OVERRIDE(dynax_state,dynax)
MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax)
@ -4227,6 +4226,7 @@ MACHINE_CONFIG_START(dynax_state::cdracula)
MCFG_SCREEN_VISIBLE_AREA(16, 512-16-1, 16, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(dynax_state, screen_update_cdracula)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(dynax_state, sprtmtch_vblank_w))
MCFG_PALETTE_ADD("palette", 512)
@ -4251,8 +4251,7 @@ MACHINE_CONFIG_START(dynax_state::hanamai)
MCFG_CPU_ADD("maincpu",Z80,22000000 / 4) /* 5.5MHz */
MCFG_CPU_PROGRAM_MAP(sprtmtch_mem_map)
MCFG_CPU_IO_MAP(hanamai_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dynax_state, sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
MCFG_MACHINE_START_OVERRIDE(dynax_state,hanamai)
MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax)
@ -4280,6 +4279,7 @@ MACHINE_CONFIG_START(dynax_state::hanamai)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1-4, 16+8, 255-8)
MCFG_SCREEN_UPDATE_DRIVER(dynax_state, screen_update_hanamai)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(dynax_state, sprtmtch_vblank_w))
MCFG_PALETTE_ADD("palette", 512)
@ -4319,8 +4319,7 @@ MACHINE_CONFIG_START(dynax_state::hnoridur)
MCFG_CPU_ADD("maincpu",Z80,XTAL(22'000'000) / 4) /* 5.5MHz */
MCFG_CPU_PROGRAM_MAP(hnoridur_mem_map)
MCFG_CPU_IO_MAP(hnoridur_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dynax_state, sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
MCFG_MACHINE_START_OVERRIDE(dynax_state,dynax)
MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax)
@ -4354,6 +4353,7 @@ MACHINE_CONFIG_START(dynax_state::hnoridur)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1-4, 16, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(dynax_state, screen_update_hnoridur)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(dynax_state, sprtmtch_vblank_w))
MCFG_PALETTE_ADD("palette", 16*256)
@ -4386,8 +4386,7 @@ MACHINE_CONFIG_START(dynax_state::hjingi)
MCFG_CPU_ADD("maincpu",Z80, XTAL(22'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(hjingi_mem_map)
MCFG_CPU_IO_MAP(hjingi_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dynax_state, sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
MCFG_MACHINE_START_OVERRIDE(dynax_state,hjingi)
MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax)
@ -4423,6 +4422,7 @@ MACHINE_CONFIG_START(dynax_state::hjingi)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1-4, 16, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(dynax_state, screen_update_hnoridur)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(dynax_state, sprtmtch_vblank_w))
MCFG_PALETTE_ADD("palette", 16*256)
@ -4455,8 +4455,7 @@ MACHINE_CONFIG_START(dynax_state::sprtmtch)
MCFG_CPU_ADD("maincpu", Z80,22000000 / 4) /* 5.5MHz */
MCFG_CPU_PROGRAM_MAP(sprtmtch_mem_map)
MCFG_CPU_IO_MAP(sprtmtch_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dynax_state, sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
MCFG_MACHINE_START_OVERRIDE(dynax_state,hanamai)
MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax)
@ -4481,6 +4480,7 @@ MACHINE_CONFIG_START(dynax_state::sprtmtch)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(dynax_state, screen_update_sprtmtch)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(dynax_state, sprtmtch_vblank_w))
MCFG_PALETTE_ADD("palette", 512)
@ -4505,13 +4505,18 @@ MACHINE_CONFIG_END
Mahjong Friday
***************************************************************************/
WRITE_LINE_MEMBER(dynax_state::mjfriday_vblank_w)
{
if (state)
m_maincpu->set_input_line(0, HOLD_LINE);
}
MACHINE_CONFIG_START(dynax_state::mjfriday)
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,24000000/4) /* 6 MHz? */
MCFG_CPU_PROGRAM_MAP(sprtmtch_mem_map)
MCFG_CPU_IO_MAP(mjfriday_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dynax_state, irq0_line_hold)
MCFG_MACHINE_START_OVERRIDE(dynax_state,hanamai)
MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax)
@ -4536,6 +4541,7 @@ MACHINE_CONFIG_START(dynax_state::mjfriday)
MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(dynax_state, screen_update_mjdialq2)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(dynax_state, mjfriday_vblank_w))
MCFG_PALETTE_ADD("palette", 512)
@ -4659,14 +4665,12 @@ MACHINE_CONFIG_START(dynax_state::jantouki)
MCFG_CPU_ADD("maincpu",Z80,22000000 / 4) /* 5.5MHz */
MCFG_CPU_PROGRAM_MAP(jantouki_mem_map)
MCFG_CPU_IO_MAP(jantouki_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("top", dynax_state, jantouki_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
MCFG_CPU_ADD("soundcpu",Z80,22000000 / 4) /* 5.5MHz */
MCFG_CPU_PROGRAM_MAP(jantouki_sound_mem_map)
MCFG_CPU_IO_MAP(jantouki_sound_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("top", dynax_state, jantouki_sound_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("soundirq", rst_pos_buffer_device, inta_cb)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("soundirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
MCFG_MACHINE_START_OVERRIDE(dynax_state,jantouki)
MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax)
@ -4702,6 +4706,7 @@ MACHINE_CONFIG_START(dynax_state::jantouki)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(dynax_state, screen_update_jantouki_top)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(dynax_state, jantouki_vblank_w))
MCFG_SCREEN_ADD("bottom", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)

6
src/mame/includes/dynax.h
View File

@ -253,9 +253,9 @@ public:
uint32_t screen_update_jantouki_bottom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_cdracula(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(sprtmtch_vblank_interrupt);
INTERRUPT_GEN_MEMBER(jantouki_vblank_interrupt);
INTERRUPT_GEN_MEMBER(jantouki_sound_vblank_interrupt);
DECLARE_WRITE_LINE_MEMBER(sprtmtch_vblank_w);
DECLARE_WRITE_LINE_MEMBER(jantouki_vblank_w);
DECLARE_WRITE_LINE_MEMBER(mjfriday_vblank_w);
void tenkai_update_rombank();