From d94e167db316f5e22b1914c6c1462b747062ef14 Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Tue, 26 Apr 2011 02:07:38 +0000 Subject: [PATCH] Removed cheapest deprecat.h usages (generally sound cpu ones) --- src/mame/drivers/argus.c | 44 ++++++++++++++++++------------------- src/mame/drivers/atarifb.c | 3 +-- src/mame/drivers/bigevglf.c | 3 +-- src/mame/drivers/bionicc.c | 2 +- src/mame/drivers/blueprnt.c | 3 +-- src/mame/drivers/bogeyman.c | 3 +-- src/mame/drivers/bottom9.c | 3 +-- src/mame/drivers/buggychl.c | 2 +- src/mame/drivers/bwing.c | 4 ++-- src/mame/drivers/cloak.c | 4 ++-- src/mame/drivers/commando.c | 3 +-- src/mame/drivers/cosmic.c | 3 ++- src/mame/drivers/destroyr.c | 3 +-- src/mame/drivers/discoboy.c | 5 +---- src/mame/drivers/docastle.c | 3 +-- src/mame/drivers/dogfgt.c | 2 +- src/mame/drivers/dorachan.c | 3 +-- src/mame/drivers/dragrace.c | 3 +-- src/mame/drivers/enigma2.c | 5 ++--- src/mame/drivers/esd16.c | 3 +-- src/mame/drivers/espial.c | 2 +- src/mame/drivers/exedexes.c | 2 +- src/mame/drivers/fastfred.c | 6 +++-- src/mame/drivers/firetrap.c | 10 ++++----- src/mame/drivers/flower.c | 3 --- src/mame/drivers/flstory.c | 13 ++++++----- src/mame/drivers/gng.c | 3 +-- src/mame/drivers/goindol.c | 3 +-- src/mame/drivers/gsword.c | 9 +++----- src/mame/drivers/gunsmoke.c | 3 +-- src/mame/drivers/itech32.c | 3 +-- src/mame/drivers/jack.c | 4 ++-- src/mame/drivers/kyugo.c | 3 +-- src/mame/drivers/ladyfrog.c | 3 +-- src/mame/drivers/liberatr.c | 3 +-- src/mame/drivers/m72.c | 25 ++++++++++----------- src/mame/drivers/matmania.c | 3 +-- src/mame/drivers/megaplay.c | 1 - src/mame/drivers/meijinsn.c | 2 +- src/mame/drivers/metlclsh.c | 2 +- src/mame/drivers/mirax.c | 3 +-- src/mame/drivers/mjsister.c | 3 +-- src/mame/drivers/mlanding.c | 11 +++++----- src/mame/drivers/mouser.c | 3 +-- src/mame/drivers/namcos2.c | 13 +++++------ src/mame/drivers/namcos21.c | 7 +++--- src/mame/drivers/nbmj8688.c | 11 ---------- src/mame/drivers/nbmj8891.c | 21 +----------------- src/mame/drivers/nova2001.c | 5 ++--- src/mame/drivers/pacman.c | 39 ++------------------------------ src/mame/drivers/paradise.c | 2 +- src/mame/drivers/photon2.c | 1 - src/mame/drivers/polepos.c | 4 ++-- src/mame/drivers/popper.c | 3 +-- src/mame/drivers/retofinv.c | 3 +-- src/mame/drivers/rollrace.c | 5 ++--- src/mame/drivers/route16.c | 2 +- src/mame/drivers/sbugger.c | 3 +-- src/mame/drivers/segag80r.c | 3 +-- src/mame/drivers/segas18.c | 2 +- src/mame/drivers/seta.c | 2 +- src/mame/drivers/shisen.c | 4 ++-- src/mame/drivers/slapfght.c | 4 ++-- src/mame/drivers/snk6502.c | 4 ++-- src/mame/drivers/solomon.c | 4 ++-- src/mame/drivers/sonson.c | 3 +-- src/mame/drivers/speedbal.c | 3 +-- src/mame/drivers/srmp2.c | 2 +- src/mame/drivers/srumbler.c | 2 +- src/mame/drivers/sstrangr.c | 3 +-- src/mame/drivers/strnskil.c | 3 +++ src/mame/drivers/suna8.c | 8 +++---- src/mame/drivers/suprloco.c | 3 +-- src/mame/drivers/tagteam.c | 2 +- src/mame/drivers/tomcat.c | 21 +++++++++--------- src/mame/drivers/tsamurai.c | 22 ++++++------------- src/mame/drivers/tunhunt.c | 2 +- src/mame/drivers/vastar.c | 3 +-- src/mame/drivers/vigilant.c | 7 +++--- src/mame/drivers/vulgus.c | 2 +- src/mame/drivers/wheelfir.c | 2 +- src/mame/drivers/wiz.c | 3 +-- 82 files changed, 171 insertions(+), 289 deletions(-) diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c index 33d3e1fefc4..87c62dcd7df 100644 --- a/src/mame/drivers/argus.c +++ b/src/mame/drivers/argus.c @@ -121,7 +121,6 @@ Known issues : #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "sound/2203intf.h" #include "includes/argus.h" @@ -132,12 +131,26 @@ Known issues : ***************************************************************************/ -static INTERRUPT_GEN( argus_interrupt ) +static TIMER_DEVICE_CALLBACK( argus_scanline ) { - if (cpu_getiloops(device) == 0) - device_set_input_line_and_vector(device, 0, HOLD_LINE, 0xd7); /* RST 10h */ - else - device_set_input_line_and_vector(device, 0, HOLD_LINE, 0xcf); /* RST 08h */ + int scanline = param; + + if(scanline == 240) // vblank-out irq + cputag_set_input_line_and_vector(timer.machine(), "maincpu", 0, HOLD_LINE,0xd7); /* RST 10h */ + + if(scanline == 16) // vblank-in irq + cputag_set_input_line_and_vector(timer.machine(), "maincpu", 0, HOLD_LINE,0xcf); /* RST 08h */ +} + +static TIMER_DEVICE_CALLBACK( butasan_scanline ) +{ + int scanline = param; + + if(scanline == 248) // vblank-out irq + cputag_set_input_line_and_vector(timer.machine(), "maincpu", 0, HOLD_LINE,0xd7); /* RST 10h */ + + if(scanline == 8) // vblank-in irq + cputag_set_input_line_and_vector(timer.machine(), "maincpu", 0, HOLD_LINE,0xcf); /* RST 08h */ } /* Handler called by the YM2203 emulator when the internal timers cause an IRQ */ @@ -534,15 +547,11 @@ static MACHINE_CONFIG_START( argus, argus_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 4 MHz */ MCFG_CPU_PROGRAM_MAP(argus_map) - MCFG_CPU_VBLANK_INT_HACK(argus_interrupt,2) + MCFG_TIMER_ADD_SCANLINE("scantimer", argus_scanline, "screen", 0, 1) MCFG_CPU_ADD("audiocpu", Z80, 5000000) MCFG_CPU_PROGRAM_MAP(sound_map_a) -#if 0 - MCFG_CPU_IO_MAP(sound_portmap_1) -#else MCFG_CPU_IO_MAP(sound_portmap_2) -#endif MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -564,14 +573,6 @@ static MACHINE_CONFIG_START( argus, argus_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") -#if 0 - MCFG_SOUND_ADD("ym1", YM2203, 6000000 / 4) - MCFG_SOUND_CONFIG(ym2203_config) - MCFG_SOUND_ROUTE(0, "mono", 0.15) - MCFG_SOUND_ROUTE(1, "mono", 0.15) - MCFG_SOUND_ROUTE(2, "mono", 0.15) - MCFG_SOUND_ROUTE(3, "mono", 0.50) -#else MCFG_SOUND_ADD("ym1", YM2203, 6000000 / 4) MCFG_SOUND_CONFIG(ym2203_config) MCFG_SOUND_ROUTE(0, "mono", 0.15) @@ -584,7 +585,6 @@ static MACHINE_CONFIG_START( argus, argus_state ) MCFG_SOUND_ROUTE(1, "mono", 0.15) MCFG_SOUND_ROUTE(2, "mono", 0.15) MCFG_SOUND_ROUTE(3, "mono", 0.50) -#endif MACHINE_CONFIG_END static MACHINE_CONFIG_START( valtric, argus_state ) @@ -592,7 +592,7 @@ static MACHINE_CONFIG_START( valtric, argus_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5 MHz */ MCFG_CPU_PROGRAM_MAP(valtric_map) - MCFG_CPU_VBLANK_INT_HACK(argus_interrupt,2) + MCFG_TIMER_ADD_SCANLINE("scantimer", argus_scanline, "screen", 0, 1) MCFG_CPU_ADD("audiocpu", Z80, 5000000) MCFG_CPU_PROGRAM_MAP(sound_map_a) @@ -637,7 +637,7 @@ static MACHINE_CONFIG_START( butasan, argus_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5 MHz */ MCFG_CPU_PROGRAM_MAP(butasan_map) - MCFG_CPU_VBLANK_INT_HACK(argus_interrupt,2) + MCFG_TIMER_ADD_SCANLINE("scantimer", butasan_scanline, "screen", 0, 1) MCFG_CPU_ADD("audiocpu", Z80, 5000000) MCFG_CPU_PROGRAM_MAP(sound_map_b) diff --git a/src/mame/drivers/atarifb.c b/src/mame/drivers/atarifb.c index 12df08c3259..5e455ceaa39 100644 --- a/src/mame/drivers/atarifb.c +++ b/src/mame/drivers/atarifb.c @@ -104,7 +104,6 @@ #include "emu.h" #include "cpu/m6502/m6502.h" -#include "deprecat.h" #include "includes/atarifb.h" #include "sound/discrete.h" @@ -558,7 +557,7 @@ static MACHINE_CONFIG_START( atarifb, atarifb_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 750000) MCFG_CPU_PROGRAM_MAP(atarifb_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) MCFG_MACHINE_START(atarifb) MCFG_MACHINE_RESET(atarifb) diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c index 9f2dc0ce353..d016b6b1b39 100644 --- a/src/mame/drivers/bigevglf.c +++ b/src/mame/drivers/bigevglf.c @@ -57,7 +57,6 @@ J1100072A #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "sound/ay8910.h" #include "sound/msm5232.h" #include "cpu/m6805/m6805.h" @@ -518,7 +517,7 @@ static MACHINE_CONFIG_START( bigevglf, bigevglf_state ) MCFG_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ? */ MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ???; + MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) /* IRQ generated by ???; 2 irqs/frame give good music tempo but also SOUND ERROR in test mode, 4 irqs/frame give SOUND OK in test mode but music seems to be running too fast */ diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c index df654f10bcb..34bfcd42cb0 100644 --- a/src/mame/drivers/bionicc.c +++ b/src/mame/drivers/bionicc.c @@ -369,7 +369,7 @@ static MACHINE_CONFIG_START( bionicc, bionicc_state ) * schematics indicate that nmi_line is set on M680000 access with AB1=1 * and IOCS=0 (active low), see pages A-1/10, A-4/10 in schematics */ - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,4) + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,4*60) MCFG_MACHINE_START(bionicc) MCFG_MACHINE_RESET(bionicc) diff --git a/src/mame/drivers/blueprnt.c b/src/mame/drivers/blueprnt.c index 300576bc10e..5e1d09b8fe3 100644 --- a/src/mame/drivers/blueprnt.c +++ b/src/mame/drivers/blueprnt.c @@ -47,7 +47,6 @@ #include "emu.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "includes/blueprnt.h" @@ -306,7 +305,7 @@ static MACHINE_CONFIG_START( blueprnt, blueprnt_state ) MCFG_CPU_ADD("audiocpu", Z80, 10000000/2/2/2) // 1.25 MHz (2H) MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 4) // IRQs connected to 32V + MCFG_CPU_PERIODIC_INT(irq0_line_hold, 4*60) // IRQs connected to 32V // NMIs are caused by the main CPU MCFG_MACHINE_START(blueprnt) diff --git a/src/mame/drivers/bogeyman.c b/src/mame/drivers/bogeyman.c index 0cc0fbee9ef..91a9ff4b7d5 100644 --- a/src/mame/drivers/bogeyman.c +++ b/src/mame/drivers/bogeyman.c @@ -12,7 +12,6 @@ ***************************************************************************/ #include "emu.h" -#include "deprecat.h" #include "cpu/m6502/m6502.h" #include "sound/ay8910.h" #include "includes/bogeyman.h" @@ -247,7 +246,7 @@ static MACHINE_CONFIG_START( bogeyman, bogeyman_state ) // basic machine hardware MCFG_CPU_ADD("maincpu", M6502, 1500000) /* Verified */ MCFG_CPU_PROGRAM_MAP(bogeyman_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 16) // Controls sound + MCFG_CPU_PERIODIC_INT(irq0_line_hold, 16*60) // Controls sound MCFG_MACHINE_START(bogeyman) MCFG_MACHINE_RESET(bogeyman) diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c index 493832d83f9..6e47450cf85 100644 --- a/src/mame/drivers/bottom9.c +++ b/src/mame/drivers/bottom9.c @@ -14,7 +14,6 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "cpu/m6809/m6809.h" #include "video/konicdev.h" #include "sound/k007232.h" @@ -370,7 +369,7 @@ static MACHINE_CONFIG_START( bottom9, bottom9_state ) MCFG_CPU_ADD("audiocpu", Z80, 3579545) MCFG_CPU_PROGRAM_MAP(audio_map) - MCFG_CPU_VBLANK_INT_HACK(bottom9_sound_interrupt,8) /* irq is triggered by the main CPU */ + MCFG_CPU_PERIODIC_INT(bottom9_sound_interrupt,8*60) /* irq is triggered by the main CPU */ MCFG_MACHINE_START(bottom9) MCFG_MACHINE_RESET(bottom9) diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c index a87acb3b730..12559d7095f 100644 --- a/src/mame/drivers/buggychl.c +++ b/src/mame/drivers/buggychl.c @@ -402,7 +402,7 @@ static MACHINE_CONFIG_START( buggychl, buggychl_state ) MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz??? */ MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,60) /* irq is timed, tied to the cpu clock and not to vblank */ + MCFG_CPU_PERIODIC_INT(irq0_line_hold,60*60) /* irq is timed, tied to the cpu clock and not to vblank */ /* nmi is caused by the main cpu */ MCFG_CPU_ADD("mcu", M68705,8000000/2) /* 4 MHz */ diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c index 2ba48e815ea..cd92e906d40 100644 --- a/src/mame/drivers/bwing.c +++ b/src/mame/drivers/bwing.c @@ -53,7 +53,7 @@ static INTERRUPT_GEN ( bwp1_interrupt ) break; case 1: - if (~input_port_read(device->machine(), "IN2") & 0x03) + if (~input_port_read(device->machine(), "IN2") & 0x03) //TODO: remove me { if (!state->m_coin) { @@ -66,7 +66,7 @@ static INTERRUPT_GEN ( bwp1_interrupt ) break; case 2: - if (input_port_read(device->machine(), "IN3")) + if (input_port_read(device->machine(), "IN3")) // TODO: remove me device_set_input_line(device, M6809_FIRQ_LINE, ASSERT_LINE); break; } diff --git a/src/mame/drivers/cloak.c b/src/mame/drivers/cloak.c index faf362c27c3..5eac78dd7af 100644 --- a/src/mame/drivers/cloak.c +++ b/src/mame/drivers/cloak.c @@ -335,11 +335,11 @@ static MACHINE_CONFIG_START( cloak, cloak_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 1000000) /* 1 MHz ???? */ MCFG_CPU_PROGRAM_MAP(master_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 4) + MCFG_CPU_PERIODIC_INT(irq0_line_hold, 4*60) MCFG_CPU_ADD("slave", M6502, 1250000) /* 1.25 MHz ???? */ MCFG_CPU_PROGRAM_MAP(slave_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 2) + MCFG_CPU_PERIODIC_INT(irq0_line_hold, 2*60) MCFG_QUANTUM_TIME(attotime::from_hz(1000)) diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c index 72c1abe5ab4..ae5eba87223 100644 --- a/src/mame/drivers/commando.c +++ b/src/mame/drivers/commando.c @@ -44,7 +44,6 @@ Note : there is an ingame typo bug that doesn't display the bonus life values #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "sound/2203intf.h" #include "includes/commando.h" @@ -254,7 +253,7 @@ static MACHINE_CONFIG_START( commando, commando_state ) MCFG_CPU_ADD("audiocpu", Z80, PHI_B) // 3 MHz MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 4) + MCFG_CPU_PERIODIC_INT(irq0_line_hold, 4*60) MCFG_MACHINE_START(commando) MCFG_MACHINE_RESET(commando) diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c index c44ae28bf6f..364860db4e7 100644 --- a/src/mame/drivers/cosmic.c +++ b/src/mame/drivers/cosmic.c @@ -8,6 +8,8 @@ Magical Spot - 8013 Magical Spot II - 8013 Devil Zone - 8022 +TODO: +- use CUSTOM_INPUT in place of the fake input ports in INTERRUPT_GEN functions 2008-08 Dip locations verified with manuals for all the games. @@ -1060,7 +1062,6 @@ static MACHINE_CONFIG_DERIVED( panic, cosmic ) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(panic_map) MCFG_CPU_VBLANK_INT_HACK(panic_interrupt,2) diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c index 3ff05be1e8a..2009c666302 100644 --- a/src/mame/drivers/destroyr.c +++ b/src/mame/drivers/destroyr.c @@ -6,7 +6,6 @@ Atari Destroyer Driver #include "emu.h" #include "cpu/m6800/m6800.h" -#include "deprecat.h" class destroyr_state : public driver_device @@ -440,7 +439,7 @@ static MACHINE_CONFIG_START( destroyr, destroyr_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, XTAL_12_096MHz / 16) MCFG_CPU_PROGRAM_MAP(destroyr_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_assert, 4) + MCFG_CPU_PERIODIC_INT(irq0_line_assert, 4*60) MCFG_MACHINE_START(destroyr) MCFG_MACHINE_RESET(destroyr) diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c index 928c40aee66..c955aab456f 100644 --- a/src/mame/drivers/discoboy.c +++ b/src/mame/drivers/discoboy.c @@ -37,7 +37,6 @@ Notes: #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "sound/msm5205.h" #include "sound/3812intf.h" @@ -472,9 +471,7 @@ static MACHINE_CONFIG_START( discoboy, discoboy_state ) MCFG_CPU_ADD("audiocpu", Z80,10000000/2) /* 5 MHz? */ MCFG_CPU_PROGRAM_MAP(sound_map) -// MCFG_CPU_IO_MAP(sound_io_map) -// MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,32) + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,32*60) MCFG_MACHINE_START( discoboy ) MCFG_MACHINE_RESET( discoboy ) diff --git a/src/mame/drivers/docastle.c b/src/mame/drivers/docastle.c index b689d490447..007613884d7 100644 --- a/src/mame/drivers/docastle.c +++ b/src/mame/drivers/docastle.c @@ -153,7 +153,6 @@ Dip locations verified with manual for docastle, dorunrun and dowild. #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "sound/msm5205.h" #include "sound/sn76496.h" #include "includes/docastle.h" @@ -602,7 +601,7 @@ static MACHINE_CONFIG_START( docastle, docastle_state ) MCFG_CPU_ADD("slave", Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(docastle_map2) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 8) + MCFG_CPU_PERIODIC_INT(irq0_line_hold, 8*60) MCFG_CPU_ADD("cpu3", Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(docastle_map3) diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c index 9a92001f5a4..70540fe700c 100644 --- a/src/mame/drivers/dogfgt.c +++ b/src/mame/drivers/dogfgt.c @@ -251,7 +251,7 @@ static MACHINE_CONFIG_START( dogfgt, dogfgt_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ???? */ MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,16) /* ? controls music tempo */ + MCFG_CPU_PERIODIC_INT(irq0_line_hold,16*60) /* ? controls music tempo */ MCFG_CPU_ADD("sub", M6502, 1500000) /* 1.5 MHz ???? */ MCFG_CPU_PROGRAM_MAP(sub_map) diff --git a/src/mame/drivers/dorachan.c b/src/mame/drivers/dorachan.c index f755a41492d..d232a271666 100644 --- a/src/mame/drivers/dorachan.c +++ b/src/mame/drivers/dorachan.c @@ -10,7 +10,6 @@ Todo: #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #define NUM_PENS (8) @@ -244,7 +243,7 @@ static MACHINE_CONFIG_START( dorachan, dorachan_state ) MCFG_CPU_ADD("maincpu", Z80, 2000000) MCFG_CPU_PROGRAM_MAP(dorachan_map) MCFG_CPU_IO_MAP(dorachan_io_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) MCFG_MACHINE_START(dorachan) MCFG_MACHINE_RESET(dorachan) diff --git a/src/mame/drivers/dragrace.c b/src/mame/drivers/dragrace.c index 55b77893cd9..6f6d81242af 100644 --- a/src/mame/drivers/dragrace.c +++ b/src/mame/drivers/dragrace.c @@ -6,7 +6,6 @@ Atari Drag Race Driver #include "emu.h" #include "cpu/m6800/m6800.h" -#include "deprecat.h" #include "includes/dragrace.h" #include "sound/discrete.h" @@ -338,7 +337,7 @@ static MACHINE_CONFIG_START( dragrace, dragrace_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, 12096000 / 12) MCFG_CPU_PROGRAM_MAP(dragrace_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 4) + MCFG_CPU_PERIODIC_INT(irq0_line_hold, 4*60) MCFG_WATCHDOG_VBLANK_INIT(8) MCFG_MACHINE_START(dragrace) diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c index d7ea74cc1ad..6407747150d 100644 --- a/src/mame/drivers/enigma2.c +++ b/src/mame/drivers/enigma2.c @@ -24,7 +24,6 @@ TODO: #include "emu.h" #include "cpu/z80/z80.h" #include "cpu/i8085/i8085.h" -#include "deprecat.h" #include "sound/ay8910.h" #define LOG_PROT (0) @@ -608,8 +607,8 @@ static MACHINE_CONFIG_START( enigma2, enigma2_state ) MCFG_CPU_PROGRAM_MAP(engima2_main_cpu_map) MCFG_CPU_ADD("audiocpu", Z80, 2500000) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,8) MCFG_CPU_PROGRAM_MAP(engima2_audio_cpu_map) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,8*52) MCFG_MACHINE_START(enigma2) MCFG_MACHINE_RESET(enigma2) @@ -637,8 +636,8 @@ static MACHINE_CONFIG_START( enigma2a, enigma2_state ) MCFG_CPU_IO_MAP(engima2a_main_cpu_io_map) MCFG_CPU_ADD("audiocpu", Z80, 2500000) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,8) MCFG_CPU_PROGRAM_MAP(engima2_audio_cpu_map) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,8*52) MCFG_MACHINE_START(enigma2) MCFG_MACHINE_RESET(enigma2) diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c index 66b994dc14f..55001b082b9 100644 --- a/src/mame/drivers/esd16.c +++ b/src/mame/drivers/esd16.c @@ -44,7 +44,6 @@ Head Panic #include "emu.h" #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" -#include "deprecat.h" #include "machine/eeprom.h" #include "sound/okim6295.h" #include "sound/3812intf.h" @@ -547,7 +546,7 @@ static MACHINE_CONFIG_START( multchmp, esd16_state ) MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ? */ MCFG_CPU_PROGRAM_MAP(multchmp_sound_map) MCFG_CPU_IO_MAP(multchmp_sound_io_map) - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,32) /* IRQ By Main CPU */ + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,32*60) /* IRQ By Main CPU */ MCFG_MACHINE_START(esd16) MCFG_MACHINE_RESET(esd16) diff --git a/src/mame/drivers/espial.c b/src/mame/drivers/espial.c index e330a77e78d..12e8f588039 100644 --- a/src/mame/drivers/espial.c +++ b/src/mame/drivers/espial.c @@ -334,7 +334,7 @@ static MACHINE_CONFIG_START( espial, espial_state ) MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 2 MHz?????? */ MCFG_CPU_PROGRAM_MAP(espial_sound_map) MCFG_CPU_IO_MAP(espial_sound_io_map) - MCFG_CPU_VBLANK_INT_HACK(espial_sound_nmi_gen,4) + MCFG_CPU_PERIODIC_INT(espial_sound_nmi_gen,4*60) MCFG_MACHINE_RESET(espial) MCFG_MACHINE_START(espial) diff --git a/src/mame/drivers/exedexes.c b/src/mame/drivers/exedexes.c index a1b3581c62e..b0da3afd78a 100644 --- a/src/mame/drivers/exedexes.c +++ b/src/mame/drivers/exedexes.c @@ -221,7 +221,7 @@ static MACHINE_CONFIG_START( exedexes, exedexes_state ) MCFG_CPU_ADD("audiocpu", Z80, 3000000) /* 3 MHz ??? */ MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) MCFG_MACHINE_START(exedexes) MCFG_MACHINE_RESET(exedexes) diff --git a/src/mame/drivers/fastfred.c b/src/mame/drivers/fastfred.c index 48713b4614f..3e1639a5b25 100644 --- a/src/mame/drivers/fastfred.c +++ b/src/mame/drivers/fastfred.c @@ -3,11 +3,13 @@ Fast Freddie/Jump Coaster hardware driver by Zsolt Vasvari + TODO: + - remove protection hack + ***************************************************************************/ #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "includes/fastfred.h" #include "sound/ay8910.h" @@ -626,7 +628,7 @@ static MACHINE_CONFIG_START( fastfred, fastfred_state ) MCFG_CPU_ADD("audiocpu", Z80, CLOCK/12) /* 1.536 MHz */ MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,4) + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,4*60) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c index b2e59a6209a..263a7c749cb 100644 --- a/src/mame/drivers/firetrap.c +++ b/src/mame/drivers/firetrap.c @@ -574,11 +574,11 @@ static const msm5205_interface msm5205_config = MSM5205_S48_4B /* 7.8125kHz */ }; -static INTERRUPT_GEN( firetrap ) +static INTERRUPT_GEN( firetrap_irq ) { firetrap_state *state = device->machine().driver_data(); UINT8 coin = 0; - UINT8 port = input_port_read(device->machine(), "COIN") & 0x07; + UINT8 port = input_port_read(device->machine(), "COIN") & 0x07; /* TODO: remove me */ /* Check for coin IRQ */ if (cpu_getiloops(device)) @@ -611,7 +611,7 @@ static INTERRUPT_GEN( firetrap ) device_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); } -static INTERRUPT_GEN( bootleg ) +static INTERRUPT_GEN( bootleg_irq ) { firetrap_state *state = device->machine().driver_data(); @@ -677,7 +677,7 @@ static MACHINE_CONFIG_START( firetrap, firetrap_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, FIRETRAP_XTAL/2) // 6 MHz MCFG_CPU_PROGRAM_MAP(firetrap_map) - MCFG_CPU_VBLANK_INT_HACK(firetrap,2) + MCFG_CPU_VBLANK_INT_HACK(firetrap_irq,2) MCFG_CPU_ADD("audiocpu", M6502, FIRETRAP_XTAL/8) // 1.5 MHz MCFG_CPU_PROGRAM_MAP(sound_map) @@ -718,7 +718,7 @@ static MACHINE_CONFIG_START( firetrapbl, firetrap_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, FIRETRAP_XTAL/2) // 6 MHz MCFG_CPU_PROGRAM_MAP(firetrap_bootleg_map) - MCFG_CPU_VBLANK_INT("screen", bootleg) + MCFG_CPU_VBLANK_INT("screen", bootleg_irq) MCFG_CPU_ADD("audiocpu", M6502, FIRETRAP_XTAL/8) // 1.5 MHz MCFG_CPU_PROGRAM_MAP(sound_map) diff --git a/src/mame/drivers/flower.c b/src/mame/drivers/flower.c index 30c59356744..5fac006d6df 100644 --- a/src/mame/drivers/flower.c +++ b/src/mame/drivers/flower.c @@ -72,7 +72,6 @@ CHIP # POSITION TYPE #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "includes/flower.h" @@ -244,13 +243,11 @@ static MACHINE_CONFIG_START( flower, flower_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,8000000) MCFG_CPU_PROGRAM_MAP(flower_cpu1_2) -// MCFG_CPU_VBLANK_INT_HACK(flower_cpu0_interrupt,10) MCFG_CPU_VBLANK_INT("screen", flower_cpu0_interrupt) //nmis stuff up the writes to shared ram MCFG_CPU_ADD("sub", Z80,8000000) MCFG_CPU_PROGRAM_MAP(flower_cpu1_2) MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) -// MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse) MCFG_CPU_ADD("audiocpu", Z80,8000000) MCFG_CPU_PROGRAM_MAP(flower_sound_cpu) diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c index 7299775f9df..b698bc0acc9 100644 --- a/src/mame/drivers/flstory.c +++ b/src/mame/drivers/flstory.c @@ -10,7 +10,6 @@ ***************************************************************************/ #include "emu.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "cpu/m6805/m6805.h" #include "sound/ay8910.h" @@ -1098,7 +1097,7 @@ static MACHINE_CONFIG_START( flstory, flstory_state ) MCFG_CPU_ADD("audiocpu", Z80,XTAL_8MHz/2) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ??? */ + MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) /* IRQ generated by ??? */ /* NMI generated by the main CPU */ MCFG_CPU_ADD("mcu", M68705,XTAL_18_432MHz/6) /* verified on pcb */ @@ -1157,8 +1156,9 @@ static MACHINE_CONFIG_START( onna34ro, flstory_state ) MCFG_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz */ MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ??? */ + MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) /* IRQ generated by ??? */ /* NMI generated by the main CPU */ + // MCFG_CPU_ADD("mcu", M68705,4000000) /* ??? */ // MCFG_CPU_PROGRAM_MAP(m68705_map) @@ -1215,8 +1215,9 @@ static MACHINE_CONFIG_START( victnine, flstory_state ) MCFG_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz */ MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ??? */ + MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) /* IRQ generated by ??? */ /* NMI generated by the main CPU */ + // MCFG_CPU_ADD("mcu", M68705,4000000) /* ??? */ // MCFG_CPU_PROGRAM_MAP(m68705_map) @@ -1280,10 +1281,10 @@ static MACHINE_CONFIG_START( rumba, flstory_state ) MCFG_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz */ MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ??? */ + MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) /* IRQ generated by ??? */ /* NMI generated by the main CPU */ -// MCFG_CPU_ADD("mcu", M68705,18432000/6) /* ??? */ +// MCFG_CPU_ADD("mcu", M68705,18432000/6) /* ??? */ // MCFG_CPU_PROGRAM_MAP(m68705_map) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */ diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c index 2a7ecad53f4..cf02619d1e2 100644 --- a/src/mame/drivers/gng.c +++ b/src/mame/drivers/gng.c @@ -22,7 +22,6 @@ Notes: #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "cpu/m6809/m6809.h" #include "sound/2203intf.h" #include "includes/gng.h" @@ -332,7 +331,7 @@ static MACHINE_CONFIG_START( gng, gng_state ) MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/4) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) MCFG_MACHINE_START(gng) MCFG_MACHINE_RESET(gng) diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c index 2e61b855e8c..4a795e8b96e 100644 --- a/src/mame/drivers/goindol.c +++ b/src/mame/drivers/goindol.c @@ -19,7 +19,6 @@ Notes: #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "sound/2203intf.h" #include "includes/goindol.h" @@ -252,7 +251,7 @@ static MACHINE_CONFIG_START( goindol, goindol_state ) MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/2) /* XTAL confirmed, divisor is not */ MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) MCFG_MACHINE_START(goindol) MCFG_MACHINE_RESET(goindol) diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c index 28cee68366c..87c320898da 100644 --- a/src/mame/drivers/gsword.c +++ b/src/mame/drivers/gsword.c @@ -142,7 +142,6 @@ reg: 0->1 (main->2nd) / : (1->0) 2nd->main : ******************************************/ #include "emu.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "machine/tait8741.h" #include "sound/ay8910.h" @@ -253,10 +252,9 @@ static MACHINE_RESET( josvolly ) static INTERRUPT_GEN( gsword_snd_interrupt ) { gsword_state *state = device->machine().driver_data(); + if(state->m_nmi_enable) - { device_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); - } } static WRITE8_DEVICE_HANDLER( gsword_nmi_set_w ) @@ -672,7 +670,7 @@ static MACHINE_CONFIG_START( gsword, gsword_state ) MCFG_CPU_ADD("sub", Z80, XTAL_18MHz/6) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(cpu2_map) MCFG_CPU_IO_MAP(cpu2_io_map) - MCFG_CPU_VBLANK_INT_HACK(gsword_snd_interrupt,4) + MCFG_CPU_PERIODIC_INT(gsword_snd_interrupt,4*60) MCFG_CPU_ADD("audiocpu", Z80, XTAL_18MHz/6) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(cpu3_map) @@ -722,12 +720,11 @@ static MACHINE_CONFIG_START( josvolly, gsword_state ) MCFG_CPU_ADD("maincpu", Z80, 18000000/6) /* ? */ MCFG_CPU_PROGRAM_MAP(cpu1_map) MCFG_CPU_IO_MAP(josvolly_cpu1_io_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) MCFG_CPU_ADD("audiocpu", Z80, 12000000/4) /* ? */ MCFG_CPU_PROGRAM_MAP(josvolly_cpu2_map) MCFG_CPU_IO_MAP(josvolly_cpu2_io_map) -// MCFG_CPU_VBLANK_INT("screen", gsword_snd_interrupt) MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) MCFG_MACHINE_RESET(josvolly) diff --git a/src/mame/drivers/gunsmoke.c b/src/mame/drivers/gunsmoke.c index 74d25fb4008..ce82694eefe 100644 --- a/src/mame/drivers/gunsmoke.c +++ b/src/mame/drivers/gunsmoke.c @@ -68,7 +68,6 @@ Stephh's notes (based on the games Z80 code and some tests) : #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "sound/2203intf.h" #include "includes/gunsmoke.h" @@ -304,7 +303,7 @@ static MACHINE_CONFIG_START( gunsmoke, gunsmoke_state ) MCFG_CPU_ADD("audiocpu", Z80, 3000000) // 3 MHz MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 4) + MCFG_CPU_PERIODIC_INT(irq0_line_hold, 4*60) MCFG_MACHINE_START(gunsmoke) MCFG_MACHINE_RESET(gunsmoke) diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c index 8935cdb2298..b29d9a8c7dd 100644 --- a/src/mame/drivers/itech32.c +++ b/src/mame/drivers/itech32.c @@ -347,7 +347,6 @@ Notes: #include "emu.h" #include "cpu/tms32031/tms32031.h" #include "cpu/m6800/m6800.h" -#include "deprecat.h" #include "cpu/m6809/m6809.h" #include "cpu/m68000/m68000.h" #include "machine/6522via.h" @@ -1773,7 +1772,7 @@ static MACHINE_CONFIG_DERIVED( sftm, bloodstm ) MCFG_CPU_MODIFY("soundcpu") MCFG_CPU_PROGRAM_MAP(sound_020_map) - MCFG_CPU_VBLANK_INT_HACK(irq1_line_assert,4) + MCFG_CPU_PERIODIC_INT(irq1_line_assert,4*60) /* via */ MCFG_DEVICE_REMOVE("via6522_0") diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c index 17c4f3d93ff..fb425ebdae5 100644 --- a/src/mame/drivers/jack.c +++ b/src/mame/drivers/jack.c @@ -857,7 +857,7 @@ static MACHINE_CONFIG_DERIVED( tripool, jack ) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* tripool needs 2 or the palette is broken */ + MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) /* tripool needs 2 or the palette is broken */ MACHINE_CONFIG_END static INTERRUPT_GEN( joinem_interrupts ) @@ -866,7 +866,7 @@ static INTERRUPT_GEN( joinem_interrupts ) device_set_input_line(device, 0, HOLD_LINE); else { - if (!(input_port_read(device->machine(), "IN2") & 0x80)) + if (!(input_port_read(device->machine(), "IN2") & 0x80)) /* TODO: remove me */ device_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); } } diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c index 3368d6127ac..31f192acce3 100644 --- a/src/mame/drivers/kyugo.c +++ b/src/mame/drivers/kyugo.c @@ -23,7 +23,6 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "sound/ay8910.h" #include "includes/kyugo.h" @@ -490,7 +489,7 @@ static MACHINE_CONFIG_START( gyrodine, kyugo_state ) MCFG_CPU_ADD("sub", Z80, XTAL_18_432MHz/6) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(gyrodine_sub_map) MCFG_CPU_IO_MAP(gyrodine_sub_portmap) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c index d380e219f17..6ffe6d97cdc 100644 --- a/src/mame/drivers/ladyfrog.c +++ b/src/mame/drivers/ladyfrog.c @@ -48,7 +48,6 @@ Notes: #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "sound/ay8910.h" #include "sound/msm5232.h" #include "includes/ladyfrog.h" @@ -318,7 +317,7 @@ static MACHINE_CONFIG_START( ladyfrog, ladyfrog_state ) MCFG_CPU_ADD("audiocpu", Z80,8000000/2) MCFG_CPU_PROGRAM_MAP(ladyfrog_sound_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) MCFG_MACHINE_START(ladyfrog) MCFG_MACHINE_RESET(ladyfrog) diff --git a/src/mame/drivers/liberatr.c b/src/mame/drivers/liberatr.c index a43ddb6bfa3..b4ad7a94d02 100644 --- a/src/mame/drivers/liberatr.c +++ b/src/mame/drivers/liberatr.c @@ -136,7 +136,6 @@ #define ADDRESS_MAP_MODERN #include "emu.h" -#include "deprecat.h" #include "includes/liberatr.h" #define MASTER_CLOCK 20000000 /* 20Mhz Main Clock Xtal */ @@ -391,7 +390,7 @@ static MACHINE_CONFIG_START( liberatr, liberatr_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/16) /* 1.25Mhz divided from 20Mhz master clock */ MCFG_CPU_PROGRAM_MAP(liberatr_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) MCFG_ER2055_ADD("earom") diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c index fec200bb0c2..946db6c6ac9 100644 --- a/src/mame/drivers/m72.c +++ b/src/mame/drivers/m72.c @@ -84,7 +84,6 @@ other supported games as well. #include "emu.h" #include "cpu/z80/z80.h" #include "cpu/nec/nec.h" -#include "deprecat.h" #include "machine/irem_cpu.h" #include "audio/m72.h" #include "sound/dac.h" @@ -1897,7 +1896,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( m72, m72_base ) MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_VBLANK_INT_HACK(fake_nmi,128) /* clocked by V1? (Vigilante) */ + MCFG_CPU_PERIODIC_INT(fake_nmi,128*55) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MACHINE_CONFIG_END @@ -1957,7 +1956,7 @@ static MACHINE_CONFIG_START( xmultipl, m72_state ) MCFG_CPU_ADD("soundcpu",Z80, SOUND_CLOCK) MCFG_CPU_PROGRAM_MAP(sound_rom_map) MCFG_CPU_IO_MAP(rtype2_sound_portmap) - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,128*55) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MCFG_MACHINE_START(m72) @@ -1999,7 +1998,7 @@ static MACHINE_CONFIG_START( xmultiplm72, m72_state ) MCFG_CPU_ADD("soundcpu",Z80, SOUND_CLOCK) MCFG_CPU_PROGRAM_MAP(sound_ram_map) MCFG_CPU_IO_MAP(sound_portmap) - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,128*55) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MCFG_MACHINE_START(m72) @@ -2041,7 +2040,7 @@ static MACHINE_CONFIG_START( dbreed, m72_state ) MCFG_CPU_ADD("soundcpu",Z80, SOUND_CLOCK) MCFG_CPU_PROGRAM_MAP(sound_rom_map) MCFG_CPU_IO_MAP(rtype2_sound_portmap) - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,128*55) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MCFG_MACHINE_START(m72) @@ -2083,7 +2082,7 @@ static MACHINE_CONFIG_START( dbreedm72, m72_state ) MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK) MCFG_CPU_PROGRAM_MAP(sound_ram_map) MCFG_CPU_IO_MAP(sound_portmap) - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,128*55) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MCFG_MACHINE_START(m72) @@ -2125,7 +2124,7 @@ static MACHINE_CONFIG_START( rtype2, m72_state ) MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK) MCFG_CPU_PROGRAM_MAP(sound_rom_map) MCFG_CPU_IO_MAP(rtype2_sound_portmap) - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,128*55) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MCFG_MACHINE_START(m72) @@ -2167,7 +2166,7 @@ static MACHINE_CONFIG_START( majtitle, m72_state ) MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK) MCFG_CPU_PROGRAM_MAP(sound_rom_map) MCFG_CPU_IO_MAP(rtype2_sound_portmap) - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,128*55) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MCFG_MACHINE_START(m72) @@ -2209,7 +2208,7 @@ static MACHINE_CONFIG_START( hharry, m72_state ) MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK) MCFG_CPU_PROGRAM_MAP(sound_rom_map) MCFG_CPU_IO_MAP(rtype2_sound_portmap) - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,128*55) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MCFG_MACHINE_START(m72) @@ -2251,7 +2250,7 @@ static MACHINE_CONFIG_START( hharryu, m72_state ) MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK) MCFG_CPU_PROGRAM_MAP(sound_rom_map) MCFG_CPU_IO_MAP(rtype2_sound_portmap) - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,128*55) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MCFG_MACHINE_START(m72) @@ -2293,7 +2292,7 @@ static MACHINE_CONFIG_START( dkgenm72, m72_state ) MCFG_CPU_ADD("soundcpu",Z80, SOUND_CLOCK) MCFG_CPU_PROGRAM_MAP(sound_ram_map) MCFG_CPU_IO_MAP(sound_portmap) - MCFG_CPU_VBLANK_INT_HACK(fake_nmi,128) /* clocked by V1? (Vigilante) */ + MCFG_CPU_PERIODIC_INT(fake_nmi,128*55) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MCFG_MACHINE_START(m72) @@ -2335,7 +2334,7 @@ static MACHINE_CONFIG_START( poundfor, m72_state ) MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK) MCFG_CPU_PROGRAM_MAP(sound_rom_map) MCFG_CPU_IO_MAP(poundfor_sound_portmap) - MCFG_CPU_VBLANK_INT_HACK(fake_nmi,128) /* clocked by V1? (Vigilante) */ + MCFG_CPU_PERIODIC_INT(fake_nmi,128*55) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MCFG_MACHINE_START(m72) @@ -2377,7 +2376,7 @@ static MACHINE_CONFIG_START( cosmccop, m72_state ) MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK) MCFG_CPU_PROGRAM_MAP(sound_rom_map) MCFG_CPU_IO_MAP(rtype2_sound_portmap) - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,128*55) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MCFG_MACHINE_START(kengo) diff --git a/src/mame/drivers/matmania.c b/src/mame/drivers/matmania.c index 01a28291933..457d069e460 100644 --- a/src/mame/drivers/matmania.c +++ b/src/mame/drivers/matmania.c @@ -30,7 +30,6 @@ The driver has been updated accordingly. ***************************************************************************/ #include "emu.h" -#include "deprecat.h" #include "cpu/m6502/m6502.h" #include "cpu/m6809/m6809.h" #include "cpu/m6805/m6805.h" @@ -317,7 +316,7 @@ static MACHINE_CONFIG_START( matmania, matmania_state ) MCFG_CPU_ADD("audiocpu", M6502, 1200000) /* 1.2 MHz ???? */ MCFG_CPU_PROGRAM_MAP(matmania_sound_map) - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,15) /* ???? */ + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,15*60) /* ???? */ /* IRQs are caused by the main CPU */ MCFG_QUANTUM_TIME(attotime::from_hz(600)) diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c index dab0325e16a..d4095f5dac9 100644 --- a/src/mame/drivers/megaplay.c +++ b/src/mame/drivers/megaplay.c @@ -654,7 +654,6 @@ static MACHINE_CONFIG_START( megaplay, mplay_state ) MCFG_CPU_ADD("mtbios", Z80, MASTER_CLOCK / 15) /* ?? */ MCFG_CPU_PROGRAM_MAP(megaplay_bios_map) MCFG_CPU_IO_MAP(megaplay_bios_io_map) - //MCFG_CPU_VBLANK_INT_HACK(megaplay_bios_irq, 262) MCFG_MACHINE_RESET( megaplay ) diff --git a/src/mame/drivers/meijinsn.c b/src/mame/drivers/meijinsn.c index 89bb28a6efa..edddc70a7e2 100644 --- a/src/mame/drivers/meijinsn.c +++ b/src/mame/drivers/meijinsn.c @@ -350,7 +350,7 @@ static MACHINE_CONFIG_START( meijinsn, meijinsn_state ) MCFG_CPU_ADD("audiocpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(meijinsn_sound_map) MCFG_CPU_IO_MAP(meijinsn_sound_io_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 160) + MCFG_CPU_PERIODIC_INT(irq0_line_hold, 160*60) MCFG_MACHINE_START(meijinsn) MCFG_MACHINE_RESET(meijinsn) diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c index 1bf9d12c7e7..8228c4d3bc7 100644 --- a/src/mame/drivers/metlclsh.c +++ b/src/mame/drivers/metlclsh.c @@ -269,7 +269,7 @@ static INTERRUPT_GEN( metlclsh_interrupt2 ) if (cpu_getiloops(device) == 0) return; /* generate NMI on coin insertion */ - if ((~input_port_read(device->machine(), "IN2") & 0xc0) || (~input_port_read(device->machine(), "DSW") & 0x40)) + if ((~input_port_read(device->machine(), "IN2") & 0xc0) || (~input_port_read(device->machine(), "DSW") & 0x40)) /* TODO: remove me */ device_set_input_line(device, INPUT_LINE_NMI, ASSERT_LINE); } diff --git a/src/mame/drivers/mirax.c b/src/mame/drivers/mirax.c index c366c5af5a9..07b7829088d 100644 --- a/src/mame/drivers/mirax.c +++ b/src/mame/drivers/mirax.c @@ -71,7 +71,6 @@ The End #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "sound/ay8910.h" @@ -401,7 +400,7 @@ static MACHINE_CONFIG_START( mirax, mirax_state ) MCFG_CPU_ADD("audiocpu", Z80, 12000000/4) MCFG_CPU_PROGRAM_MAP(mirax_sound_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 4) + MCFG_CPU_PERIODIC_INT(irq0_line_hold, 4*60) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c index 1da6aa7ebf7..89826f959eb 100644 --- a/src/mame/drivers/mjsister.c +++ b/src/mame/drivers/mjsister.c @@ -8,7 +8,6 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "sound/dac.h" #include "sound/ay8910.h" @@ -502,7 +501,7 @@ static MACHINE_CONFIG_START( mjsister, mjsister_state ) MCFG_CPU_ADD("maincpu", Z80, MCLK/2) /* 6.000 MHz */ MCFG_CPU_PROGRAM_MAP(mjsister_map) MCFG_CPU_IO_MAP(mjsister_io_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) MCFG_MACHINE_START(mjsister) MCFG_MACHINE_RESET(mjsister) diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c index 36812f98f8c..c140131508f 100644 --- a/src/mame/drivers/mlanding.c +++ b/src/mame/drivers/mlanding.c @@ -13,7 +13,7 @@ TODO: - Comms between the five CPUs; - Gameplay looks stiff; - Needs a custom artwork for the cloche status; -- Current dump is weird, a mix between German, English, and Japanese? +- Current dump is weird, a mix between German, English and Japanese? - clean-ups! ************************************************************************************************************/ @@ -22,7 +22,6 @@ TODO: #include "cpu/m68000/m68000.h" #include "cpu/tms32025/tms32025.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "audio/taitosnd.h" #include "sound/2151intf.h" #include "sound/msm5205.h" @@ -752,12 +751,12 @@ static MACHINE_CONFIG_START( mlanding, mlanding_state ) MCFG_CPU_PROGRAM_MAP(mlanding_mem) MCFG_CPU_VBLANK_INT("screen", irq6_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, 4000000 ) /* 4 MHz ??? (guess) */ - MCFG_CPU_PROGRAM_MAP(mlanding_z80_mem) - MCFG_CPU_ADD("sub", M68000, 12000000 ) /* 12 MHz ??? (guess) */ MCFG_CPU_PROGRAM_MAP(mlanding_sub_mem) - MCFG_CPU_VBLANK_INT_HACK(irq6_line_hold,7) + MCFG_CPU_PERIODIC_INT(irq6_line_hold,7*60) /* ??? */ + + MCFG_CPU_ADD("audiocpu", Z80, 4000000 ) /* 4 MHz ??? (guess) */ + MCFG_CPU_PROGRAM_MAP(mlanding_z80_mem) MCFG_CPU_ADD("z80sub", Z80, 4000000 ) /* 4 MHz ??? (guess) */ MCFG_CPU_PROGRAM_MAP(mlanding_z80_sub_mem) diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c index 5e85a1d8339..9507cbe92c5 100644 --- a/src/mame/drivers/mouser.c +++ b/src/mame/drivers/mouser.c @@ -14,7 +14,6 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "sound/ay8910.h" #include "includes/mouser.h" @@ -217,7 +216,7 @@ static MACHINE_CONFIG_START( mouser, mouser_state ) MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */ MCFG_CPU_PROGRAM_MAP(mouser_sound_map) MCFG_CPU_IO_MAP(mouser_sound_io_map) - MCFG_CPU_VBLANK_INT_HACK(mouser_sound_nmi_assert, 4) /* ??? This controls the sound tempo */ + MCFG_CPU_PERIODIC_INT(mouser_sound_nmi_assert, 4*60) /* ??? This controls the sound tempo */ MCFG_MACHINE_START(mouser) MCFG_MACHINE_RESET(mouser) diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c index 358077e918d..6afe0da656e 100644 --- a/src/mame/drivers/namcos2.c +++ b/src/mame/drivers/namcos2.c @@ -445,7 +445,6 @@ $a00000 checks have been seen on the Final Lap boards. #include "emu.h" #include "cpu/m68000/m68000.h" #include "cpu/m6805/m6805.h" -#include "deprecat.h" #include "includes/namcos2.h" #include "cpu/m6809/m6809.h" #include "includes/namcoic.h" @@ -1617,7 +1616,7 @@ static MACHINE_CONFIG_START( default, driver_device ) MCFG_CPU_ADD("audiocpu", M6809, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */ MCFG_CPU_PROGRAM_MAP(sound_default_am) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) MCFG_CPU_PERIODIC_INT(irq1_line_hold, 120) MCFG_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */ @@ -1694,7 +1693,7 @@ static MACHINE_CONFIG_START( gollygho, driver_device ) MCFG_CPU_ADD("audiocpu", M6809, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */ MCFG_CPU_PROGRAM_MAP(sound_default_am) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) + MCFG_CPU_PERIODIC_INT(irq0_line_hold, 2*60) MCFG_CPU_PERIODIC_INT(irq1_line_hold, 120) MCFG_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */ @@ -1744,7 +1743,7 @@ static MACHINE_CONFIG_START( finallap, driver_device ) MCFG_CPU_ADD("audiocpu", M6809, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */ MCFG_CPU_PROGRAM_MAP(sound_default_am) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) + MCFG_CPU_PERIODIC_INT(irq0_line_hold, 2*60) MCFG_CPU_PERIODIC_INT(irq1_line_hold, 120) MCFG_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */ @@ -1794,7 +1793,7 @@ static MACHINE_CONFIG_START( sgunner, driver_device ) MCFG_CPU_ADD("audiocpu", M6809, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */ MCFG_CPU_PROGRAM_MAP(sound_default_am) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) + MCFG_CPU_PERIODIC_INT(irq0_line_hold, 2*60) MCFG_CPU_PERIODIC_INT(irq1_line_hold, 120) MCFG_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */ @@ -1844,7 +1843,7 @@ static MACHINE_CONFIG_START( luckywld, driver_device ) MCFG_CPU_ADD("audiocpu", M6809, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */ MCFG_CPU_PROGRAM_MAP(sound_default_am) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) MCFG_CPU_PERIODIC_INT(irq1_line_hold,120) MCFG_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */ @@ -1894,7 +1893,7 @@ static MACHINE_CONFIG_START( metlhawk, driver_device ) MCFG_CPU_ADD("audiocpu", M6809, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */ MCFG_CPU_PROGRAM_MAP(sound_default_am) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) MCFG_CPU_PERIODIC_INT(irq1_line_hold,120) MCFG_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */ diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c index b971b94eadf..2f554c387d8 100644 --- a/src/mame/drivers/namcos21.c +++ b/src/mame/drivers/namcos21.c @@ -291,7 +291,6 @@ CPU68 PCB: #include "emu.h" #include "cpu/m68000/m68000.h" #include "cpu/m6805/m6805.h" -#include "deprecat.h" #include "includes/namcos2.h" #include "cpu/m6809/m6809.h" #include "cpu/tms32025/tms32025.h" @@ -1535,7 +1534,7 @@ static MACHINE_CONFIG_START( s21base, namcos21_state ) MCFG_CPU_ADD("audiocpu", M6809,3072000) /* Sound */ MCFG_CPU_PROGRAM_MAP(am_sound_winrun) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) MCFG_CPU_PERIODIC_INT(irq1_line_hold,120) MCFG_CPU_ADD("mcu", HD63705,2048000) /* IO */ @@ -1612,7 +1611,7 @@ static MACHINE_CONFIG_START( driveyes, namcos21_state ) MCFG_CPU_ADD("audiocpu", M6809,3072000) /* Sound */ MCFG_CPU_PROGRAM_MAP(am_sound_winrun) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) MCFG_CPU_PERIODIC_INT(irq1_line_hold,120) MCFG_CPU_ADD("mcu", HD63705,2048000) /* IO */ @@ -1667,7 +1666,7 @@ static MACHINE_CONFIG_START( winrun_c140_typeB, namcos21_state ) MCFG_CPU_ADD("audiocpu", M6809,3072000) /* Sound */ MCFG_CPU_PROGRAM_MAP(am_sound_winrun) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) MCFG_CPU_PERIODIC_INT(irq1_line_hold,120) MCFG_CPU_ADD("mcu", HD63705,2048000) /* IO */ diff --git a/src/mame/drivers/nbmj8688.c b/src/mame/drivers/nbmj8688.c index d4c921ec3f8..de2decdc25d 100644 --- a/src/mame/drivers/nbmj8688.c +++ b/src/mame/drivers/nbmj8688.c @@ -2985,7 +2985,6 @@ static MACHINE_CONFIG_DERIVED( crystalg, NBMJDRV_256 ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(secolove_map) MCFG_CPU_IO_MAP(crystalg_io_map) -// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 96) // nmiclock = 2f MACHINE_CONFIG_END @@ -2995,7 +2994,6 @@ static MACHINE_CONFIG_DERIVED( apparel, NBMJDRV_256 ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(secolove_map) MCFG_CPU_IO_MAP(secolove_io_map) -// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60 MACHINE_CONFIG_END @@ -3005,7 +3003,6 @@ static MACHINE_CONFIG_DERIVED( mbmj_h12bit, NBMJDRV_4096 ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(secolove_map) MCFG_CPU_IO_MAP(secolove_io_map) -// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60 /* video hardware */ MCFG_VIDEO_START(mbmj8688_hybrid_12bit) @@ -3017,7 +3014,6 @@ static MACHINE_CONFIG_DERIVED( barline, mbmj_h12bit ) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(barline_io_map) -// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60 MCFG_SOUND_REPLACE("psg", YM3812, 20000000/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) @@ -3031,7 +3027,6 @@ static MACHINE_CONFIG_DERIVED( mbmj_p16bit, NBMJDRV_65536 ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(secolove_map) MCFG_CPU_IO_MAP(secolove_io_map) -// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60/40 /* video hardware */ MCFG_VIDEO_START(mbmj8688_pure_16bit) @@ -3099,7 +3094,6 @@ static MACHINE_CONFIG_DERIVED( seiha, NBMJDRV_65536 ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(secolove_map) MCFG_CPU_IO_MAP(seiha_io_map) -// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60 MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( mjgaiden, NBMJDRV_4096 ) @@ -3117,7 +3111,6 @@ static MACHINE_CONFIG_DERIVED( iemoto, NBMJDRV_65536 ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(secolove_map) MCFG_CPU_IO_MAP(iemoto_io_map) -// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60 MACHINE_CONFIG_END @@ -3127,7 +3120,6 @@ static MACHINE_CONFIG_DERIVED( ojousan, NBMJDRV_65536 ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(ojousan_map) MCFG_CPU_IO_MAP(iemoto_io_map) -// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60 MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( mbmj_p12bit, NBMJDRV_4096 ) @@ -3136,7 +3128,6 @@ static MACHINE_CONFIG_DERIVED( mbmj_p12bit, NBMJDRV_4096 ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(mjsikaku_map) MCFG_CPU_IO_MAP(kaguya_io_map) -// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) MACHINE_CONFIG_END @@ -3146,7 +3137,6 @@ static MACHINE_CONFIG_DERIVED( mjsikaku, NBMJDRV_4096 ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(mjsikaku_map) MCFG_CPU_IO_MAP(mjsikaku_io_map) -// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 144) // nmiclock = 70 /* sound hardware */ MCFG_SOUND_REPLACE("psg", YM3812, 20000000/8) @@ -3160,7 +3150,6 @@ static MACHINE_CONFIG_DERIVED( mmsikaku, NBMJDRV_4096 ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(secolove_map) MCFG_CPU_IO_MAP(mmsikaku_io_map) -// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) MACHINE_CONFIG_END diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c index 6e24045cb22..40b921cace3 100644 --- a/src/mame/drivers/nbmj8891.c +++ b/src/mame/drivers/nbmj8891.c @@ -2612,7 +2612,6 @@ static MACHINE_CONFIG_START( gionbana, nbmj8891_state ) MCFG_CPU_ADD("maincpu", Z80, 20000000/4) /* 5.00 MHz ? */ MCFG_CPU_PROGRAM_MAP(gionbana_map) MCFG_CPU_IO_MAP(gionbana_io_map) -// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 132) // nmiclock = 60 MCFG_CPU_VBLANK_INT("screen", nb1413m3_interrupt) MCFG_MACHINE_RESET(nb1413m3) @@ -2674,7 +2673,6 @@ static MACHINE_CONFIG_DERIVED( mjcamerb, gionbana ) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(hanamomo_io_map) -// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 142) // ? MCFG_NVRAM_ADD_0FILL("nvram") @@ -2689,7 +2687,6 @@ static MACHINE_CONFIG_DERIVED( mmcamera, gionbana ) /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(hanamomo_io_map) -// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) MCFG_NVRAM_ADD_0FILL("nvram") @@ -2705,7 +2702,6 @@ static MACHINE_CONFIG_DERIVED( hanamomo, gionbana ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(hanamomo_map) MCFG_CPU_IO_MAP(hanamomo_io_map) -// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -2720,7 +2716,6 @@ static MACHINE_CONFIG_DERIVED( msjiken, hanamomo ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(gionbana_map) MCFG_CPU_IO_MAP(msjiken_io_map) -// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 142) // nmiclock = 70 MACHINE_CONFIG_END @@ -2728,23 +2723,10 @@ MACHINE_CONFIG_END /* NBMJDRV3 */ static MACHINE_CONFIG_DERIVED( telmahjn, gionbana ) - /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") -// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 142) // nmiclock = 70 - /* video hardware */ MCFG_VIDEO_START(nbmj8891_1layer) MACHINE_CONFIG_END - -static MACHINE_CONFIG_DERIVED( mgmen89, telmahjn ) - - /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") -// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) -MACHINE_CONFIG_END - - /* NBMJDRV4 */ static MACHINE_CONFIG_DERIVED( mjfocus, gionbana ) @@ -2846,7 +2828,6 @@ static MACHINE_CONFIG_DERIVED( mjfocusm, gionbana ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(scandalm_map) MCFG_CPU_IO_MAP(scandalm_io_map) -// MCFG_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) MCFG_NVRAM_ADD_0FILL("nvram") @@ -3871,7 +3852,7 @@ GAME( 1989, mjcamerb, 0, mjcamerb, mjcamerb, mmcamera, ROT0, "Miki Syo GAME( 1989, mmcamera, mjcamerb, mmcamera, mmcamera, mmcamera, ROT0, "Miki Syouji", "Mahjong Camera Kozou [BET] (Japan 890509)", 0 ) GAME( 1989, scandal, 0, scandal, scandal, scandal, ROT0, "Nichibutsu", "Scandal Mahjong (Japan 890213)", 0 ) GAME( 1989, scandalm, scandal, mjfocusm, scandalm, scandalm, ROT0, "Nichibutsu", "Scandal Mahjong [BET] (Japan 890217)", 0 ) -GAME( 1989, mgmen89, 0, mgmen89, mgmen89, mgmen89, ROT0, "Nichibutsu", "Mahjong G-MEN'89 (Japan 890425)", 0 ) +GAME( 1989, mgmen89, 0, telmahjn, mgmen89, mgmen89, ROT0, "Nichibutsu", "Mahjong G-MEN'89 (Japan 890425)", 0 ) GAME( 1989, mjnanpas, 0, mjnanpas, mjnanpas, mjnanpas, ROT0, "Brooks", "Mahjong Nanpa Story (Japan 890713)", 0 ) GAME( 1989, mjnanpaa, mjnanpas, mjnanpas, mjnanpaa, mjnanpas, ROT0, "Brooks", "Mahjong Nanpa Story (Japan 890712)", 0 ) GAME( 1989, mjnanpau, mjnanpas, mjnanpas, mjnanpas, mjnanpas, ROT0, "Brooks", "Mahjong Nanpa Story (Ura) (Japan 890805)", 0 ) diff --git a/src/mame/drivers/nova2001.c b/src/mame/drivers/nova2001.c index 6e962d8761b..de81e572acf 100644 --- a/src/mame/drivers/nova2001.c +++ b/src/mame/drivers/nova2001.c @@ -119,7 +119,6 @@ e000 - e7ff R/W Work RAM #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "sound/ay8910.h" #include "includes/nova2001.h" @@ -725,7 +724,7 @@ static MACHINE_CONFIG_START( ninjakun, nova2001_state ) MCFG_CPU_ADD("sub", Z80, MAIN_CLOCK/4) // 3 MHz MCFG_CPU_PROGRAM_MAP(ninjakun_cpu2_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* ? */ + MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) /* ? */ MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame */ @@ -801,7 +800,7 @@ static MACHINE_CONFIG_START( raiders5, nova2001_state ) MCFG_CPU_ADD("sub", Z80, MAIN_CLOCK/4) // 3 MHz MCFG_CPU_PROGRAM_MAP(raiders5_cpu2_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* ? */ + MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) /* ? */ MCFG_QUANTUM_TIME(attotime::from_hz(24000)) diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c index db1cacdde7c..e5342f6f1d6 100644 --- a/src/mame/drivers/pacman.c +++ b/src/mame/drivers/pacman.c @@ -338,7 +338,6 @@ Boards: #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "includes/pacman.h" #include "cpu/s2650/s2650.h" #include "sound/namco.h" @@ -399,23 +398,6 @@ static WRITE8_HANDLER( pacman_interrupt_vector_w ) } -static INTERRUPT_GEN( pacman_interrupt ) -{ - /* always signal a normal VBLANK */ - if (cpu_getiloops(device) == 0) - irq0_line_hold(device); - - /* on other "VBLANK" opportunities, check to make sure the cheat is enabled */ - /* and that the speedup button is pressed */ - else - { - UINT8 value = input_port_read_safe(device->machine(), "FAKE", 0); - if ((value & 7) == 5 || (value & 6) == 2) - irq0_line_hold(device); - } -} - - /* The piranha board has a sync bus controler card similar to Midway's pacman. It stores the LSB of the interupt vector using port 00 but it alters the byte to prevent @@ -1348,14 +1330,6 @@ static INPUT_PORTS_START( pacman ) PORT_START("DSW2") PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START("FAKE") - /* This fake input port is used to get the status of the fire button */ - /* and activate the speedup cheat if it is. */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME( "2x Speed (Cheat)" ) - PORT_CONFNAME( 0x06, 0x00, "2x Speed Cheat" ) - PORT_CONFSETTING( 0x00, "Disabled" ) - PORT_CONFSETTING( 0x02, "Enabled Always" ) - PORT_CONFSETTING( 0x04, "Enabled with Button" ) INPUT_PORTS_END @@ -1410,18 +1384,9 @@ static INPUT_PORTS_START( mspacman ) PORT_START("DSW2") PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_START("FAKE") - /* This fake input port is used to get the status of the fire button */ - /* and activate the speedup cheat if it is. */ - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME( "2x Speed (Cheat)" ) - PORT_CONFNAME( 0x06, 0x00, "2x Speed Cheat" ) - PORT_CONFSETTING( 0x00, "Disabled" ) - PORT_CONFSETTING( 0x02, "Enabled Always" ) - PORT_CONFSETTING( 0x04, "Enabled with Button" ) INPUT_PORTS_END -/* Same as 'mspacman', but no fake input port */ static INPUT_PORTS_START( mspacpls ) PORT_START("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY @@ -3147,7 +3112,7 @@ static MACHINE_CONFIG_START( pacman, pacman_state ) MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) MCFG_CPU_PROGRAM_MAP(pacman_map) MCFG_CPU_IO_MAP(writeport) - MCFG_CPU_VBLANK_INT_HACK(pacman_interrupt,2) + MCFG_CPU_VBLANK_INT("screen",irq0_line_hold) MCFG_WATCHDOG_VBLANK_INIT(16) /* video hardware */ @@ -3276,7 +3241,7 @@ static MACHINE_CONFIG_DERIVED( bigbucks, pacman ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(bigbucks_map) MCFG_CPU_IO_MAP(bigbucks_portmap) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,20) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,20*60) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1) diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c index ddb6c2f9b97..3ca7b8ce9ff 100644 --- a/src/mame/drivers/paradise.c +++ b/src/mame/drivers/paradise.c @@ -568,7 +568,7 @@ static MACHINE_CONFIG_START( paradise, paradise_state ) MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* Z8400B - 6mhz Verified */ MCFG_CPU_PROGRAM_MAP(paradise_map) MCFG_CPU_IO_MAP(paradise_io_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No nmi routine */ + MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) /* No nmi routine */ MCFG_MACHINE_START(paradise) MCFG_MACHINE_RESET(paradise) diff --git a/src/mame/drivers/photon2.c b/src/mame/drivers/photon2.c index 14402fecc2a..9b9ede14a4d 100644 --- a/src/mame/drivers/photon2.c +++ b/src/mame/drivers/photon2.c @@ -310,7 +310,6 @@ static MACHINE_CONFIG_START( photon2, photon2_state ) MCFG_CPU_PROGRAM_MAP(spectrum_mem) MCFG_CPU_IO_MAP(spectrum_io) MCFG_CPU_VBLANK_INT_HACK(spec_interrupt_hack, 2) - MCFG_QUANTUM_TIME(attotime::from_hz(60)) MCFG_MACHINE_RESET( photon2 ) diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c index 8f3cdbdb27d..f51dc57ff95 100644 --- a/src/mame/drivers/polepos.c +++ b/src/mame/drivers/polepos.c @@ -869,7 +869,7 @@ static MACHINE_CONFIG_START( polepos, polepos_state ) MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/8) /* 3.072 MHz */ MCFG_CPU_PROGRAM_MAP(z80_map) MCFG_CPU_IO_MAP(z80_io) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_assert,2) /* 64V */ + MCFG_CPU_PERIODIC_INT(irq0_line_assert,2*60) /* 64V */ MCFG_CPU_ADD("sub", Z8002, MASTER_CLOCK/8) /* 3.072 MHz */ MCFG_CPU_PROGRAM_MAP(z8002_map) @@ -955,7 +955,7 @@ static MACHINE_CONFIG_START( topracern, polepos_state ) MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/8) /* 3.072 MHz */ MCFG_CPU_PROGRAM_MAP(z80_map) MCFG_CPU_IO_MAP(z80_io) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_assert,2) /* 64V */ + MCFG_CPU_PERIODIC_INT(irq0_line_assert,2*60) /* 64V */ MCFG_CPU_ADD("sub", Z8002, MASTER_CLOCK/8) /* 3.072 MHz */ MCFG_CPU_PROGRAM_MAP(z8002_map) diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c index fcf1aafa333..dc08f3dc5a0 100644 --- a/src/mame/drivers/popper.c +++ b/src/mame/drivers/popper.c @@ -83,7 +83,6 @@ Notes: #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "sound/ay8910.h" #include "includes/popper.h" @@ -334,7 +333,7 @@ static MACHINE_CONFIG_START( popper, popper_state ) MCFG_CPU_ADD("audiocpu", Z80,18432000/12) MCFG_CPU_PROGRAM_MAP(popper_sound_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) //NMIs caused by the main CPU + MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) //NMIs caused by the main CPU MCFG_QUANTUM_TIME(attotime::from_hz(1800)) diff --git a/src/mame/drivers/retofinv.c b/src/mame/drivers/retofinv.c index 2d5a52267db..1ef044b102a 100644 --- a/src/mame/drivers/retofinv.c +++ b/src/mame/drivers/retofinv.c @@ -30,7 +30,6 @@ Notes: #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "cpu/m6805/m6805.h" #include "sound/sn76496.h" #include "includes/retofinv.h" @@ -350,7 +349,7 @@ static MACHINE_CONFIG_START( retofinv, retofinv_state ) MCFG_CPU_ADD("audiocpu", Z80, 18432000/6) /* 3.072 MHz? */ MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,2) + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,2*60) MCFG_CPU_ADD("68705", M68705,18432000/6) /* 3.072 MHz? */ MCFG_CPU_PROGRAM_MAP(mcu_map) diff --git a/src/mame/drivers/rollrace.c b/src/mame/drivers/rollrace.c index 0b591c2c31f..9768f27d594 100644 --- a/src/mame/drivers/rollrace.c +++ b/src/mame/drivers/rollrace.c @@ -8,7 +8,6 @@ Issues: ***************************************************************************/ #include "emu.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "includes/rollrace.h" @@ -52,7 +51,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( rollrace_sound_map, AS_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x2000, 0x2fff) AM_RAM - AM_RANGE(0x3000, 0x3000) AM_READWRITE(soundlatch_r,interrupt_enable_w) + AM_RANGE(0x3000, 0x3000) AM_READWRITE(soundlatch_r,interrupt_enable_w) /* TODO: check me ... */ AM_RANGE(0x4000, 0x4001) AM_DEVWRITE("ay1", ay8910_address_data_w) AM_RANGE(0x5000, 0x5001) AM_DEVWRITE("ay2", ay8910_address_data_w) AM_RANGE(0x6000, 0x6001) AM_DEVWRITE("ay3", ay8910_address_data_w) @@ -205,7 +204,7 @@ static MACHINE_CONFIG_START( rollrace, rollrace_state ) MCFG_CPU_ADD("audiocpu", Z80,XTAL_24MHz/16) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(rollrace_sound_map) - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,4) + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,4*60) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/route16.c b/src/mame/drivers/route16.c index 2fd11174193..dd81622cf02 100644 --- a/src/mame/drivers/route16.c +++ b/src/mame/drivers/route16.c @@ -676,7 +676,7 @@ static MACHINE_CONFIG_DERIVED( spacecho, speakres ) /* basic machine hardware */ MCFG_CPU_MODIFY("cpu2") - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,48) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,48*60) MACHINE_CONFIG_END diff --git a/src/mame/drivers/sbugger.c b/src/mame/drivers/sbugger.c index 0c5a98ac7e8..6404208c45b 100644 --- a/src/mame/drivers/sbugger.c +++ b/src/mame/drivers/sbugger.c @@ -99,7 +99,6 @@ Sound PCB #include "emu.h" #include "cpu/i8085/i8085.h" -#include "deprecat.h" #include "sound/sn76496.h" #include "includes/sbugger.h" @@ -217,7 +216,7 @@ static MACHINE_CONFIG_START( sbugger, sbugger_state ) MCFG_CPU_ADD("maincpu", I8085A, 6000000) /* 3.00 MHz??? */ MCFG_CPU_PROGRAM_MAP(sbugger_map) MCFG_CPU_IO_MAP(sbugger_io_map) - MCFG_CPU_VBLANK_INT_HACK(irq3_line_hold,NUM_INTS_FRAME) + MCFG_CPU_PERIODIC_INT(irq3_line_hold,NUM_INTS_FRAME*60) MCFG_GFXDECODE(sbugger) diff --git a/src/mame/drivers/segag80r.c b/src/mame/drivers/segag80r.c index 368f6e9d3a1..cd76fa5e32b 100644 --- a/src/mame/drivers/segag80r.c +++ b/src/mame/drivers/segag80r.c @@ -105,7 +105,6 @@ ***************************************************************************/ #include "emu.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "sound/dac.h" #include "sound/sn76496.h" @@ -931,7 +930,7 @@ static MACHINE_CONFIG_DERIVED( sindbadm, g80r_base ) MCFG_CPU_ADD("audiocpu", Z80, SINDBADM_SOUND_CLOCK/2) MCFG_CPU_PROGRAM_MAP(sindbadm_sound_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) /* sound hardware */ MCFG_SOUND_ADD("sn1", SN76496, SINDBADM_SOUND_CLOCK/4) diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c index fe831bb7fbf..662ee238459 100644 --- a/src/mame/drivers/segas18.c +++ b/src/mame/drivers/segas18.c @@ -1320,7 +1320,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( system18_8751, system18 ) MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_VBLANK_INT_HACK(NULL,0) + MCFG_CPU_VBLANK_INT_HACK(NULL,0) /* TODO: ??? */ MCFG_CPU_ADD("mcu", I8751, 8000000) MCFG_CPU_IO_MAP(mcu_io_map) diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index 132d2f2d5ef..e6fd9ceb433 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -7166,7 +7166,7 @@ static MACHINE_CONFIG_START( calibr50, seta_state ) MCFG_CPU_ADD("sub", M65C02, XTAL_16MHz/8) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(calibr50_sub_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* IRQ: 4/frame + MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) /* IRQ: 4/frame NMI: when the 68k writes the sound latch */ MCFG_MACHINE_RESET(calibr50) diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c index a47740a466b..e7bef16f1af 100644 --- a/src/mame/drivers/shisen.c +++ b/src/mame/drivers/shisen.c @@ -5,9 +5,9 @@ Shisen driver by Nicola Salmoria ***************************************************************************/ + #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "audio/m72.h" #include "sound/dac.h" #include "sound/2151intf.h" @@ -220,7 +220,7 @@ static MACHINE_CONFIG_START( shisen, shisen_state ) MCFG_CPU_ADD("soundcpu", Z80, 3579645) MCFG_CPU_PROGRAM_MAP(shisen_sound_map) MCFG_CPU_IO_MAP(shisen_sound_io_map) - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,128*55) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c index a2378abe583..39578145ad5 100644 --- a/src/mame/drivers/slapfght.c +++ b/src/mame/drivers/slapfght.c @@ -798,7 +798,7 @@ static MACHINE_CONFIG_START( tigerhb, slapfght_state ) MCFG_CPU_ADD("audiocpu", Z80, 6000000) MCFG_CPU_PROGRAM_MAP(slapfght_sound_map) - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,6) /* ??? */ + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,6*60) /* ??? */ MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ @@ -844,7 +844,7 @@ static MACHINE_CONFIG_START( tigerh, slapfght_state ) MCFG_CPU_ADD("audiocpu", Z80, XTAL_36MHz/12) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(slapfght_sound_map) - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,6) /* ??? */ + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,6*60) /* ??? */ MCFG_CPU_ADD("mcu", M68705,XTAL_36MHz/12) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(tigerh_m68705_map) diff --git a/src/mame/drivers/snk6502.c b/src/mame/drivers/snk6502.c index 91091dfca05..8e3c383014c 100644 --- a/src/mame/drivers/snk6502.c +++ b/src/mame/drivers/snk6502.c @@ -725,7 +725,7 @@ static INTERRUPT_GEN( satansat_interrupt ) { if (cpu_getiloops(device) != 0) { - UINT8 val = input_port_read(device->machine(), "IN2"); + UINT8 val = input_port_read(device->machine(), "IN2"); /* TODO: use CUSTOM_INPUT */ coin_counter_w(device->machine(), 0, val & 1); @@ -741,7 +741,7 @@ static INTERRUPT_GEN( snk6502_interrupt ) { if (cpu_getiloops(device) != 0) { - UINT8 val = input_port_read(device->machine(), "IN2"); + UINT8 val = input_port_read(device->machine(), "IN2"); /* TODO: use CUSTOM_INPUT */ coin_counter_w(device->machine(), 0, val & 1); coin_counter_w(device->machine(), 1, val & 2); diff --git a/src/mame/drivers/solomon.c b/src/mame/drivers/solomon.c index b862cd7d00c..78960cf6782 100644 --- a/src/mame/drivers/solomon.c +++ b/src/mame/drivers/solomon.c @@ -5,8 +5,8 @@ Solomon's Key driver by Mirko Buffoni ***************************************************************************/ + #include "emu.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "includes/solomon.h" @@ -198,7 +198,7 @@ static MACHINE_CONFIG_START( solomon, solomon_state ) MCFG_CPU_ADD("audiocpu", Z80, 3072000) MCFG_CPU_PROGRAM_MAP(sound_map) MCFG_CPU_IO_MAP(sound_portmap) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? */ + MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) /* ??? */ /* NMIs are caused by the main CPU */ /* video hardware */ diff --git a/src/mame/drivers/sonson.c b/src/mame/drivers/sonson.c index 716ce51d8c7..10e925ed1cc 100644 --- a/src/mame/drivers/sonson.c +++ b/src/mame/drivers/sonson.c @@ -49,7 +49,6 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "deprecat.h" #include "cpu/m6809/m6809.h" #include "sound/ay8910.h" #include "includes/sonson.h" @@ -252,7 +251,7 @@ static MACHINE_CONFIG_START( sonson, sonson_state ) MCFG_CPU_ADD("audiocpu", M6809,12000000/6) /* 2 MHz ??? */ MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* FIRQs are triggered by the main CPU */ + MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) /* FIRQs are triggered by the main CPU */ MCFG_MACHINE_START(sonson) MCFG_MACHINE_RESET(sonson) diff --git a/src/mame/drivers/speedbal.c b/src/mame/drivers/speedbal.c index 41d0cbc481c..969fa99694e 100644 --- a/src/mame/drivers/speedbal.c +++ b/src/mame/drivers/speedbal.c @@ -52,7 +52,6 @@ c1 ?? #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "sound/3812intf.h" #include "includes/speedbal.h" #include "machine/nvram.h" @@ -229,7 +228,7 @@ static MACHINE_CONFIG_START( speedbal, speedbal_state ) MCFG_CPU_ADD("audiocpu", Z80, 2660000) /* 2.66 MHz ??? Maybe yes */ MCFG_CPU_PROGRAM_MAP(sound_cpu_map) MCFG_CPU_IO_MAP(sound_cpu_io_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,8) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,8*60) MCFG_NVRAM_ADD_1FILL("nvram") diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c index b403cff5d50..9a98495c29d 100644 --- a/src/mame/drivers/srmp2.c +++ b/src/mame/drivers/srmp2.c @@ -38,7 +38,7 @@ Known issues : =============== - IOX might be either a shared component between PCBs or every game have its own configuration. For now I've opted for the latter solution, until an HW test will be done ... - - IOX might be a MCU of some sort. + Could also be that's a MCU of some sort. - AY-3-8910 sound may be wrong. - CPU clock of srmp3 does not match the real machine. - MSM5205 clock frequency in srmp3 is wrong. diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c index cf55bee6e1f..0e5265b4aab 100644 --- a/src/mame/drivers/srumbler.c +++ b/src/mame/drivers/srumbler.c @@ -240,7 +240,7 @@ static MACHINE_CONFIG_START( srumbler, srumbler_state ) MCFG_CPU_ADD("audiocpu", Z80, 3000000) /* 3 MHz ??? */ MCFG_CPU_PROGRAM_MAP(srumbler_sound_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) MCFG_MACHINE_RESET(srumbler) diff --git a/src/mame/drivers/sstrangr.c b/src/mame/drivers/sstrangr.c index ec0287b574f..8ab57a7f1c5 100644 --- a/src/mame/drivers/sstrangr.c +++ b/src/mame/drivers/sstrangr.c @@ -7,7 +7,6 @@ #include "emu.h" #include "cpu/i8085/i8085.h" -#include "deprecat.h" #include "sstrangr.lh" @@ -197,7 +196,7 @@ static MACHINE_CONFIG_START( sstrangr, sstrangr_state ) MCFG_CPU_ADD("maincpu",I8080,1996800) /* clock is a guess, taken from mw8080bw */ MCFG_CPU_PROGRAM_MAP(sstrangr_map) MCFG_CPU_IO_MAP(sstrangr_io_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/strnskil.c b/src/mame/drivers/strnskil.c index 0a9d0cfd5f0..43e2634f107 100644 --- a/src/mame/drivers/strnskil.c +++ b/src/mame/drivers/strnskil.c @@ -6,6 +6,9 @@ Strength & Skill (c) 1984 Sun Electronics 19/Jun/2001 - +TODO: +- needs merging with Ikki driver; + Notes: Banbam has a Fujitsu MB8841 4-Bit MCU for protection labeled SUN 8212. Its internal ROM has been imaged, manually typed, and decoded as sun-8212.ic3. diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c index ae790ad7611..79702f0a008 100644 --- a/src/mame/drivers/suna8.c +++ b/src/mame/drivers/suna8.c @@ -1505,7 +1505,7 @@ static MACHINE_CONFIG_START( hardhead, suna8_state ) MCFG_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 8) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(hardhead_sound_map) MCFG_CPU_IO_MAP(hardhead_sound_io_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No NMI */ + MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) /* No NMI */ /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1570,7 +1570,7 @@ static MACHINE_CONFIG_START( rranger, suna8_state ) MCFG_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */ MCFG_CPU_PROGRAM_MAP(rranger_sound_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* NMI = retn */ + MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) /* NMI = retn */ /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1734,7 +1734,7 @@ static MACHINE_CONFIG_START( starfigh, suna8_state ) MCFG_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */ MCFG_CPU_PROGRAM_MAP(hardhead_sound_map) MCFG_CPU_IO_MAP(hardhead_sound_io_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No NMI */ + MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) /* No NMI */ /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1793,7 +1793,7 @@ static MACHINE_CONFIG_START( sparkman, suna8_state ) MCFG_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */ MCFG_CPU_PROGRAM_MAP(hardhead_sound_map) MCFG_CPU_IO_MAP(hardhead_sound_io_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No NMI */ + MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) /* No NMI */ /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/suprloco.c b/src/mame/drivers/suprloco.c index 7ffb6e90b89..d1900858ed0 100644 --- a/src/mame/drivers/suprloco.c +++ b/src/mame/drivers/suprloco.c @@ -12,7 +12,6 @@ TODO: ******************************************************************************/ #include "emu.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "machine/segacrpt.h" #include "sound/sn76496.h" @@ -161,7 +160,7 @@ static MACHINE_CONFIG_START( suprloco, suprloco_state ) MCFG_CPU_ADD("audiocpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* NMIs are caused by the main CPU */ + MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) /* NMIs are caused by the main CPU */ /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/tagteam.c b/src/mame/drivers/tagteam.c index 292e935e348..513ff6c1246 100644 --- a/src/mame/drivers/tagteam.c +++ b/src/mame/drivers/tagteam.c @@ -220,7 +220,7 @@ static MACHINE_CONFIG_START( tagteam, tagteam_state ) MCFG_CPU_ADD("audiocpu", M6502, 975000) /* 975 kHz ?? */ MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,16) /* IRQs are triggered by the main CPU */ + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,16*57) /* IRQs are triggered by the main CPU */ /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/tomcat.c b/src/mame/drivers/tomcat.c index 77c23de8024..8f78ba75850 100644 --- a/src/mame/drivers/tomcat.c +++ b/src/mame/drivers/tomcat.c @@ -23,7 +23,6 @@ */ #include "emu.h" -#include "deprecat.h" #include "cpu/m68000/m68000.h" #include "cpu/tms32010/tms32010.h" #include "cpu/m6502/m6502.h" @@ -337,15 +336,6 @@ static INPUT_PORTS_START( tomcat ) PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(30) INPUT_PORTS_END -ROM_START( tomcat ) - ROM_REGION( 0x10000, "maincpu", 0) - ROM_LOAD16_BYTE( "rom1k.bin", 0x00001, 0x8000, CRC(5535a1ff) SHA1(b9807c749a8e6b5ddec3ff494130abda09f0baab) ) - ROM_LOAD16_BYTE( "rom2k.bin", 0x00000, 0x8000, CRC(021a01d2) SHA1(01d99aab54ad57a664e8aaa91296bb879fc6e422) ) - - ROM_REGION( 0x100, "user1", 0 ) - ROM_LOAD( "136021-105.1l", 0x0000, 0x0100, CRC(82fc3eb2) SHA1(184231c7baef598294860a7d2b8a23798c5c7da6) ) /* AVG PROM */ -ROM_END - static MACHINE_START(tomcat) { tomcat_state *state = machine.driver_data(); @@ -388,7 +378,7 @@ static const riot6532_interface tomcat_riot6532_intf = static MACHINE_CONFIG_START( tomcat, tomcat_state ) MCFG_CPU_ADD("maincpu", M68010, XTAL_12MHz / 2) MCFG_CPU_PROGRAM_MAP(tomcat_map) - MCFG_CPU_VBLANK_INT_HACK(irq1_line_assert, 5) + MCFG_CPU_PERIODIC_INT(irq1_line_assert, 5*60) //MCFG_CPU_PERIODIC_INT(irq1_line_assert, (double)XTAL_12MHz / 16 / 16 / 16 / 12) MCFG_CPU_ADD("dsp", TMS32010, XTAL_16MHz) @@ -434,4 +424,13 @@ static MACHINE_CONFIG_START( tomcat, tomcat_state ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.60) MACHINE_CONFIG_END +ROM_START( tomcat ) + ROM_REGION( 0x10000, "maincpu", 0) + ROM_LOAD16_BYTE( "rom1k.bin", 0x00001, 0x8000, CRC(5535a1ff) SHA1(b9807c749a8e6b5ddec3ff494130abda09f0baab) ) + ROM_LOAD16_BYTE( "rom2k.bin", 0x00000, 0x8000, CRC(021a01d2) SHA1(01d99aab54ad57a664e8aaa91296bb879fc6e422) ) + + ROM_REGION( 0x100, "user1", 0 ) + ROM_LOAD( "136021-105.1l", 0x0000, 0x0100, CRC(82fc3eb2) SHA1(184231c7baef598294860a7d2b8a23798c5c7da6) ) /* AVG PROM */ +ROM_END + GAME( 1985, tomcat, 0, tomcat, tomcat, 0, ROT0, "Atari", "TomCat (prototype)", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/tsamurai.c b/src/mame/drivers/tsamurai.c index 4b561528d9e..eb30e1b7614 100644 --- a/src/mame/drivers/tsamurai.c +++ b/src/mame/drivers/tsamurai.c @@ -1,14 +1,11 @@ /**************************************************************************** - Preliminary driver for Samurai, Nunchackun, Yuke Yuke Yamaguchi-kun - (c) Taito 1985 + Samurai, Nunchackun, Yuke Yuke Yamaguchi-kun (c) Taito 1985 - Known Issues: - - some color problems (need screenshots) - - Nunchackun has wrong colors; sprites look better if you subtract sprite color from 0x2d - - Yuke Yuke Yamaguchi-kun isn't playable (sprite problem only?) + TODO: + - colors for this HW are a complete mystery and probably needs HW tests. -driver by Phil Stroffolino + driver by Phil Stroffolino Mission 660 extensions by Paul Swan (swan@easynet.co.uk) -------------------------------------------------------- @@ -35,14 +32,9 @@ used this same value on the original M660 and it seems to work. I'm guessing the bootleg is of a "world" release and the original is from the "America" release. -TODO: -1) Colours. -2) A few unknown regs. - ****************************************************************************/ #include "emu.h" -#include "deprecat.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "sound/dac.h" @@ -749,7 +741,7 @@ static MACHINE_CONFIG_START( vsgongf, tsamurai_state ) MCFG_CPU_ADD("audiocpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(sound_vsgongf_map) MCFG_CPU_IO_MAP(vsgongf_audio_io_map) - MCFG_CPU_VBLANK_INT_HACK(vsgongf_sound_interrupt,3) + MCFG_CPU_PERIODIC_INT(vsgongf_sound_interrupt,3*60) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1213,8 +1205,8 @@ ROM_START( ringfgt2 ) ROM_END GAME( 1984, vsgongf, 0, vsgongf, vsgongf, 0, ROT90, "Kaneko", "VS Gong Fight", GAME_IMPERFECT_COLORS ) -GAME( 1984, ringfgt, vsgongf, vsgongf, vsgongf, 0, ROT90, "Kaneko (Taito license)", "Ring Fighter (set 1)", 0 ) -GAME( 1984, ringfgt2, vsgongf, vsgongf, vsgongf, 0, ROT90, "Kaneko (Taito license)", "Ring Fighter (set 2)", 0 ) +GAME( 1984, ringfgt, vsgongf, vsgongf, vsgongf, 0, ROT90, "Kaneko (Taito license)", "Ring Fighter (set 1)", GAME_IMPERFECT_COLORS ) +GAME( 1984, ringfgt2, vsgongf, vsgongf, vsgongf, 0, ROT90, "Kaneko (Taito license)", "Ring Fighter (set 2)", GAME_IMPERFECT_COLORS ) GAME( 1985, tsamurai, 0, tsamurai, tsamurai, 0, ROT90, "Kaneko / Taito", "Samurai Nihon-ichi (set 1)", 0 ) GAME( 1985, tsamurai2,tsamurai, tsamurai, tsamurai, 0, ROT90, "Kaneko / Taito", "Samurai Nihon-ichi (set 2)", 0 ) diff --git a/src/mame/drivers/tunhunt.c b/src/mame/drivers/tunhunt.c index e3c3626b0d7..cc4f6832eaf 100644 --- a/src/mame/drivers/tunhunt.c +++ b/src/mame/drivers/tunhunt.c @@ -306,7 +306,7 @@ static MACHINE_CONFIG_START( tunhunt, tunhunt_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502,2000000) /* ??? */ MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ? probably wrong */ + MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) /* ? probably wrong */ /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/vastar.c b/src/mame/drivers/vastar.c index 4bd6a3c3184..78775cc630b 100644 --- a/src/mame/drivers/vastar.c +++ b/src/mame/drivers/vastar.c @@ -63,7 +63,6 @@ write: #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "sound/ay8910.h" #include "includes/vastar.h" @@ -303,7 +302,7 @@ static MACHINE_CONFIG_START( vastar, vastar_state ) MCFG_CPU_ADD("sub", Z80, 3072000) /* 3.072 MHz ???? */ MCFG_CPU_PROGRAM_MAP(cpu2_map) MCFG_CPU_IO_MAP(cpu2_port_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* ??? */ + MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) /* ??? */ MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - seems enough to ensure proper */ /* synchronization of the CPUs */ diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c index faf8f1f8136..2efb6933fbc 100644 --- a/src/mame/drivers/vigilant.c +++ b/src/mame/drivers/vigilant.c @@ -16,7 +16,6 @@ Buccaneers has a 5.6888 Mhz and a 18.432 Mhz OSC #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "audio/m72.h" #include "sound/dac.h" #include "sound/2203intf.h" @@ -524,7 +523,7 @@ static MACHINE_CONFIG_START( vigilant, vigilant_state ) MCFG_CPU_ADD("soundcpu", Z80, 3579645) /* 3.579645 MHz */ MCFG_CPU_PROGRAM_MAP(sound_map) MCFG_CPU_IO_MAP(sound_io_map) - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1 */ + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,128*55) /* clocked by V1 */ /* IRQs are generated by main Z80 and YM2151 */ /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -567,7 +566,7 @@ static MACHINE_CONFIG_START( buccanrs, vigilant_state ) MCFG_CPU_ADD("soundcpu", Z80, 18432000/6) /* 3.072000 MHz */ MCFG_CPU_PROGRAM_MAP(sound_map) MCFG_CPU_IO_MAP(buccanrs_sound_io_map) - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1 */ + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,128*55) /* clocked by V1 */ /* IRQs are generated by main Z80 and YM2151 */ /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -626,7 +625,7 @@ static MACHINE_CONFIG_START( kikcubic, vigilant_state ) MCFG_CPU_ADD("soundcpu", Z80, 3579645) /* 3.579645 MHz */ MCFG_CPU_PROGRAM_MAP(sound_map) MCFG_CPU_IO_MAP(sound_io_map) - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1 */ + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,128*55) /* clocked by V1 */ /* IRQs are generated by main Z80 and YM2151 */ /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/vulgus.c b/src/mame/drivers/vulgus.c index 7243b9ee848..252820d7b75 100644 --- a/src/mame/drivers/vulgus.c +++ b/src/mame/drivers/vulgus.c @@ -226,7 +226,7 @@ static MACHINE_CONFIG_START( vulgus, vulgus_state ) MCFG_CPU_ADD("audiocpu", Z80, 3000000) /* 3 MHz ??? */ MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,8) + MCFG_CPU_PERIODIC_INT(irq0_line_hold,8*60) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/wheelfir.c b/src/mame/drivers/wheelfir.c index 7e0259bee5a..9e9120df43c 100644 --- a/src/mame/drivers/wheelfir.c +++ b/src/mame/drivers/wheelfir.c @@ -808,7 +808,7 @@ static MACHINE_CONFIG_START( wheelfir, wheelfir_state ) MCFG_CPU_ADD("subcpu", M68000, 32000000/2) MCFG_CPU_PROGRAM_MAP(wheelfir_sub) - //MCFG_CPU_VBLANK_INT_HACK(irq1_line_hold,256) + //MCFG_CPU_PERIODIC_INT(irq1_line_hold,256*60) MCFG_QUANTUM_TIME(attotime::from_hz(12000)) diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c index 639b47d5fe1..4b4b110b16b 100644 --- a/src/mame/drivers/wiz.c +++ b/src/mame/drivers/wiz.c @@ -159,7 +159,6 @@ Stephh's notes (based on the games Z80 code and some tests) : #include "emu.h" #include "cpu/z80/z80.h" -#include "deprecat.h" #include "sound/ay8910.h" #include "sound/discrete.h" #include "includes/wiz.h" @@ -690,7 +689,7 @@ static MACHINE_CONFIG_START( wiz, wiz_state ) MCFG_CPU_ADD("audiocpu", Z80, 14318000/8) /* ? */ MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_VBLANK_INT_HACK(nmi_line_pulse,4) /* ??? */ + MCFG_CPU_PERIODIC_INT(nmi_line_pulse,4*60) /* ??? */ MCFG_MACHINE_RESET( wiz )