diff options
author | Ivan Vangelista <mesgnet@yahoo.it> | 2017-04-10 17:59:47 +0200 |
---|---|---|
committer | Ivan Vangelista <mesgnet@yahoo.it> | 2017-04-10 17:59:47 +0200 |
commit | 9791d2fdb605a03ad4b430b78084ad5942ada9c1 (patch) | |
tree | fdcfde90314fa9d3ce506a150c203278bd7efcdd | |
parent | 7f63cfec02e1c439b7e02d42e8a14c3ffcdc5b4a (diff) |
asuka.cpp, rabbit.cpp: removed anonymous timers (nw)
-rw-r--r-- | src/mame/drivers/asuka.cpp | 24 | ||||
-rw-r--r-- | src/mame/drivers/rabbit.cpp | 5 | ||||
-rw-r--r-- | src/mame/includes/asuka.h | 3 |
3 files changed, 21 insertions, 11 deletions
diff --git a/src/mame/drivers/asuka.cpp b/src/mame/drivers/asuka.cpp index 1efa101ece8..5108c8a2b07 100644 --- a/src/mame/drivers/asuka.cpp +++ b/src/mame/drivers/asuka.cpp @@ -251,7 +251,7 @@ void asuka_state::device_timer(emu_timer &timer, device_timer_id id, int param, INTERRUPT_GEN_MEMBER(asuka_state::cadash_interrupt) { - timer_set(m_maincpu->cycles_to_attotime(500), TIMER_CADASH_INTERRUPT5); + m_cadash_int5_timer->adjust(m_maincpu->cycles_to_attotime(500)); device.execute().set_input_line(4, HOLD_LINE); /* interrupt vector 4 */ } @@ -1733,6 +1733,10 @@ ROM_START( eto ) ROM_LOAD( "eto-5.ic27", 0x00000, 0x10000, CRC(b3689da0) SHA1(812d2e0a794403df9f0a5035784f14cd070ea080) ) /* banked */ ROM_END +DRIVER_INIT_MEMBER(asuka_state, cadash) +{ + m_cadash_int5_timer = timer_alloc(TIMER_CADASH_INTERRUPT5); +} GAME( 1988, bonzeadv, 0, bonzeadv, bonzeadv, driver_device, 0, ROT0, "Taito Corporation Japan", "Bonze Adventure (World, Newer)", MACHINE_SUPPORTS_SAVE ) GAME( 1988, bonzeadvo, bonzeadv, bonzeadv, bonzeadv, driver_device, 0, ROT0, "Taito Corporation Japan", "Bonze Adventure (World, Older)", MACHINE_SUPPORTS_SAVE ) @@ -1745,15 +1749,15 @@ GAME( 1988, asukaj, asuka, asuka, asuka, driver_device, 0, ROT270, " GAME( 1989, mofflott, 0, mofflott, mofflott, driver_device, 0, ROT270, "Taito Corporation", "Maze of Flott (Japan)", MACHINE_SUPPORTS_SAVE ) -GAME( 1989, cadash, 0, cadash, cadash, driver_device, 0, ROT0, "Taito Corporation Japan", "Cadash (World)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) -GAME( 1989, cadashj, cadash, cadash, cadashj, driver_device, 0, ROT0, "Taito Corporation", "Cadash (Japan, version 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) -GAME( 1989, cadashj1, cadash, cadash, cadashj, driver_device, 0, ROT0, "Taito Corporation", "Cadash (Japan, version 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) -GAME( 1989, cadashjo, cadash, cadash, cadashj, driver_device, 0, ROT0, "Taito Corporation", "Cadash (Japan, oldest version)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) -GAME( 1989, cadashu, cadash, cadash, cadashu, driver_device, 0, ROT0, "Taito America Corporation", "Cadash (US, version 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) -GAME( 1989, cadashi, cadash, cadash, cadash, driver_device, 0, ROT0, "Taito Corporation Japan", "Cadash (Italy)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) -GAME( 1989, cadashf, cadash, cadash, cadash, driver_device, 0, ROT0, "Taito Corporation Japan", "Cadash (France)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) -GAME( 1989, cadashg, cadash, cadash, cadash, driver_device, 0, ROT0, "Taito Corporation Japan", "Cadash (Germany, version 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) -GAME( 1989, cadashp, cadash, cadash, cadashj, driver_device, 0, ROT0, "Taito Corporation Japan", "Cadash (World, prototype)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN) +GAME( 1989, cadash, 0, cadash, cadash, asuka_state, cadash, ROT0, "Taito Corporation Japan", "Cadash (World)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) +GAME( 1989, cadashj, cadash, cadash, cadashj, asuka_state, cadash, ROT0, "Taito Corporation", "Cadash (Japan, version 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) +GAME( 1989, cadashj1, cadash, cadash, cadashj, asuka_state, cadash, ROT0, "Taito Corporation", "Cadash (Japan, version 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) +GAME( 1989, cadashjo, cadash, cadash, cadashj, asuka_state, cadash, ROT0, "Taito Corporation", "Cadash (Japan, oldest version)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) +GAME( 1989, cadashu, cadash, cadash, cadashu, asuka_state, cadash, ROT0, "Taito America Corporation", "Cadash (US, version 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) +GAME( 1989, cadashi, cadash, cadash, cadash, asuka_state, cadash, ROT0, "Taito Corporation Japan", "Cadash (Italy)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) +GAME( 1989, cadashf, cadash, cadash, cadash, asuka_state, cadash, ROT0, "Taito Corporation Japan", "Cadash (France)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) +GAME( 1989, cadashg, cadash, cadash, cadash, asuka_state, cadash, ROT0, "Taito Corporation Japan", "Cadash (Germany, version 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) +GAME( 1989, cadashp, cadash, cadash, cadashj, asuka_state, cadash, ROT0, "Taito Corporation Japan", "Cadash (World, prototype)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN) GAME( 1992, galmedes, 0, galmedes, galmedes, driver_device, 0, ROT270, "Visco", "Galmedes (Japan)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/rabbit.cpp b/src/mame/drivers/rabbit.cpp index 22befac6560..c3ce3d5cc11 100644 --- a/src/mame/drivers/rabbit.cpp +++ b/src/mame/drivers/rabbit.cpp @@ -135,6 +135,7 @@ public: int m_banking; std::unique_ptr<uint32_t[]> m_tilemap_ram[4]; tilemap_t *m_tilemap[4]; + emu_timer *m_blit_done_timer; DECLARE_WRITE32_MEMBER(tilemap0_w); DECLARE_WRITE32_MEMBER(tilemap1_w); @@ -439,6 +440,8 @@ void rabbit_state::video_start() m_sprite_bitmap = std::make_unique<bitmap_ind16>(0x1000,0x1000); m_sprite_clip.set(0, 0x1000-1, 0, 0x1000-1); + m_blit_done_timer = timer_alloc(TIMER_BLIT_DONE); + save_pointer(NAME(m_tilemap_ram[0].get()), 0x20000/4); save_pointer(NAME(m_tilemap_ram[1].get()), 0x20000/4); save_pointer(NAME(m_tilemap_ram[2].get()), 0x20000/4); @@ -631,7 +634,7 @@ void rabbit_state::do_blit() if (!blt_amount) { if(BLITLOG) osd_printf_debug("end of blit list\n"); - timer_set(attotime::from_usec(500), TIMER_BLIT_DONE); + m_blit_done_timer->adjust(attotime::from_usec(500)); return; } diff --git a/src/mame/includes/asuka.h b/src/mame/includes/asuka.h index 2b3f74d8317..137cdc4df20 100644 --- a/src/mame/includes/asuka.h +++ b/src/mame/includes/asuka.h @@ -50,6 +50,8 @@ public: u16 m_adpcm_pos; bool m_adpcm_ff; + emu_timer *m_cadash_int5_timer; + optional_shared_ptr<uint8_t> m_cadash_shared_ram; /* devices */ @@ -76,6 +78,7 @@ public: uint32_t screen_update_asuka(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_asuka); INTERRUPT_GEN_MEMBER(cadash_interrupt); + DECLARE_DRIVER_INIT(cadash); /*----------- defined in machine/bonzeadv.c -----------*/ void WriteLevelData(); |