diff --git a/src/emu/cpuexec.h b/src/emu/cpuexec.h index 1e37ddd757d..24d92ee298c 100644 --- a/src/emu/cpuexec.h +++ b/src/emu/cpuexec.h @@ -261,6 +261,7 @@ struct _cpu_config construct_map_t construct_map[ADDRESS_SPACES][2]; /* 2 memory maps per address space */ void (*vblank_interrupt)(running_machine *machine, int cpunum); /* for interrupts tied to VBLANK */ int vblank_interrupts_per_frame;/* usually 1 */ + const char * vblank_interrupt_screen; /* the screen that causes the VBLANK interrupt */ void (*timed_interrupt)(running_machine *machine, int cpunum); /* for interrupts not tied to VBLANK */ attoseconds_t timed_interrupt_period; /* period for periodic interrupts */ const void * reset_param; /* parameter for cpu_reset */ diff --git a/src/emu/deprecat.h b/src/emu/deprecat.h index 5204d1a4af4..5884d9efb23 100644 --- a/src/emu/deprecat.h +++ b/src/emu/deprecat.h @@ -32,6 +32,26 @@ extern running_machine *Machine; +/************************************* + * + * Old way of allowing "VBLANK" + * interrupts to fire more than once + * a frame. + * + * These should be replaced with + * scanline based interrupts as + * it makes no sense to have more + * than one VBLANK interrupt + * per frame. + * + *************************************/ + +#define MDRV_CPU_VBLANK_INT_HACK(_func, _rate) \ + TOKEN_UINT32_PACK2(MCONFIG_TOKEN_CPU_VBLANK_INT_HACK, 8, _rate, 24), \ + TOKEN_PTR(interrupt, _func), + + + /************************************* * * Video timing diff --git a/src/emu/mconfig.c b/src/emu/mconfig.c index ec88aced202..38195ab0bd0 100644 --- a/src/emu/mconfig.c +++ b/src/emu/mconfig.c @@ -366,6 +366,15 @@ static void machine_config_detokenize(machine_config *config, const machine_conf break; case MCONFIG_TOKEN_CPU_VBLANK_INT: + assert(cpu != NULL); + TOKEN_UNGET_UINT32(tokens); + TOKEN_GET_UINT32_UNPACK1(tokens, entrytype, 8); + cpu->vblank_interrupt_screen = TOKEN_GET_STRING(tokens); + cpu->vblank_interrupt = TOKEN_GET_PTR(tokens, interrupt); + cpu->vblank_interrupts_per_frame = 1; + break; + + case MCONFIG_TOKEN_CPU_VBLANK_INT_HACK: assert(cpu != NULL); TOKEN_UNGET_UINT32(tokens); TOKEN_GET_UINT32_UNPACK2(tokens, entrytype, 8, cpu->vblank_interrupts_per_frame, 24); diff --git a/src/emu/mconfig.h b/src/emu/mconfig.h index c05335dd750..fee1b41c121 100644 --- a/src/emu/mconfig.h +++ b/src/emu/mconfig.h @@ -48,6 +48,7 @@ enum MCONFIG_TOKEN_CPU_DATA_MAP, MCONFIG_TOKEN_CPU_IO_MAP, MCONFIG_TOKEN_CPU_VBLANK_INT, + MCONFIG_TOKEN_CPU_VBLANK_INT_HACK, MCONFIG_TOKEN_CPU_PERIODIC_INT, MCONFIG_TOKEN_DRIVER_DATA, @@ -284,8 +285,9 @@ union _machine_config_token TOKEN_PTR(voidptr, construct_map_##_map1), \ TOKEN_PTR(voidptr, construct_map_##_map2), \ -#define MDRV_CPU_VBLANK_INT(_func, _rate) \ - TOKEN_UINT32_PACK2(MCONFIG_TOKEN_CPU_VBLANK_INT, 8, _rate, 24), \ +#define MDRV_CPU_VBLANK_INT(_tag, _func) \ + TOKEN_UINT32_PACK1(MCONFIG_TOKEN_CPU_VBLANK_INT, 8), \ + TOKEN_STRING(_tag), \ TOKEN_PTR(interrupt, _func), #define MDRV_CPU_PERIODIC_INT(_func, _rate) \ diff --git a/src/emu/validity.c b/src/emu/validity.c index bd05902034d..04fc0141a98 100644 --- a/src/emu/validity.c +++ b/src/emu/validity.c @@ -759,6 +759,59 @@ static int validate_cpu(int drivnum, const machine_config *config, const UINT32 } } } + + /* validate the interrupts */ + if (cpu->vblank_interrupt != NULL) + { + if (cpu->vblank_interrupts_per_frame == 0) + { + mame_printf_error("%s: %s cpu #%d has a VBLANK interrupt handler with 0 interrupts!\n", driver->source_file, driver->name, cpunum); + error = TRUE; + } + else if (cpu->vblank_interrupts_per_frame == 1) + { + if (cpu->vblank_interrupt_screen == NULL) + { + mame_printf_error("%s: %s cpu #%d has a valid VBLANK interrupt handler with no screen tag supplied!\n", driver->source_file, driver->name, cpunum); + error = TRUE; + } + else + { + int screen_tag_found = FALSE; + const device_config *device; + + /* loop over screens looking for the tag */ + for (device = video_screen_first(config); device != NULL; device = video_screen_next(device)) + if (strcmp(device->tag, cpu->vblank_interrupt_screen) == 0) + { + screen_tag_found = TRUE; + break; + } + + if (!screen_tag_found) + { + mame_printf_error("%s: %s cpu #%d VBLANK interrupt with a non-existant screen tag (%s)!\n", driver->source_file, driver->name, cpunum, cpu->vblank_interrupt_screen); + error = TRUE; + } + } + } + } + else if (cpu->vblank_interrupts_per_frame != 0) + { + mame_printf_error("%s: %s cpu #%d has no VBLANK interrupt handler but a non-0 interrupt count is given!\n", driver->source_file, driver->name, cpunum); + error = TRUE; + } + + if ((cpu->timed_interrupt != NULL) && (cpu->timed_interrupt_period == 0)) + { + mame_printf_error("%s: %s cpu #%d has a timer interrupt handler with 0 period!\n", driver->source_file, driver->name, cpunum); + error = TRUE; + } + else if ((cpu->timed_interrupt == NULL) && (cpu->timed_interrupt_period != 0)) + { + mame_printf_error("%s: %s cpu #%d has a no timer interrupt handler but has a non-0 period given!\n", driver->source_file, driver->name, cpunum); + error = TRUE; + } } } diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c index f1447054dcf..7ceb7ab020a 100644 --- a/src/mame/audio/dkong.c +++ b/src/mame/audio/dkong.c @@ -1358,11 +1358,11 @@ MACHINE_DRIVER_START( dkong3_audio ) MDRV_CPU_ADD_TAG("n2a03a", N2A03,N2A03_DEFAULTCLOCK) MDRV_CPU_PROGRAM_MAP(dkong3_sound1_map, 0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD_TAG("n2a03b", N2A03,N2A03_DEFAULTCLOCK) MDRV_CPU_PROGRAM_MAP(dkong3_sound2_map, 0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_SPEAKER_STANDARD_MONO("mono") MDRV_SOUND_ADD(NES, N2A03_DEFAULTCLOCK) diff --git a/src/mame/audio/exidy440.c b/src/mame/audio/exidy440.c index 530b16d39f2..3e28bda1579 100644 --- a/src/mame/audio/exidy440.c +++ b/src/mame/audio/exidy440.c @@ -932,7 +932,7 @@ MACHINE_DRIVER_START( exidy440_audio ) MDRV_CPU_ADD(M6809, EXIDY440_AUDIO_CLOCK) MDRV_CPU_PROGRAM_MAP(exidy440_audio_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_SPEAKER_STANDARD_STEREO("left", "right") diff --git a/src/mame/audio/namcoc7x.h b/src/mame/audio/namcoc7x.h index b6ac15e2efa..faaa68cdc68 100644 --- a/src/mame/audio/namcoc7x.h +++ b/src/mame/audio/namcoc7x.h @@ -37,13 +37,13 @@ static const struct C352interface namcoc7x_c352_interface = \ MDRV_CPU_ADD_TAG("mcu", M37702, clock) \ MDRV_CPU_PROGRAM_MAP(namcoc7x_mcu_map, 0) \ MDRV_CPU_IO_MAP(namcoc7x_mcu_io, 0) \ - MDRV_CPU_VBLANK_INT(namcoc7x_interrupt, 2) + MDRV_CPU_VBLANK_INT_HACK(namcoc7x_interrupt, 2) #define NAMCO_C7X_MCU_SHARED(clock) \ MDRV_CPU_ADD_TAG("mcu", M37702, clock) \ MDRV_CPU_PROGRAM_MAP(namcoc7x_mcu_share_map, 0) \ MDRV_CPU_IO_MAP(namcoc7x_mcu_io, 0) \ - MDRV_CPU_VBLANK_INT(namcoc7x_interrupt, 2) + MDRV_CPU_VBLANK_INT_HACK(namcoc7x_interrupt, 2) #define NAMCO_C7X_SOUND(clock) \ MDRV_SPEAKER_STANDARD_STEREO("left", "right") \ diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c index 140250eb4ad..f56381b07de 100644 --- a/src/mame/drivers/1942.c +++ b/src/mame/drivers/1942.c @@ -268,11 +268,11 @@ static MACHINE_DRIVER_START( 1942 ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz (?) */ MDRV_CPU_PROGRAM_MAP(c1942_map, 0) - MDRV_CPU_VBLANK_INT(c1942_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(c1942_interrupt,2) MDRV_CPU_ADD(Z80, 3000000) /* 3 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* video hardware */ MDRV_GFXDECODE(1942) diff --git a/src/mame/drivers/1943.c b/src/mame/drivers/1943.c index e374fa4e4b5..5eeb97397bc 100644 --- a/src/mame/drivers/1943.c +++ b/src/mame/drivers/1943.c @@ -21,6 +21,7 @@ */ #include "driver.h" +#include "deprecat.h" #include "cpu/z80/z80.h" #include "sound/2203intf.h" @@ -251,12 +252,12 @@ static MACHINE_DRIVER_START( 1943 ) // basic machine hardware MDRV_CPU_ADD(Z80, 6000000) // 6 MHz MDRV_CPU_PROGRAM_MAP(c1943_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 3000000) // 3 MHz /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 4) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4) // video hardware diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c index 43f4282eab8..92a6cc4cceb 100644 --- a/src/mame/drivers/1945kiii.c +++ b/src/mame/drivers/1945kiii.c @@ -246,7 +246,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( k3 ) MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(k3_map,0) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_GFXDECODE(1945kiii) diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c index bc230331f2f..e1e91222c67 100644 --- a/src/mame/drivers/20pacgal.c +++ b/src/mame/drivers/20pacgal.c @@ -291,7 +291,7 @@ static MACHINE_DRIVER_START( 20pacgal ) MDRV_CPU_ADD(Z180, MAIN_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(20pacgal_map,0) MDRV_CPU_IO_MAP(20pacgal_io_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_NVRAM_HANDLER(eeprom) diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c index 048be701828..f2c1db72e43 100644 --- a/src/mame/drivers/2mindril.c +++ b/src/mame/drivers/2mindril.c @@ -195,7 +195,7 @@ static const struct YM2610interface ym2610_interface = static MACHINE_DRIVER_START( drill ) MDRV_CPU_ADD_TAG("main", M68000, 16000000 ) MDRV_CPU_PROGRAM_MAP(drill_map,0) - MDRV_CPU_VBLANK_INT(drill_interrupt,1) + MDRV_CPU_VBLANK_INT("main", drill_interrupt) MDRV_GFXDECODE(2mindril) MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c index 0feb952ee83..bb044f859cd 100644 --- a/src/mame/drivers/40love.c +++ b/src/mame/drivers/40love.c @@ -1098,12 +1098,12 @@ static MACHINE_DRIVER_START( 40love ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,8000000/2) /* OK */ MDRV_CPU_PROGRAM_MAP(40love_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,8000000/2) /* audio CPU */ /* OK */ MDRV_CPU_PROGRAM_MAP(sound_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) /* source/number of IRQs is unknown */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* source/number of IRQs is unknown */ MDRV_CPU_ADD(M68705,18432000/6) /* OK */ MDRV_CPU_PROGRAM_MAP(mcu_map,0) @@ -1145,12 +1145,12 @@ static MACHINE_DRIVER_START( undoukai ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(undoukai_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,8000000/2) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) /* source/number of IRQs is unknown */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* source/number of IRQs is unknown */ // MDRV_CPU_ADD(M68705,18432000/6) // MDRV_CPU_PROGRAM_MAP(mcu_map,0) diff --git a/src/mame/drivers/4enraya.c b/src/mame/drivers/4enraya.c index 39a896aef6b..606f311b15d 100644 --- a/src/mame/drivers/4enraya.c +++ b/src/mame/drivers/4enraya.c @@ -49,6 +49,7 @@ Sound : ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" @@ -161,7 +162,7 @@ static MACHINE_DRIVER_START( 4enraya ) MDRV_CPU_ADD(Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c index 1f6b749a616..f56b12d61e1 100644 --- a/src/mame/drivers/8080bw.c +++ b/src/mame/drivers/8080bw.c @@ -1535,7 +1535,7 @@ static MACHINE_DRIVER_START( sflush ) MDRV_IMPORT_FROM(mw8080bw_root) MDRV_CPU_REPLACE("main",M6800,2000000) /* ?? */ MDRV_CPU_PROGRAM_MAP(sflush_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_pulse,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_pulse,2) /* video hardware */ MDRV_VIDEO_UPDATE(sflush) @@ -1775,7 +1775,7 @@ static MACHINE_DRIVER_START( polaris ) MDRV_CPU_PROGRAM_MAP(schaser_map,0) MDRV_CPU_IO_MAP(polaris_io_map,0) MDRV_WATCHDOG_VBLANK_INIT(255) - MDRV_CPU_VBLANK_INT(polaris_interrupt,1) + MDRV_CPU_VBLANK_INT("main", polaris_interrupt) /* video hardware */ MDRV_VIDEO_UPDATE(polaris) @@ -2515,7 +2515,7 @@ static MACHINE_DRIVER_START( darthvdr ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(darthvdr_map,0) MDRV_CPU_IO_MAP(darthvdr_io_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_START(darthvdr) MDRV_MACHINE_RESET(darthvdr) diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c index fa6441831c4..2d279103d0f 100644 --- a/src/mame/drivers/88games.c +++ b/src/mame/drivers/88games.c @@ -279,7 +279,7 @@ static MACHINE_DRIVER_START( 88games ) /* basic machine hardware */ MDRV_CPU_ADD(KONAMI, 3000000) /* ? */ MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(k88games_interrupt,1) + MDRV_CPU_VBLANK_INT("main", k88games_interrupt) MDRV_CPU_ADD(Z80, 3579545) MDRV_CPU_PROGRAM_MAP(sound_map,0) diff --git a/src/mame/drivers/acefruit.c b/src/mame/drivers/acefruit.c index 49e89d04081..f5ab535912f 100644 --- a/src/mame/drivers/acefruit.c +++ b/src/mame/drivers/acefruit.c @@ -549,7 +549,7 @@ static MACHINE_DRIVER_START( acefruit ) MDRV_CPU_PROGRAM_MAP(acefruit_map,0) MDRV_CPU_IO_MAP(acefruit_io,0) MDRV_GFXDECODE(acefruit) - MDRV_CPU_VBLANK_INT(acefruit_vblank,1) + MDRV_CPU_VBLANK_INT("main", acefruit_vblank) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c index 7a0e36dd66b..24851c741f7 100644 --- a/src/mame/drivers/acommand.c +++ b/src/mame/drivers/acommand.c @@ -519,7 +519,7 @@ static MACHINE_DRIVER_START( acommand ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,12000000) MDRV_CPU_PROGRAM_MAP(acommand,0) - MDRV_CPU_VBLANK_INT(acommand_irq,2) + MDRV_CPU_VBLANK_INT_HACK(acommand_irq,2) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c index 080d6fa41ba..bde727a99bb 100644 --- a/src/mame/drivers/actfancr.c +++ b/src/mame/drivers/actfancr.c @@ -352,7 +352,7 @@ static MACHINE_DRIVER_START( actfancr ) /* basic machine hardware */ MDRV_CPU_ADD(H6280,21477200/3) /* Should be accurate */ MDRV_CPU_PROGRAM_MAP(actfan_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* VBL */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* VBL */ MDRV_CPU_ADD(M6502, 1500000) /* audio CPU */ /* Should be accurate */ @@ -396,7 +396,7 @@ static MACHINE_DRIVER_START( triothep ) /* basic machine hardware */ MDRV_CPU_ADD(H6280,XTAL_21_4772MHz/3) /* XIN=21.4772Mhz, verified on pcb */ MDRV_CPU_PROGRAM_MAP(triothep_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* VBL */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* VBL */ MDRV_CPU_ADD(M6502, XTAL_12MHz/8) /* verified on pcb */ /* audio CPU */ /* Should be accurate */ diff --git a/src/mame/drivers/aeroboto.c b/src/mame/drivers/aeroboto.c index cf1dad3504e..dac5305dc36 100644 --- a/src/mame/drivers/aeroboto.c +++ b/src/mame/drivers/aeroboto.c @@ -229,11 +229,11 @@ static MACHINE_DRIVER_START( formatz ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, XTAL_10MHz/8) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(aeroboto_interrupt,1) + MDRV_CPU_VBLANK_INT("main", aeroboto_interrupt) MDRV_CPU_ADD(M6809, XTAL_10MHz/16) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c index c63a58b07e1..9c48939384e 100644 --- a/src/mame/drivers/aerofgt.c +++ b/src/mame/drivers/aerofgt.c @@ -1264,7 +1264,7 @@ static MACHINE_DRIVER_START( pspikes ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz (?) */ MDRV_CPU_PROGRAM_MAP(pspikes_map,0) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1)/* all irq vectors are the same */ + MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */ MDRV_CPU_ADD(Z80,8000000/2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) @@ -1303,7 +1303,7 @@ static MACHINE_DRIVER_START( pallavol ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz (?) */ MDRV_CPU_PROGRAM_MAP(pallavol_map,0) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1)/* all irq vectors are the same */ + MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */ /* + Z80 for sound */ @@ -1334,7 +1334,7 @@ static MACHINE_DRIVER_START( pspikesb ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz (?) */ MDRV_CPU_PROGRAM_MAP(pspikesb_map,0) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1)/* all irq vectors are the same */ + MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -1362,7 +1362,7 @@ static MACHINE_DRIVER_START( pspikesc ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz (?) */ MDRV_CPU_PROGRAM_MAP(pspikesc_map,0) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1)/* all irq vectors are the same */ + MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -1390,7 +1390,7 @@ static MACHINE_DRIVER_START( karatblz ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz (?) */ MDRV_CPU_PROGRAM_MAP(karatblz_map,0) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80,8000000/2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) @@ -1428,7 +1428,7 @@ static MACHINE_DRIVER_START( spinlbrk ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz (?) */ MDRV_CPU_PROGRAM_MAP(spinlbrk_map,0) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1)/* there are vectors for 3 and 4 too */ + MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* there are vectors for 3 and 4 too */ MDRV_CPU_ADD(Z80,8000000/2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) @@ -1466,7 +1466,7 @@ static MACHINE_DRIVER_START( turbofrc ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz (verified on pcb) */ MDRV_CPU_PROGRAM_MAP(turbofrc_map,0) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1)/* all irq vectors are the same */ + MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */ MDRV_CPU_ADD(Z80,5000000) /* 5 MHz (verified on pcb) */ MDRV_CPU_PROGRAM_MAP(sound_map,0) @@ -1504,7 +1504,7 @@ static MACHINE_DRIVER_START( aerofgtb ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz (?) */ MDRV_CPU_PROGRAM_MAP(aerofgtb_map,0) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1)/* all irq vectors are the same */ + MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */ MDRV_CPU_ADD(Z80,8000000/2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) @@ -1543,7 +1543,7 @@ static MACHINE_DRIVER_START( aerofgt ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz (verified on pcb) */ MDRV_CPU_PROGRAM_MAP(aerofgt_map,0) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1)/* all irq vectors are the same */ + MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */ MDRV_CPU_ADD(Z80,5000000) /* 5 MHz (verified on pcb) */ MDRV_CPU_PROGRAM_MAP(sound_map,0) @@ -1582,7 +1582,7 @@ static MACHINE_DRIVER_START( aerfboot ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz (?) */ MDRV_CPU_PROGRAM_MAP(aerfboot_map,0) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80,8000000/2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(aerfboot_sound_map,0) @@ -1614,7 +1614,7 @@ static MACHINE_DRIVER_START( wbbc97 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz (?) */ MDRV_CPU_PROGRAM_MAP(wbbc97_map,0) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1)/* all irq vectors are the same */ + MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* all irq vectors are the same */ MDRV_CPU_ADD(Z80,8000000/2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(wbbc97_sound_map,0) diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c index ccfb30905ef..0ee565945a7 100644 --- a/src/mame/drivers/airbustr.c +++ b/src/mame/drivers/airbustr.c @@ -599,17 +599,17 @@ static MACHINE_DRIVER_START( airbustr ) MDRV_CPU_ADD(Z80, 6000000) // ??? MDRV_CPU_PROGRAM_MAP(master_map, 0) MDRV_CPU_IO_MAP(master_io_map, 0) - MDRV_CPU_VBLANK_INT(master_interrupt, 2) // nmi caused by sub cpu?, ? + MDRV_CPU_VBLANK_INT_HACK(master_interrupt, 2) // nmi caused by sub cpu?, ? MDRV_CPU_ADD(Z80, 6000000) // ??? MDRV_CPU_PROGRAM_MAP(slave_map, 0) MDRV_CPU_IO_MAP(slave_io_map, 0) - MDRV_CPU_VBLANK_INT(slave_interrupt, 2) // nmi caused by main cpu, ? + MDRV_CPU_VBLANK_INT_HACK(slave_interrupt, 2) // nmi caused by main cpu, ? MDRV_CPU_ADD(Z80, 6000000) // ??? MDRV_CPU_PROGRAM_MAP(sound_map, 0) MDRV_CPU_IO_MAP(sound_io_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) // nmi are caused by sub cpu writing a sound command + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) // nmi are caused by sub cpu writing a sound command MDRV_INTERLEAVE(100) // Palette RAM is filled by sub cpu with data supplied by main cpu // Maybe a high value is safer in order to avoid glitches diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c index 017e0c46501..57b3898d5ac 100644 --- a/src/mame/drivers/ajax.c +++ b/src/mame/drivers/ajax.c @@ -240,7 +240,7 @@ static MACHINE_DRIVER_START( ajax ) /* basic machine hardware */ MDRV_CPU_ADD(KONAMI, 3000000) /* 12/4 MHz*/ MDRV_CPU_PROGRAM_MAP(ajax_main_map,0) - MDRV_CPU_VBLANK_INT(ajax_interrupt,1) /* IRQs triggered by the 051960 */ + MDRV_CPU_VBLANK_INT("main", ajax_interrupt) /* IRQs triggered by the 051960 */ MDRV_CPU_ADD(M6809, 3000000) /* ? */ MDRV_CPU_PROGRAM_MAP(ajax_sub_map,0) diff --git a/src/mame/drivers/aleck64.c b/src/mame/drivers/aleck64.c index db4b3af24a8..7f1d5249678 100644 --- a/src/mame/drivers/aleck64.c +++ b/src/mame/drivers/aleck64.c @@ -430,7 +430,7 @@ static MACHINE_DRIVER_START( aleck64 ) MDRV_CPU_ADD(R4600BE, 93750000) MDRV_CPU_CONFIG(config) MDRV_CPU_PROGRAM_MAP(n64_map, 0) - MDRV_CPU_VBLANK_INT( n64_vblank, 1 ) + MDRV_CPU_VBLANK_INT("main", n64_vblank) MDRV_CPU_ADD(RSP, 62500000) MDRV_CPU_CONFIG(n64_rsp_config) diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c index fd83292bd9e..526e8228363 100644 --- a/src/mame/drivers/aliens.c +++ b/src/mame/drivers/aliens.c @@ -238,7 +238,7 @@ static MACHINE_DRIVER_START( aliens ) /* basic machine hardware */ MDRV_CPU_ADD(KONAMI, 3000000) /* ? */ MDRV_CPU_PROGRAM_MAP(aliens_map,0) - MDRV_CPU_VBLANK_INT(aliens_interrupt,1) + MDRV_CPU_VBLANK_INT("main", aliens_interrupt) MDRV_CPU_ADD(Z80, 3579545) MDRV_CPU_PROGRAM_MAP(aliens_sound_map,0) diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c index 5d251decf85..e18d9e7d526 100644 --- a/src/mame/drivers/alpha68k.c +++ b/src/mame/drivers/alpha68k.c @@ -1986,14 +1986,14 @@ static MACHINE_DRIVER_START( sstingry ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 6000000) /* 24MHz/4? */ MDRV_CPU_PROGRAM_MAP(kyros_map,0) - MDRV_CPU_VBLANK_INT(alpha68k_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt,2) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* ? */ MDRV_CPU_PROGRAM_MAP(sstingry_sound_map,0) MDRV_CPU_IO_MAP(kyros_sound_portmap,0) //AT - MDRV_CPU_VBLANK_INT(irq0_line_hold, 2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 2) MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 4000) //ZT @@ -2036,14 +2036,14 @@ static MACHINE_DRIVER_START( kyros ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 6000000) /* 24MHz/4? */ MDRV_CPU_PROGRAM_MAP(kyros_map,0) - MDRV_CPU_VBLANK_INT(alpha68k_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt,2) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* ? */ MDRV_CPU_PROGRAM_MAP(kyros_sound_map,0) MDRV_CPU_IO_MAP(kyros_sound_portmap,0) //AT - MDRV_CPU_VBLANK_INT(irq0_line_hold, 2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 2) MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 4000) //ZT @@ -2085,12 +2085,12 @@ static MACHINE_DRIVER_START( jongbou ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) MDRV_CPU_PROGRAM_MAP(kyros_map,0) - MDRV_CPU_VBLANK_INT(alpha68k_interrupt,17) // must be at least 4 for the controls to be smooth + MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt,17) // must be at least 4 for the controls to be smooth MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(jongbou_sound_map,0) MDRV_CPU_IO_MAP(jongbou_sound_portmap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 160) // guess, controls sound speed + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 160) // guess, controls sound speed MDRV_MACHINE_RESET(common) @@ -2120,7 +2120,7 @@ static MACHINE_DRIVER_START( alpha68k_I ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 6000000) /* 24MHz/4? */ MDRV_CPU_PROGRAM_MAP(alpha68k_I_map,0) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1)/* VBL */ + MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* VBL */ MDRV_CPU_ADD(Z80, 4000000) // 4Mhz seems to yield the correct tone MDRV_CPU_PROGRAM_MAP(alpha68k_I_s_map,0) @@ -2152,7 +2152,7 @@ static MACHINE_DRIVER_START( alpha68k_II ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* Correct */ MDRV_CPU_PROGRAM_MAP(alpha68k_II_map,0) - MDRV_CPU_VBLANK_INT(irq3_line_hold,1)/* VBL */ + MDRV_CPU_VBLANK_INT("main", irq3_line_hold)/* VBL */ MDRV_CPU_ADD(Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */ /* audio CPU */ /* Correct?? */ @@ -2192,7 +2192,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( btlfildb ) MDRV_IMPORT_FROM(alpha68k_II) MDRV_CPU_MODIFY("main") - MDRV_CPU_VBLANK_INT(alpha68k_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt,2) MACHINE_DRIVER_END //AT @@ -2201,7 +2201,7 @@ static MACHINE_DRIVER_START( alpha68k_II_gm ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) MDRV_CPU_PROGRAM_MAP(alpha68k_II_map, 0) - MDRV_CPU_VBLANK_INT(alpha68k_interrupt, 4) + MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt, 4) MDRV_CPU_ADD(Z80, 4000000*2) MDRV_CPU_PROGRAM_MAP(sound_map,0) @@ -2243,7 +2243,7 @@ static MACHINE_DRIVER_START( alpha68k_V ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* ? */ MDRV_CPU_PROGRAM_MAP(alpha68k_V_map,0) - MDRV_CPU_VBLANK_INT(irq3_line_hold,1)/* VBL */ + MDRV_CPU_VBLANK_INT("main", irq3_line_hold)/* VBL */ MDRV_CPU_ADD(Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */ MDRV_CPU_PROGRAM_MAP(sound_map,0) @@ -2284,7 +2284,7 @@ static MACHINE_DRIVER_START( alpha68k_V_sb ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* ? */ MDRV_CPU_PROGRAM_MAP(alpha68k_V_map,0) - MDRV_CPU_VBLANK_INT(irq3_line_hold,1)/* VBL */ + MDRV_CPU_VBLANK_INT("main", irq3_line_hold)/* VBL */ MDRV_CPU_ADD(Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */ MDRV_CPU_PROGRAM_MAP(sound_map,0) @@ -2325,7 +2325,7 @@ static MACHINE_DRIVER_START( tnexspce ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 9000000) /* Confirmed 18 MHz/2 */ MDRV_CPU_PROGRAM_MAP(tnexspce_map,0) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1)/* VBL */ + MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* VBL */ MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(tnexspce_sound_map,0) diff --git a/src/mame/drivers/ambush.c b/src/mame/drivers/ambush.c index 05057d89d06..470ab28adbd 100644 --- a/src/mame/drivers/ambush.c +++ b/src/mame/drivers/ambush.c @@ -176,7 +176,7 @@ static MACHINE_DRIVER_START( ambush ) MDRV_CPU_ADD(Z80, 4000000) /* 4.00 MHz??? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c index 9ebff9b639a..9538645f58b 100644 --- a/src/mame/drivers/amspdwy.c +++ b/src/mame/drivers/amspdwy.c @@ -257,7 +257,7 @@ static MACHINE_DRIVER_START( amspdwy ) MDRV_CPU_ADD(Z80,3000000) MDRV_CPU_PROGRAM_MAP(amspdwy_map,0) MDRV_CPU_IO_MAP(amspdwy_portmap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* IRQ: 60Hz, NMI: retn */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* IRQ: 60Hz, NMI: retn */ MDRV_CPU_ADD(Z80,3000000) /* Can't be disabled: the YM2151 timers must work */ MDRV_CPU_PROGRAM_MAP(amspdwy_sound_map,0) diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c index 4ca32291034..418882dafca 100644 --- a/src/mame/drivers/angelkds.c +++ b/src/mame/drivers/angelkds.c @@ -596,7 +596,7 @@ static MACHINE_DRIVER_START( angelkds ) MDRV_CPU_ADD(Z80, 8000000) /* 8MHz? 6 seems too slow? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* 8 MHz? */ MDRV_CPU_PROGRAM_MAP(sub_map,0) diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c index 3d054d5e794..e0dad89d106 100644 --- a/src/mame/drivers/appoooh.c +++ b/src/mame/drivers/appoooh.c @@ -216,7 +216,7 @@ static MACHINE_DRIVER_START( appoooh ) MDRV_CPU_ADD(Z80,18432000/6) /* ??? the main xtal is 18.432 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -418,7 +418,7 @@ static MACHINE_DRIVER_START( robowres ) MDRV_CPU_ADD(Z80,18432000/6) /* ??? the main xtal is 18.432 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c index cf2d30beaa4..4d15d3ebc87 100644 --- a/src/mame/drivers/aquarium.c +++ b/src/mame/drivers/aquarium.c @@ -370,7 +370,7 @@ static MACHINE_DRIVER_START( aquarium ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 32000000/2) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, 6000000) /* audio CPU */ diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c index ef869ce4fd7..68e75e52761 100644 --- a/src/mame/drivers/arabian.c +++ b/src/mame/drivers/arabian.c @@ -353,7 +353,7 @@ static MACHINE_DRIVER_START( arabian ) MDRV_CPU_ADD(Z80, MAIN_OSC/4) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_io_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/arcadecl.c b/src/mame/drivers/arcadecl.c index 97f750c5675..f4160b97825 100644 --- a/src/mame/drivers/arcadecl.c +++ b/src/mame/drivers/arcadecl.c @@ -347,7 +347,7 @@ static MACHINE_DRIVER_START( arcadecl ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, MASTER_CLOCK) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(atarigen_video_int_gen,1) + MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) MDRV_MACHINE_RESET(arcadecl) MDRV_NVRAM_HANDLER(atarigen) diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c index b52bbace223..6810d9cc888 100644 --- a/src/mame/drivers/argus.c +++ b/src/mame/drivers/argus.c @@ -773,7 +773,7 @@ static MACHINE_DRIVER_START( argus ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 5000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(argus_readmem,argus_writemem) - MDRV_CPU_VBLANK_INT(argus_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(argus_interrupt,2) MDRV_CPU_ADD(Z80, 5000000) /* audio CPU */ /* 4 MHz */ @@ -811,7 +811,7 @@ static MACHINE_DRIVER_START( valtric ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 5000000) /* 5 MHz */ MDRV_CPU_PROGRAM_MAP(valtric_readmem,valtric_writemem) - MDRV_CPU_VBLANK_INT(argus_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(argus_interrupt,2) MDRV_CPU_ADD(Z80, 5000000) /* audio CPU */ /* 5 MHz */ @@ -855,7 +855,7 @@ static MACHINE_DRIVER_START( butasan ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 5000000) /* 5 MHz */ MDRV_CPU_PROGRAM_MAP(butasan_readmem,butasan_writemem) - MDRV_CPU_VBLANK_INT(argus_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(argus_interrupt,2) MDRV_CPU_ADD(Z80, 5000000) /* audio CPU */ /* 5 MHz */ @@ -899,7 +899,7 @@ static MACHINE_DRIVER_START( bombsa ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 5000000) /* 5 MHz */ MDRV_CPU_PROGRAM_MAP(bombsa_readmem,bombsa_writemem) - MDRV_CPU_VBLANK_INT(argus_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(argus_interrupt,2) MDRV_CPU_ADD(Z80, 12000000 / 2) /* audio CPU */ /* 6 MHz */ /* maybe CPU speeds are reversed? Probably not (ajg) */ diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c index 0630ff8dcb2..6d70938697c 100644 --- a/src/mame/drivers/arkanoid.c +++ b/src/mame/drivers/arkanoid.c @@ -746,7 +746,7 @@ static MACHINE_DRIVER_START( arkanoid ) // basic machine hardware MDRV_CPU_ADD_TAG("main", Z80, 6000000) /* 6 Mhz */ MDRV_CPU_PROGRAM_MAP(arkanoid_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD_TAG("mcu", M68705, 3000000) /* 3 Mhz */ MDRV_CPU_PROGRAM_MAP(mcu_map, 0) diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c index 7f3b7114e43..27b96c7ed12 100644 --- a/src/mame/drivers/armedf.c +++ b/src/mame/drivers/armedf.c @@ -762,13 +762,13 @@ static MACHINE_DRIVER_START( terraf ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz?? */ MDRV_CPU_PROGRAM_MAP(terraf_readmem,terraf_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, 3072000) /* audio CPU */ /* 3.072 MHz???? */ MDRV_CPU_PROGRAM_MAP(soundreadmem,soundwritemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,128) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM) @@ -804,13 +804,13 @@ static MACHINE_DRIVER_START( kodure ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz?? */ MDRV_CPU_PROGRAM_MAP(kodure_readmem,kodure_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, 3072000) /* audio CPU */ /* 3.072 MHz???? */ MDRV_CPU_PROGRAM_MAP(soundreadmem,soundwritemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,128) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM) @@ -846,13 +846,13 @@ static MACHINE_DRIVER_START( armedf ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz?? */ MDRV_CPU_PROGRAM_MAP(armedf_readmem,armedf_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, 3072000) /* audio CPU */ /* 3.072 MHz???? */ MDRV_CPU_PROGRAM_MAP(soundreadmem,soundwritemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,128) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM) @@ -888,13 +888,13 @@ static MACHINE_DRIVER_START( cclimbr2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz?? */ MDRV_CPU_PROGRAM_MAP(cclimbr2_readmem,cclimbr2_writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_CPU_ADD(Z80, 3072000) /* audio CPU */ /* 3.072 MHz???? */ MDRV_CPU_PROGRAM_MAP(cclimbr2_soundreadmem,cclimbr2_soundwritemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,128) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM) @@ -930,13 +930,13 @@ static MACHINE_DRIVER_START( legion ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz?? */ MDRV_CPU_PROGRAM_MAP(cclimbr2_readmem,legion_writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_CPU_ADD(Z80, 3072000) /* audio CPU */ /* 3.072 MHz???? */ MDRV_CPU_PROGRAM_MAP(cclimbr2_soundreadmem,cclimbr2_soundwritemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,128) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM) @@ -972,13 +972,13 @@ static MACHINE_DRIVER_START( legiono ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz?? */ MDRV_CPU_PROGRAM_MAP(cclimbr2_readmem,legiono_writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_CPU_ADD(Z80, 3072000) /* audio CPU */ /* 3.072 MHz???? */ MDRV_CPU_PROGRAM_MAP(cclimbr2_soundreadmem,cclimbr2_soundwritemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,128) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM) diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c index edb5ec2fca8..a6038c6b67c 100644 --- a/src/mame/drivers/ashnojoe.c +++ b/src/mame/drivers/ashnojoe.c @@ -335,7 +335,7 @@ static MACHINE_DRIVER_START( ashnojoe ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz (verified on pcb) */ MDRV_CPU_PROGRAM_MAP(ashnojoe_map,0) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz (verified on pcb) */ MDRV_CPU_PROGRAM_MAP(sound_map,0) diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c index f7708ed4769..64325855a2a 100644 --- a/src/mame/drivers/asterix.c +++ b/src/mame/drivers/asterix.c @@ -257,7 +257,7 @@ static MACHINE_DRIVER_START( asterix ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(asterix_interrupt,1) + MDRV_CPU_VBLANK_INT("main", asterix_interrupt) MDRV_CPU_ADD(Z80, 8000000) MDRV_CPU_PROGRAM_MAP(sound_map,0) diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c index 695457cf46c..4464f24e3f9 100644 --- a/src/mame/drivers/astinvad.c +++ b/src/mame/drivers/astinvad.c @@ -538,7 +538,7 @@ static MACHINE_DRIVER_START( spaceint ) MDRV_CPU_ADD(Z80, MASTER_CLOCK) /* a guess */ MDRV_CPU_PROGRAM_MAP(spaceint_map,0) MDRV_CPU_IO_MAP(spaceint_portmap,0) - MDRV_CPU_VBLANK_INT(spaceint_interrupt,1) + MDRV_CPU_VBLANK_INT("main", spaceint_interrupt) /* video hardware */ MDRV_VIDEO_START(spaceint) diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c index a2846239931..d024e2d08bf 100644 --- a/src/mame/drivers/astrof.c +++ b/src/mame/drivers/astrof.c @@ -882,7 +882,7 @@ static MACHINE_DRIVER_START( base ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M6502, MAIN_CPU_CLOCK) - MDRV_CPU_VBLANK_INT(coin_nmi,1) + MDRV_CPU_VBLANK_INT("main", coin_nmi) MDRV_MACHINE_RESET(astrof) diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c index a84a8ba4938..ae5c87e4347 100644 --- a/src/mame/drivers/asuka.c +++ b/src/mame/drivers/asuka.c @@ -783,7 +783,7 @@ static MACHINE_DRIVER_START( bonzeadv ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* checked on PCB */ MDRV_CPU_PROGRAM_MAP(bonzeadv_map,0) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD(Z80,4000000) /* sound CPU, also required for test mode */ MDRV_CPU_PROGRAM_MAP(bonzeadv_z80_map,0) @@ -819,7 +819,7 @@ static MACHINE_DRIVER_START( asuka ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_16MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(asuka_map,0) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq5_line_hold) MDRV_CPU_ADD(Z80, XTAL_16MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(z80_map,0) @@ -858,7 +858,7 @@ static MACHINE_DRIVER_START( cadash ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_32MHz/2) /* 68000p12 running at 16Mhz, verified on pcb */ MDRV_CPU_PROGRAM_MAP(cadash_map,0) - MDRV_CPU_VBLANK_INT(cadash_interrupt,1) + MDRV_CPU_VBLANK_INT("main", cadash_interrupt) MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cadash_z80_map,0) @@ -893,7 +893,7 @@ static MACHINE_DRIVER_START( mofflott ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz ??? */ MDRV_CPU_PROGRAM_MAP(asuka_map,0) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq5_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(z80_map,0) @@ -932,7 +932,7 @@ static MACHINE_DRIVER_START( galmedes ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz ??? */ MDRV_CPU_PROGRAM_MAP(asuka_map,0) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq5_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(cadash_z80_map,0) @@ -967,7 +967,7 @@ static MACHINE_DRIVER_START( eto ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz ??? */ MDRV_CPU_PROGRAM_MAP(eto_map,0) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq5_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(cadash_z80_map,0) diff --git a/src/mame/drivers/atarifb.c b/src/mame/drivers/atarifb.c index e9e42733a4c..b70872bd4b1 100644 --- a/src/mame/drivers/atarifb.c +++ b/src/mame/drivers/atarifb.c @@ -103,6 +103,7 @@ ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "atarifb.h" #include "sound/discrete.h" @@ -561,7 +562,7 @@ static MACHINE_DRIVER_START( atarifb ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M6502, 750000) MDRV_CPU_PROGRAM_MAP(atarifb_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/atarig1.c b/src/mame/drivers/atarig1.c index af41516bf5c..0d3d8b4cd73 100644 --- a/src/mame/drivers/atarig1.c +++ b/src/mame/drivers/atarig1.c @@ -424,7 +424,7 @@ static MACHINE_DRIVER_START( atarig1 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(atarigen_video_int_gen,1) + MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) MDRV_MACHINE_START(atarig1) MDRV_MACHINE_RESET(atarig1) diff --git a/src/mame/drivers/atarig42.c b/src/mame/drivers/atarig42.c index 9244f88b2b0..63bb8d6ac50 100644 --- a/src/mame/drivers/atarig42.c +++ b/src/mame/drivers/atarig42.c @@ -518,7 +518,7 @@ static MACHINE_DRIVER_START( atarig42 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(atarigen_video_int_gen,1) + MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) /* ASIC65 */ MDRV_IMPORT_FROM(asic65) diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c index e7f79382e97..1176120a2ea 100644 --- a/src/mame/drivers/atarigt.c +++ b/src/mame/drivers/atarigt.c @@ -807,7 +807,7 @@ static MACHINE_DRIVER_START( atarigt ) /* basic machine hardware */ MDRV_CPU_ADD(M68EC020, ATARI_CLOCK_50MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(atarigen_video_int_gen,1) + MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) MDRV_CPU_PERIODIC_INT(atarigen_scanline_int_gen, 250) MDRV_MACHINE_RESET(atarigt) diff --git a/src/mame/drivers/atarigx2.c b/src/mame/drivers/atarigx2.c index 7d29905cce4..6d2f47b532e 100644 --- a/src/mame/drivers/atarigx2.c +++ b/src/mame/drivers/atarigx2.c @@ -1433,7 +1433,7 @@ static MACHINE_DRIVER_START( atarigx2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68EC020, ATARI_CLOCK_14MHz) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(atarigen_video_int_gen,1) + MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) MDRV_MACHINE_RESET(atarigx2) MDRV_NVRAM_HANDLER(atarigen) diff --git a/src/mame/drivers/atarisy1.c b/src/mame/drivers/atarisy1.c index cd498bc49ec..9802240381a 100644 --- a/src/mame/drivers/atarisy1.c +++ b/src/mame/drivers/atarisy1.c @@ -740,7 +740,7 @@ static MACHINE_DRIVER_START( atarisy1 ) /* basic machine hardware */ MDRV_CPU_ADD(M68010, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(atarigen_video_int_gen,1) + MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) MDRV_CPU_ADD(M6502, ATARI_CLOCK_14MHz/8) MDRV_CPU_PROGRAM_MAP(sound_map,0) diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c index 3e9736d9549..a551c6ffb2b 100644 --- a/src/mame/drivers/atarisy2.c +++ b/src/mame/drivers/atarisy2.c @@ -1353,7 +1353,7 @@ static MACHINE_DRIVER_START( atarisy2 ) MDRV_CPU_ADD_TAG("main", T11, MASTER_CLOCK/2) MDRV_CPU_CONFIG(t11_data) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(vblank_int,1) + MDRV_CPU_VBLANK_INT("main", vblank_int) MDRV_CPU_ADD_TAG("sound", M6502, SOUND_CLOCK/8) MDRV_CPU_PROGRAM_MAP(sound_map,0) diff --git a/src/mame/drivers/avalnche.c b/src/mame/drivers/avalnche.c index f920c4f6fa7..375ce2a3359 100644 --- a/src/mame/drivers/avalnche.c +++ b/src/mame/drivers/avalnche.c @@ -28,6 +28,7 @@ ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "sound/discrete.h" #include "avalnche.h" @@ -235,7 +236,7 @@ static MACHINE_DRIVER_START( avalnche ) /* basic machine hardware */ MDRV_CPU_ADD(M6502,12096000/16) /* clock input is the "2H" signal divided by two */ MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(avalnche_interrupt,8) + MDRV_CPU_VBLANK_INT_HACK(avalnche_interrupt,8) /* video hardware */ MDRV_VIDEO_UPDATE(avalnche) diff --git a/src/mame/drivers/aztarac.c b/src/mame/drivers/aztarac.c index 4828e976d1e..5d352e61f91 100644 --- a/src/mame/drivers/aztarac.c +++ b/src/mame/drivers/aztarac.c @@ -150,7 +150,7 @@ static MACHINE_DRIVER_START( aztarac ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD(Z80, 2000000) MDRV_CPU_PROGRAM_MAP(sound_map,0) diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c index 65da27ca8ba..254023424e8 100644 --- a/src/mame/drivers/backfire.c +++ b/src/mame/drivers/backfire.c @@ -489,7 +489,7 @@ static MACHINE_DRIVER_START( backfire ) /* basic machine hardware */ MDRV_CPU_ADD(ARM, 28000000/4) /* Unconfirmed */ MDRV_CPU_PROGRAM_MAP(backfire_map,0) - MDRV_CPU_VBLANK_INT(deco32_vbl_interrupt,1) + MDRV_CPU_VBLANK_INT("left", deco32_vbl_interrupt) /* or is it "right?" */ MDRV_NVRAM_HANDLER(93C46) diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c index 2ab6d13e8b0..7e84317eebe 100644 --- a/src/mame/drivers/badlands.c +++ b/src/mame/drivers/badlands.c @@ -440,7 +440,7 @@ static MACHINE_DRIVER_START( badlands ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(vblank_int,1) + MDRV_CPU_VBLANK_INT("main", vblank_int) MDRV_CPU_ADD(M6502, ATARI_CLOCK_14MHz/8) MDRV_CPU_PROGRAM_MAP(audio_map,0) diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c index 873ec1f6eff..a0533f4243d 100644 --- a/src/mame/drivers/bagman.c +++ b/src/mame/drivers/bagman.c @@ -565,7 +565,7 @@ static MACHINE_DRIVER_START( bagman ) MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz (?) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_RESET(bagman) @@ -601,7 +601,7 @@ static MACHINE_DRIVER_START( pickin ) MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz (?) */ MDRV_CPU_PROGRAM_MAP(pickin_readmem,pickin_writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_RESET(bagman) @@ -651,7 +651,7 @@ static MACHINE_DRIVER_START( botanic ) MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz (?) */ MDRV_CPU_PROGRAM_MAP(pickin_readmem,pickin_writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_RESET(bagman) diff --git a/src/mame/drivers/balsente.c b/src/mame/drivers/balsente.c index 9d53097e28f..db0c1384d3b 100644 --- a/src/mame/drivers/balsente.c +++ b/src/mame/drivers/balsente.c @@ -1670,7 +1670,7 @@ static MACHINE_DRIVER_START( balsente ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 5000000/4) MDRV_CPU_PROGRAM_MAP(cpu1_map,0) - MDRV_CPU_VBLANK_INT(balsente_update_analog_inputs,1) + MDRV_CPU_VBLANK_INT("main", balsente_update_analog_inputs) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ diff --git a/src/mame/drivers/bankp.c b/src/mame/drivers/bankp.c index 724043d83fd..beaf4e7d834 100644 --- a/src/mame/drivers/bankp.c +++ b/src/mame/drivers/bankp.c @@ -275,7 +275,7 @@ static MACHINE_DRIVER_START( bankp ) MDRV_CPU_ADD(Z80, BANKP_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(bankp_map, 0) MDRV_CPU_IO_MAP(bankp_io_map, 0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/baraduke.c b/src/mame/drivers/baraduke.c index 2c1ac4bd254..0c70d7413f6 100644 --- a/src/mame/drivers/baraduke.c +++ b/src/mame/drivers/baraduke.c @@ -438,12 +438,12 @@ static MACHINE_DRIVER_START( baraduke ) /* basic machine hardware */ MDRV_CPU_ADD(M6809,49152000/32) MDRV_CPU_PROGRAM_MAP(baraduke_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_CPU_ADD(HD63701,49152000/8) MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_CPU_IO_MAP(mcu_port_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(100) /* we need heavy synch */ diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c index 76547908684..3fd0f52b0ba 100644 --- a/src/mame/drivers/battlane.c +++ b/src/mame/drivers/battlane.c @@ -258,7 +258,7 @@ static MACHINE_DRIVER_START( battlane ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 1250000) /* 1.25 MHz ? */ MDRV_CPU_PROGRAM_MAP(battlane_map, 0) - MDRV_CPU_VBLANK_INT(battlane_cpu1_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", battlane_cpu1_interrupt) MDRV_CPU_ADD(M6809, 1250000) /* 1.25 MHz ? */ MDRV_CPU_PROGRAM_MAP(battlane_map, 0) diff --git a/src/mame/drivers/battlera.c b/src/mame/drivers/battlera.c index a06624da406..1fae61d0c83 100644 --- a/src/mame/drivers/battlera.c +++ b/src/mame/drivers/battlera.c @@ -274,7 +274,7 @@ static MACHINE_DRIVER_START( battlera ) MDRV_CPU_ADD(H6280,21477200/3) MDRV_CPU_PROGRAM_MAP(battlera_readmem,battlera_writemem) MDRV_CPU_IO_MAP(0,battlera_portwrite) - MDRV_CPU_VBLANK_INT(battlera_interrupt,256) /* 8 prelines, 232 lines, 16 vblank? */ + MDRV_CPU_VBLANK_INT_HACK(battlera_interrupt,256) /* 8 prelines, 232 lines, 16 vblank? */ MDRV_CPU_ADD(H6280,21477200/3) /* audio CPU */ diff --git a/src/mame/drivers/battlex.c b/src/mame/drivers/battlex.c index a19c8f22acc..2c6237eaf60 100644 --- a/src/mame/drivers/battlex.c +++ b/src/mame/drivers/battlex.c @@ -41,6 +41,7 @@ XTAL: 10.0 MHz #include "driver.h" +#include "deprecat.h" #include "sound/ay8910.h" @@ -210,7 +211,7 @@ static MACHINE_DRIVER_START( battlex ) MDRV_CPU_ADD(Z80,10000000/2 ) /* 10 MHz, divided ? (Z80A CPU) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,8) /* controls game speed? */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,8) /* controls game speed? */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c index f9f2f9acf90..4165fd5bb68 100644 --- a/src/mame/drivers/battlnts.c +++ b/src/mame/drivers/battlnts.c @@ -336,7 +336,7 @@ static MACHINE_DRIVER_START( battlnts ) /* basic machine hardware */ MDRV_CPU_ADD(HD6309, 3000000*4) /* ? */ MDRV_CPU_PROGRAM_MAP(battlnts_readmem,battlnts_writemem) - MDRV_CPU_VBLANK_INT(battlnts_interrupt,1) + MDRV_CPU_VBLANK_INT("main", battlnts_interrupt) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* ? */ diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c index 63128abe769..ebfd5b3f7ca 100644 --- a/src/mame/drivers/bbusters.c +++ b/src/mame/drivers/bbusters.c @@ -695,7 +695,7 @@ static MACHINE_DRIVER_START( bbusters ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(bbuster_readmem,bbuster_writemem) - MDRV_CPU_VBLANK_INT(bbuster,4) + MDRV_CPU_VBLANK_INT_HACK(bbuster,4) MDRV_CPU_ADD(Z80,4000000) /* Accurate */ /* audio CPU */ @@ -739,7 +739,7 @@ static MACHINE_DRIVER_START( mechatt ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(mechatt_readmem,mechatt_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD(Z80,4000000) /* Accurate */ /* audio CPU */ diff --git a/src/mame/drivers/beezer.c b/src/mame/drivers/beezer.c index 6a5a5362e05..550eabc0595 100644 --- a/src/mame/drivers/beezer.c +++ b/src/mame/drivers/beezer.c @@ -7,6 +7,7 @@ */ #include "driver.h" +#include "deprecat.h" #include "machine/6522via.h" #include "cpu/m6809/m6809.h" #include "sound/dac.h" @@ -92,7 +93,7 @@ static MACHINE_DRIVER_START( beezer ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 1000000) /* 1 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(beezer_interrupt,128) + MDRV_CPU_VBLANK_INT_HACK(beezer_interrupt,128) MDRV_CPU_ADD(M6809, 1000000) /* 1 MHz */ MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c index 50ae5d3bce2..3f847c4c7eb 100644 --- a/src/mame/drivers/bestleag.c +++ b/src/mame/drivers/bestleag.c @@ -315,7 +315,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( bestleag ) MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(bestleag_map,0) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c index 99162035bac..77059d01763 100644 --- a/src/mame/drivers/bfcobra.c +++ b/src/mame/drivers/bfcobra.c @@ -1497,7 +1497,7 @@ static MACHINE_DRIVER_START( bfcobra ) MDRV_CPU_ADD(Z80, Z80_XTAL) MDRV_CPU_PROGRAM_MAP(z80_prog_map, 0) MDRV_CPU_IO_MAP(z80_io_map, 0) - MDRV_CPU_VBLANK_INT(vblank_gen, 1) + MDRV_CPU_VBLANK_INT("main", vblank_gen) MDRV_CPU_ADD(M6809, M6809_XTAL) MDRV_CPU_PROGRAM_MAP(m6809_prog_map, 0) diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c index 213943e93f3..a9311c1591a 100644 --- a/src/mame/drivers/bfm_sc2.c +++ b/src/mame/drivers/bfm_sc2.c @@ -3000,7 +3000,7 @@ static MACHINE_DRIVER_START( scorpion2_vid ) MDRV_CPU_ADD_TAG("adder2", M6809, MASTER_CLOCK/4 ) // adder2 board 6809 CPU at 2 Mhz MDRV_CPU_PROGRAM_MAP(adder2_memmap,0) // setup adder2 board memorymap - MDRV_CPU_VBLANK_INT(adder2_vbl, 1) // board has a VBL IRQ + MDRV_CPU_VBLANK_INT("ADDER", adder2_vbl) // board has a VBL IRQ MDRV_SPEAKER_STANDARD_MONO("mono") MDRV_SOUND_ADD(UPD7759, UPD7759_STANDARD_CLOCK) diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c index de18cd838a0..1c18626eb8a 100644 --- a/src/mame/drivers/bigevglf.c +++ b/src/mame/drivers/bigevglf.c @@ -479,17 +479,17 @@ static MACHINE_DRIVER_START( bigevglf ) MDRV_CPU_ADD(Z80,10000000/2) /* 5 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(bigevglf_readport,bigevglf_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* vblank */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* vblank */ MDRV_CPU_ADD(Z80,10000000/2) /* 5 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem_sub,writemem_sub) MDRV_CPU_IO_MAP(bigevglf_sub_readport,bigevglf_sub_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* vblank */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* vblank */ MDRV_CPU_ADD(Z80,8000000/2) /* audio CPU */ /* 4 MHz ? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) /* IRQ generated by ???; + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* 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/bigfghtr.c b/src/mame/drivers/bigfghtr.c index 3bd786f0867..319575a2868 100644 --- a/src/mame/drivers/bigfghtr.c +++ b/src/mame/drivers/bigfghtr.c @@ -421,13 +421,13 @@ static MACHINE_DRIVER_START( bigfghtr ) MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz?? */ MDRV_CPU_PROGRAM_MAP(mainmem,0) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, 3072000) /* audio CPU */ /* 3.072 MHz???? */ MDRV_CPU_PROGRAM_MAP(soundmem,0) MDRV_CPU_IO_MAP(soundport,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,128) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM) diff --git a/src/mame/drivers/bigstrkb.c b/src/mame/drivers/bigstrkb.c index 8f7b29b509c..1611d30e035 100644 --- a/src/mame/drivers/bigstrkb.c +++ b/src/mame/drivers/bigstrkb.c @@ -224,7 +224,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( bigstrkb ) MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(bigstrkb_readmem,bigstrkb_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_GFXDECODE(bigstrkb) diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c index 366e1821ac1..ae804f9ca8e 100644 --- a/src/mame/drivers/bionicc.c +++ b/src/mame/drivers/bionicc.c @@ -347,7 +347,7 @@ static MACHINE_DRIVER_START( bionicc ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, MASTER_CLOCK / 2) /* 12 MHz - verified in schematics */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(bionicc_interrupt,8) + MDRV_CPU_VBLANK_INT_HACK(bionicc_interrupt,8) /* audio CPU */ MDRV_CPU_ADD(Z80, EXO3_F0_CLK / 4) /* EXO3 C,B=GND, A=5V ==> Divisor 2^2 */ @@ -356,7 +356,7 @@ static MACHINE_DRIVER_START( bionicc ) * 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 */ - MDRV_CPU_VBLANK_INT(nmi_line_pulse,4) + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,4) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM) diff --git a/src/mame/drivers/bishi.c b/src/mame/drivers/bishi.c index 93d0678a949..75dc45c07b2 100644 --- a/src/mame/drivers/bishi.c +++ b/src/mame/drivers/bishi.c @@ -268,7 +268,7 @@ static MACHINE_DRIVER_START( bishi ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(bishi_interrupt, 2) + MDRV_CPU_VBLANK_INT_HACK(bishi_interrupt, 2) MDRV_MACHINE_START(bishi) MDRV_MACHINE_RESET(bishi) diff --git a/src/mame/drivers/bishjan.c b/src/mame/drivers/bishjan.c index a6a75f5b37b..0ebe195a4e0 100644 --- a/src/mame/drivers/bishjan.c +++ b/src/mame/drivers/bishjan.c @@ -442,7 +442,7 @@ static INTERRUPT_GEN( bishjan_interrupt ) static MACHINE_DRIVER_START( bishjan ) MDRV_CPU_ADD(H83044, 44100000/3) MDRV_CPU_PROGRAM_MAP( bishjan_map, 0 ) - MDRV_CPU_VBLANK_INT(bishjan_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(bishjan_interrupt,2) MDRV_NVRAM_HANDLER(generic_0fill) diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c index ca9a489c087..751ef4fe969 100644 --- a/src/mame/drivers/bking.c +++ b/src/mame/drivers/bking.c @@ -444,7 +444,7 @@ static MACHINE_DRIVER_START( bking ) MDRV_CPU_ADD_TAG("main_cpu", Z80, XTAL_12MHz/4) /* 3 MHz */ MDRV_CPU_PROGRAM_MAP(bking_map,0) MDRV_CPU_IO_MAP(bking_io_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, XTAL_6MHz/2) /* 3 MHz */ /* audio CPU */ diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c index 45036a80735..3c03c1f623f 100644 --- a/src/mame/drivers/bladestl.c +++ b/src/mame/drivers/bladestl.c @@ -434,7 +434,7 @@ static MACHINE_DRIVER_START( bladestl ) /* basic machine hardware */ MDRV_CPU_ADD(HD6309, 24000000/2) /* 24MHz/2 (?) */ MDRV_CPU_PROGRAM_MAP(bladestl_readmem,bladestl_writemem) - MDRV_CPU_VBLANK_INT(bladestl_interrupt,2) /* (1 IRQ + 1 NMI) */ + MDRV_CPU_VBLANK_INT_HACK(bladestl_interrupt,2) /* (1 IRQ + 1 NMI) */ MDRV_CPU_ADD(M6809, 2000000) /* audio CPU */ /* ? */ diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c index a0955af1798..168f37b771c 100644 --- a/src/mame/drivers/blktiger.c +++ b/src/mame/drivers/blktiger.c @@ -255,7 +255,7 @@ static MACHINE_DRIVER_START( blktiger ) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz (?) */ MDRV_CPU_PROGRAM_MAP(mem_map, 0) MDRV_CPU_IO_MAP(port_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 3000000) /* audio CPU */ diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c index 416dc520160..4d5197e3b06 100644 --- a/src/mame/drivers/blmbycar.c +++ b/src/mame/drivers/blmbycar.c @@ -386,7 +386,7 @@ static MACHINE_DRIVER_START( blmbycar ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* ? */ MDRV_CPU_PROGRAM_MAP(blmbycar_readmem,blmbycar_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -416,7 +416,7 @@ static MACHINE_DRIVER_START( watrball ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* ? */ MDRV_CPU_PROGRAM_MAP(watrball_readmem,watrball_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/blockade.c b/src/mame/drivers/blockade.c index 59940ae58c1..cb685c8cd9f 100644 --- a/src/mame/drivers/blockade.c +++ b/src/mame/drivers/blockade.c @@ -458,7 +458,7 @@ static MACHINE_DRIVER_START( blockade ) MDRV_CPU_ADD(8080, 2079000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(blockade_interrupt,1) + MDRV_CPU_VBLANK_INT("main", blockade_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c index 1539c82ccf9..b78c9231790 100644 --- a/src/mame/drivers/blockhl.c +++ b/src/mame/drivers/blockhl.c @@ -222,7 +222,7 @@ static MACHINE_DRIVER_START( blockhl ) /* basic machine hardware */ MDRV_CPU_ADD(KONAMI,3000000) /* Konami custom 052526 */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(blockhl_interrupt,1) + MDRV_CPU_VBLANK_INT("main", blockhl_interrupt) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* ? */ diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c index a7b737cfb05..d107fe71e87 100644 --- a/src/mame/drivers/blockout.c +++ b/src/mame/drivers/blockout.c @@ -318,7 +318,7 @@ static MACHINE_DRIVER_START( blockout ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* MRH - 8.76 makes gfx/adpcm samples sync better -- but 10 is correct speed*/ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(blockout_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(blockout_interrupt,2) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* 3.579545 MHz */ diff --git a/src/mame/drivers/bloodbro.c b/src/mame/drivers/bloodbro.c index 5f80c6f34c4..47bce78ba7e 100644 --- a/src/mame/drivers/bloodbro.c +++ b/src/mame/drivers/bloodbro.c @@ -528,7 +528,7 @@ static MACHINE_DRIVER_START( bloodbro ) // basic machine hardware MDRV_CPU_ADD_TAG("main", M68000, XTAL_20MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(bloodbro_map, 0) - MDRV_CPU_VBLANK_INT(irq4_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) SEIBU_SOUND_SYSTEM_CPU(XTAL_7_15909MHz/2) /* verified on pcb */ @@ -558,7 +558,7 @@ static MACHINE_DRIVER_START( weststry ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(weststry_map, 0) - MDRV_CPU_VBLANK_INT(irq6_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_GFXDECODE(weststry) MDRV_PALETTE_LENGTH(1024) @@ -570,7 +570,7 @@ static MACHINE_DRIVER_START( skysmash ) MDRV_IMPORT_FROM(bloodbro) MDRV_CPU_MODIFY("main") - MDRV_CPU_VBLANK_INT(irq2_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_VIDEO_UPDATE(skysmash) MACHINE_DRIVER_END diff --git a/src/mame/drivers/blstroid.c b/src/mame/drivers/blstroid.c index 1aa97009538..3bc6c6ebb4c 100644 --- a/src/mame/drivers/blstroid.c +++ b/src/mame/drivers/blstroid.c @@ -197,7 +197,7 @@ static MACHINE_DRIVER_START( blstroid ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(atarigen_video_int_gen,1) + MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) MDRV_MACHINE_RESET(blstroid) MDRV_NVRAM_HANDLER(atarigen) diff --git a/src/mame/drivers/blueprnt.c b/src/mame/drivers/blueprnt.c index db9e915dca9..62179f12d50 100644 --- a/src/mame/drivers/blueprnt.c +++ b/src/mame/drivers/blueprnt.c @@ -297,11 +297,11 @@ static MACHINE_DRIVER_START( blueprnt ) // basic machine hardware MDRV_CPU_ADD(Z80, 7000000/2) // 3.5 MHz MDRV_CPU_PROGRAM_MAP(blueprnt_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 10000000/2/2/2) // 1.25 MHz (2H) MDRV_CPU_PROGRAM_MAP(sound_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 4) // IRQs connected to 32V + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4) // IRQs connected to 32V // NMIs are caused by the main CPU // video hardware diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c index 810f4b22709..c25aacd8967 100644 --- a/src/mame/drivers/bmcbowl.c +++ b/src/mame/drivers/bmcbowl.c @@ -495,7 +495,7 @@ static INTERRUPT_GEN( bmc_interrupt ) static MACHINE_DRIVER_START( bmcbowl ) MDRV_CPU_ADD_TAG("main", M68000, 21477270/2 ) MDRV_CPU_PROGRAM_MAP(bmcbowl_mem,0) - MDRV_CPU_VBLANK_INT(bmc_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(bmc_interrupt,2) MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c index 7a29a0b06a3..2a5cf36908a 100644 --- a/src/mame/drivers/bnstars.c +++ b/src/mame/drivers/bnstars.c @@ -1339,7 +1339,7 @@ static MACHINE_DRIVER_START( bnstars ) /* basic machine hardware */ MDRV_CPU_ADD(V70, 20000000) // 20MHz MDRV_CPU_PROGRAM_MAP(bnstars_map,0) - MDRV_CPU_VBLANK_INT(ms32_interrupt,32) + MDRV_CPU_VBLANK_INT_HACK(ms32_interrupt,32) // MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ // MDRV_CPU_PROGRAM_MAP(bnstars_z80_map, 0) diff --git a/src/mame/drivers/bogeyman.c b/src/mame/drivers/bogeyman.c index 10818f1db84..60932b63464 100644 --- a/src/mame/drivers/bogeyman.c +++ b/src/mame/drivers/bogeyman.c @@ -9,6 +9,7 @@ ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "cpu/m6502/m6502.h" #include "sound/ay8910.h" extern UINT8 *bogeyman_videoram2, *bogeyman_colorram2; @@ -227,7 +228,7 @@ static MACHINE_DRIVER_START( bogeyman ) // basic machine hardware MDRV_CPU_ADD(M6502, 2000000) // 12 MHz clock on board MDRV_CPU_PROGRAM_MAP(bogeyman_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 16) // Controls sound + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 16) // Controls sound // video hardware MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) diff --git a/src/mame/drivers/bombjack.c b/src/mame/drivers/bombjack.c index fc22a5e739c..94a1c729432 100644 --- a/src/mame/drivers/bombjack.c +++ b/src/mame/drivers/bombjack.c @@ -333,13 +333,13 @@ static MACHINE_DRIVER_START( bombjack ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(Z80, 3072000) /* audio CPU */ /* 3.072 MHz????? */ MDRV_CPU_PROGRAM_MAP(bombjack_sound_readmem,bombjack_sound_writemem) MDRV_CPU_IO_MAP(0,bombjack_sound_writeport) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_MACHINE_START(bombjack) diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c index eb61cb8dbb8..881f7dacd4b 100644 --- a/src/mame/drivers/boogwing.c +++ b/src/mame/drivers/boogwing.c @@ -305,7 +305,7 @@ static MACHINE_DRIVER_START( boogwing ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14000000) /* DE102 */ MDRV_CPU_PROGRAM_MAP(boogwing_map,0) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(H6280,32220000/4) MDRV_CPU_PROGRAM_MAP(sound_readmem, sound_writemem) diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c index 9eaeb66316d..c4851a803aa 100644 --- a/src/mame/drivers/bottom9.c +++ b/src/mame/drivers/bottom9.c @@ -403,12 +403,12 @@ static MACHINE_DRIVER_START( bottom9 ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 2000000) /* ? */ MDRV_CPU_PROGRAM_MAP(bottom9_readmem,bottom9_writemem) - MDRV_CPU_VBLANK_INT(bottom9_interrupt,1) + MDRV_CPU_VBLANK_INT("main", bottom9_interrupt) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(bottom9_sound_readmem,bottom9_sound_writemem) - MDRV_CPU_VBLANK_INT(bottom9_sound_interrupt,8) /* irq is triggered by the main CPU */ + MDRV_CPU_VBLANK_INT_HACK(bottom9_sound_interrupt,8) /* irq is triggered by the main CPU */ /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS) diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c index 8fe4167d925..8b082f8ddd8 100644 --- a/src/mame/drivers/brkthru.c +++ b/src/mame/drivers/brkthru.c @@ -402,7 +402,7 @@ static MACHINE_DRIVER_START( brkthru ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */ MDRV_CPU_PROGRAM_MAP(brkthru_map,0) - MDRV_CPU_VBLANK_INT(brkthru_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(brkthru_interrupt,2) MDRV_CPU_ADD(M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) @@ -440,7 +440,7 @@ static MACHINE_DRIVER_START( darwin ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */ MDRV_CPU_PROGRAM_MAP(darwin_map,0) - MDRV_CPU_VBLANK_INT(brkthru_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(brkthru_interrupt,2) MDRV_CPU_ADD(M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) diff --git a/src/mame/drivers/bsktball.c b/src/mame/drivers/bsktball.c index 2271570e282..794a91ec287 100644 --- a/src/mame/drivers/bsktball.c +++ b/src/mame/drivers/bsktball.c @@ -22,6 +22,7 @@ ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "bsktball.h" #include "sound/discrete.h" @@ -210,7 +211,7 @@ static MACHINE_DRIVER_START( bsktball ) /* basic machine hardware */ MDRV_CPU_ADD(M6502,750000) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(bsktball_interrupt,8) + MDRV_CPU_VBLANK_INT_HACK(bsktball_interrupt,8) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c index d45896a3d98..71b2762b65d 100644 --- a/src/mame/drivers/btime.c +++ b/src/mame/drivers/btime.c @@ -1296,12 +1296,12 @@ static MACHINE_DRIVER_START( btime ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M6502, 1500000) MDRV_CPU_PROGRAM_MAP(btime_readmem,btime_writemem) - MDRV_CPU_VBLANK_INT(btime_irq_interrupt,1) + MDRV_CPU_VBLANK_INT("main", btime_irq_interrupt) MDRV_CPU_ADD_TAG("sound", M6502, 500000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,16) + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,16) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -1335,7 +1335,7 @@ static MACHINE_DRIVER_START( cookrace ) MDRV_IMPORT_FROM(btime) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(cookrace_readmem,cookrace_writemem) - MDRV_CPU_VBLANK_INT(btime_nmi_interrupt,1) + MDRV_CPU_VBLANK_INT("main", btime_nmi_interrupt) MDRV_CPU_MODIFY("sound") MDRV_CPU_PROGRAM_MAP(sound_map,0) @@ -1354,10 +1354,10 @@ static MACHINE_DRIVER_START( lnc ) MDRV_IMPORT_FROM(btime) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(lnc_readmem,lnc_writemem) - MDRV_CPU_VBLANK_INT(btime_nmi_interrupt,1) + MDRV_CPU_VBLANK_INT("main", btime_nmi_interrupt) MDRV_CPU_MODIFY("sound") - MDRV_CPU_VBLANK_INT(lnc_sound_interrupt,16) + MDRV_CPU_VBLANK_INT_HACK(lnc_sound_interrupt,16) MDRV_MACHINE_RESET(lnc) @@ -1375,7 +1375,7 @@ static MACHINE_DRIVER_START( wtennis ) /* basic machine hardware */ MDRV_IMPORT_FROM(lnc) MDRV_CPU_MODIFY("sound") - MDRV_CPU_VBLANK_INT(nmi_line_pulse,16) + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,16) /* video hardware */ MDRV_VIDEO_UPDATE(eggs) @@ -1397,7 +1397,7 @@ static MACHINE_DRIVER_START( bnj ) MDRV_IMPORT_FROM(btime) MDRV_CPU_REPLACE("main", M6502, 750000) MDRV_CPU_PROGRAM_MAP(bnj_readmem,bnj_writemem) - MDRV_CPU_VBLANK_INT(btime_nmi_interrupt,1) + MDRV_CPU_VBLANK_INT("main", btime_nmi_interrupt) /* video hardware */ MDRV_GFXDECODE(bnj) @@ -1414,7 +1414,7 @@ static MACHINE_DRIVER_START( zoar ) MDRV_IMPORT_FROM(btime) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(zoar_readmem,zoar_writemem) - MDRV_CPU_VBLANK_INT(zoar_irq_interrupt,1) + MDRV_CPU_VBLANK_INT("main", zoar_irq_interrupt) /* video hardware */ MDRV_GFXDECODE(zoar) diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c index 72fb532a138..eb735629182 100644 --- a/src/mame/drivers/bublbobl.c +++ b/src/mame/drivers/bublbobl.c @@ -736,11 +736,11 @@ static MACHINE_DRIVER_START( tokio ) // basic machine hardware MDRV_CPU_ADD(Z80, MAIN_XTAL/4) // 6 MHz MDRV_CPU_PROGRAM_MAP(tokio_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, MAIN_XTAL/4) // 6 MHz MDRV_CPU_PROGRAM_MAP(tokio_slave_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, MAIN_XTAL/8) /* audio CPU */ // 3 MHz @@ -781,7 +781,7 @@ static MACHINE_DRIVER_START( bublbobl ) MDRV_CPU_ADD(Z80, MAIN_XTAL/4) // 6 MHz MDRV_CPU_PROGRAM_MAP(slave_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, MAIN_XTAL/8) /* audio CPU */ // 3 MHz @@ -789,7 +789,7 @@ static MACHINE_DRIVER_START( bublbobl ) MDRV_CPU_ADD_TAG("mcu", M6801, 4000000) // actually 6801U4 // xtal is 4MHz, divided by 4 internally MDRV_CPU_PROGRAM_MAP(mcu_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_pulse, 1) // comes from the same clock that latches the INT pin on the second Z80 + MDRV_CPU_VBLANK_INT("main", irq0_line_pulse) // comes from the same clock that latches the INT pin on the second Z80 MDRV_INTERLEAVE(100) // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs @@ -825,7 +825,7 @@ static MACHINE_DRIVER_START( boblbobl ) // basic machine hardware MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(bootleg_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) // interrupt mode 1, unlike Bubble Bobble + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) // interrupt mode 1, unlike Bubble Bobble MDRV_CPU_REMOVE("mcu") MACHINE_DRIVER_END @@ -837,7 +837,7 @@ static MACHINE_DRIVER_START( bub68705 ) MDRV_CPU_ADD_TAG("mcu", M68705, 4000000) // xtal is 4MHz, divided by 4 internally MDRV_CPU_PROGRAM_MAP(bootlegmcu_map, 0) - MDRV_CPU_VBLANK_INT(bublbobl_m68705_interrupt, 2) // ??? should come from the same clock which latches the INT pin on the second Z80 + MDRV_CPU_VBLANK_INT_HACK(bublbobl_m68705_interrupt, 2) // ??? should come from the same clock which latches the INT pin on the second Z80 MACHINE_DRIVER_END diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c index de2619f36f4..d535caa1a35 100644 --- a/src/mame/drivers/buggychl.c +++ b/src/mame/drivers/buggychl.c @@ -432,12 +432,12 @@ static MACHINE_DRIVER_START( buggychl ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* 4 MHz??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,60) /* irq is timed, tied to the cpu clock and not to vblank */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,60) /* irq is timed, tied to the cpu clock and not to vblank */ /* nmi is caused by the main cpu */ MDRV_CPU_ADD(M68705,8000000/2) /* 4 MHz */ diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c index 21fd1721d6d..1f488e744c3 100644 --- a/src/mame/drivers/bwing.c +++ b/src/mame/drivers/bwing.c @@ -392,11 +392,11 @@ static MACHINE_DRIVER_START( bwing ) // basic machine hardware MDRV_CPU_ADD(M6809, 2000000) MDRV_CPU_PROGRAM_MAP(bwp1_readmem, bwp1_writemem) - MDRV_CPU_VBLANK_INT(bwp1_interrupt, 3) + MDRV_CPU_VBLANK_INT_HACK(bwp1_interrupt, 3) MDRV_CPU_ADD(M6809, 2000000) MDRV_CPU_PROGRAM_MAP(bwp2_readmem, bwp2_writemem) -// MDRV_CPU_VBLANK_INT(irq1_line_assert, 1) // vblank triggers FIRQ on CPU2 by design (unused) +// MDRV_CPU_VBLANK_INT("main", irq1_line_assert) // vblank triggers FIRQ on CPU2 by design (unused) MDRV_CPU_ADD(DECO16, 2000000) /* audio CPU */ diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c index 35fa7c4b3e9..214fea04654 100644 --- a/src/mame/drivers/cabal.c +++ b/src/mame/drivers/cabal.c @@ -540,7 +540,7 @@ static MACHINE_DRIVER_START( cabal ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 20000000/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem_cpu,writemem_cpu) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, 3579580) /* verified on pcb */ /* audio CPU */ @@ -585,7 +585,7 @@ static MACHINE_DRIVER_START( cabalbl ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(cabalbl_readmem_cpu,cabalbl_writemem_cpu) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(cabalbl_readmem_sound,cabalbl_writemem_sound) diff --git a/src/mame/drivers/calomega.c b/src/mame/drivers/calomega.c index 5af7d573538..8222ebddddc 100644 --- a/src/mame/drivers/calomega.c +++ b/src/mame/drivers/calomega.c @@ -1150,7 +1150,7 @@ static MACHINE_DRIVER_START( sys903 ) // basic machine hardware MDRV_CPU_ADD_TAG("main", M6502, MASTER_CLOCK/16) /* confirmed */ MDRV_CPU_PROGRAM_MAP(sys903_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_NVRAM_HANDLER(generic_0fill) diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c index 6dcc747e99a..50f6b0b43f9 100644 --- a/src/mame/drivers/calorie.c +++ b/src/mame/drivers/calorie.c @@ -362,7 +362,7 @@ static MACHINE_DRIVER_START( calorie ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(calorie_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,3000000) /* 3 MHz */ MDRV_CPU_PROGRAM_MAP(calorie_sound_map,0) diff --git a/src/mame/drivers/canyon.c b/src/mame/drivers/canyon.c index 23e7692e02e..7186a9f6c15 100644 --- a/src/mame/drivers/canyon.c +++ b/src/mame/drivers/canyon.c @@ -237,7 +237,7 @@ static MACHINE_DRIVER_START( canyon ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 12096000 / 16) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse, 1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_WATCHDOG_VBLANK_INIT(8) /* video hardware */ diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c index 8c30f6fbb57..f16f91de17b 100644 --- a/src/mame/drivers/capbowl.c +++ b/src/mame/drivers/capbowl.c @@ -352,7 +352,7 @@ static MACHINE_DRIVER_START( capbowl ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M6809E, MASTER_CLOCK) MDRV_CPU_PROGRAM_MAP(capbowl_map,0) - MDRV_CPU_VBLANK_INT(capbowl_interrupt,1) + MDRV_CPU_VBLANK_INT("main", capbowl_interrupt) /* audio CPU */ MDRV_CPU_ADD(M6809E, MASTER_CLOCK) diff --git a/src/mame/drivers/carjmbre.c b/src/mame/drivers/carjmbre.c index b4f80a567f6..d6bb819d320 100644 --- a/src/mame/drivers/carjmbre.c +++ b/src/mame/drivers/carjmbre.c @@ -186,13 +186,13 @@ static MACHINE_DRIVER_START( carjmbre ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,18432000/6) MDRV_CPU_PROGRAM_MAP(carjmbre_readmem,carjmbre_writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(Z80, 1500000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(carjmbre_sound_readmem,carjmbre_sound_writemem) MDRV_CPU_IO_MAP(carjmbre_sound_readport,carjmbre_sound_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/carpolo.c b/src/mame/drivers/carpolo.c index c6ff6760889..f601271a3fd 100644 --- a/src/mame/drivers/carpolo.c +++ b/src/mame/drivers/carpolo.c @@ -238,7 +238,7 @@ static MACHINE_DRIVER_START( carpolo ) /* basic machine hardware */ MDRV_CPU_ADD(M6502,11289000/12) /* 940.75 kHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(carpolo_timer_interrupt,1) /* this not strictly VBLANK, + MDRV_CPU_VBLANK_INT("main", carpolo_timer_interrupt) /* this not strictly VBLANK, but it's supposed to happen 60 times a sec, so it's a good place */ MDRV_MACHINE_START(carpolo) diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c index cafcbfd78e7..e88a40a3759 100644 --- a/src/mame/drivers/carrera.c +++ b/src/mame/drivers/carrera.c @@ -307,7 +307,7 @@ static MACHINE_DRIVER_START( carrera ) MDRV_CPU_ADD(Z80,MASTER_CLOCK/6) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c index 30f9274ae82..ca6e43bb539 100644 --- a/src/mame/drivers/cave.c +++ b/src/mame/drivers/cave.c @@ -2018,7 +2018,7 @@ static MACHINE_DRIVER_START( dfeveron ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(dfeveron_readmem,dfeveron_writemem) - MDRV_CPU_VBLANK_INT(cave_interrupt,1) + MDRV_CPU_VBLANK_INT("main", cave_interrupt) MDRV_MACHINE_RESET(cave) MDRV_NVRAM_HANDLER(cave) @@ -2057,7 +2057,7 @@ static MACHINE_DRIVER_START( ddonpach ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(ddonpach_readmem,ddonpach_writemem) - MDRV_CPU_VBLANK_INT(cave_interrupt,1) + MDRV_CPU_VBLANK_INT("main", cave_interrupt) MDRV_MACHINE_RESET(cave) MDRV_NVRAM_HANDLER(cave) @@ -2096,7 +2096,7 @@ static MACHINE_DRIVER_START( donpachi ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(donpachi_readmem,donpachi_writemem) - MDRV_CPU_VBLANK_INT(cave_interrupt,1) + MDRV_CPU_VBLANK_INT("main", cave_interrupt) MDRV_MACHINE_RESET(cave) MDRV_NVRAM_HANDLER(cave) @@ -2140,7 +2140,7 @@ static MACHINE_DRIVER_START( esprade ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(esprade_readmem,esprade_writemem) - MDRV_CPU_VBLANK_INT(cave_interrupt,1) + MDRV_CPU_VBLANK_INT("main", cave_interrupt) MDRV_MACHINE_RESET(cave) MDRV_NVRAM_HANDLER(cave) @@ -2178,7 +2178,7 @@ static MACHINE_DRIVER_START( gaia ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(gaia_readmem,gaia_writemem) - MDRV_CPU_VBLANK_INT(cave_interrupt,1) + MDRV_CPU_VBLANK_INT("main", cave_interrupt) MDRV_MACHINE_RESET(cave) @@ -2215,7 +2215,7 @@ static MACHINE_DRIVER_START( guwange ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(guwange_readmem,guwange_writemem) - MDRV_CPU_VBLANK_INT(cave_interrupt,1) + MDRV_CPU_VBLANK_INT("main", cave_interrupt) MDRV_MACHINE_RESET(cave) MDRV_NVRAM_HANDLER(cave) @@ -2252,7 +2252,7 @@ static MACHINE_DRIVER_START( hotdogst ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(hotdogst_readmem,hotdogst_writemem) - MDRV_CPU_VBLANK_INT(cave_interrupt,1) + MDRV_CPU_VBLANK_INT("main", cave_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* ? */ @@ -2307,7 +2307,7 @@ static MACHINE_DRIVER_START( korokoro ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(korokoro_readmem,korokoro_writemem) - MDRV_CPU_VBLANK_INT(cave_interrupt,1) + MDRV_CPU_VBLANK_INT("main", cave_interrupt) MDRV_MACHINE_RESET(cave) MDRV_NVRAM_HANDLER(korokoro) @@ -2346,7 +2346,7 @@ static MACHINE_DRIVER_START( mazinger ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(mazinger_readmem,mazinger_writemem) - MDRV_CPU_VBLANK_INT(cave_interrupt,1) + MDRV_CPU_VBLANK_INT("main", cave_interrupt) MDRV_CPU_ADD(Z80, 4000000) // /* audio CPU */ // Bidirectional communication @@ -2403,7 +2403,7 @@ static MACHINE_DRIVER_START( metmqstr ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,32000000 / 2) MDRV_CPU_PROGRAM_MAP(metmqstr_readmem,metmqstr_writemem) - MDRV_CPU_VBLANK_INT(cave_interrupt,1) + MDRV_CPU_VBLANK_INT("main", cave_interrupt) MDRV_CPU_ADD(Z80,32000000 / 4) /* audio CPU */ @@ -2461,7 +2461,7 @@ static MACHINE_DRIVER_START( pwrinst2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(pwrinst2_readmem,pwrinst2_writemem) - MDRV_CPU_VBLANK_INT(cave_interrupt,1) + MDRV_CPU_VBLANK_INT("main", cave_interrupt) MDRV_CPU_ADD(Z80,16000000 / 2) /* audio CPU */ /* 8 MHz */ @@ -2521,7 +2521,7 @@ static MACHINE_DRIVER_START( sailormn ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(sailormn_readmem,sailormn_writemem) - MDRV_CPU_VBLANK_INT(cave_interrupt,1) + MDRV_CPU_VBLANK_INT("main", cave_interrupt) MDRV_CPU_ADD(Z80, 8000000) // /* audio CPU */ // Bidirectional Communication @@ -2576,7 +2576,7 @@ static MACHINE_DRIVER_START( uopoko ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(uopoko_readmem,uopoko_writemem) - MDRV_CPU_VBLANK_INT(cave_interrupt,1) + MDRV_CPU_VBLANK_INT("main", cave_interrupt) MDRV_NVRAM_HANDLER(cave) diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c index 0d0517a108a..5894b4bbbcc 100644 --- a/src/mame/drivers/cbasebal.c +++ b/src/mame/drivers/cbasebal.c @@ -255,7 +255,7 @@ static MACHINE_DRIVER_START( cbasebal ) MDRV_CPU_ADD(Z80, 6000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(cbasebal_map,0) MDRV_CPU_IO_MAP(cbasebal_portmap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* ??? */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* ??? */ MDRV_NVRAM_HANDLER(cbasebal) diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c index 7b644b8b890..7a92bdfc152 100644 --- a/src/mame/drivers/cbuster.c +++ b/src/mame/drivers/cbuster.c @@ -346,7 +346,7 @@ static MACHINE_DRIVER_START( twocrude ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* Custom chip 59 */ MDRV_CPU_PROGRAM_MAP(twocrude_readmem,twocrude_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1)/* VBL */ + MDRV_CPU_VBLANK_INT("main", irq4_line_hold)/* VBL */ MDRV_CPU_ADD(H6280,32220000/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c index e87d8c9ab47..f435dbe4f01 100644 --- a/src/mame/drivers/cclimber.c +++ b/src/mame/drivers/cclimber.c @@ -1070,7 +1070,7 @@ static MACHINE_DRIVER_START( root ) MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/3/2) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(cclimber_map,0) MDRV_CPU_IO_MAP(cclimber_portmap,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_MACHINE_RESET(cclimber) @@ -1173,7 +1173,7 @@ static MACHINE_DRIVER_START( swimmer ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(swimmer_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(Z80,4000000/2) MDRV_CPU_PROGRAM_MAP(swimmer_audio_map,0) diff --git a/src/mame/drivers/chaknpop.c b/src/mame/drivers/chaknpop.c index 3a253341f7b..f687a3a402a 100644 --- a/src/mame/drivers/chaknpop.c +++ b/src/mame/drivers/chaknpop.c @@ -289,7 +289,7 @@ static MACHINE_DRIVER_START( chaknpop ) MDRV_CPU_ADD(Z80, 2350000) //MDRV_CPU_ADD(Z80, 2760000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_RESET(chaknpop) diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c index 4ca86a73c63..13561b748c4 100644 --- a/src/mame/drivers/champbas.c +++ b/src/mame/drivers/champbas.c @@ -268,7 +268,7 @@ static MACHINE_DRIVER_START( champbas ) /* main cpu */ MDRV_CPU_ADD(Z80, 18432000/6) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* audio CPU */ MDRV_CPU_ADD(Z80, 18432000/6) diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c index 509a4615344..82a5adec39a 100644 --- a/src/mame/drivers/champbwl.c +++ b/src/mame/drivers/champbwl.c @@ -333,7 +333,7 @@ static MACHINE_DRIVER_START( champbwl ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 16000000/4) /* 4MHz */ MDRV_CPU_PROGRAM_MAP(champbwl_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_NVRAM_HANDLER(generic_0fill) diff --git a/src/mame/drivers/changela.c b/src/mame/drivers/changela.c index 27681c44e52..03377aef374 100644 --- a/src/mame/drivers/changela.c +++ b/src/mame/drivers/changela.c @@ -9,6 +9,7 @@ Tomasz Slanina ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "cpu/z80/z80.h" #include "cpu/m6805/m6805.h" #include "sound/ay8910.h" @@ -479,7 +480,7 @@ static MACHINE_DRIVER_START( changela ) MDRV_CPU_ADD(Z80,5000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(chl_interrupt,4) + MDRV_CPU_VBLANK_INT_HACK(chl_interrupt,4) MDRV_CPU_ADD(M68705,2500000) MDRV_CPU_PROGRAM_MAP(mcu_readmem,mcu_writemem) diff --git a/src/mame/drivers/cheekyms.c b/src/mame/drivers/cheekyms.c index d6a974c050d..31f2c85db1c 100644 --- a/src/mame/drivers/cheekyms.c +++ b/src/mame/drivers/cheekyms.c @@ -125,7 +125,7 @@ static MACHINE_DRIVER_START( cheekyms ) MDRV_CPU_ADD(Z80,5000000/2) /* 2.5 MHz */ MDRV_CPU_PROGRAM_MAP(addressmap,0) MDRV_CPU_IO_MAP(portmap,0) - MDRV_CPU_VBLANK_INT(cheekyms_interrupt,1) + MDRV_CPU_VBLANK_INT("main", cheekyms_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/cherrym.c b/src/mame/drivers/cherrym.c index 740dda1d75f..14bc2c37def 100644 --- a/src/mame/drivers/cherrym.c +++ b/src/mame/drivers/cherrym.c @@ -374,7 +374,7 @@ static MACHINE_DRIVER_START( cmv801 ) MDRV_CPU_ADD(Z80, 8000000/2) // ??? MDRV_CPU_PROGRAM_MAP(cm_map, 0) MDRV_CPU_IO_MAP(cm_io_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) //MDRV_NVRAM_HANDLER(cmv801) diff --git a/src/mame/drivers/cherrym2.c b/src/mame/drivers/cherrym2.c index 9fdbc3ec399..777e72c8122 100644 --- a/src/mame/drivers/cherrym2.c +++ b/src/mame/drivers/cherrym2.c @@ -354,7 +354,7 @@ static MACHINE_DRIVER_START( cm2v841 ) MDRV_CPU_ADD(Z80, 8000000/2) // ??? MDRV_CPU_PROGRAM_MAP(cm_map, 0) MDRV_CPU_IO_MAP(cm_io_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) //MDRV_NVRAM_HANDLER(cmv801) diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c index 81d8edff8ae..ae1865cb535 100644 --- a/src/mame/drivers/chinagat.c +++ b/src/mame/drivers/chinagat.c @@ -495,7 +495,7 @@ static MACHINE_DRIVER_START( chinagat ) /* basic machine hardware */ MDRV_CPU_ADD(HD6309,12000000/2) /* 1.5 MHz (12MHz oscillator ???) */ MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(chinagat_interrupt,1) + MDRV_CPU_VBLANK_INT("main", chinagat_interrupt) MDRV_CPU_ADD(HD6309,12000000/2) /* 1.5 MHz (12MHz oscillator ???) */ MDRV_CPU_PROGRAM_MAP(sub_map,0) @@ -539,7 +539,7 @@ static MACHINE_DRIVER_START( saiyugb1 ) /* basic machine hardware */ MDRV_CPU_ADD(M6809,12000000/8) /* 68B09EP 1.5 MHz (12MHz oscillator) */ MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(chinagat_interrupt,1) + MDRV_CPU_VBLANK_INT("main", chinagat_interrupt) MDRV_CPU_ADD(M6809,12000000/8) /* 68B09EP 1.5 MHz (12MHz oscillator) */ MDRV_CPU_PROGRAM_MAP(sub_map,0) @@ -587,7 +587,7 @@ static MACHINE_DRIVER_START( saiyugb2 ) /* basic machine hardware */ MDRV_CPU_ADD(M6809,12000000/8) /* 1.5 MHz (12MHz oscillator) */ MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(chinagat_interrupt,1) + MDRV_CPU_VBLANK_INT("main", chinagat_interrupt) MDRV_CPU_ADD(M6809,12000000/8) /* 1.5 MHz (12MHz oscillator) */ MDRV_CPU_PROGRAM_MAP(sub_map,0) diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c index 9f2fdef26fa..b6f696f768d 100644 --- a/src/mame/drivers/chinsan.c +++ b/src/mame/drivers/chinsan.c @@ -461,7 +461,7 @@ static MACHINE_DRIVER_START( chinsan ) MDRV_CPU_ADD(Z80,10000000/2) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(chinsan_map,0) MDRV_CPU_IO_MAP(chinsan_io,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_RESET( chinsan ) diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c index 06235ff8913..5ebe78d372d 100644 --- a/src/mame/drivers/chqflag.c +++ b/src/mame/drivers/chqflag.c @@ -363,7 +363,7 @@ static MACHINE_DRIVER_START( chqflag ) /* basic machine hardware */ MDRV_CPU_ADD(KONAMI,XTAL_24MHz/8) /* 052001 (verified on pcb) */ MDRV_CPU_PROGRAM_MAP(chqflag_readmem,chqflag_writemem) - MDRV_CPU_VBLANK_INT(chqflag_interrupt,16) /* ? */ + MDRV_CPU_VBLANK_INT_HACK(chqflag_interrupt,16) /* ? */ MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) /* verified on pcb */ /* audio CPU */ /* ? */ diff --git a/src/mame/drivers/cidelsa.c b/src/mame/drivers/cidelsa.c index 639b54a31c4..1451b26af20 100644 --- a/src/mame/drivers/cidelsa.c +++ b/src/mame/drivers/cidelsa.c @@ -517,7 +517,7 @@ static MACHINE_DRIVER_START( destryer ) MDRV_CPU_PROGRAM_MAP(destryer_map, 0) MDRV_CPU_IO_MAP(destryer_io_map, 0) MDRV_CPU_CONFIG(cidelsa_cdp1802_config) - MDRV_CPU_VBLANK_INT(altair_interrupt, CDP1869_TOTAL_SCANLINES_PAL) + MDRV_CPU_VBLANK_INT_HACK(altair_interrupt, CDP1869_TOTAL_SCANLINES_PAL) MDRV_NVRAM_HANDLER(generic_0fill) MDRV_MACHINE_START(destryer) MDRV_MACHINE_RESET(destryer) @@ -550,7 +550,7 @@ static MACHINE_DRIVER_START( destryea ) MDRV_CPU_PROGRAM_MAP(destryea_map, 0) MDRV_CPU_IO_MAP(destryer_io_map, 0) MDRV_CPU_CONFIG(cidelsa_cdp1802_config) - MDRV_CPU_VBLANK_INT(altair_interrupt, CDP1869_TOTAL_SCANLINES_PAL) + MDRV_CPU_VBLANK_INT_HACK(altair_interrupt, CDP1869_TOTAL_SCANLINES_PAL) MDRV_NVRAM_HANDLER(generic_0fill) MDRV_MACHINE_START(destryer) MDRV_MACHINE_RESET(destryer) @@ -583,7 +583,7 @@ static MACHINE_DRIVER_START( altair ) MDRV_CPU_PROGRAM_MAP(altair_map, 0) MDRV_CPU_IO_MAP(altair_io_map, 0) MDRV_CPU_CONFIG(cidelsa_cdp1802_config) - MDRV_CPU_VBLANK_INT(altair_interrupt, CDP1869_TOTAL_SCANLINES_PAL) + MDRV_CPU_VBLANK_INT_HACK(altair_interrupt, CDP1869_TOTAL_SCANLINES_PAL) MDRV_MACHINE_START(destryer) MDRV_MACHINE_RESET(destryer) @@ -615,7 +615,7 @@ static MACHINE_DRIVER_START( draco ) MDRV_CPU_PROGRAM_MAP(draco_map, 0) MDRV_CPU_IO_MAP(draco_io_map, 0) MDRV_CPU_CONFIG(cidelsa_cdp1802_config) - MDRV_CPU_VBLANK_INT(draco_interrupt, CDP1869_TOTAL_SCANLINES_PAL) + MDRV_CPU_VBLANK_INT_HACK(draco_interrupt, CDP1869_TOTAL_SCANLINES_PAL) MDRV_NVRAM_HANDLER(generic_0fill) MDRV_MACHINE_START(draco) MDRV_MACHINE_RESET(destryer) diff --git a/src/mame/drivers/cinemat.c b/src/mame/drivers/cinemat.c index be3d5478092..68fba3b1407 100644 --- a/src/mame/drivers/cinemat.c +++ b/src/mame/drivers/cinemat.c @@ -988,7 +988,7 @@ static MACHINE_DRIVER_START( cinemat_nojmi_4k ) MDRV_CPU_PROGRAM_MAP(program_map_4k,0) MDRV_CPU_DATA_MAP(data_map,0) MDRV_CPU_IO_MAP(io_map,0) - MDRV_CPU_VBLANK_INT(check_coins,1) + MDRV_CPU_VBLANK_INT("main", check_coins) MDRV_MACHINE_START(cinemat) MDRV_MACHINE_RESET(cinemat) diff --git a/src/mame/drivers/circus.c b/src/mame/drivers/circus.c index 4e69b24745a..01b725f8087 100644 --- a/src/mame/drivers/circus.c +++ b/src/mame/drivers/circus.c @@ -31,6 +31,7 @@ D000 Paddle Position and Interrupt Reset ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "sound/samples.h" #include "circus.h" @@ -272,7 +273,7 @@ static MACHINE_DRIVER_START( circus ) /* basic machine hardware */ MDRV_CPU_ADD(M6502,11289000/16) /* 705.562kHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -307,7 +308,7 @@ static MACHINE_DRIVER_START( robotbwl ) /* basic machine hardware */ MDRV_CPU_ADD(M6502,11289000/16) /* 705.562kHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -341,7 +342,7 @@ static MACHINE_DRIVER_START( crash ) /* basic machine hardware */ MDRV_CPU_ADD(M6502,11289000/16) /* 705.562kHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -375,7 +376,7 @@ static MACHINE_DRIVER_START( ripcord ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 705562) /* 11.289MHz / 16 */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - //MDRV_CPU_VBLANK_INT(ripcord_interrupt,1) //AT + //MDRV_CPU_VBLANK_INT("main", ripcord_interrupt) //AT /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c index 07c89e2fbfc..8e393410ec6 100644 --- a/src/mame/drivers/circusc.c +++ b/src/mame/drivers/circusc.c @@ -303,7 +303,7 @@ static MACHINE_DRIVER_START( circusc ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 2048000) /* 2 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_WATCHDOG_VBLANK_INIT(8) /* audio CPU */ /* Z80 Clock is derived from a 14.31818 MHz crystal */ diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c index 7c52c4b01fc..ee816a3a1ab 100644 --- a/src/mame/drivers/cischeat.c +++ b/src/mame/drivers/cischeat.c @@ -1735,9 +1735,6 @@ static INTERRUPT_GEN( cischeat_interrupt ) } -/* CPU # 2 & 3 */ -#define CISCHEAT_SUB_INTERRUPT_NUM 1 - /* CPU # 4 */ #define CISCHEAT_SOUND_INTERRUPT_NUM 16 @@ -1752,20 +1749,20 @@ static MACHINE_DRIVER_START( bigrun ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("cpu1", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(bigrun_readmem,bigrun_writemem) - MDRV_CPU_VBLANK_INT(cischeat_interrupt,CISCHEAT_INTERRUPT_NUM) + MDRV_CPU_VBLANK_INT_HACK(cischeat_interrupt,CISCHEAT_INTERRUPT_NUM) MDRV_CPU_ADD_TAG("cpu2", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(bigrun_readmem2,bigrun_writemem2) - MDRV_CPU_VBLANK_INT(irq4_line_hold,CISCHEAT_SUB_INTERRUPT_NUM) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD_TAG("cpu3", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(bigrun_readmem3,bigrun_writemem3) - MDRV_CPU_VBLANK_INT(irq4_line_hold,CISCHEAT_SUB_INTERRUPT_NUM) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD_TAG("sound", M68000, 6000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(bigrun_sound_readmem,bigrun_sound_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,CISCHEAT_SOUND_INTERRUPT_NUM) + MDRV_CPU_VBLANK_INT_HACK(irq4_line_hold,CISCHEAT_SOUND_INTERRUPT_NUM) MDRV_INTERLEAVE(20) @@ -1898,7 +1895,7 @@ static MACHINE_DRIVER_START( scudhamm ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main",M68000, 12000000) MDRV_CPU_PROGRAM_MAP(readmem_scudhamm,writemem_scudhamm) - MDRV_CPU_VBLANK_INT(interrupt_scudhamm,INTERRUPT_NUM_SCUDHAMM) + MDRV_CPU_VBLANK_INT_HACK(interrupt_scudhamm,INTERRUPT_NUM_SCUDHAMM) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK | VIDEO_HAS_SHADOWS) @@ -1950,7 +1947,7 @@ static MACHINE_DRIVER_START( armchmp2 ) MDRV_IMPORT_FROM(scudhamm) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(readmem_armchmp2,writemem_armchmp2) - MDRV_CPU_VBLANK_INT(interrupt_armchmp2,INTERRUPT_NUM_SCUDHAMM) + MDRV_CPU_VBLANK_INT_HACK(interrupt_armchmp2,INTERRUPT_NUM_SCUDHAMM) MACHINE_DRIVER_END diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c index 660bd98280e..1c1481a89d6 100644 --- a/src/mame/drivers/citycon.c +++ b/src/mame/drivers/citycon.c @@ -209,12 +209,12 @@ static MACHINE_DRIVER_START( citycon ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 2048000) /* 2.048 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(M6809, 640000) /* audio CPU */ /* 0.640 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/clayshoo.c b/src/mame/drivers/clayshoo.c index 8316661f18d..edc8a81635a 100644 --- a/src/mame/drivers/clayshoo.c +++ b/src/mame/drivers/clayshoo.c @@ -299,7 +299,7 @@ static MACHINE_DRIVER_START( clayshoo ) MDRV_CPU_ADD(Z80,5068000/4) /* 5.068/4 Mhz (divider is a guess) */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_io_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_START(clayshoo) diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c index c2c22b18073..d6f8f74778f 100644 --- a/src/mame/drivers/cliffhgr.c +++ b/src/mame/drivers/cliffhgr.c @@ -738,7 +738,7 @@ static MACHINE_DRIVER_START( cliffhgr ) MDRV_CPU_ADD(Z80, 4000000) /* 4MHz */ MDRV_CPU_PROGRAM_MAP(mainmem,0) MDRV_CPU_IO_MAP(mainport,0) - MDRV_CPU_VBLANK_INT(cliff_vsync,1) + MDRV_CPU_VBLANK_INT("main", cliff_vsync) MDRV_MACHINE_START(cliffhgr) MDRV_MACHINE_RESET(cliffhgr) diff --git a/src/mame/drivers/cloak.c b/src/mame/drivers/cloak.c index 63a8482b39b..b62873d2b1b 100644 --- a/src/mame/drivers/cloak.c +++ b/src/mame/drivers/cloak.c @@ -337,11 +337,11 @@ static MACHINE_DRIVER_START( cloak ) /* basic machine hardware */ MDRV_CPU_ADD(M6502,1000000) /* 1 MHz ???? */ MDRV_CPU_PROGRAM_MAP(master_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) MDRV_CPU_ADD(M6502,1250000) /* 1.25 MHz ???? */ MDRV_CPU_PROGRAM_MAP(slave_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_INTERLEAVE(5) diff --git a/src/mame/drivers/clshroad.c b/src/mame/drivers/clshroad.c index 08a9bea454f..a8d1ac227db 100644 --- a/src/mame/drivers/clshroad.c +++ b/src/mame/drivers/clshroad.c @@ -306,12 +306,12 @@ static MACHINE_DRIVER_START( firebatl ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 3000000) /* ? */ MDRV_CPU_PROGRAM_MAP(clshroad_readmem,clshroad_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* IRQ, no NMI */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* IRQ, no NMI */ MDRV_CPU_ADD(Z80, 3000000) /* ? */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(clshroad_sound_readmem,clshroad_sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* IRQ, no NMI */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* IRQ, no NMI */ MDRV_MACHINE_RESET(clshroad) @@ -343,12 +343,12 @@ static MACHINE_DRIVER_START( clshroad ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 18432000/6) /* ? */ MDRV_CPU_PROGRAM_MAP(clshroad_readmem,clshroad_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* IRQ, no NMI */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* IRQ, no NMI */ MDRV_CPU_ADD(Z80, 18432000/6) /* ? */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(clshroad_sound_readmem,clshroad_sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* IRQ, no NMI */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* IRQ, no NMI */ MDRV_MACHINE_RESET(clshroad) diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c index 2db681486b7..069d063e6fc 100644 --- a/src/mame/drivers/cninja.c +++ b/src/mame/drivers/cninja.c @@ -785,7 +785,7 @@ static MACHINE_DRIVER_START( cninja ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(cninja_readmem,cninja_writemem) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq5_line_hold) MDRV_CPU_ADD(H6280,32220000/8) /* audio CPU */ /* Accurate */ @@ -834,7 +834,7 @@ static MACHINE_DRIVER_START( stoneage ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(cninja_readmem,cninja_writemem) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq5_line_hold) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ @@ -880,7 +880,7 @@ static MACHINE_DRIVER_START( edrandy ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(edrandy_readmem,edrandy_writemem) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq5_line_hold) MDRV_CPU_ADD(H6280,32220000/8) /* audio CPU */ /* Accurate */ @@ -929,7 +929,7 @@ static MACHINE_DRIVER_START( robocop2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14000000) MDRV_CPU_PROGRAM_MAP(robocop2_readmem,robocop2_writemem) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq5_line_hold) MDRV_CPU_ADD(H6280,32220000/8) /* audio CPU */ /* Accurate */ @@ -981,7 +981,7 @@ static MACHINE_DRIVER_START( mutantf ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14000000) MDRV_CPU_PROGRAM_MAP(mutantf_readmem,mutantf_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(H6280,32220000/8) /* audio CPU */ diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c index 49324d722f8..4510ed57010 100644 --- a/src/mame/drivers/cntsteer.c +++ b/src/mame/drivers/cntsteer.c @@ -716,16 +716,16 @@ static MACHINE_RESET( zerotrgt ) static MACHINE_DRIVER_START( cntsteer ) MDRV_CPU_ADD(M6809, 2000000) /* ? */ MDRV_CPU_PROGRAM_MAP(gekitsui_cpu1_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) /* ? */ + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* ? */ MDRV_CPU_ADD(M6809, 2000000) /* ? */ MDRV_CPU_PROGRAM_MAP(gekitsui_cpu2_map,0) -// MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) /* ? */ +// MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* ? */ // MDRV_CPU_ADD(M6502, 1500000) /* ? */ // /* audio CPU */ // MDRV_CPU_PROGRAM_MAP(sound_map,0) -// MDRV_CPU_VBLANK_INT(nmi_line_pulse,16) /* ? */ // should be interrupt, 16? +// MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,16) /* ? */ // should be interrupt, 16? /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -751,16 +751,16 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( zerotrgt ) MDRV_CPU_ADD(M6809, 2000000) /* ? */ MDRV_CPU_PROGRAM_MAP(gekitsui_cpu1_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) /* ? */ + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* ? */ MDRV_CPU_ADD(M6809, 2000000) /* ? */ MDRV_CPU_PROGRAM_MAP(gekitsui_cpu2_map,0) -// MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) /* ? */ +// MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* ? */ MDRV_CPU_ADD(M6502, 1500000) /* ? */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_pulse,16) /* ? */ // should be interrupt, 16? + MDRV_CPU_VBLANK_INT_HACK(irq0_line_pulse,16) /* ? */ // should be interrupt, 16? MDRV_CPU_PERIODIC_INT(sound_interrupt, 1000) /* video hardware */ diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c index a1042758181..9d08fb69947 100644 --- a/src/mame/drivers/coinmstr.c +++ b/src/mame/drivers/coinmstr.c @@ -637,7 +637,7 @@ static const struct AY8910interface ay8912_interface = static MACHINE_DRIVER_START( coinmstr ) MDRV_CPU_ADD_TAG("cpu",Z80,8000000) // ? MDRV_CPU_PROGRAM_MAP(coinmstr_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c index 242576d3301..8b96ec34674 100644 --- a/src/mame/drivers/combatsc.c +++ b/src/mame/drivers/combatsc.c @@ -662,7 +662,7 @@ static MACHINE_DRIVER_START( combasc ) /* basic machine hardware */ MDRV_CPU_ADD(HD6309, 3000000*4) /* 3 MHz? */ MDRV_CPU_PROGRAM_MAP(combasc_readmem,combasc_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,3579545) /* 3.579545 MHz */ /* audio CPU */ @@ -705,7 +705,7 @@ static MACHINE_DRIVER_START( combascb ) /* basic machine hardware */ MDRV_CPU_ADD(HD6309, 3000000*4) /* 3 MHz? */ MDRV_CPU_PROGRAM_MAP(combascb_readmem,combascb_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,3579545) /* 3.579545 MHz */ /* audio CPU */ diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c index 4670b3e6532..530bd4bc2df 100644 --- a/src/mame/drivers/commando.c +++ b/src/mame/drivers/commando.c @@ -43,6 +43,7 @@ Note : there is an ingame typo bug that doesn't display the bonus life values ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "sound/2203intf.h" extern UINT8 *commando_videoram2, *commando_colorram2; @@ -240,12 +241,12 @@ static MACHINE_DRIVER_START( commando ) // basic machine hardware MDRV_CPU_ADD(Z80, PHI_MAIN) // ??? MDRV_CPU_PROGRAM_MAP(commando_map, 0) - MDRV_CPU_VBLANK_INT(commando_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", commando_interrupt) MDRV_CPU_ADD(Z80, PHI_B) // 3 MHz /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 4) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4) // video hardware MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM) diff --git a/src/mame/drivers/compgolf.c b/src/mame/drivers/compgolf.c index 0d6f4861db4..9e401b7ca52 100644 --- a/src/mame/drivers/compgolf.c +++ b/src/mame/drivers/compgolf.c @@ -211,7 +211,7 @@ static const struct YM2203interface ym2203_interface = static MACHINE_DRIVER_START( compgolf ) MDRV_CPU_ADD(M6809, 2000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c index 949729215bb..5b4376936dd 100644 --- a/src/mame/drivers/contra.c +++ b/src/mame/drivers/contra.c @@ -249,7 +249,7 @@ static MACHINE_DRIVER_START( contra ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 1500000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(M6809, 2000000) /* audio CPU */ diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c index e070d669d87..80345291f76 100644 --- a/src/mame/drivers/coolridr.c +++ b/src/mame/drivers/coolridr.c @@ -178,14 +178,14 @@ static MACHINE_RESET ( coolridr ) static MACHINE_DRIVER_START( coolridr ) MDRV_CPU_ADD_TAG("main", SH2, 28000000) // ?? mhz MDRV_CPU_PROGRAM_MAP(system_h1_map,0) - MDRV_CPU_VBLANK_INT(system_h1, 2) + MDRV_CPU_VBLANK_INT_HACK(system_h1, 2) MDRV_CPU_ADD_TAG("sound", M68000, 12000000) // ?? mhz MDRV_CPU_PROGRAM_MAP(system_h1_sound_map,0) MDRV_CPU_ADD_TAG("sub", SH2, 8000000) // SH7032 HD6417032F20!! ?? mhz MDRV_CPU_PROGRAM_MAP(coolridr_submap,0) - MDRV_CPU_VBLANK_INT(system_h1_sub, 2) + MDRV_CPU_VBLANK_INT_HACK(system_h1_sub, 2) MDRV_GFXDECODE(coolridr) diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c index a6b96998dd8..31d29629b69 100644 --- a/src/mame/drivers/cop01.c +++ b/src/mame/drivers/cop01.c @@ -418,7 +418,7 @@ static MACHINE_DRIVER_START( cop01 ) MDRV_CPU_ADD(Z80, 4000000) /* ???? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 3000000) /* audio CPU */ /* ???? */ @@ -459,7 +459,7 @@ static MACHINE_DRIVER_START( mightguy ) MDRV_CPU_ADD(Z80, 4000000) /* ???? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(mightguy_readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 3000000) /* audio CPU */ /* ???? */ diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c index 4541d763d81..3b4820f83f5 100644 --- a/src/mame/drivers/cosmic.c +++ b/src/mame/drivers/cosmic.c @@ -1005,7 +1005,7 @@ static MACHINE_DRIVER_START( panic ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(panic_readmem,panic_writemem) - MDRV_CPU_VBLANK_INT(panic_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(panic_interrupt,2) /* video hardware */ MDRV_GFXDECODE(panic) @@ -1033,7 +1033,7 @@ static MACHINE_DRIVER_START( cosmica ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(cosmica_readmem,cosmica_writemem) - MDRV_CPU_VBLANK_INT(cosmica_interrupt,32) + MDRV_CPU_VBLANK_INT_HACK(cosmica_interrupt,32) /* video hardware */ MDRV_GFXDECODE(cosmica) @@ -1054,7 +1054,7 @@ static MACHINE_DRIVER_START( cosmicg ) 1.5MHz. So, if someone can check this... */ MDRV_CPU_PROGRAM_MAP(cosmicg_readmem,cosmicg_writemem) MDRV_CPU_IO_MAP(cosmicg_readport,cosmicg_writeport) - MDRV_CPU_VBLANK_INT(cosmicg_interrupt,1) + MDRV_CPU_VBLANK_INT("main", cosmicg_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -1087,7 +1087,7 @@ static MACHINE_DRIVER_START( magspot ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(magspot_readmem,magspot_writemem) - MDRV_CPU_VBLANK_INT(magspot_interrupt,1) + MDRV_CPU_VBLANK_INT("main", magspot_interrupt) /* video hardware */ MDRV_GFXDECODE(panic) @@ -1121,7 +1121,7 @@ static MACHINE_DRIVER_START( nomnlnd ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(magspot_readmem,magspot_writemem) - MDRV_CPU_VBLANK_INT(nomnlnd_interrupt,1) + MDRV_CPU_VBLANK_INT("main", nomnlnd_interrupt) /* video hardware */ MDRV_GFXDECODE(panic) diff --git a/src/mame/drivers/couple.c b/src/mame/drivers/couple.c index 226b2f3715c..c94a0b93a29 100644 --- a/src/mame/drivers/couple.c +++ b/src/mame/drivers/couple.c @@ -445,7 +445,7 @@ static MACHINE_DRIVER_START( couple ) MDRV_CPU_ADD(Z80,18432000/6) /* ?? */ MDRV_CPU_PROGRAM_MAP(merit_mem,0) MDRV_CPU_IO_MAP(merit_io,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_RESET(couple) diff --git a/src/mame/drivers/cowrace.c b/src/mame/drivers/cowrace.c index c4078b1d481..b65428668b4 100644 --- a/src/mame/drivers/cowrace.c +++ b/src/mame/drivers/cowrace.c @@ -164,12 +164,12 @@ static MACHINE_DRIVER_START( cowrace ) MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(mem_map_cowrace,0) MDRV_CPU_IO_MAP(io_map_cowrace,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(mem_map_sound_cowrace,0) MDRV_CPU_IO_MAP(io_map_sound_cowrace,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) // NMI by main CPU + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) // NMI by main CPU /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c index 6bdf8bf4104..91fea3f519e 100644 --- a/src/mame/drivers/cps1.c +++ b/src/mame/drivers/cps1.c @@ -3466,7 +3466,7 @@ static MACHINE_DRIVER_START( cps1 ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(cps1_readmem,cps1_writemem) - MDRV_CPU_VBLANK_INT(cps1_interrupt,1) + MDRV_CPU_VBLANK_INT("main", cps1_interrupt) MDRV_CPU_ADD_TAG("sound", Z80, 3579545) /* audio CPU */ @@ -3520,7 +3520,7 @@ static MACHINE_DRIVER_START( qsound ) /* basic machine hardware */ MDRV_IMPORT_FROM(cps1) MDRV_CPU_REPLACE("main", M68000, 12000000) - MDRV_CPU_VBLANK_INT(cps1_qsound_interrupt,1) /* ??? interrupts per frame */ + MDRV_CPU_VBLANK_INT("main", cps1_qsound_interrupt) /* ??? interrupts per frame */ MDRV_CPU_REPLACE("sound", Z80, 8000000) MDRV_CPU_PROGRAM_MAP(qsound_readmem,qsound_writemem) diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c index 13464585084..97b921b5c7a 100644 --- a/src/mame/drivers/cps2.c +++ b/src/mame/drivers/cps2.c @@ -1239,7 +1239,7 @@ static MACHINE_DRIVER_START( cps2 ) MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_CONFIG(cps2_encryption) MDRV_CPU_PROGRAM_MAP(cps2_readmem,cps2_writemem) - MDRV_CPU_VBLANK_INT(cps2_interrupt,262) // 262 /* ??? interrupts per frame */ + MDRV_CPU_VBLANK_INT_HACK(cps2_interrupt,262) // 262 /* ??? interrupts per frame */ MDRV_CPU_ADD(Z80, 8000000) MDRV_CPU_PROGRAM_MAP(qsound_readmem,qsound_writemem) diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c index 727ffeb3739..56114ccb903 100644 --- a/src/mame/drivers/cps3.c +++ b/src/mame/drivers/cps3.c @@ -2726,7 +2726,7 @@ static MACHINE_DRIVER_START( cps3 ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", SH2, 6250000*4) // external clock is 6.25 Mhz, it sets the intenral multiplier to 4x (this should probably be handled in the core..) MDRV_CPU_PROGRAM_MAP(cps3_map,0) - MDRV_CPU_VBLANK_INT(cps3_vbl_interrupt,1) + MDRV_CPU_VBLANK_INT("main", cps3_vbl_interrupt) MDRV_CPU_PERIODIC_INT(cps3_other_interrupt,80) /* ?source? */ /* video hardware */ diff --git a/src/mame/drivers/crbaloon.c b/src/mame/drivers/crbaloon.c index 34bef4db9c7..a01298ab951 100644 --- a/src/mame/drivers/crbaloon.c +++ b/src/mame/drivers/crbaloon.c @@ -365,7 +365,7 @@ static MACHINE_DRIVER_START( crbaloon ) MDRV_CPU_ADD(Z80, CRBALOON_MASTER_XTAL / 3) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_io_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_RESET(crballoon) diff --git a/src/mame/drivers/crgolf.c b/src/mame/drivers/crgolf.c index 6751ffe0350..8ad977b5fdc 100644 --- a/src/mame/drivers/crgolf.c +++ b/src/mame/drivers/crgolf.c @@ -364,11 +364,11 @@ static MACHINE_DRIVER_START( crgolf ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,MASTER_CLOCK/3/2) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,MASTER_CLOCK/3/2) MDRV_CPU_PROGRAM_MAP(sound_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_START(crgolf) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c index 8f0d7808017..36a66f3b479 100644 --- a/src/mame/drivers/crimfght.c +++ b/src/mame/drivers/crimfght.c @@ -367,7 +367,7 @@ static MACHINE_DRIVER_START( crimfght ) /* basic machine hardware */ MDRV_CPU_ADD(KONAMI, 3000000) /* ? */ MDRV_CPU_PROGRAM_MAP(crimfght_readmem,crimfght_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 3579545) /* verified with PCB */ /* audio CPU */ diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c index 06a583627b4..740972caf2f 100644 --- a/src/mame/drivers/crospang.c +++ b/src/mame/drivers/crospang.c @@ -406,7 +406,7 @@ static MACHINE_DRIVER_START( crospang ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14318180/2) MDRV_CPU_PROGRAM_MAP(crospang_readmem,crospang_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(Z80, 14318180/4) /* audio CPU */ @@ -444,7 +444,7 @@ static MACHINE_DRIVER_START( bestri ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14318180/2) MDRV_CPU_PROGRAM_MAP(bestri_readmem,bestri_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(Z80, 14318180/4) /* audio CPU */ diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c index 5a21c005e80..9099ac3e963 100644 --- a/src/mame/drivers/crshrace.c +++ b/src/mame/drivers/crshrace.c @@ -625,7 +625,7 @@ static MACHINE_DRIVER_START( crshrace ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,16000000) /* 16 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80,4000000) /* 4 MHz ??? */ /* audio CPU */ diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c index 3546d2eb885..e944eb684cf 100644 --- a/src/mame/drivers/crystal.c +++ b/src/mame/drivers/crystal.c @@ -824,7 +824,7 @@ static const struct VR0Interface vr0_interface = static MACHINE_DRIVER_START( crystal ) MDRV_CPU_ADD(SE3208, 43000000) MDRV_CPU_PROGRAM_MAP(crystal_mem,0) - MDRV_CPU_VBLANK_INT(crystal_interrupt,1) + MDRV_CPU_VBLANK_INT("main", crystal_interrupt) MDRV_MACHINE_RESET(crystal) diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c index 4fb4c13c826..d579fcb6b2f 100644 --- a/src/mame/drivers/cshooter.c +++ b/src/mame/drivers/cshooter.c @@ -473,7 +473,7 @@ static MACHINE_DRIVER_START( cshooter ) MDRV_CPU_ADD(Z80,6000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(cshooter_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(cshooter_interrupt,2) MDRV_CPU_ADD(Z80,6000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(s_readmem,s_writemem) @@ -502,7 +502,7 @@ static MACHINE_DRIVER_START( airraid ) MDRV_CPU_ADD(Z80,6000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(arreadmem,arwritemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(cshooter_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(cshooter_interrupt,2) MDRV_CPU_ADD(Z80,6000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(s2_readmem,s2_writemem) diff --git a/src/mame/drivers/csk.c b/src/mame/drivers/csk.c index 0f2d829fd9d..ffa10d3ce43 100644 --- a/src/mame/drivers/csk.c +++ b/src/mame/drivers/csk.c @@ -128,6 +128,7 @@ Palette3*: 585D (low), 5899 (high), len = 60 (used alternatively with pal3) #include "driver.h" +#include "deprecat.h" #include "cpu/z80/z80.h" #include "sound/2413intf.h" @@ -737,7 +738,7 @@ static MACHINE_DRIVER_START( cpoker ) MDRV_CPU_ADD_TAG("main",Z80, 3579545) MDRV_CPU_PROGRAM_MAP(map,0) MDRV_CPU_IO_MAP(cpoker_map,0) - MDRV_CPU_VBLANK_INT(cpoker_interrupt,8) + MDRV_CPU_VBLANK_INT_HACK(cpoker_interrupt,8) MDRV_MACHINE_RESET(cpk) @@ -768,7 +769,7 @@ static MACHINE_DRIVER_START( csk227it ) MDRV_CPU_MODIFY("main") /* basic machine hardware */ MDRV_CPU_IO_MAP(csk227_map,0) - MDRV_CPU_VBLANK_INT(cska_interrupt,8) + MDRV_CPU_VBLANK_INT_HACK(cska_interrupt,8) MDRV_GFXDECODE(csk) MACHINE_DRIVER_END @@ -779,7 +780,7 @@ static MACHINE_DRIVER_START( csk234it ) MDRV_CPU_MODIFY("main") /* basic machine hardware */ MDRV_CPU_IO_MAP(csk234_map,0) - MDRV_CPU_VBLANK_INT(cska_interrupt,8) + MDRV_CPU_VBLANK_INT_HACK(cska_interrupt,8) MDRV_GFXDECODE(csk) MACHINE_DRIVER_END diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c index bf7a9161798..b16e7aeb13d 100644 --- a/src/mame/drivers/cultures.c +++ b/src/mame/drivers/cultures.c @@ -360,7 +360,7 @@ static MACHINE_DRIVER_START( cultures ) MDRV_CPU_ADD(Z80, MCLK/2) /* 8.000 MHz */ MDRV_CPU_PROGRAM_MAP(cultures_map,0) MDRV_CPU_IO_MAP(cultures_io_map,0) - MDRV_CPU_VBLANK_INT(cultures_interrupt,1) + MDRV_CPU_VBLANK_INT("main", cultures_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c index 7db87901ea7..4ea60c07bd4 100644 --- a/src/mame/drivers/cvs.c +++ b/src/mame/drivers/cvs.c @@ -998,7 +998,7 @@ static MACHINE_DRIVER_START( cvs ) MDRV_CPU_ADD(S2650, 894886.25) MDRV_CPU_PROGRAM_MAP(cvs_main_cpu_map,0) MDRV_CPU_IO_MAP(cvs_main_cpu_io_map,0) - MDRV_CPU_VBLANK_INT(cvs_main_cpu_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", cvs_main_cpu_interrupt) MDRV_CPU_ADD(S2650, 894886.25) MDRV_CPU_PROGRAM_MAP(cvs_dac_cpu_map,0) diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c index fba5f39fcb7..11482358a11 100644 --- a/src/mame/drivers/cyberbal.c +++ b/src/mame/drivers/cyberbal.c @@ -454,7 +454,7 @@ static MACHINE_DRIVER_START( cyberbal ) MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(extra_map,0) - MDRV_CPU_VBLANK_INT(atarigen_video_int_gen,1) + MDRV_CPU_VBLANK_INT("left", atarigen_video_int_gen) /* or is it "right?" */ MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(sound_68k_map,0) @@ -506,7 +506,7 @@ static MACHINE_DRIVER_START( cyberb2p ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(cyberb2p_map,0) - MDRV_CPU_VBLANK_INT(atarigen_video_int_gen,1) + MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) MDRV_MACHINE_RESET(cyberb2p) MDRV_NVRAM_HANDLER(atarigen) diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c index de5feb8f76a..716abae61a4 100644 --- a/src/mame/drivers/cybertnk.c +++ b/src/mame/drivers/cybertnk.c @@ -565,11 +565,11 @@ static const struct Y8950interface y8950_interface = { static MACHINE_DRIVER_START( cybertnk ) MDRV_CPU_ADD(M68000,20000000/2) MDRV_CPU_PROGRAM_MAP(master_mem,0) - MDRV_CPU_VBLANK_INT(master_irq,2) + MDRV_CPU_VBLANK_INT_HACK(master_irq,2) MDRV_CPU_ADD(M68000,20000000/2) MDRV_CPU_PROGRAM_MAP(slave_mem,0) - MDRV_CPU_VBLANK_INT(slave_irq,2) + MDRV_CPU_VBLANK_INT_HACK(slave_irq,2) MDRV_CPU_ADD(Z80,3579500) MDRV_CPU_PROGRAM_MAP(sound_mem,0) diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c index 0c4f4ba2d2e..bf2763a393c 100644 --- a/src/mame/drivers/dacholer.c +++ b/src/mame/drivers/dacholer.c @@ -337,7 +337,7 @@ static MACHINE_DRIVER_START( dacholer ) MDRV_CPU_ADD(Z80, 4000000) /* ? */ MDRV_CPU_PROGRAM_MAP(main_map, 0) MDRV_CPU_IO_MAP(main_io_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* ? */ MDRV_CPU_PROGRAM_MAP(snd_map, 0) diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c index d4d8779bbb7..3428cca5ab1 100644 --- a/src/mame/drivers/darius.c +++ b/src/mame/drivers/darius.c @@ -833,7 +833,7 @@ static MACHINE_DRIVER_START( darius ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,16000000/2) /* 8 MHz ? */ MDRV_CPU_PROGRAM_MAP(darius_readmem,darius_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("left", irq4_line_hold) MDRV_CPU_ADD(Z80,8000000/2) /* audio CPU */ /* 4 MHz ? */ @@ -841,7 +841,7 @@ static MACHINE_DRIVER_START( darius ) MDRV_CPU_ADD(M68000,16000000/2) /* 8 MHz ? */ MDRV_CPU_PROGRAM_MAP(darius_cpub_readmem,darius_cpub_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("left", irq4_line_hold) MDRV_CPU_ADD(Z80,8000000/2) /* 4 MHz ? */ /* audio CPU */ /* ADPCM player using MSM5205 */ diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c index 8f128b640dc..60ebdb09c9c 100644 --- a/src/mame/drivers/darkhors.c +++ b/src/mame/drivers/darkhors.c @@ -600,7 +600,7 @@ static INTERRUPT_GEN( darkhors ) static MACHINE_DRIVER_START( darkhors ) MDRV_CPU_ADD(M68EC020, 12000000) // 36MHz/3 ?? MDRV_CPU_PROGRAM_MAP(darkhors_readmem,darkhors_writemem) - MDRV_CPU_VBLANK_INT(darkhors,3) + MDRV_CPU_VBLANK_INT_HACK(darkhors,3) MDRV_NVRAM_HANDLER(darkhors) diff --git a/src/mame/drivers/darkmist.c b/src/mame/drivers/darkmist.c index 28e8d5745d4..ad45abf4a1e 100644 --- a/src/mame/drivers/darkmist.c +++ b/src/mame/drivers/darkmist.c @@ -249,7 +249,7 @@ static MACHINE_DRIVER_START( darkmist ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,4000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(memmap, 0) - MDRV_CPU_VBLANK_INT(darkmist_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(darkmist_interrupt,2) MDRV_CPU_ADD_TAG(CPUTAG_T5182,Z80,14318180/4) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(t5182_map, 0) diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c index d3c21443346..40b17ebda59 100644 --- a/src/mame/drivers/darkseal.c +++ b/src/mame/drivers/darkseal.c @@ -289,7 +289,7 @@ static MACHINE_DRIVER_START( darkseal ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,12000000) /* Custom chip 59 */ MDRV_CPU_PROGRAM_MAP(darkseal_readmem,darkseal_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1)/* VBL */ + MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL */ MDRV_CPU_ADD(H6280, 32220000/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */ /* audio CPU */ diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c index 0fe8b510785..106bbfe5024 100644 --- a/src/mame/drivers/dassault.c +++ b/src/mame/drivers/dassault.c @@ -556,11 +556,11 @@ static MACHINE_DRIVER_START( dassault ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14000000) /* Accurate */ MDRV_CPU_PROGRAM_MAP(dassault_readmem,dassault_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD(M68000, 14000000) /* Accurate */ MDRV_CPU_PROGRAM_MAP(dassault_sub_readmem,dassault_sub_writemem) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq5_line_hold) MDRV_CPU_ADD(H6280,32220000/8) /* audio CPU */ /* Accurate */ diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c index 4aaca033dce..5885b7b2ad7 100644 --- a/src/mame/drivers/dblewing.c +++ b/src/mame/drivers/dblewing.c @@ -543,7 +543,7 @@ static MACHINE_DRIVER_START( dblewing ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14000000) /* DE102 */ MDRV_CPU_PROGRAM_MAP(dblewing_map,0) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(sound_map,0) diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c index b6057556730..c9a36b8a970 100644 --- a/src/mame/drivers/dbz.c +++ b/src/mame/drivers/dbz.c @@ -439,7 +439,7 @@ static MACHINE_DRIVER_START( dbz ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(dbz_readmem,dbz_writemem) - MDRV_CPU_VBLANK_INT(dbz_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(dbz_interrupt,2) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c index 1eb975ac12b..ed1aec59105 100644 --- a/src/mame/drivers/dcheese.c +++ b/src/mame/drivers/dcheese.c @@ -404,7 +404,7 @@ static MACHINE_DRIVER_START( dcheese ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, MAIN_OSC) MDRV_CPU_PROGRAM_MAP(main_cpu_map,0) - MDRV_CPU_VBLANK_INT(dcheese_vblank,1) + MDRV_CPU_VBLANK_INT("main", dcheese_vblank) MDRV_CPU_ADD(M6809, SOUND_OSC/16) MDRV_CPU_PROGRAM_MAP(sound_cpu_map,0) diff --git a/src/mame/drivers/dcon.c b/src/mame/drivers/dcon.c index 3cc7b005e9c..ad542e378ac 100644 --- a/src/mame/drivers/dcon.c +++ b/src/mame/drivers/dcon.c @@ -277,7 +277,7 @@ static MACHINE_DRIVER_START( dcon ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) SEIBU_SOUND_SYSTEM_CPU(4000000) /* Perhaps 14318180/4? */ @@ -306,7 +306,7 @@ static MACHINE_DRIVER_START( sdgndmps ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) SEIBU2_SOUND_SYSTEM_CPU(14318180/4) diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c index e4b821b43e3..812f8885ee6 100644 --- a/src/mame/drivers/ddayjlc.c +++ b/src/mame/drivers/ddayjlc.c @@ -399,12 +399,12 @@ static INTERRUPT_GEN( ddayjlc_snd_interrupt ) static MACHINE_DRIVER_START( ddayjlc ) MDRV_CPU_ADD(Z80,12000000/3) MDRV_CPU_PROGRAM_MAP(main_cpu,0) - MDRV_CPU_VBLANK_INT(ddayjlc_interrupt,1) + MDRV_CPU_VBLANK_INT("main", ddayjlc_interrupt) MDRV_CPU_ADD(Z80, 12000000/4) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_cpu,0) - MDRV_CPU_VBLANK_INT(ddayjlc_snd_interrupt,1) + MDRV_CPU_VBLANK_INT("main", ddayjlc_snd_interrupt) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c index 06d009ec61e..724ed8b0948 100644 --- a/src/mame/drivers/ddealer.c +++ b/src/mame/drivers/ddealer.c @@ -189,7 +189,7 @@ static INTERRUPT_GEN( ddealer_interrupt ) static MACHINE_DRIVER_START( ddealer ) MDRV_CPU_ADD_TAG("main" , M68000, 10000000) MDRV_CPU_PROGRAM_MAP(ddealer,0) - MDRV_CPU_VBLANK_INT(ddealer_interrupt,1) + MDRV_CPU_VBLANK_INT("main", ddealer_interrupt) MDRV_CPU_PERIODIC_INT(irq1_line_hold, 112) MDRV_GFXDECODE(jalmah) diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c index 027f26f559e..6f33274f805 100644 --- a/src/mame/drivers/ddenlovr.c +++ b/src/mame/drivers/ddenlovr.c @@ -6523,7 +6523,7 @@ static MACHINE_DRIVER_START( ddenlovr ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main",M68000,24000000 / 2) MDRV_CPU_PROGRAM_MAP(ddenlovr_readmem,ddenlovr_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -6638,7 +6638,7 @@ static MACHINE_DRIVER_START( quizchq ) MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* ? */ MDRV_CPU_PROGRAM_MAP(quizchq_readmem,quizchq_writemem) MDRV_CPU_IO_MAP(quizchq_readport,quizchq_writeport) - MDRV_CPU_VBLANK_INT(quizchq_irq,1) + MDRV_CPU_VBLANK_INT("main", quizchq_irq) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -6708,12 +6708,12 @@ static MACHINE_DRIVER_START( mmpanic ) MDRV_CPU_ADD_TAG("main", Z80, 8000000) MDRV_CPU_PROGRAM_MAP(mmpanic_readmem,mmpanic_writemem) MDRV_CPU_IO_MAP(mmpanic_readport,mmpanic_writeport) - MDRV_CPU_VBLANK_INT(mmpanic_irq,1) + MDRV_CPU_VBLANK_INT("main", mmpanic_irq) MDRV_CPU_ADD_TAG("sound", Z80, 3579545) MDRV_CPU_PROGRAM_MAP(mmpanic_sound_readmem,mmpanic_sound_writemem) MDRV_CPU_IO_MAP(mmpanic_sound_readport,mmpanic_sound_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) // NMI by main cpu + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) // NMI by main cpu /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -6777,7 +6777,7 @@ static MACHINE_DRIVER_START( hanakanz ) MDRV_CPU_ADD_TAG("main",Z80,8000000) // TMPZ84C015BF-8 MDRV_CPU_PROGRAM_MAP(hanakanz_readmem,hanakanz_writemem) MDRV_CPU_IO_MAP(hanakanz_readport,hanakanz_writeport) - MDRV_CPU_VBLANK_INT(hanakanz_irq,1) + MDRV_CPU_VBLANK_INT("main", hanakanz_irq) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -6850,7 +6850,7 @@ static MACHINE_DRIVER_START( mjchuuka ) MDRV_IMPORT_FROM( hanakanz ) MDRV_CPU_MODIFY("main") MDRV_CPU_IO_MAP(mjchuuka_readport,mjchuuka_writeport) - MDRV_CPU_VBLANK_INT(mjchuuka_irq,1) + MDRV_CPU_VBLANK_INT("main", mjchuuka_irq) MDRV_SOUND_ADD(AY8910, 1789772) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) @@ -6863,7 +6863,7 @@ static MACHINE_DRIVER_START( funkyfig ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(funkyfig_readmem,funkyfig_writemem) MDRV_CPU_IO_MAP(funkyfig_readport,funkyfig_writeport) - MDRV_CPU_VBLANK_INT(mjchuuka_irq,1) + MDRV_CPU_VBLANK_INT("main", mjchuuka_irq) MDRV_CPU_MODIFY("sound") MDRV_CPU_IO_MAP(funkyfig_sound_readport,mmpanic_sound_writeport) @@ -6922,7 +6922,7 @@ static MACHINE_DRIVER_START( mjmyster ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(mjmyster_readmem,mjmyster_writemem) MDRV_CPU_IO_MAP(mjmyster_readport,mjmyster_writeport) - MDRV_CPU_VBLANK_INT(mjmyster_irq, 2) + MDRV_CPU_VBLANK_INT_HACK(mjmyster_irq, 2) MDRV_CPU_PERIODIC_INT(rtc_nmi_irq, 1) MDRV_SOUND_ADD(AY8910, 3579545) @@ -6969,7 +6969,7 @@ static MACHINE_DRIVER_START( hginga ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(hginga_readmem,hginga_writemem) MDRV_CPU_IO_MAP(hginga_readport,hginga_writeport) - MDRV_CPU_VBLANK_INT(hginga_irq, 1) + MDRV_CPU_VBLANK_INT("main", hginga_irq) MDRV_SOUND_ADD(AY8910, 3579545) MDRV_SOUND_CONFIG(hginga_ay8910_interface) @@ -6982,7 +6982,7 @@ static MACHINE_DRIVER_START( hgokou ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(hgokou_readmem,hgokou_writemem) MDRV_CPU_IO_MAP(hgokou_readport,hgokou_writeport) - MDRV_CPU_VBLANK_INT(hginga_irq, 1) + MDRV_CPU_VBLANK_INT("main", hginga_irq) MDRV_SOUND_ADD(AY8910, 3579545) MDRV_SOUND_CONFIG(hginga_ay8910_interface) @@ -7003,7 +7003,7 @@ static MACHINE_DRIVER_START( mjmyuniv ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(mjmyster_readmem,mjmyster_writemem) MDRV_CPU_IO_MAP(mjmyster_readport,mjmyster_writeport) - MDRV_CPU_VBLANK_INT(mjmyster_irq, 2) + MDRV_CPU_VBLANK_INT_HACK(mjmyster_irq, 2) MDRV_CPU_PERIODIC_INT(rtc_nmi_irq, 1) MDRV_SOUND_ADD(AY8910, 1789772) @@ -7016,7 +7016,7 @@ static MACHINE_DRIVER_START( mjmyornt ) MDRV_IMPORT_FROM( quizchq ) MDRV_CPU_MODIFY("main") MDRV_CPU_IO_MAP(mjmyster_readport,mjmyster_writeport) - MDRV_CPU_VBLANK_INT(mjmyster_irq, 2) + MDRV_CPU_VBLANK_INT_HACK(mjmyster_irq, 2) MDRV_CPU_PERIODIC_INT(rtc_nmi_irq, 1) MDRV_SOUND_ADD(AY8910, 1789772) @@ -7047,7 +7047,7 @@ static MACHINE_DRIVER_START( mjflove ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(rongrong_readmem,rongrong_writemem) MDRV_CPU_IO_MAP(mjflove_readport,mjflove_writeport) - MDRV_CPU_VBLANK_INT(mjflove_irq, 2) + MDRV_CPU_VBLANK_INT_HACK(mjflove_irq, 2) MDRV_VIDEO_START(mjflove) // blitter commands in the roms are shuffled around @@ -7068,7 +7068,7 @@ static MACHINE_DRIVER_START( hparadis ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(hparadis_readmem,hparadis_writemem) MDRV_CPU_IO_MAP(hparadis_readport,hparadis_writeport) - MDRV_CPU_VBLANK_INT(hparadis_irq, 1) + MDRV_CPU_VBLANK_INT("main", hparadis_irq) MACHINE_DRIVER_END diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c index 8ce2cd23998..8d1bd2a1a54 100644 --- a/src/mame/drivers/ddragon3.c +++ b/src/mame/drivers/ddragon3.c @@ -505,7 +505,7 @@ static MACHINE_DRIVER_START( ddragon3 ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 12000000) // Guess MDRV_CPU_PROGRAM_MAP(readmem, writemem) - MDRV_CPU_VBLANK_INT(ddragon3_cpu_interrupt, 2) + MDRV_CPU_VBLANK_INT_HACK(ddragon3_cpu_interrupt, 2) MDRV_CPU_ADD_TAG("audio", Z80, 3579545) // Guess /* audio CPU */ diff --git a/src/mame/drivers/ddrible.c b/src/mame/drivers/ddrible.c index 58ece4375f0..25c1153a3b1 100644 --- a/src/mame/drivers/ddrible.c +++ b/src/mame/drivers/ddrible.c @@ -342,11 +342,11 @@ static MACHINE_DRIVER_START( ddribble ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem_cpu0,writemem_cpu0) - MDRV_CPU_VBLANK_INT(ddrible_interrupt_0,1) + MDRV_CPU_VBLANK_INT("main", ddrible_interrupt_0) MDRV_CPU_ADD(M6809, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem_cpu1,writemem_cpu1) - MDRV_CPU_VBLANK_INT(ddrible_interrupt_1,1) + MDRV_CPU_VBLANK_INT("main", ddrible_interrupt_1) MDRV_CPU_ADD(M6809, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem_cpu2,writemem_cpu2) diff --git a/src/mame/drivers/ddz.c b/src/mame/drivers/ddz.c index 4375ccd52bd..d1deb7f96b5 100644 --- a/src/mame/drivers/ddz.c +++ b/src/mame/drivers/ddz.c @@ -54,7 +54,7 @@ static const struct VR0Interface vr0_interface = static MACHINE_DRIVER_START( ddz ) MDRV_CPU_ADD(SE3208, 43000000) MDRV_CPU_PROGRAM_MAP(ddz_mem,0) - MDRV_CPU_VBLANK_INT(ddz_interrupt,1) + MDRV_CPU_VBLANK_INT("main", ddz_interrupt) //MDRV_MACHINE_RESET(ddz) diff --git a/src/mame/drivers/deadang.c b/src/mame/drivers/deadang.c index b09ef90a8d7..0cbfd97eded 100644 --- a/src/mame/drivers/deadang.c +++ b/src/mame/drivers/deadang.c @@ -281,11 +281,11 @@ static MACHINE_DRIVER_START( deadang ) /* basic machine hardware */ MDRV_CPU_ADD(V30,XTAL_16MHz/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */ MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(deadang_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(deadang_interrupt,2) MDRV_CPU_ADD(V30,XTAL_16MHz/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */ MDRV_CPU_PROGRAM_MAP(sub_map,0) - MDRV_CPU_VBLANK_INT(deadang_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(deadang_interrupt,2) SEIBU3A_SOUND_SYSTEM_CPU(XTAL_14_31818MHz/4) diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c index 84a39bf5658..52ce21d2607 100644 --- a/src/mame/drivers/dec0.c +++ b/src/mame/drivers/dec0.c @@ -930,7 +930,7 @@ static MACHINE_DRIVER_START( hbarrel ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(dec0_readmem,dec0_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1)/* VBL, level 5 interrupts from i8751 */ + MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL, level 5 interrupts from i8751 */ MDRV_CPU_ADD(M6502, 1500000) /* audio CPU */ @@ -973,7 +973,7 @@ static MACHINE_DRIVER_START( baddudes ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(dec0_readmem,dec0_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1)/* VBL, level 5 interrupts from i8751 */ + MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL, level 5 interrupts from i8751 */ MDRV_CPU_ADD(M6502, 1500000) /* audio CPU */ @@ -1016,7 +1016,7 @@ static MACHINE_DRIVER_START( birdtry ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(dec0_readmem,dec0_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1)/* VBL, level 5 interrupts from i8751 */ + MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL, level 5 interrupts from i8751 */ MDRV_CPU_ADD(M6502, 1500000) /* audio CPU */ @@ -1059,7 +1059,7 @@ static MACHINE_DRIVER_START( robocop ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(dec0_readmem,dec0_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1)/* VBL */ + MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL */ MDRV_CPU_ADD(M6502, 1500000) /* audio CPU */ @@ -1107,7 +1107,7 @@ static MACHINE_DRIVER_START( robocopb ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(dec0_readmem,dec0_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1)/* VBL */ + MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL */ MDRV_CPU_ADD(M6502, 1500000) /* audio CPU */ @@ -1150,7 +1150,7 @@ static MACHINE_DRIVER_START( hippodrm ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(dec0_readmem,dec0_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1)/* VBL */ + MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL */ MDRV_CPU_ADD(M6502, 1500000) /* audio CPU */ @@ -1198,7 +1198,7 @@ static MACHINE_DRIVER_START( slyspy ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */ MDRV_CPU_PROGRAM_MAP(slyspy_readmem,slyspy_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1)/* VBL */ + MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL */ MDRV_CPU_ADD(H6280, XTAL_12MHz/2/3) /* audio CPU */ /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */ @@ -1241,7 +1241,7 @@ static MACHINE_DRIVER_START( midres ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */ MDRV_CPU_PROGRAM_MAP(midres_readmem,midres_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1)/* VBL */ + MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL */ MDRV_CPU_ADD(H6280, XTAL_24MHz/4/3) /* audio CPU */ /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */ diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c index 078726a4297..6da55c548cf 100644 --- a/src/mame/drivers/dec8.c +++ b/src/mame/drivers/dec8.c @@ -2087,7 +2087,7 @@ static MACHINE_DRIVER_START( cobracom ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 2000000) MDRV_CPU_PROGRAM_MAP(cobra_readmem,cobra_writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(M6502, 1500000) /* audio CPU */ @@ -2129,7 +2129,7 @@ static MACHINE_DRIVER_START( ghostb ) /* basic machine hardware */ MDRV_CPU_ADD(HD6309, 3000000*4) MDRV_CPU_PROGRAM_MAP(ghostb_readmem,ghostb_writemem) - MDRV_CPU_VBLANK_INT(ghostb_interrupt,1) + MDRV_CPU_VBLANK_INT("main", ghostb_interrupt) MDRV_CPU_ADD(M6502, 1500000) /* audio CPU */ @@ -2173,7 +2173,7 @@ static MACHINE_DRIVER_START( srdarwin ) /* basic machine hardware */ MDRV_CPU_ADD(M6809,2000000) /* MC68A09EP */ MDRV_CPU_PROGRAM_MAP(srdarwin_readmem,srdarwin_writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(M6502, 1500000) /* audio CPU */ @@ -2215,7 +2215,7 @@ static MACHINE_DRIVER_START( gondo ) /* basic machine hardware */ MDRV_CPU_ADD(HD6309,3000000*4) /* HD63C09EP */ MDRV_CPU_PROGRAM_MAP(gondo_readmem,gondo_writemem) - MDRV_CPU_VBLANK_INT(gondo_interrupt,1) + MDRV_CPU_VBLANK_INT("main", gondo_interrupt) MDRV_CPU_ADD(M6502, 1500000) /* audio CPU */ @@ -2258,7 +2258,7 @@ static MACHINE_DRIVER_START( oscar ) /* basic machine hardware */ MDRV_CPU_ADD(HD6309, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(oscar_readmem,oscar_writemem) - MDRV_CPU_VBLANK_INT(oscar_interrupt,1) + MDRV_CPU_VBLANK_INT("main", oscar_interrupt) MDRV_CPU_ADD(HD6309, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(oscar_sub_readmem,oscar_sub_writemem) @@ -2397,7 +2397,7 @@ static MACHINE_DRIVER_START( csilver ) MDRV_CPU_ADD(M6809, XTAL_12MHz/8) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(csilver_sub_readmem,csilver_sub_writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(M6502, XTAL_12MHz/8) /* verified on pcb */ /* audio CPU */ @@ -2444,7 +2444,7 @@ static MACHINE_DRIVER_START( garyoret ) /* basic machine hardware */ MDRV_CPU_ADD(HD6309,3000000*4) /* HD63C09EP */ MDRV_CPU_PROGRAM_MAP(garyoret_readmem,garyoret_writemem) - MDRV_CPU_VBLANK_INT(gondo_interrupt,1) + MDRV_CPU_VBLANK_INT("main", gondo_interrupt) MDRV_CPU_ADD(M6502, 1500000) /* audio CPU */ diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c index ef71dcd4491..0f796427e42 100644 --- a/src/mame/drivers/deco156.c +++ b/src/mame/drivers/deco156.c @@ -426,7 +426,7 @@ static MACHINE_DRIVER_START( hvysmsh ) /* basic machine hardware */ MDRV_CPU_ADD(ARM, 28000000) /* Unconfirmed */ MDRV_CPU_PROGRAM_MAP(hvysmsh_map,0) - MDRV_CPU_VBLANK_INT(deco32_vbl_interrupt,1) + MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt) MDRV_NVRAM_HANDLER(93C46) @@ -465,7 +465,7 @@ static MACHINE_DRIVER_START( wcvol95 ) /* basic machine hardware */ MDRV_CPU_ADD(ARM, 28000000) /* Unconfirmed */ MDRV_CPU_PROGRAM_MAP(wcvol95_map,0) - MDRV_CPU_VBLANK_INT(deco32_vbl_interrupt,1) + MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt) MDRV_NVRAM_HANDLER(93C46) diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c index 6ce708cd4b6..b0552d12ffc 100644 --- a/src/mame/drivers/deco32.c +++ b/src/mame/drivers/deco32.c @@ -1877,7 +1877,7 @@ static MACHINE_DRIVER_START( captaven ) /* basic machine hardware */ MDRV_CPU_ADD(ARM, 28000000/4) MDRV_CPU_PROGRAM_MAP(captaven_readmem,captaven_writemem) - MDRV_CPU_VBLANK_INT(deco32_vbl_interrupt,1) + MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt) MDRV_CPU_ADD(H6280, 32220000/8) /* audio CPU */ @@ -1925,7 +1925,7 @@ static MACHINE_DRIVER_START( fghthist ) /* basic machine hardware */ MDRV_CPU_ADD(ARM, 28000000/4) MDRV_CPU_PROGRAM_MAP(fghthist_readmem,fghthist_writemem) - MDRV_CPU_VBLANK_INT(deco32_vbl_interrupt,1) + MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt) MDRV_CPU_ADD(H6280, 32220000/8) /* audio CPU */ @@ -1972,7 +1972,7 @@ static MACHINE_DRIVER_START( fghthsta ) /* basic machine hardware */ MDRV_CPU_ADD(ARM, 28000000/4) MDRV_CPU_PROGRAM_MAP(fghthsta_memmap,0) - MDRV_CPU_VBLANK_INT(deco32_vbl_interrupt,1) + MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt) MDRV_CPU_ADD(H6280, 32220000/8) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) @@ -2018,7 +2018,7 @@ static MACHINE_DRIVER_START( dragngun ) /* basic machine hardware */ MDRV_CPU_ADD(ARM, 28000000/4) MDRV_CPU_PROGRAM_MAP(dragngun_readmem,dragngun_writemem) - MDRV_CPU_VBLANK_INT(deco32_vbl_interrupt,1) + MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt) MDRV_CPU_ADD(H6280, 32220000/8) /* audio CPU */ @@ -2072,7 +2072,7 @@ static MACHINE_DRIVER_START( lockload ) /* basic machine hardware */ MDRV_CPU_ADD(ARM, 28000000/4) MDRV_CPU_PROGRAM_MAP(lockload_readmem,lockload_writemem) - MDRV_CPU_VBLANK_INT(deco32_vbl_interrupt,2) // From 2 + MDRV_CPU_VBLANK_INT_HACK(deco32_vbl_interrupt,2) // From 2 MDRV_CPU_ADD(H6280, 32220000/8) /* audio CPU */ @@ -2126,7 +2126,7 @@ static MACHINE_DRIVER_START( tattass ) /* basic machine hardware */ MDRV_CPU_ADD(ARM, 28000000/4) /* Unconfirmed */ MDRV_CPU_PROGRAM_MAP(tattass_readmem,tattass_writemem) - MDRV_CPU_VBLANK_INT(deco32_vbl_interrupt,1) + MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt) MDRV_CPU_ADD(M6809, 2000000) /* audio CPU */ @@ -2164,7 +2164,7 @@ static MACHINE_DRIVER_START( nslasher ) /* basic machine hardware */ MDRV_CPU_ADD(ARM, 28322000/4) MDRV_CPU_PROGRAM_MAP(nslasher_readmem,nslasher_writemem) - MDRV_CPU_VBLANK_INT(deco32_vbl_interrupt,1) + MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt) MDRV_CPU_ADD(Z80, 32220000/9) MDRV_CPU_PROGRAM_MAP(nslasher_sound,0) diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c index 45b198ad580..a7916a12d84 100644 --- a/src/mame/drivers/deniam.c +++ b/src/mame/drivers/deniam.c @@ -324,7 +324,7 @@ static MACHINE_DRIVER_START( deniam16b ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,25000000/2) /* ??? */ MDRV_CPU_PROGRAM_MAP(deniam16b_readmem,deniam16b_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD(Z80,25000000/4) /* (makes logicpro music tempo correct) */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) @@ -363,7 +363,7 @@ static MACHINE_DRIVER_START( deniam16c ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,25000000/2) /* ??? */ MDRV_CPU_PROGRAM_MAP(deniam16c_readmem,deniam16c_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_MACHINE_RESET(deniam) diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c index f89b7d4306e..062e4dd5ff9 100644 --- a/src/mame/drivers/destroyr.c +++ b/src/mame/drivers/destroyr.c @@ -341,7 +341,7 @@ static MACHINE_DRIVER_START( destroyr ) /* basic machine hardware */ MDRV_CPU_ADD(M6800, 12096000 / 16) MDRV_CPU_PROGRAM_MAP(destroyr_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_assert, 4) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_assert, 4) MDRV_MACHINE_RESET(destroyr) diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c index 2e4485d0636..baf50a6d91b 100644 --- a/src/mame/drivers/dietgo.c +++ b/src/mame/drivers/dietgo.c @@ -205,7 +205,7 @@ static MACHINE_DRIVER_START( dietgo ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_28MHz/2) /* DE102 (verified on pcb) */ MDRV_CPU_PROGRAM_MAP(dietgo_map,0) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(H6280, XTAL_32_22MHz/4/3) /* Custom chip 45; XIN is 32.220MHZ/4, verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c index f4ffa4f0f84..2b16c6aa02a 100644 --- a/src/mame/drivers/discoboy.c +++ b/src/mame/drivers/discoboy.c @@ -477,13 +477,13 @@ static MACHINE_DRIVER_START( discoboy ) MDRV_CPU_ADD(Z80,12000000/2) /* 6 MHz? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,10000000/2) /* 5 MHz? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) -// MDRV_CPU_VBLANK_INT(irq0_line_hold,1) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,32) +// MDRV_CPU_VBLANK_INT("main", irq0_line_hold) + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,32) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c index 9207f572671..76e9d54285c 100644 --- a/src/mame/drivers/diverboy.c +++ b/src/mame/drivers/diverboy.c @@ -195,7 +195,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( diverboy ) MDRV_CPU_ADD(M68000, 12000000) /* guess */ MDRV_CPU_PROGRAM_MAP(diverboy_readmem,diverboy_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c index 2cbc80b517d..aac757b9787 100644 --- a/src/mame/drivers/djboy.c +++ b/src/mame/drivers/djboy.c @@ -829,17 +829,17 @@ static MACHINE_DRIVER_START( djboy ) MDRV_CPU_ADD(Z80,6000000) MDRV_CPU_PROGRAM_MAP(cpu0_am,0) MDRV_CPU_IO_MAP(cpu0_port_am,0) - MDRV_CPU_VBLANK_INT(djboy_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(djboy_interrupt,2) MDRV_CPU_ADD(Z80,6000000) MDRV_CPU_PROGRAM_MAP(cpu1_am,0) MDRV_CPU_IO_MAP(cpu1_port_am,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 6000000) MDRV_CPU_PROGRAM_MAP(cpu2_am,0) MDRV_CPU_IO_MAP(cpu2_port_am,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c index c4ee5d164f9..747350cada2 100644 --- a/src/mame/drivers/djmain.c +++ b/src/mame/drivers/djmain.c @@ -1223,7 +1223,7 @@ static MACHINE_DRIVER_START( djmain ) //MDRV_CPU_ADD(M68EC020, 18432000/2) /* 9.216 MHz!? */ MDRV_CPU_ADD(M68EC020, 32000000/4) /* 8.000 MHz!? */ MDRV_CPU_PROGRAM_MAP(memory_map, 0) - MDRV_CPU_VBLANK_INT(vb_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", vb_interrupt) MDRV_MACHINE_START(djmain) MDRV_MACHINE_RESET(djmain) diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c index 8eaffb62a5a..8b59dd60b8d 100644 --- a/src/mame/drivers/dkong.c +++ b/src/mame/drivers/dkong.c @@ -1558,7 +1558,7 @@ static MACHINE_DRIVER_START( dkong_base ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", Z80, CLOCK_1H) MDRV_CPU_PROGRAM_MAP(dkong_map, 0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_MACHINE_START(dkong2b) MDRV_MACHINE_RESET(dkong) @@ -1625,7 +1625,7 @@ static MACHINE_DRIVER_START( hunchbkd ) MDRV_CPU_REPLACE("main", S2650, CLOCK_1H / 2) /* ??? */ MDRV_CPU_PROGRAM_MAP(hunchbkd_map, 0) MDRV_CPU_IO_MAP(hunchbkd_io_map, 0) - MDRV_CPU_VBLANK_INT(hunchbkd_interrupt,1) + MDRV_CPU_VBLANK_INT("main", hunchbkd_interrupt) MDRV_MACHINE_START(hunchbkd) @@ -1640,7 +1640,7 @@ static MACHINE_DRIVER_START( dkong3 ) MDRV_CPU_ADD_TAG("main", Z80, XTAL_8MHz / 2) /* verified in schematics */ MDRV_CPU_PROGRAM_MAP(dkong3_map, 0) MDRV_CPU_IO_MAP(0, dkong3_io_map) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_MACHINE_START(dkong3) MDRV_MACHINE_RESET(dkong3) diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c index 487d8ede440..e08e330298e 100644 --- a/src/mame/drivers/dlair.c +++ b/src/mame/drivers/dlair.c @@ -803,7 +803,7 @@ static MACHINE_DRIVER_START( dlair ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK_US/4) MDRV_CPU_PROGRAM_MAP(dlus_map,0) - MDRV_CPU_VBLANK_INT(vblank_callback, 1) + MDRV_CPU_VBLANK_INT("main", vblank_callback) MDRV_CPU_PERIODIC_INT(irq0_line_hold, (double)MASTER_CLOCK_US/8/16/16/16/16) MDRV_MACHINE_START(dlair) @@ -843,7 +843,7 @@ static MACHINE_DRIVER_START( dleuro ) MDRV_CPU_CONFIG(dleuro_daisy_chain) MDRV_CPU_PROGRAM_MAP(dleuro_map,0) MDRV_CPU_IO_MAP(dleuro_io_map,0) - MDRV_CPU_VBLANK_INT(vblank_callback, 1) + MDRV_CPU_VBLANK_INT("main", vblank_callback) MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_HZ(MASTER_CLOCK_EURO/(16*16*16*16*16*8))) diff --git a/src/mame/drivers/dmndrby.c b/src/mame/drivers/dmndrby.c index 15ade6b2f73..7b8f390ab2d 100644 --- a/src/mame/drivers/dmndrby.c +++ b/src/mame/drivers/dmndrby.c @@ -178,7 +178,7 @@ static MACHINE_DRIVER_START( dderby ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,8000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(memmap,0) - MDRV_CPU_VBLANK_INT(dderby_interrupt,1) + MDRV_CPU_VBLANK_INT("main", dderby_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/docastle.c b/src/mame/drivers/docastle.c index b85abc2ef29..96832000e1a 100644 --- a/src/mame/drivers/docastle.c +++ b/src/mame/drivers/docastle.c @@ -126,6 +126,7 @@ more sprite tiles, it also has a MSM5205 chip for sample playback. */ #include "driver.h" +#include "deprecat.h" #include "sound/msm5205.h" #include "sound/sn76496.h" #include "includes/docastle.h" @@ -630,15 +631,15 @@ static MACHINE_DRIVER_START( docastle ) MDRV_CPU_ADD_TAG("main", Z80, 3900000) // make dip switches work in docastle and dorunrun MDRV_CPU_PROGRAM_MAP(docastle_map, 0) MDRV_CPU_IO_MAP(docastle_io_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD_TAG("slave", Z80, 4000000) // 4 MHz MDRV_CPU_PROGRAM_MAP(docastle_map2, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 8) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 8) MDRV_CPU_ADD(Z80, 4000000) // 4 MHz MDRV_CPU_PROGRAM_MAP(docastle_map3, 0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse, 1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) // video hardware diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c index 7261eb6a071..c41208dc0c4 100644 --- a/src/mame/drivers/dogfgt.c +++ b/src/mame/drivers/dogfgt.c @@ -243,7 +243,7 @@ static MACHINE_DRIVER_START( dogfgt ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 1500000) /* 1.5 MHz ???? */ MDRV_CPU_PROGRAM_MAP(main_readmem,main_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,16) /* ? controls music tempo */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,16) /* ? controls music tempo */ MDRV_CPU_ADD(M6502, 1500000) /* 1.5 MHz ???? */ MDRV_CPU_PROGRAM_MAP(sub_readmem,sub_writemem) diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c index 76cc0a2d7bf..1f1b6af3960 100644 --- a/src/mame/drivers/dominob.c +++ b/src/mame/drivers/dominob.c @@ -254,7 +254,7 @@ static MACHINE_DRIVER_START( dominob ) MDRV_CPU_ADD(Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(memmap, 0) MDRV_CPU_IO_MAP(portmap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c index eec8c27f010..760455ef8a9 100644 --- a/src/mame/drivers/dooyong.c +++ b/src/mame/drivers/dooyong.c @@ -977,7 +977,7 @@ static MACHINE_DRIVER_START( lastday ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 8000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(lastday_readmem,lastday_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* ??? */ @@ -1011,7 +1011,7 @@ static MACHINE_DRIVER_START( gulfstrm ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 8000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(gulfstrm_readmem,pollux_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* ??? */ @@ -1045,7 +1045,7 @@ static MACHINE_DRIVER_START( pollux ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 8000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(pollux_readmem,pollux_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* ??? */ @@ -1079,7 +1079,7 @@ static MACHINE_DRIVER_START( bluehawk ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 8000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(bluehawk_readmem,bluehawk_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* ??? */ @@ -1113,7 +1113,7 @@ static MACHINE_DRIVER_START( flytiger ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 8000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(flytiger_readmem,flytiger_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* ??? */ @@ -1147,7 +1147,7 @@ static MACHINE_DRIVER_START( primella ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 8000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(primella_readmem,primella_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* ??? */ @@ -1185,7 +1185,7 @@ static MACHINE_DRIVER_START( rshark ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* measured on super-x */ MDRV_CPU_PROGRAM_MAP(rshark_readmem,rshark_writemem) - MDRV_CPU_VBLANK_INT(rshark_interrupt,2) /* 5 and 6 */ + MDRV_CPU_VBLANK_INT_HACK(rshark_interrupt,2) /* 5 and 6 */ MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* measured on super-x */ @@ -1217,7 +1217,7 @@ static MACHINE_DRIVER_START( superx ) // dif mem map /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* measured on super-x */ MDRV_CPU_PROGRAM_MAP(superx_readmem,superx_writemem) - MDRV_CPU_VBLANK_INT(rshark_interrupt,2) /* 5 and 6 */ + MDRV_CPU_VBLANK_INT_HACK(rshark_interrupt,2) /* 5 and 6 */ MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* measured on super-x */ @@ -1249,7 +1249,7 @@ static MACHINE_DRIVER_START( popbingo ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(popbingo_readmem,popbingo_writemem) - MDRV_CPU_VBLANK_INT(rshark_interrupt,2) /* 5 and 6 */ + MDRV_CPU_VBLANK_INT_HACK(rshark_interrupt,2) /* 5 and 6 */ MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* measured on super-x */ diff --git a/src/mame/drivers/dorachan.c b/src/mame/drivers/dorachan.c index 15297b6a049..7cdee427291 100644 --- a/src/mame/drivers/dorachan.c +++ b/src/mame/drivers/dorachan.c @@ -9,6 +9,7 @@ Todo: */ #include "driver.h" +#include "deprecat.h" #define NUM_PENS (8) @@ -213,7 +214,7 @@ static MACHINE_DRIVER_START( dorachan ) MDRV_CPU_ADD(Z80, 2000000) MDRV_CPU_PROGRAM_MAP(dorachan_map,0) MDRV_CPU_IO_MAP(dorachan_io_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* video hardware */ MDRV_VIDEO_UPDATE(dorachan) diff --git a/src/mame/drivers/dotrikun.c b/src/mame/drivers/dotrikun.c index 2fcd275f138..1419a973b91 100644 --- a/src/mame/drivers/dotrikun.c +++ b/src/mame/drivers/dotrikun.c @@ -68,7 +68,7 @@ static MACHINE_DRIVER_START( dotrikun ) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_VIDEO_UPDATE(dotrikun) diff --git a/src/mame/drivers/dragrace.c b/src/mame/drivers/dragrace.c index e0450160c7e..8e83d4cf034 100644 --- a/src/mame/drivers/dragrace.c +++ b/src/mame/drivers/dragrace.c @@ -5,6 +5,7 @@ Atari Drag Race Driver ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "dragrace.h" #include "sound/discrete.h" @@ -326,7 +327,7 @@ static MACHINE_DRIVER_START( dragrace ) /* basic machine hardware */ MDRV_CPU_ADD(M6800, 12096000 / 12) MDRV_CPU_PROGRAM_MAP(dragrace_readmem, dragrace_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 4) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4) MDRV_WATCHDOG_VBLANK_INIT(8) MDRV_MACHINE_RESET(dragrace) diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c index 68129db6328..b32e7c59b56 100644 --- a/src/mame/drivers/dreamwld.c +++ b/src/mame/drivers/dreamwld.c @@ -448,7 +448,7 @@ static MACHINE_DRIVER_START( dreamwld ) /* basic machine hardware */ MDRV_CPU_ADD(M68EC020, MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(dreamwld_map, 0) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) // 4, 5, or 6, all point to the same place + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) // 4, 5, or 6, all point to the same place /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c index beaf4c79e29..88883f5d544 100644 --- a/src/mame/drivers/drgnmst.c +++ b/src/mame/drivers/drgnmst.c @@ -360,7 +360,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( drgnmst ) MDRV_CPU_ADD(M68000, 12000000) /* Confirmed */ MDRV_CPU_PROGRAM_MAP(drgnmst_main_map, 0) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_CPU_ADD(PIC16C55, 32000000/8) /* Confirmed */ /* Program and Data Maps are internal to the MCU */ diff --git a/src/mame/drivers/dribling.c b/src/mame/drivers/dribling.c index 21f7f815d81..3d77ff5a3ac 100644 --- a/src/mame/drivers/dribling.c +++ b/src/mame/drivers/dribling.c @@ -301,7 +301,7 @@ static MACHINE_DRIVER_START( dribling ) MDRV_CPU_ADD(Z80, 5000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(dribling_irq_gen,1) + MDRV_CPU_VBLANK_INT("main", dribling_irq_gen) MDRV_MACHINE_RESET(dribling) diff --git a/src/mame/drivers/drmicro.c b/src/mame/drivers/drmicro.c index b4e9b10193f..1bdb649ae34 100644 --- a/src/mame/drivers/drmicro.c +++ b/src/mame/drivers/drmicro.c @@ -232,7 +232,7 @@ static MACHINE_DRIVER_START( drmicro ) MDRV_CPU_ADD(Z80,MCLK/6) /* 3.072MHz? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(drmicro_interrupt,1) + MDRV_CPU_VBLANK_INT("main", drmicro_interrupt) MDRV_INTERLEAVE(1) diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c index 3f0a671398b..433294fec73 100644 --- a/src/mame/drivers/drtomy.c +++ b/src/mame/drivers/drtomy.c @@ -252,7 +252,7 @@ static MACHINE_DRIVER_START( drtomy ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,24000000/2) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(drtomy_map,0) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c index 6870d9ecc0c..653b0e492df 100644 --- a/src/mame/drivers/drw80pkr.c +++ b/src/mame/drivers/drw80pkr.c @@ -223,7 +223,7 @@ static MACHINE_DRIVER_START( drw80pkr ) MDRV_CPU_ADD_TAG("main", I8039, 7864300) MDRV_CPU_PROGRAM_MAP(drw80pkr_map, 0) MDRV_CPU_IO_MAP(drw80pkr_io_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) // video hardware diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c index ea43e55b352..7864c6131ba 100644 --- a/src/mame/drivers/dunhuang.c +++ b/src/mame/drivers/dunhuang.c @@ -676,7 +676,7 @@ static MACHINE_DRIVER_START( dunhuang ) MDRV_CPU_ADD(Z80,12000000/2) MDRV_CPU_PROGRAM_MAP(dunhuang_map,0) MDRV_CPU_IO_MAP(dunhuang_io_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_SEC(5)) diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c index 30783381b9d..98cd85e4054 100644 --- a/src/mame/drivers/dwarfd.c +++ b/src/mame/drivers/dwarfd.c @@ -690,7 +690,7 @@ static MACHINE_DRIVER_START( dwarfd ) MDRV_CPU_PROGRAM_MAP(mem_map, 0) MDRV_CPU_IO_MAP(io_map, 0) - MDRV_CPU_VBLANK_INT(dwarfd_interrupt,NUM_LINES+4) //16 +vblank + 1 unused + MDRV_CPU_VBLANK_INT_HACK(dwarfd_interrupt,NUM_LINES+4) //16 +vblank + 1 unused /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c index ac5636c5003..725b999bb50 100644 --- a/src/mame/drivers/dynax.c +++ b/src/mame/drivers/dynax.c @@ -3605,7 +3605,7 @@ static MACHINE_DRIVER_START( hanamai ) MDRV_CPU_ADD_TAG("main",Z80,22000000 / 4) /* 5.5MHz */ MDRV_CPU_PROGRAM_MAP(sprtmtch_mem_map,0) MDRV_CPU_IO_MAP(hanamai_io_map,0) - MDRV_CPU_VBLANK_INT(sprtmtch_vblank_interrupt,1) /* IM 0 needs an opcode on the data bus */ + MDRV_CPU_VBLANK_INT("main", sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */ MDRV_MACHINE_RESET(adpcm) @@ -3660,7 +3660,7 @@ static MACHINE_DRIVER_START( hnoridur ) MDRV_CPU_ADD_TAG("main",Z80,22000000 / 4) /* 5.5MHz */ MDRV_CPU_PROGRAM_MAP(hnoridur_mem_map,0) MDRV_CPU_IO_MAP(hnoridur_io_map,0) - MDRV_CPU_VBLANK_INT(sprtmtch_vblank_interrupt,1) /* IM 0 needs an opcode on the data bus */ + MDRV_CPU_VBLANK_INT("main", sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */ MDRV_MACHINE_RESET(adpcm) @@ -3714,7 +3714,7 @@ static MACHINE_DRIVER_START( sprtmtch ) MDRV_CPU_ADD(Z80,22000000 / 4) /* 5.5MHz */ MDRV_CPU_PROGRAM_MAP(sprtmtch_mem_map,0) MDRV_CPU_IO_MAP(sprtmtch_io_map,0) - MDRV_CPU_VBLANK_INT(sprtmtch_vblank_interrupt,1) /* IM 0 needs an opcode on the data bus */ + MDRV_CPU_VBLANK_INT("main", sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */ MDRV_NVRAM_HANDLER(generic_0fill) @@ -3754,7 +3754,7 @@ static MACHINE_DRIVER_START( mjfriday ) MDRV_CPU_ADD_TAG("main",Z80,24000000/4) /* 6 MHz? */ MDRV_CPU_PROGRAM_MAP(sprtmtch_mem_map,0) MDRV_CPU_IO_MAP(mjfriday_io_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_NVRAM_HANDLER(generic_0fill) @@ -3891,12 +3891,12 @@ static MACHINE_DRIVER_START( jantouki ) MDRV_CPU_ADD_TAG("main",Z80,22000000 / 4) /* 5.5MHz */ MDRV_CPU_PROGRAM_MAP(jantouki_mem_map,0) MDRV_CPU_IO_MAP(jantouki_io_map,0) - MDRV_CPU_VBLANK_INT(jantouki_vblank_interrupt, 1) /* IM 0 needs an opcode on the data bus */ + MDRV_CPU_VBLANK_INT("top", jantouki_vblank_interrupt) /* IM 0 needs an opcode on the data bus */ MDRV_CPU_ADD_TAG("sound",Z80,22000000 / 4) /* 5.5MHz */ MDRV_CPU_PROGRAM_MAP(jantouki_sound_mem_map,0) MDRV_CPU_IO_MAP(jantouki_sound_io_map,0) - MDRV_CPU_VBLANK_INT(jantouki_sound_vblank_interrupt,1) /* IM 0 needs an opcode on the data bus */ + MDRV_CPU_VBLANK_INT("top", jantouki_sound_vblank_interrupt) /* IM 0 needs an opcode on the data bus */ MDRV_MACHINE_RESET(adpcm) @@ -3970,7 +3970,7 @@ static MACHINE_DRIVER_START( mjelctrn ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(nanajign_mem_map,0) MDRV_CPU_IO_MAP(mjelctrn_io_map,0) - MDRV_CPU_VBLANK_INT(mjelctrn_vblank_interrupt,1) /* IM 2 needs a vector on the data bus */ + MDRV_CPU_VBLANK_INT("main", mjelctrn_vblank_interrupt) /* IM 2 needs a vector on the data bus */ MDRV_VIDEO_START(mjelctrn) MACHINE_DRIVER_END @@ -4007,7 +4007,7 @@ static MACHINE_DRIVER_START( neruton ) MDRV_IMPORT_FROM( mjelctrn ) MDRV_CPU_MODIFY("main") - MDRV_CPU_VBLANK_INT(neruton_vblank_interrupt,1+10) /* IM 2 needs a vector on the data bus */ + MDRV_CPU_VBLANK_INT_HACK(neruton_vblank_interrupt,1+10) /* IM 2 needs a vector on the data bus */ MDRV_VIDEO_START(neruton) MACHINE_DRIVER_END @@ -4032,7 +4032,7 @@ static MACHINE_DRIVER_START( majxtal7 ) MDRV_IMPORT_FROM( neruton ) MDRV_CPU_MODIFY("main") - MDRV_CPU_VBLANK_INT(majxtal7_vblank_interrupt,1) /* IM 2 needs a vector on the data bus */ + MDRV_CPU_VBLANK_INT("main", majxtal7_vblank_interrupt) /* IM 2 needs a vector on the data bus */ MACHINE_DRIVER_END @@ -4054,7 +4054,7 @@ static MACHINE_DRIVER_START( htengoku ) MDRV_CPU_ADD_TAG("main",Z80,20000000 / 4) MDRV_CPU_PROGRAM_MAP(yarunara_mem_map,0) MDRV_CPU_IO_MAP(htengoku_io_map,0) - MDRV_CPU_VBLANK_INT(sprtmtch_vblank_interrupt,1) /* IM 0 needs an opcode on the data bus */ + MDRV_CPU_VBLANK_INT("main", sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */ MDRV_CPU_PERIODIC_INT(yarunara_clock_interrupt, 60) // RTC MDRV_NVRAM_HANDLER(generic_0fill) @@ -4112,7 +4112,7 @@ static MACHINE_DRIVER_START( tenkai ) MDRV_CPU_ADD_TAG("main",TMP91640, 21472700 / 2) MDRV_CPU_PROGRAM_MAP(tenkai_map,0) MDRV_CPU_IO_MAP(tenkai_io_map,0) - MDRV_CPU_VBLANK_INT(tenkai_interrupt,3) + MDRV_CPU_VBLANK_INT_HACK(tenkai_interrupt,3) MDRV_NVRAM_HANDLER(generic_0fill) diff --git a/src/mame/drivers/dynduke.c b/src/mame/drivers/dynduke.c index 131611a02ec..63b70dace90 100644 --- a/src/mame/drivers/dynduke.c +++ b/src/mame/drivers/dynduke.c @@ -270,11 +270,11 @@ static MACHINE_DRIVER_START( dynduke ) // basic machine hardware MDRV_CPU_ADD_TAG("main", V30, 16000000/2) // NEC V30-8 CPU MDRV_CPU_PROGRAM_MAP(master_map, 0) - MDRV_CPU_VBLANK_INT(dynduke_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", dynduke_interrupt) MDRV_CPU_ADD(V30, 16000000/2) // NEC V30-8 CPU MDRV_CPU_PROGRAM_MAP(slave_map, 0) - MDRV_CPU_VBLANK_INT(dynduke_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", dynduke_interrupt) SEIBU_SOUND_SYSTEM_CPU(14318180/4) diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c index df17c63b3cb..a9cb53163f5 100644 --- a/src/mame/drivers/egghunt.c +++ b/src/mame/drivers/egghunt.c @@ -389,7 +389,7 @@ static MACHINE_DRIVER_START( egghunt ) MDRV_CPU_ADD(Z80,12000000/2) /* 6 MHz ?*/ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) // or 2 like mitchell.c? + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) // or 2 like mitchell.c? MDRV_CPU_ADD(Z80,12000000/2) /* 6 MHz ?*/ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c index 17816c22fc2..b1a4efacd56 100644 --- a/src/mame/drivers/enigma2.c +++ b/src/mame/drivers/enigma2.c @@ -566,7 +566,7 @@ static MACHINE_DRIVER_START( enigma2 ) MDRV_CPU_PROGRAM_MAP(engima2_main_cpu_map,0) MDRV_CPU_ADD(Z80, 2500000) - MDRV_CPU_VBLANK_INT(irq0_line_hold,8) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,8) MDRV_CPU_PROGRAM_MAP(engima2_audio_cpu_map,0) MDRV_MACHINE_START(enigma2) @@ -596,7 +596,7 @@ static MACHINE_DRIVER_START( enigma2a ) MDRV_CPU_IO_MAP(engima2a_main_cpu_io_map,0) MDRV_CPU_ADD(Z80, 2500000) - MDRV_CPU_VBLANK_INT(irq0_line_hold,8) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,8) MDRV_CPU_PROGRAM_MAP(engima2_audio_cpu_map,0) MDRV_MACHINE_START(enigma2) diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c index 005f2b115c8..4143a28d198 100644 --- a/src/mame/drivers/eolith.c +++ b/src/mame/drivers/eolith.c @@ -258,7 +258,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( eolith45 ) MDRV_CPU_ADD_TAG("cpu", E132N, 45000000) /* 45 MHz */ MDRV_CPU_PROGRAM_MAP(eolith_map,0) - MDRV_CPU_VBLANK_INT(eolith_speedup,262) + MDRV_CPU_VBLANK_INT_HACK(eolith_speedup,262) /* sound cpu */ diff --git a/src/mame/drivers/eolith16.c b/src/mame/drivers/eolith16.c index be1e4a3e874..2e587db4e23 100644 --- a/src/mame/drivers/eolith16.c +++ b/src/mame/drivers/eolith16.c @@ -10,6 +10,7 @@ **********************************************************************/ #include "driver.h" +#include "deprecat.h" #include "machine/eeprom.h" #include "sound/okim6295.h" #include "eolithsp.h" @@ -165,7 +166,7 @@ static PALETTE_INIT( eolith16 ) static MACHINE_DRIVER_START( eolith16 ) MDRV_CPU_ADD(E116T, 60000000) /* no internal multiplier */ MDRV_CPU_PROGRAM_MAP(eolith16_map,0) - MDRV_CPU_VBLANK_INT(eolith_speedup,262) + MDRV_CPU_VBLANK_INT_HACK(eolith_speedup,262) MDRV_NVRAM_HANDLER(eolith16_eeprom) diff --git a/src/mame/drivers/epos.c b/src/mame/drivers/epos.c index 89166994993..45783bd29e1 100644 --- a/src/mame/drivers/epos.c +++ b/src/mame/drivers/epos.c @@ -350,7 +350,7 @@ static MACHINE_DRIVER_START( epos ) MDRV_CPU_ADD(Z80, 11000000/4) /* 2.75 MHz (see notes) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_VIDEO_UPDATE(epos) @@ -374,7 +374,7 @@ static MACHINE_DRIVER_START( dealer ) MDRV_CPU_ADD(Z80, 11000000/4) /* 2.75 MHz (see notes) */ MDRV_CPU_PROGRAM_MAP(dealer_readmem,dealer_writemem) MDRV_CPU_IO_MAP(dealer_readport,dealer_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_VIDEO_UPDATE(epos) diff --git a/src/mame/drivers/eprom.c b/src/mame/drivers/eprom.c index 968a93d65a8..8f385316643 100644 --- a/src/mame/drivers/eprom.c +++ b/src/mame/drivers/eprom.c @@ -420,7 +420,7 @@ static MACHINE_DRIVER_START( eprom ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(atarigen_video_int_gen,1) + MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(extra_map,0) @@ -454,7 +454,7 @@ static MACHINE_DRIVER_START( klaxp ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(atarigen_video_int_gen,1) + MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) MDRV_INTERLEAVE(10) @@ -484,7 +484,7 @@ static MACHINE_DRIVER_START( guts ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(guts_map,0) - MDRV_CPU_VBLANK_INT(atarigen_video_int_gen,1) + MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) MDRV_INTERLEAVE(10) diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c index f2bf0e1ef00..2f8ec9659d5 100644 --- a/src/mame/drivers/equites.c +++ b/src/mame/drivers/equites.c @@ -666,7 +666,7 @@ static MACHINE_DRIVER_START( equites ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_12MHz/4) /* 68000P8 running at 3mhz! verified on pcb */ MDRV_CPU_PROGRAM_MAP(equites_map,0) - MDRV_CPU_VBLANK_INT(equites_interrupt, 2) + MDRV_CPU_VBLANK_INT_HACK(equites_interrupt, 2) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK) @@ -695,7 +695,7 @@ static MACHINE_DRIVER_START( splndrbt ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_24MHz/4) /* 68000P8 running at 6mhz, verified on pcb */ MDRV_CPU_PROGRAM_MAP(splndrbt_map, 0) - MDRV_CPU_VBLANK_INT(splndrbt_interrupt, 2) + MDRV_CPU_VBLANK_INT_HACK(splndrbt_interrupt, 2) MDRV_MACHINE_RESET(splndrbt) diff --git a/src/mame/drivers/ertictac.c b/src/mame/drivers/ertictac.c index 54c4314a055..8e566472e88 100644 --- a/src/mame/drivers/ertictac.c +++ b/src/mame/drivers/ertictac.c @@ -384,7 +384,7 @@ static MACHINE_DRIVER_START( ertictac ) MDRV_CPU_ADD(ARM, 16000000) /* guess */ MDRV_CPU_PROGRAM_MAP(ertictac_map,0) - MDRV_CPU_VBLANK_INT(ertictac_interrupt,1) + MDRV_CPU_VBLANK_INT("main", ertictac_interrupt) MDRV_MACHINE_RESET(ertictac) diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c index f5584e976d0..50d839c0e2f 100644 --- a/src/mame/drivers/esd16.c +++ b/src/mame/drivers/esd16.c @@ -528,13 +528,13 @@ static MACHINE_DRIVER_START( multchmp ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main",M68000, 16000000) MDRV_CPU_PROGRAM_MAP(multchmp_readmem,multchmp_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* ? */ MDRV_CPU_PROGRAM_MAP(multchmp_sound_readmem,multchmp_sound_writemem) MDRV_CPU_IO_MAP(multchmp_sound_readport,multchmp_sound_writeport) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,32) /* IRQ By Main CPU */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,32) /* IRQ By Main CPU */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c index 717bc088d6d..560fef091c1 100644 --- a/src/mame/drivers/esh.c +++ b/src/mame/drivers/esh.c @@ -286,7 +286,7 @@ static MACHINE_DRIVER_START( esh ) MDRV_CPU_ADD(Z80, PCB_CLOCK/6) /* The denominator is a Daphne guess based on PacMan's hardware */ MDRV_CPU_PROGRAM_MAP(z80_0_mem,0) MDRV_CPU_IO_MAP(z80_0_io,0) - MDRV_CPU_VBLANK_INT(vblank_callback_esh, 1) + MDRV_CPU_VBLANK_INT("main", vblank_callback_esh) MDRV_MACHINE_START(esh) MDRV_NVRAM_HANDLER(generic_0fill) diff --git a/src/mame/drivers/espial.c b/src/mame/drivers/espial.c index d777715fc99..ca4ef857727 100644 --- a/src/mame/drivers/espial.c +++ b/src/mame/drivers/espial.c @@ -315,12 +315,12 @@ static MACHINE_DRIVER_START( espial ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", Z80, 3072000) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(espial_readmem,espial_writemem) - MDRV_CPU_VBLANK_INT(zodiac_master_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(zodiac_master_interrupt,2) MDRV_CPU_ADD(Z80, 3072000) /* 2 MHz?????? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(0,sound_writeport) - MDRV_CPU_VBLANK_INT(espial_sound_nmi_gen,4) + MDRV_CPU_VBLANK_INT_HACK(espial_sound_nmi_gen,4) MDRV_MACHINE_RESET(espial) diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c index 7de325b0a2f..25b61f81680 100644 --- a/src/mame/drivers/ettrivia.c +++ b/src/mame/drivers/ettrivia.c @@ -230,7 +230,7 @@ static MACHINE_DRIVER_START( ettrivia ) MDRV_CPU_ADD(Z80,12000000/4-48000) //should be ok, it gives the 300 interrupts expected MDRV_CPU_PROGRAM_MAP(cpu_map,0) MDRV_CPU_IO_MAP(io_map,0) - MDRV_CPU_VBLANK_INT(ettrivia_interrupt,1) + MDRV_CPU_VBLANK_INT("main", ettrivia_interrupt) MDRV_NVRAM_HANDLER(generic_0fill) diff --git a/src/mame/drivers/exctsccr.c b/src/mame/drivers/exctsccr.c index 1c4a2f2f935..c1f8ab4772b 100644 --- a/src/mame/drivers/exctsccr.c +++ b/src/mame/drivers/exctsccr.c @@ -383,7 +383,7 @@ static MACHINE_DRIVER_START( exctsccr ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4.0 MHz (?) */ MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4123456) /* ??? with 4 MHz, nested NMIs might happen */ MDRV_CPU_PROGRAM_MAP(sub_map,0) @@ -440,7 +440,7 @@ static MACHINE_DRIVER_START( exctsccb ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4.0 MHz (?) */ MDRV_CPU_PROGRAM_MAP(bl_readmem,bl_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz ? */ MDRV_CPU_PROGRAM_MAP(bl_sound_readmem,bl_sound_writemem) diff --git a/src/mame/drivers/exedexes.c b/src/mame/drivers/exedexes.c index 79704e11954..bbc0c5b5c7d 100644 --- a/src/mame/drivers/exedexes.c +++ b/src/mame/drivers/exedexes.c @@ -225,12 +225,12 @@ static MACHINE_DRIVER_START( exedexes ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz (?) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(exedexes_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(exedexes_interrupt,2) MDRV_CPU_ADD(Z80, 3000000) /* audio CPU */ /* 3 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM) diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c index d35ccd53d88..07d463d2de1 100644 --- a/src/mame/drivers/exerion.c +++ b/src/mame/drivers/exerion.c @@ -281,7 +281,7 @@ static MACHINE_DRIVER_START( exerion ) MDRV_CPU_ADD(Z80, EXERION_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(exerion_interrupt,1) + MDRV_CPU_VBLANK_INT("main", exerion_interrupt) MDRV_CPU_ADD(Z80, EXERION_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(sub_map,0) diff --git a/src/mame/drivers/exidy.c b/src/mame/drivers/exidy.c index 99d897ef6b2..de6ee3391db 100644 --- a/src/mame/drivers/exidy.c +++ b/src/mame/drivers/exidy.c @@ -126,6 +126,7 @@ ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "exidy.h" #include "targ.h" #include "machine/6821pia.h" @@ -782,7 +783,7 @@ static MACHINE_DRIVER_START( base ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M6502, EXIDY_CPU_CLOCK) - MDRV_CPU_VBLANK_INT(exidy_vblank_interrupt,1) + MDRV_CPU_VBLANK_INT("main", exidy_vblank_interrupt) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) @@ -862,7 +863,7 @@ static MACHINE_DRIVER_START( teetert ) /* basic machine hardware */ MDRV_IMPORT_FROM(venture) MDRV_CPU_MODIFY("main") - MDRV_CPU_VBLANK_INT(teetert_vblank_interrupt,10) + MDRV_CPU_VBLANK_INT_HACK(teetert_vblank_interrupt,10) MACHINE_DRIVER_END diff --git a/src/mame/drivers/exidy440.c b/src/mame/drivers/exidy440.c index 00135382ee0..3b9985f98d8 100644 --- a/src/mame/drivers/exidy440.c +++ b/src/mame/drivers/exidy440.c @@ -1028,7 +1028,7 @@ static MACHINE_DRIVER_START( exidy440 ) /* basic machine hardware */ MDRV_CPU_ADD(M6809,EXIDY440_MAIN_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(exidy440_map,0) - MDRV_CPU_VBLANK_INT(main_interrupt,1) + MDRV_CPU_VBLANK_INT("main", main_interrupt) MDRV_MACHINE_RESET(exidy440) MDRV_NVRAM_HANDLER(exidy440) diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c index fa6746acd09..8f08e025938 100644 --- a/src/mame/drivers/expro02.c +++ b/src/mame/drivers/expro02.c @@ -317,7 +317,7 @@ static MACHINE_DRIVER_START( galsnew ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(galsnew,0) - MDRV_CPU_VBLANK_INT(galsnew_interrupt,3) + MDRV_CPU_VBLANK_INT_HACK(galsnew_interrupt,3) /* CALC01 MCU @ 16Mhz (unknown type, simulated) */ diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c index 0ad84741d32..6668d53e75d 100644 --- a/src/mame/drivers/exprraid.c +++ b/src/mame/drivers/exprraid.c @@ -307,7 +307,7 @@ static MACHINE_DRIVER_START( exprraid ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(master_map, 0) - MDRV_CPU_VBLANK_INT(exprraid_interrupt,1) + MDRV_CPU_VBLANK_INT("main", exprraid_interrupt) MDRV_CPU_ADD(M6809, 2000000) /* 2 MHz ??? */ MDRV_CPU_PROGRAM_MAP(slave_map, 0) diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c index b7e800d4bd8..5edbd02cb69 100644 --- a/src/mame/drivers/exzisus.c +++ b/src/mame/drivers/exzisus.c @@ -328,18 +328,18 @@ static MACHINE_DRIVER_START( exzisus ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 6000000) /* 6 MHz ??? */ MDRV_CPU_PROGRAM_MAP(cpua_readmem,cpua_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_ADD(Z80, 6000000) /* 6 MHz ??? */ MDRV_CPU_PROGRAM_MAP(cpub_readmem,cpub_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 6000000) /* 6 MHz ??? */ MDRV_CPU_PROGRAM_MAP(cpuc_readmem,cpuc_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(10) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ diff --git a/src/mame/drivers/f-32.c b/src/mame/drivers/f-32.c index 011195bf3d2..eea2cd5b9de 100644 --- a/src/mame/drivers/f-32.c +++ b/src/mame/drivers/f-32.c @@ -152,7 +152,7 @@ static MACHINE_DRIVER_START( mosaicf2 ) MDRV_CPU_ADD_TAG("main", E132XN, 20000000*4) /* 4x internal multiplier */ MDRV_CPU_PROGRAM_MAP(common_map,0) MDRV_CPU_IO_MAP(mosaicf2_io,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_NVRAM_HANDLER(93C46) diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c index 1560fc09dde..b7bad677473 100644 --- a/src/mame/drivers/f1gp.c +++ b/src/mame/drivers/f1gp.c @@ -568,11 +568,11 @@ static MACHINE_DRIVER_START( f1gp ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main",M68000,XTAL_20MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(f1gp_readmem1,f1gp_writemem1) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(M68000,XTAL_20MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem2,writemem2) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80,XTAL_20MHz/4) /* verified on pcb */ /* audio CPU */ @@ -611,11 +611,11 @@ static MACHINE_DRIVER_START( f1gpb ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main",M68000,10000000) /* 10 MHz ??? */ MDRV_CPU_PROGRAM_MAP(f1gpb_cpu1_map,0) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(M68000,10000000) /* 10 MHz ??? */ MDRV_CPU_PROGRAM_MAP(f1gpb_cpu2_map,0) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) /* NO sound CPU */ MDRV_INTERLEAVE(100) /* 100 CPU slices per frame */ diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c index 4fa49a78439..4d3bdd2ad68 100644 --- a/src/mame/drivers/fantland.c +++ b/src/mame/drivers/fantland.c @@ -811,7 +811,7 @@ static MACHINE_DRIVER_START( fantland ) /* basic machine hardware */ MDRV_CPU_ADD(I8086, 8000000) // ? MDRV_CPU_PROGRAM_MAP(fantland_map, 0) - MDRV_CPU_VBLANK_INT(fantland_irq,1) + MDRV_CPU_VBLANK_INT("main", fantland_irq) /* audio CPU */ MDRV_CPU_ADD(I8088, 8000000) // ? @@ -863,7 +863,7 @@ static MACHINE_DRIVER_START( galaxygn ) /* basic machine hardware */ MDRV_CPU_ADD(I8088, 8000000) // ? MDRV_CPU_PROGRAM_MAP(galaxygn_map, 0) - MDRV_CPU_VBLANK_INT(fantland_irq,1) + MDRV_CPU_VBLANK_INT("main", fantland_irq) /* audio CPU */ MDRV_CPU_ADD(I8088, 8000000) // ? @@ -917,7 +917,7 @@ static MACHINE_DRIVER_START( borntofi ) /* basic machine hardware */ MDRV_CPU_ADD(V20, 16000000/2) // D701080C-8 - NEC D70108C-8 V20 CPU, running at 8.000MHz [16/2] MDRV_CPU_PROGRAM_MAP(borntofi_map, 0) - MDRV_CPU_VBLANK_INT(fantland_irq,1) + MDRV_CPU_VBLANK_INT("main", fantland_irq) /* audio CPU */ MDRV_CPU_ADD(I8088, 18432000/3) // 8088 - AMD P8088-2 CPU, running at 6.144MHz [18.432/3] @@ -963,7 +963,7 @@ static MACHINE_DRIVER_START( wheelrun ) /* basic machine hardware */ MDRV_CPU_ADD(V20, XTAL_18MHz/2) // D701080C-8 (V20) MDRV_CPU_PROGRAM_MAP(wheelrun_map, 0) - MDRV_CPU_VBLANK_INT(fantland_irq,1) + MDRV_CPU_VBLANK_INT("main", fantland_irq) /* audio CPU */ MDRV_CPU_ADD(Z80, XTAL_18MHz/2) // Z8400BB1 (Z80B) diff --git a/src/mame/drivers/fastfred.c b/src/mame/drivers/fastfred.c index a6ec5ce4be2..e9ffd31bb86 100644 --- a/src/mame/drivers/fastfred.c +++ b/src/mame/drivers/fastfred.c @@ -6,6 +6,7 @@ ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "fastfred.h" #include "sound/ay8910.h" @@ -558,12 +559,12 @@ static MACHINE_DRIVER_START( fastfred ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", Z80, CLOCK/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(fastfred_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD_TAG("audio", Z80, CLOCK/12) /* audio CPU */ /* 1.536 MHz */ MDRV_CPU_PROGRAM_MAP(sound_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,4) + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,4) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/fastlane.c b/src/mame/drivers/fastlane.c index a0c9047ba7d..f5ebe2ca92f 100644 --- a/src/mame/drivers/fastlane.c +++ b/src/mame/drivers/fastlane.c @@ -279,7 +279,7 @@ static MACHINE_DRIVER_START( fastlane ) /* basic machine hardware */ MDRV_CPU_ADD(HD6309, 3000000*4) /* 24MHz/8? */ MDRV_CPU_PROGRAM_MAP(fastlane_readmem,fastlane_writemem) - MDRV_CPU_VBLANK_INT(fastlane_interrupt,16) /* 1 IRQ + ??? NMI (generated by the 007121) */ + MDRV_CPU_VBLANK_INT_HACK(fastlane_interrupt,16) /* 1 IRQ + ??? NMI (generated by the 007121) */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/fcombat.c b/src/mame/drivers/fcombat.c index 239681c4c31..c802bab0a2c 100644 --- a/src/mame/drivers/fcombat.c +++ b/src/mame/drivers/fcombat.c @@ -312,7 +312,7 @@ static MACHINE_DRIVER_START( fcombat ) MDRV_CPU_ADD(Z80, 10000000/3) MDRV_CPU_PROGRAM_MAP(fcombat_readmem,fcombat_writemem) - MDRV_CPU_VBLANK_INT(fcombat_interrupt,1) + MDRV_CPU_VBLANK_INT("main", fcombat_interrupt) MDRV_CPU_ADD(Z80, 10000000/3) MDRV_CPU_PROGRAM_MAP(fcombat_readmem2,fcombat_writemem2) diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c index b3e6e2df6fa..d3c5e9717d3 100644 --- a/src/mame/drivers/fcrash.c +++ b/src/mame/drivers/fcrash.c @@ -324,7 +324,7 @@ static MACHINE_DRIVER_START( fcrash ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(fcrash_readmem,fcrash_writemem) - MDRV_CPU_VBLANK_INT(cps1_interrupt,1) + MDRV_CPU_VBLANK_INT("main", cps1_interrupt) // MDRV_CPU_ADD_TAG("sound", Z80, 4000000) /* ???? */ // /* audio CPU */ diff --git a/src/mame/drivers/filetto.c b/src/mame/drivers/filetto.c index 36c62f2caad..cfbc193bd79 100644 --- a/src/mame/drivers/filetto.c +++ b/src/mame/drivers/filetto.c @@ -738,7 +738,7 @@ static MACHINE_DRIVER_START( filetto ) MDRV_CPU_ADD_TAG("main", I8088, 8000000) MDRV_CPU_PROGRAM_MAP(filetto_map,0) MDRV_CPU_IO_MAP(filetto_io,0) - MDRV_CPU_VBLANK_INT(filetto_irq,200) + MDRV_CPU_VBLANK_INT_HACK(filetto_irq,200) MDRV_GFXDECODE(filetto) diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c index ecd7acf3f40..57d2ac466c2 100644 --- a/src/mame/drivers/finalizr.c +++ b/src/mame/drivers/finalizr.c @@ -407,7 +407,7 @@ static MACHINE_DRIVER_START( finalizr ) /* basic machine hardware */ MDRV_CPU_ADD(M6809,18432000/6) /* ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(finalizr_interrupt,16) /* 1 IRQ + 8 NMI (generated by a custom IC) */ + MDRV_CPU_VBLANK_INT_HACK(finalizr_interrupt,16) /* 1 IRQ + 8 NMI (generated by a custom IC) */ MDRV_CPU_ADD(I8039,18432000/2) /* 9.216MHz clkin ?? */ /* audio CPU */ /* DAC */ diff --git a/src/mame/drivers/findout.c b/src/mame/drivers/findout.c index 95e15b672a9..be7e655bd15 100644 --- a/src/mame/drivers/findout.c +++ b/src/mame/drivers/findout.c @@ -446,7 +446,7 @@ static MACHINE_DRIVER_START( findout ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_MACHINE_RESET(findout) MDRV_NVRAM_HANDLER(generic_0fill) diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c index ab7337672c7..eed5f399a1f 100644 --- a/src/mame/drivers/firebeat.c +++ b/src/mame/drivers/firebeat.c @@ -1994,7 +1994,7 @@ static MACHINE_DRIVER_START(firebeat) MDRV_CPU_ADD(PPC403, 66000000) MDRV_CPU_CONFIG(firebeat_ppc_cfg) MDRV_CPU_PROGRAM_MAP(firebeat_map, 0) - MDRV_CPU_VBLANK_INT(firebeat_interrupt,1) + MDRV_CPU_VBLANK_INT("main", firebeat_interrupt) MDRV_MACHINE_RESET(firebeat) MDRV_NVRAM_HANDLER(firebeat) @@ -2032,7 +2032,7 @@ static MACHINE_DRIVER_START(firebeat2) MDRV_CPU_ADD(PPC403, 66000000) MDRV_CPU_CONFIG(firebeat_ppc_cfg) MDRV_CPU_PROGRAM_MAP(firebeat_map, 0) - MDRV_CPU_VBLANK_INT(firebeat_interrupt,1) + MDRV_CPU_VBLANK_INT("left", firebeat_interrupt) MDRV_MACHINE_RESET(firebeat) MDRV_NVRAM_HANDLER(firebeat) diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c index 244c015bcf8..d42c343303f 100644 --- a/src/mame/drivers/firetrap.c +++ b/src/mame/drivers/firetrap.c @@ -576,7 +576,7 @@ static MACHINE_DRIVER_START( firetrap ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 6000000) /* 6 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(firetrap,2) + MDRV_CPU_VBLANK_INT_HACK(firetrap,2) MDRV_CPU_ADD(M6502,3072000/2) /* audio CPU */ /* 1.536 MHz? */ @@ -616,7 +616,7 @@ static MACHINE_DRIVER_START( firetpbl ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 6000000) /* 6 MHz */ MDRV_CPU_PROGRAM_MAP(readmem_bootleg,writemem_bootleg) - MDRV_CPU_VBLANK_INT(bootleg,1) + MDRV_CPU_VBLANK_INT("main", bootleg) MDRV_CPU_ADD(M6502,3072000/2) /* audio CPU */ /* 1.536 MHz? */ diff --git a/src/mame/drivers/firetrk.c b/src/mame/drivers/firetrk.c index 7191d02124b..1313dfc9044 100644 --- a/src/mame/drivers/firetrk.c +++ b/src/mame/drivers/firetrk.c @@ -1051,7 +1051,7 @@ static MACHINE_DRIVER_START( firetrk ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M6800, FIRETRK_CPU_CLOCK_1MHZ) /* 750Khz during service mode */ MDRV_CPU_PROGRAM_MAP(firetrk_map, 0) - MDRV_CPU_VBLANK_INT(firetrk_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", firetrk_interrupt) MDRV_WATCHDOG_VBLANK_INIT(5) MDRV_MACHINE_RESET(firetrk) diff --git a/src/mame/drivers/fitfight.c b/src/mame/drivers/fitfight.c index c38ec5e7547..acce64b4971 100644 --- a/src/mame/drivers/fitfight.c +++ b/src/mame/drivers/fitfight.c @@ -753,14 +753,14 @@ GFXDECODE_END static MACHINE_DRIVER_START( fitfight ) MDRV_CPU_ADD_TAG("main",M68000, 12000000) MDRV_CPU_PROGRAM_MAP(fitfight_main_map,0) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_CPU_ADD(UPD7810, 12000000) /* audio CPU */ MDRV_CPU_CONFIG(sound_cpu_config) MDRV_CPU_PROGRAM_MAP(snd_mem, 0) MDRV_CPU_IO_MAP(snd_io, 0) - MDRV_CPU_VBLANK_INT(snd_irq,1) + MDRV_CPU_VBLANK_INT("main", snd_irq) MDRV_GFXDECODE(fitfight) @@ -787,7 +787,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( bbprot ) MDRV_CPU_ADD_TAG("main",M68000, 12000000) MDRV_CPU_PROGRAM_MAP(bbprot_main_map,0) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_GFXDECODE(prot) diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c index bcd1cfd713e..3d1648001a1 100644 --- a/src/mame/drivers/flkatck.c +++ b/src/mame/drivers/flkatck.c @@ -273,7 +273,7 @@ static MACHINE_DRIVER_START( flkatck ) /* basic machine hardware */ MDRV_CPU_ADD(HD6309,3000000*4) /* HD63C09EP, 24/8 MHz */ MDRV_CPU_PROGRAM_MAP(flkatck_readmem,flkatck_writemem) - MDRV_CPU_VBLANK_INT(flkatck_interrupt,1) + MDRV_CPU_VBLANK_INT("main", flkatck_interrupt) MDRV_CPU_ADD(Z80,3579545) /* NEC D780C-1, 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(flkatck_readmem_sound,flkatck_writemem_sound) diff --git a/src/mame/drivers/flower.c b/src/mame/drivers/flower.c index 53d5b4f4b36..d7012f3c770 100644 --- a/src/mame/drivers/flower.c +++ b/src/mame/drivers/flower.c @@ -235,13 +235,13 @@ static MACHINE_DRIVER_START( flower ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,8000000) MDRV_CPU_PROGRAM_MAP(flower_cpu1,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,10) -// MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) //nmis stuff up the writes to shared ram + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,10) +// MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) //nmis stuff up the writes to shared ram MDRV_CPU_ADD(Z80,8000000) MDRV_CPU_PROGRAM_MAP(flower_cpu2,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) -// MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) +// MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(Z80,8000000) MDRV_CPU_PROGRAM_MAP(flower_sound_cpu,0) diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c index 3032991b29b..1b5c3a4a853 100644 --- a/src/mame/drivers/flstory.c +++ b/src/mame/drivers/flstory.c @@ -683,12 +683,12 @@ static MACHINE_DRIVER_START( flstory ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,10733000/2) /* ??? */ MDRV_CPU_PROGRAM_MAP(flstory_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,8000000/2) /* audio CPU */ /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) /* IRQ generated by ??? */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ??? */ /* NMI generated by the main CPU */ MDRV_CPU_ADD(M68705,4000000) /* ??? */ @@ -732,12 +732,12 @@ static MACHINE_DRIVER_START( onna34ro ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,10733000/2) /* ??? */ MDRV_CPU_PROGRAM_MAP(onna34ro_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,8000000/2) /* audio CPU */ /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) /* IRQ generated by ??? */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ??? */ /* NMI generated by the main CPU */ // MDRV_CPU_ADD(M68705,4000000) /* ??? */ // MDRV_CPU_PROGRAM_MAP(m68705_readmem,m68705_writemem) @@ -780,12 +780,12 @@ static MACHINE_DRIVER_START( victnine ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,8000000/2) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(victnine_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,8000000/2) /* audio CPU */ /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) /* IRQ generated by ??? */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ??? */ /* NMI generated by the main CPU */ // MDRV_CPU_ADD(M68705,4000000) /* ??? */ // MDRV_CPU_PROGRAM_MAP(m68705_readmem,m68705_writemem) diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c index 8b0f7f56fb4..4eb738115da 100644 --- a/src/mame/drivers/flyball.c +++ b/src/mame/drivers/flyball.c @@ -261,7 +261,7 @@ static MACHINE_DRIVER_START( flyball ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 12096000 / 16) MDRV_CPU_PROGRAM_MAP(flyball_map, 0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse, 1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_MACHINE_RESET(flyball) diff --git a/src/mame/drivers/foodf.c b/src/mame/drivers/foodf.c index 1205784d4d6..5f0ddc930a6 100644 --- a/src/mame/drivers/foodf.c +++ b/src/mame/drivers/foodf.c @@ -374,7 +374,7 @@ static MACHINE_DRIVER_START( foodf ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(atarigen_video_int_gen,1) + MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) MDRV_MACHINE_START(foodf) MDRV_MACHINE_RESET(foodf) diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c index b51c99cab18..d2389728eaa 100644 --- a/src/mame/drivers/fortecar.c +++ b/src/mame/drivers/fortecar.c @@ -147,7 +147,7 @@ static MACHINE_DRIVER_START( fortecar ) MDRV_CPU_PROGRAM_MAP(fortecar_map,0) MDRV_CPU_IO_MAP(fortecar_ports,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c index 4c312b08ac0..970207d6c9c 100644 --- a/src/mame/drivers/freekick.c +++ b/src/mame/drivers/freekick.c @@ -662,7 +662,7 @@ static MACHINE_DRIVER_START( base ) MDRV_CPU_ADD_TAG("main",Z80, 18432000/6) //confirmed MDRV_CPU_PROGRAM_MAP(pbillrd_readmem,pbillrd_writemem) MDRV_CPU_PERIODIC_INT(irq0_line_hold, 50*3) //?? - MDRV_CPU_VBLANK_INT(freekick_irqgen,1) + MDRV_CPU_VBLANK_INT("main", freekick_irqgen) MDRV_GFXDECODE(freekick) diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c index 25bf5883cdf..491c9e00671 100644 --- a/src/mame/drivers/fromanc2.c +++ b/src/mame/drivers/fromanc2.c @@ -705,7 +705,7 @@ static MACHINE_DRIVER_START( fromanc2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,32000000/2) /* 16.00 MHz */ MDRV_CPU_PROGRAM_MAP(fromanc2_readmem_main,fromanc2_writemem_main) - MDRV_CPU_VBLANK_INT(fromanc2_interrupt,1) + MDRV_CPU_VBLANK_INT("left", fromanc2_interrupt) MDRV_CPU_ADD(Z80,32000000/4) /* audio CPU */ /* 8.00 MHz */ @@ -758,7 +758,7 @@ static MACHINE_DRIVER_START( fromancr ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,32000000/2) /* 16.00 MHz */ MDRV_CPU_PROGRAM_MAP(fromancr_readmem_main,fromancr_writemem_main) - MDRV_CPU_VBLANK_INT(fromanc2_interrupt,1) + MDRV_CPU_VBLANK_INT("left", fromanc2_interrupt) MDRV_CPU_ADD(Z80,32000000/4) /* audio CPU */ /* 8.00 MHz */ @@ -810,7 +810,7 @@ static MACHINE_DRIVER_START( fromanc4 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,32000000/2) /* 16.00 MHz */ MDRV_CPU_PROGRAM_MAP(fromanc4_readmem_main,fromanc4_writemem_main) - MDRV_CPU_VBLANK_INT(fromanc2_interrupt,1) + MDRV_CPU_VBLANK_INT("left", fromanc2_interrupt) MDRV_CPU_ADD(Z80,32000000/4) /* audio CPU */ /* 8.00 MHz */ diff --git a/src/mame/drivers/fromance.c b/src/mame/drivers/fromance.c index f79522aaa55..3a732441311 100644 --- a/src/mame/drivers/fromance.c +++ b/src/mame/drivers/fromance.c @@ -1060,7 +1060,7 @@ static MACHINE_DRIVER_START( nekkyoku ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,12000000/2) /* 6.00 Mhz ? */ MDRV_CPU_PROGRAM_MAP(nekkyoku_readmem_main,nekkyoku_writemem_main) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,12000000/2) /* 6.00 Mhz ? */ MDRV_CPU_PROGRAM_MAP(nekkyoku_readmem_sub,nekkyoku_writemem_sub) @@ -1098,7 +1098,7 @@ static MACHINE_DRIVER_START( idolmj ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,12000000/2) /* 6.00 Mhz ? */ MDRV_CPU_PROGRAM_MAP(fromance_readmem_main,fromance_writemem_main) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,12000000/2) /* 6.00 Mhz ? */ MDRV_CPU_PROGRAM_MAP(fromance_readmem_sub,fromance_writemem_sub) @@ -1136,7 +1136,7 @@ static MACHINE_DRIVER_START( fromance ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,12000000/2) /* 6.00 Mhz ? */ MDRV_CPU_PROGRAM_MAP(fromance_readmem_main,fromance_writemem_main) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,12000000/2) /* 6.00 Mhz ? */ MDRV_CPU_PROGRAM_MAP(fromance_readmem_sub,fromance_writemem_sub) diff --git a/src/mame/drivers/funkybee.c b/src/mame/drivers/funkybee.c index 18e2b61d825..16104b85333 100644 --- a/src/mame/drivers/funkybee.c +++ b/src/mame/drivers/funkybee.c @@ -306,7 +306,7 @@ static MACHINE_DRIVER_START( funkybee ) MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c index 2066e7c2b6c..030d3b49e81 100644 --- a/src/mame/drivers/funkyjet.c +++ b/src/mame/drivers/funkyjet.c @@ -368,7 +368,7 @@ static MACHINE_DRIVER_START( funkyjet ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14000000) /* 28 MHz crystal */ MDRV_CPU_PROGRAM_MAP(funkyjet_readmem,funkyjet_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(H6280,32220000/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */ /* audio CPU */ diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c index 0878078da5c..03a965f033a 100644 --- a/src/mame/drivers/funworld.c +++ b/src/mame/drivers/funworld.c @@ -1547,7 +1547,7 @@ static MACHINE_DRIVER_START( funworld ) // basic machine hardware MDRV_CPU_ADD_TAG("main", M65SC02, MASTER_CLOCK/8) // 2MHz MDRV_CPU_PROGRAM_MAP(funworld_map, 0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse, 1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_NVRAM_HANDLER(generic_0fill) @@ -1630,7 +1630,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( snookr10 ) MDRV_CPU_ADD_TAG("main", M65SC02, MASTER_CLOCK/8) // 2MHz MDRV_CPU_PROGRAM_MAP(snookr10_map, 0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse, 1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) // video hardware diff --git a/src/mame/drivers/funybubl.c b/src/mame/drivers/funybubl.c index d589047284e..a7b05e6ed8b 100644 --- a/src/mame/drivers/funybubl.c +++ b/src/mame/drivers/funybubl.c @@ -248,7 +248,7 @@ static MACHINE_DRIVER_START( funybubl ) MDRV_CPU_ADD(Z80,12000000/2) /* 6 MHz?? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,8000000/2) /* 4 MHz?? */ MDRV_CPU_PROGRAM_MAP(soundreadmem,soundwritemem) diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c index 63e8cabe0e0..cad5cdc116a 100644 --- a/src/mame/drivers/gaelco.c +++ b/src/mame/drivers/gaelco.c @@ -219,7 +219,7 @@ static MACHINE_DRIVER_START( bigkarnk ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* MC68000P10, 10 MHz */ MDRV_CPU_PROGRAM_MAP(bigkarnk_readmem,bigkarnk_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(M6809, 8867000/4) /* 68B09, 2.21675 MHz? */ /* audio CPU */ @@ -474,7 +474,7 @@ static MACHINE_DRIVER_START( maniacsq ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(maniacsq_readmem,maniacsq_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -1110,7 +1110,7 @@ static MACHINE_DRIVER_START( squash ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* MC68000P12, 12 MHz */ MDRV_CPU_PROGRAM_MAP(squash_readmem,squash_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_INTERLEAVE(10) @@ -1278,7 +1278,7 @@ static MACHINE_DRIVER_START( thoop ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* MC68000P12, 12 MHz */ MDRV_CPU_PROGRAM_MAP(squash_readmem,thoop_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_INTERLEAVE(10) diff --git a/src/mame/drivers/gaelco2.c b/src/mame/drivers/gaelco2.c index a8ff1005d53..b315a1443f2 100644 --- a/src/mame/drivers/gaelco2.c +++ b/src/mame/drivers/gaelco2.c @@ -193,7 +193,7 @@ static MACHINE_DRIVER_START( maniacsq ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 26000000/2) /* 13 MHz? */ MDRV_CPU_PROGRAM_MAP(maniacsq_readmem, maniacsq_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM) @@ -346,7 +346,7 @@ static MACHINE_DRIVER_START( bang ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 30000000/2) /* 15 MHz */ MDRV_CPU_PROGRAM_MAP(bang_readmem, bang_writemem) - MDRV_CPU_VBLANK_INT(bang_interrupt, 6) + MDRV_CPU_VBLANK_INT_HACK(bang_interrupt, 6) MDRV_NVRAM_HANDLER(gaelco2) @@ -551,7 +551,7 @@ static MACHINE_DRIVER_START( alighunt ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 24000000/2) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(alighunt_readmem, alighunt_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM) @@ -814,7 +814,7 @@ static MACHINE_DRIVER_START( touchgo ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 32000000/2) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(touchgo_readmem, touchgo_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold, 1) + MDRV_CPU_VBLANK_INT("left", irq6_line_hold) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM) @@ -1017,7 +1017,7 @@ static MACHINE_DRIVER_START( snowboar ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 30000000/2) /* 15 MHz */ MDRV_CPU_PROGRAM_MAP(snowboar_readmem, snowboar_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_NVRAM_HANDLER(gaelco2) @@ -1262,7 +1262,7 @@ static MACHINE_DRIVER_START( wrally2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 26000000/2) /* 13 MHz */ MDRV_CPU_PROGRAM_MAP(wrally2_readmem, wrally2_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold, 1) + MDRV_CPU_VBLANK_INT("left", irq6_line_hold) MDRV_NVRAM_HANDLER(gaelco2) diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c index d6a1895e39f..8fbc412c5ac 100644 --- a/src/mame/drivers/gaelco3d.c +++ b/src/mame/drivers/gaelco3d.c @@ -943,7 +943,7 @@ static MACHINE_DRIVER_START( gaelco3d ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 15000000) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(vblank_gen, 1) + MDRV_CPU_VBLANK_INT("main", vblank_gen) MDRV_CPU_ADD_TAG("tms", TMS32031, 60000000) MDRV_CPU_PROGRAM_MAP(tms_map,0) diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c index 295f6bf2893..f03fd47d8d0 100644 --- a/src/mame/drivers/gaiden.c +++ b/src/mame/drivers/gaiden.c @@ -972,7 +972,7 @@ static MACHINE_DRIVER_START( shadoww ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 18432000/2) /* 9.216 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq5_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ /* audio CPU */ @@ -1032,7 +1032,7 @@ static MACHINE_DRIVER_START( drgnbowl ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 20000000/2) /* 10 MHz */ MDRV_CPU_PROGRAM_MAP(drgnbowl_map,0) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq5_line_hold) MDRV_CPU_ADD(Z80, 12000000/2) /* 6 MHz */ /* audio CPU */ diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c index 7c653745e7c..4c126f50e65 100644 --- a/src/mame/drivers/galaga.c +++ b/src/mame/drivers/galaga.c @@ -1621,15 +1621,15 @@ static MACHINE_DRIVER_START( bosco ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(bosco_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(bosco_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(bosco_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,2) /* 64V */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,2) /* 64V */ MDRV_CPU_ADD_TAG(CPUTAG_50XX, MB8842, 18432000/12/6) /* 1.536 MHz, internally divided by 6 */ MDRV_CPU_PROGRAM_MAP(namco_50xx_map_program,0) @@ -1690,15 +1690,15 @@ static MACHINE_DRIVER_START( galaga ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(galaga_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(galaga_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(galaga_map,0) - MDRV_CPU_VBLANK_INT(galaga_cpu3_nmi,4) /* 64V (see notes at the top of the driver) */ + MDRV_CPU_VBLANK_INT_HACK(galaga_cpu3_nmi,4) /* 64V (see notes at the top of the driver) */ MDRV_CPU_ADD_TAG(CPUTAG_54XX, MB8844, 18432000/12/6) /* 1.536 MHz, internally divided by 6 */ MDRV_CPU_PROGRAM_MAP(namco_54xx_map_program,0) @@ -1759,15 +1759,15 @@ static MACHINE_DRIVER_START( xevious ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(xevious_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(xevious_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(xevious_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,2) /* 64V */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,2) /* 64V */ MDRV_CPU_ADD_TAG(CPUTAG_50XX, MB8842, 18432000/12/6) /* 1.536 MHz, internally divided by 6 */ MDRV_CPU_PROGRAM_MAP(namco_50xx_map_program,0) @@ -1822,7 +1822,7 @@ static MACHINE_DRIVER_START( battles ) MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(readmem4_battles,writemem4_battles) - MDRV_CPU_VBLANK_INT(battles_interrupt_4,1) + MDRV_CPU_VBLANK_INT("main", battles_interrupt_4) MDRV_MACHINE_RESET(battles) @@ -1843,15 +1843,15 @@ static MACHINE_DRIVER_START( digdug ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(digdug_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(digdug_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(digdug_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,2) /* 64V */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,2) /* 64V */ MDRV_INTERLEAVE(100) /* 100 CPU slices per frame - an high value to ensure proper */ /* synchronization of the CPUs */ diff --git a/src/mame/drivers/galaxia.c b/src/mame/drivers/galaxia.c index 3f86f9af5e4..6bd7bfd0464 100644 --- a/src/mame/drivers/galaxia.c +++ b/src/mame/drivers/galaxia.c @@ -146,8 +146,8 @@ static MACHINE_DRIVER_START( galaxia ) MDRV_CPU_ADD(S2650,2000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) -// MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) +// MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c index 767bd25eca6..e7a888d0b28 100644 --- a/src/mame/drivers/galaxian.c +++ b/src/mame/drivers/galaxian.c @@ -4321,7 +4321,7 @@ static MACHINE_DRIVER_START( gmgalax ) MDRV_IMPORT_FROM(galaxian) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(gmgalax_readmem,galaxian_writemem) - MDRV_CPU_VBLANK_INT(gmgalax_vh_interrupt,1) + MDRV_CPU_VBLANK_INT("main", gmgalax_vh_interrupt) /* video hardware */ MDRV_GFXDECODE(gmgalax) @@ -4543,7 +4543,7 @@ static MACHINE_DRIVER_START( checkman ) /* audio CPU */ /* 1.62 MHz */ MDRV_CPU_PROGRAM_MAP(checkman_sound_readmem,checkman_sound_writemem) MDRV_CPU_IO_MAP(checkman_sound_readport,checkman_sound_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* NMIs are triggered by the main CPU */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* NMIs are triggered by the main CPU */ /* video hardware */ MDRV_PALETTE_LENGTH(32+2+64) /* 32 for the characters, 2 for the bullets, 64 for the stars */ @@ -4570,7 +4570,7 @@ static MACHINE_DRIVER_START( checkmaj ) MDRV_CPU_ADD(Z80, 1620000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(checkmaj_sound_readmem,checkmaj_sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,32) /* NMIs are triggered by the main CPU */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,32) /* NMIs are triggered by the main CPU */ /* video hardware */ @@ -4594,7 +4594,7 @@ static MACHINE_DRIVER_START( dingoe ) /* audio CPU */ /* 1.62 MHz */ MDRV_CPU_PROGRAM_MAP(checkman_sound_readmem,checkman_sound_writemem) MDRV_CPU_IO_MAP(checkman_sound_readport,checkman_sound_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* NMIs are triggered by the main CPU */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* NMIs are triggered by the main CPU */ /* video hardware */ MDRV_PALETTE_LENGTH(32+2+64) /* 32 for the characters, 2 for the bullets, 64 for the stars */ @@ -4717,7 +4717,7 @@ static MACHINE_DRIVER_START( ozon1 ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(ozon1_readmem,ozon1_writemem) MDRV_CPU_IO_MAP(0,ozon1_writeport) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_MACHINE_RESET(NULL) @@ -4735,7 +4735,7 @@ static MACHINE_DRIVER_START( drivfrcg ) MDRV_CPU_ADD(S2650, 18432000/6) MDRV_CPU_PROGRAM_MAP(drivfrcg,0) MDRV_CPU_IO_MAP(drivfrcg_io,0) - MDRV_CPU_VBLANK_INT(hunchbks_vh_interrupt,1) + MDRV_CPU_VBLANK_INT("main", hunchbks_vh_interrupt) MDRV_SCREEN_ADD("main", RASTER) @@ -4781,7 +4781,7 @@ static MACHINE_DRIVER_START( hunchbkg ) MDRV_CPU_ADD(S2650, PIXEL_CLOCK/2) MDRV_CPU_PROGRAM_MAP(hunchbkg,0) MDRV_CPU_IO_MAP(hunchbkg_io,0) - MDRV_CPU_VBLANK_INT(hunchbks_vh_interrupt,1) + MDRV_CPU_VBLANK_INT("main", hunchbks_vh_interrupt) MDRV_GFXDECODE(galaxian) MDRV_PALETTE_LENGTH(32+2+64) /* 32 for the characters, 2 for the bullets, 64 for the stars */ @@ -4807,7 +4807,7 @@ static MACHINE_DRIVER_START( harem ) MDRV_IMPORT_FROM(galaxian_base) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(harem_cpu1,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(Z80, 1620000) /* audio CPU */ @@ -4844,7 +4844,7 @@ static MACHINE_DRIVER_START( racknrol ) MDRV_CPU_ADD(S2650, PIXEL_CLOCK/2) MDRV_CPU_PROGRAM_MAP(racknrol,0) MDRV_CPU_IO_MAP(racknrol_io,0) - MDRV_CPU_VBLANK_INT(hunchbks_vh_interrupt,1) + MDRV_CPU_VBLANK_INT("main", hunchbks_vh_interrupt) MDRV_GFXDECODE(galaxian) MDRV_PALETTE_LENGTH(32) @@ -4902,7 +4902,7 @@ static MACHINE_DRIVER_START( hexpoola ) MDRV_CPU_ADD(S2650, PIXEL_CLOCK/2) MDRV_CPU_PROGRAM_MAP(racknrol,0) MDRV_CPU_IO_MAP(hexpoola_io,0) - MDRV_CPU_VBLANK_INT(hunchbks_vh_interrupt,1) + MDRV_CPU_VBLANK_INT("main", hunchbks_vh_interrupt) MDRV_GFXDECODE(galaxian) MDRV_PALETTE_LENGTH(32) diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c index 9d2cf330ef0..67b5178e6a4 100644 --- a/src/mame/drivers/galivan.c +++ b/src/mame/drivers/galivan.c @@ -560,7 +560,7 @@ static MACHINE_DRIVER_START( galivan ) MDRV_CPU_ADD(Z80,12000000/2) /* 6 MHz? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,8000000/2) /* audio CPU */ /* 4 MHz? */ @@ -604,7 +604,7 @@ static MACHINE_DRIVER_START( ninjemak ) MDRV_CPU_ADD(Z80,12000000/2) /* 6 MHz? */ MDRV_CPU_PROGRAM_MAP(readmem,ninjemak_writemem) MDRV_CPU_IO_MAP(ninjemak_readport,ninjemak_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,8000000/2) /* audio CPU */ /* 4 MHz? */ diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c index 5ea816def09..a21a8105473 100644 --- a/src/mame/drivers/galpani2.c +++ b/src/mame/drivers/galpani2.c @@ -462,11 +462,11 @@ static MACHINE_DRIVER_START( galpani2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16MHz */ MDRV_CPU_PROGRAM_MAP(galpani2_mem1, 0) - MDRV_CPU_VBLANK_INT(galpani2_interrupt,GALPANI2_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(galpani2_interrupt,GALPANI2_INTERRUPTS_NUM) MDRV_CPU_ADD(M68000, 16000000) /* 16MHz */ MDRV_CPU_PROGRAM_MAP(galpani2_mem2, 0) - MDRV_CPU_VBLANK_INT(galpani2_interrupt2,GALPANI2_INTERRUPTS_NUM2) + MDRV_CPU_VBLANK_INT_HACK(galpani2_interrupt2,GALPANI2_INTERRUPTS_NUM2) MDRV_MACHINE_RESET(galpani2) MDRV_NVRAM_HANDLER(93C46) diff --git a/src/mame/drivers/galpani3.c b/src/mame/drivers/galpani3.c index 40f08440dba..10f259b3c22 100644 --- a/src/mame/drivers/galpani3.c +++ b/src/mame/drivers/galpani3.c @@ -373,7 +373,7 @@ static const struct YMZ280Binterface ymz280b_intf = static MACHINE_DRIVER_START( galpani3 ) MDRV_CPU_ADD_TAG("main", M68000, 16000000) // ? (from which clock?) MDRV_CPU_PROGRAM_MAP(galpani3_map,0) - MDRV_CPU_VBLANK_INT(galpani3_vblank, 3) + MDRV_CPU_VBLANK_INT_HACK(galpani3_vblank, 3) MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c index 39d5a42bef6..ebc4a8eceee 100644 --- a/src/mame/drivers/galpanic.c +++ b/src/mame/drivers/galpanic.c @@ -932,7 +932,7 @@ static MACHINE_DRIVER_START( galpanic ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 8000000) MDRV_CPU_PROGRAM_MAP(galpanic,0) - MDRV_CPU_VBLANK_INT(galpanic_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(galpanic_interrupt,2) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -986,7 +986,7 @@ static MACHINE_DRIVER_START( supmodel ) MDRV_IMPORT_FROM(comad) MDRV_CPU_REPLACE("main", M68000, 12000000) /* ? */ MDRV_CPU_PROGRAM_MAP(supmodel_readmem,supmodel_writemem) - MDRV_CPU_VBLANK_INT(galpanic_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(galpanic_interrupt,2) /* video hardware */ MDRV_VIDEO_UPDATE(comad) @@ -1017,7 +1017,7 @@ static MACHINE_DRIVER_START( galhustl ) MDRV_IMPORT_FROM(comad) MDRV_CPU_REPLACE("main", M68000, 12000000) /* ? */ MDRV_CPU_PROGRAM_MAP(galhustl_readmem,galhustl_writemem) - MDRV_CPU_VBLANK_INT(galhustl_interrupt,3) + MDRV_CPU_VBLANK_INT_HACK(galhustl_interrupt,3) /* video hardware */ MDRV_VIDEO_UPDATE(comad) @@ -1034,7 +1034,7 @@ static MACHINE_DRIVER_START( zipzap ) MDRV_IMPORT_FROM(comad) MDRV_CPU_REPLACE("main", M68000, 12000000) /* ? */ MDRV_CPU_PROGRAM_MAP(zipzap_readmem,zipzap_writemem) - MDRV_CPU_VBLANK_INT(galhustl_interrupt,3) + MDRV_CPU_VBLANK_INT_HACK(galhustl_interrupt,3) /* video hardware */ MDRV_VIDEO_UPDATE(comad) diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c index cc2a52b36fd..05ff4cf8203 100644 --- a/src/mame/drivers/galspnbl.c +++ b/src/mame/drivers/galspnbl.c @@ -281,7 +281,7 @@ static MACHINE_DRIVER_START( galspnbl ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz ??? */ MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(irq3_line_hold,1)/* also has vector for 6, but it does nothing */ + MDRV_CPU_VBLANK_INT("main", irq3_line_hold)/* also has vector for 6, but it does nothing */ MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* 4 MHz ??? */ diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c index 0b26a70cbb8..0154740ed76 100644 --- a/src/mame/drivers/gaplus.c +++ b/src/mame/drivers/gaplus.c @@ -758,15 +758,15 @@ static MACHINE_DRIVER_START( gaplus ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 24576000/16) /* 1.536 MHz */ MDRV_CPU_PROGRAM_MAP(readmem_cpu1,writemem_cpu1) - MDRV_CPU_VBLANK_INT(gaplus_interrupt_1,1) + MDRV_CPU_VBLANK_INT("main", gaplus_interrupt_1) MDRV_CPU_ADD(M6809, 24576000/16) /* 1.536 MHz */ MDRV_CPU_PROGRAM_MAP(readmem_cpu2,writemem_cpu2) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_CPU_ADD(M6809, 24576000/16) /* 1.536 MHz */ MDRV_CPU_PROGRAM_MAP(readmem_cpu3,writemem_cpu3) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_INTERLEAVE(100) /* a high value to ensure proper synchronization of the CPUs */ MDRV_MACHINE_RESET(gaplus) diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c index 1f136af4708..71458adc2fb 100644 --- a/src/mame/drivers/gauntlet.c +++ b/src/mame/drivers/gauntlet.c @@ -532,7 +532,7 @@ static MACHINE_DRIVER_START( gauntlet ) /* basic machine hardware */ MDRV_CPU_ADD(M68010, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(atarigen_video_int_gen,1) + MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) MDRV_CPU_ADD(M6502, ATARI_CLOCK_14MHz/8) MDRV_CPU_PROGRAM_MAP(sound_map,0) diff --git a/src/mame/drivers/gberet.c b/src/mame/drivers/gberet.c index 6edc3f0f9a7..631136d42f3 100644 --- a/src/mame/drivers/gberet.c +++ b/src/mame/drivers/gberet.c @@ -552,7 +552,7 @@ static MACHINE_DRIVER_START( gberet ) // basic machine hardware MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) // X1S (generated by a custom IC) MDRV_CPU_PROGRAM_MAP(gberet_map, 0) - MDRV_CPU_VBLANK_INT(gberet_interrupt, 32) // 1 IRQ + 16 NMI (generated by a custom IC) + MDRV_CPU_VBLANK_INT_HACK(gberet_interrupt, 32) // 1 IRQ + 16 NMI (generated by a custom IC) // video hardware @@ -583,7 +583,7 @@ static MACHINE_DRIVER_START( gberetb ) // basic machine hardware MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(gberetb_map, 0) - MDRV_CPU_VBLANK_INT(gberet_interrupt, 16) // 1 IRQ + 8 NMI + MDRV_CPU_VBLANK_INT_HACK(gberet_interrupt, 16) // 1 IRQ + 8 NMI MDRV_SCREEN_MODIFY("main") MDRV_SCREEN_REFRESH_RATE(60) @@ -601,7 +601,7 @@ static MACHINE_DRIVER_START( mrgoemon ) // basic machine hardware MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(mrgoemon_map, 0) - MDRV_CPU_VBLANK_INT(gberet_interrupt, 16) // 1 IRQ + 8 NMI + MDRV_CPU_VBLANK_INT_HACK(gberet_interrupt, 16) // 1 IRQ + 8 NMI MDRV_SCREEN_MODIFY("main") MDRV_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c index 1166bcfce47..c40b96284f6 100644 --- a/src/mame/drivers/gbusters.c +++ b/src/mame/drivers/gbusters.c @@ -299,7 +299,7 @@ static MACHINE_DRIVER_START( gbusters ) /* basic machine hardware */ MDRV_CPU_ADD(KONAMI, 3000000) /* Konami custom 052526 */ MDRV_CPU_PROGRAM_MAP(gbusters_readmem,gbusters_writemem) - MDRV_CPU_VBLANK_INT(gbusters_interrupt,1) + MDRV_CPU_VBLANK_INT("main", gbusters_interrupt) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* ? */ diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c index 1616167c06b..44d75727272 100644 --- a/src/mame/drivers/gcpinbal.c +++ b/src/mame/drivers/gcpinbal.c @@ -381,7 +381,7 @@ static MACHINE_DRIVER_START( gcpinbal ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 32000000/2) /* 16 MHz ? */ MDRV_CPU_PROGRAM_MAP(gcpinbal_readmem,gcpinbal_writemem) - MDRV_CPU_VBLANK_INT(gcpinbal_interrupt,1) + MDRV_CPU_VBLANK_INT("main", gcpinbal_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/genesis.c b/src/mame/drivers/genesis.c index 05604437e25..f1beff18cdf 100644 --- a/src/mame/drivers/genesis.c +++ b/src/mame/drivers/genesis.c @@ -782,11 +782,11 @@ static MACHINE_DRIVER_START( genesis_base ) /*basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK / 7) MDRV_CPU_PROGRAM_MAP(genesis_readmem, genesis_writemem) - MDRV_CPU_VBLANK_INT(genesis_vblank_interrupt,1) + MDRV_CPU_VBLANK_INT("main", genesis_vblank_interrupt) MDRV_CPU_ADD_TAG("sound", Z80, MASTER_CLOCK / 15) MDRV_CPU_PROGRAM_MAP(genesis_z80_readmem, genesis_z80_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) /* from vdp at scanline 0xe0 */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* from vdp at scanline 0xe0 */ MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/getrivia.c b/src/mame/drivers/getrivia.c index 5bba8c8ef88..1444b4ea515 100644 --- a/src/mame/drivers/getrivia.c +++ b/src/mame/drivers/getrivia.c @@ -396,7 +396,7 @@ static MACHINE_RESET( gselect ) static MACHINE_DRIVER_START( getrivia ) MDRV_CPU_ADD_TAG("cpu",Z80,4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(getrivia_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/ghosteo.c b/src/mame/drivers/ghosteo.c index ed59a572773..7a69a787fec 100644 --- a/src/mame/drivers/ghosteo.c +++ b/src/mame/drivers/ghosteo.c @@ -484,7 +484,7 @@ static MACHINE_DRIVER_START( bballoon ) /* basic machine hardware */ MDRV_CPU_ADD(ARM7, 24000000) MDRV_CPU_PROGRAM_MAP(bballoon_map,0) - MDRV_CPU_VBLANK_INT(bballoon_interrupt,1) + MDRV_CPU_VBLANK_INT("main", bballoon_interrupt) MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c index 3972edc0833..60f2db500db 100644 --- a/src/mame/drivers/gijoe.c +++ b/src/mame/drivers/gijoe.c @@ -344,7 +344,7 @@ static MACHINE_DRIVER_START( gijoe ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* Confirmed */ MDRV_CPU_PROGRAM_MAP(readmem, writemem) - MDRV_CPU_VBLANK_INT(gijoe_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", gijoe_interrupt) MDRV_CPU_ADD(Z80, 8000000) /* audio CPU */ /* Amuse & confirmed. z80e */ diff --git a/src/mame/drivers/ginganin.c b/src/mame/drivers/ginganin.c index 0a40a2b8e47..e731f3b3de2 100644 --- a/src/mame/drivers/ginganin.c +++ b/src/mame/drivers/ginganin.c @@ -351,12 +351,12 @@ static MACHINE_DRIVER_START( ginganin ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 6000000) /* ? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) /* ? (vectors 1-7 cointain the same address) */ + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) /* ? (vectors 1-7 cointain the same address) */ MDRV_CPU_ADD(M6809, 1000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(ginganin_sound_interrupt,60) /* Takahiro Nogi. 1999/09/27 (1 -> 60) */ + MDRV_CPU_VBLANK_INT_HACK(ginganin_sound_interrupt,60) /* Takahiro Nogi. 1999/09/27 (1 -> 60) */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c index 19e80f0df19..d9cd69b4c94 100644 --- a/src/mame/drivers/gladiatr.c +++ b/src/mame/drivers/gladiatr.c @@ -683,12 +683,12 @@ static MACHINE_DRIVER_START( ppking ) MDRV_CPU_ADD(Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(ppking_cpu1_map,0) MDRV_CPU_IO_MAP(ppking_cpu1_io,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, XTAL_12MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpu2_map,0) MDRV_CPU_IO_MAP(ppking_cpu2_io,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(M6809, XTAL_12MHz/16) /* verified on pcb */ /* audio CPU */ @@ -733,7 +733,7 @@ static MACHINE_DRIVER_START( gladiatr ) MDRV_CPU_ADD(Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(gladiatr_cpu1_map,0) MDRV_CPU_IO_MAP(gladiatr_cpu1_io,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, XTAL_12MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpu2_map,0) diff --git a/src/mame/drivers/glass.c b/src/mame/drivers/glass.c index e1abf20b9b5..5e71d015263 100644 --- a/src/mame/drivers/glass.c +++ b/src/mame/drivers/glass.c @@ -204,7 +204,7 @@ static MACHINE_DRIVER_START( glass ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz (M680000 P12) */ MDRV_CPU_PROGRAM_MAP(glass_readmem,glass_writemem) - MDRV_CPU_VBLANK_INT(glass_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", glass_interrupt) MDRV_MACHINE_RESET(glass) diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c index 6120545fef2..967693d63ae 100644 --- a/src/mame/drivers/gng.c +++ b/src/mame/drivers/gng.c @@ -21,6 +21,7 @@ Notes: ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "cpu/m6809/m6809.h" #include "sound/2203intf.h" @@ -341,12 +342,12 @@ static MACHINE_DRIVER_START( gng ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 1500000) /* 1.5 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 3000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) MDRV_MACHINE_START(gng) diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c index 9829d330e34..7d7e4fe4a0d 100644 --- a/src/mame/drivers/go2000.c +++ b/src/mame/drivers/go2000.c @@ -169,7 +169,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( go2000 ) MDRV_CPU_ADD_TAG("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(go2000_readmem,go2000_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_GFXDECODE(go2000) diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c index 5ed786a6123..46301a64ae1 100644 --- a/src/mame/drivers/goal92.c +++ b/src/mame/drivers/goal92.c @@ -314,7 +314,7 @@ static MACHINE_DRIVER_START( goal92 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,12000000) MDRV_CPU_PROGRAM_MAP(goal92_readmem,goal92_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) /* VBL */ + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) /* VBL */ MDRV_CPU_ADD(Z80, 2500000) /* audio CPU */ diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c index ea94cc7219d..05a292c56cc 100644 --- a/src/mame/drivers/goindol.c +++ b/src/mame/drivers/goindol.c @@ -18,6 +18,7 @@ Notes: ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "sound/2203intf.h" VIDEO_START( goindol ); @@ -272,12 +273,12 @@ static MACHINE_DRIVER_START( goindol ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 6000000) /* 6 MHz (?) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c index 214132f5da3..e3f7d481be3 100644 --- a/src/mame/drivers/goldstar.c +++ b/src/mame/drivers/goldstar.c @@ -287,7 +287,7 @@ static MACHINE_DRIVER_START( goldstar ) MDRV_CPU_ADD(Z80, 3579545)//(4000000?) MDRV_CPU_PROGRAM_MAP(map,0) MDRV_CPU_IO_MAP(readport,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -323,7 +323,7 @@ static MACHINE_DRIVER_START( goldstbl ) MDRV_CPU_ADD(Z80, 3579545)//(4000000?) MDRV_CPU_PROGRAM_MAP(map,0) MDRV_CPU_IO_MAP(readport,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -358,7 +358,7 @@ static MACHINE_DRIVER_START( moonlght ) MDRV_CPU_ADD(Z80, 3579545)//(4000000?) MDRV_CPU_PROGRAM_MAP(map,0) MDRV_CPU_IO_MAP(readport,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/gomoku.c b/src/mame/drivers/gomoku.c index c7d30af4a00..0ac58a24a5d 100644 --- a/src/mame/drivers/gomoku.c +++ b/src/mame/drivers/gomoku.c @@ -169,7 +169,7 @@ static MACHINE_DRIVER_START( gomoku ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 18432000/12) /* 1.536 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem_gomoku, writemem_gomoku) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c index 42784c89cd4..f52a3c301fe 100644 --- a/src/mame/drivers/good.c +++ b/src/mame/drivers/good.c @@ -273,7 +273,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( good ) MDRV_CPU_ADD_TAG("main", M68000, 16000000 /2) MDRV_CPU_PROGRAM_MAP(good_map,0) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_GFXDECODE(good) diff --git a/src/mame/drivers/goodejan.c b/src/mame/drivers/goodejan.c index 5fe8dd3dbb4..af7864c71c9 100644 --- a/src/mame/drivers/goodejan.c +++ b/src/mame/drivers/goodejan.c @@ -278,7 +278,7 @@ static MACHINE_DRIVER_START( goodejan ) MDRV_CPU_ADD(V30, GOODEJAN_MHZ2/2) MDRV_CPU_PROGRAM_MAP(goodejan_map,0) MDRV_CPU_IO_MAP(goodejan_io_map,0) - MDRV_CPU_VBLANK_INT(goodejan_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(goodejan_interrupt,2) SEIBU_SOUND_SYSTEM_CPU(GOODEJAN_MHZ1/2) diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c index 541fa3d4410..b6ba4667810 100644 --- a/src/mame/drivers/gotcha.c +++ b/src/mame/drivers/gotcha.c @@ -277,12 +277,12 @@ static MACHINE_DRIVER_START( gotcha ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,14318180) /* 14.31818 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(Z80,6000000) /* 6 MHz */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) -// MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) +// MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/gottlieb.c b/src/mame/drivers/gottlieb.c index b025e647acc..d83a27e213a 100644 --- a/src/mame/drivers/gottlieb.c +++ b/src/mame/drivers/gottlieb.c @@ -1523,7 +1523,7 @@ static MACHINE_DRIVER_START( gottlieb ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", I8088, 5000000) /* 5 MHz */ MDRV_CPU_PROGRAM_MAP(gottlieb_map,0) - MDRV_CPU_VBLANK_INT(gottlieb_interrupt,1) + MDRV_CPU_VBLANK_INT("main", gottlieb_interrupt) /* audio CPU */ MDRV_CPU_ADD_TAG("sound", M6502, 3579545/4) /* the board can be set to /2 as well */ @@ -1601,7 +1601,7 @@ static MACHINE_DRIVER_START( gottlieb2 ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", I8088, 5000000) /* 5 MHz */ MDRV_CPU_PROGRAM_MAP(gottlieb_map,0) - MDRV_CPU_VBLANK_INT(gottlieb_interrupt,1) + MDRV_CPU_VBLANK_INT("main", gottlieb_interrupt) MDRV_CPU_ADD_TAG("sound", M6502, 1000000) /* 1 MHz */ /* audio CPU */ diff --git a/src/mame/drivers/gotya.c b/src/mame/drivers/gotya.c index 36f9b920f00..769e0fba751 100644 --- a/src/mame/drivers/gotya.c +++ b/src/mame/drivers/gotya.c @@ -200,7 +200,7 @@ static MACHINE_DRIVER_START( gotya ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,18432000/6) /* 3.072 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c index c36b27cea4b..4636e291fda 100644 --- a/src/mame/drivers/gpworld.c +++ b/src/mame/drivers/gpworld.c @@ -434,7 +434,7 @@ static MACHINE_DRIVER_START( gpworld ) MDRV_CPU_ADD(Z80, GUESSED_CLOCK) MDRV_CPU_PROGRAM_MAP(mainmem,0) MDRV_CPU_IO_MAP(mainport,0) - MDRV_CPU_VBLANK_INT(vblank_callback_gpworld, 1) + MDRV_CPU_VBLANK_INT("main", vblank_callback_gpworld) MDRV_MACHINE_START(gpworld) diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c index 24aee8b95e8..47ac412c77c 100644 --- a/src/mame/drivers/gradius3.c +++ b/src/mame/drivers/gradius3.c @@ -339,11 +339,11 @@ static MACHINE_DRIVER_START( gradius3 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz */ MDRV_CPU_PROGRAM_MAP(gradius3_map,0) - MDRV_CPU_VBLANK_INT(cpuA_interrupt,1) + MDRV_CPU_VBLANK_INT("main", cpuA_interrupt) MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz */ MDRV_CPU_PROGRAM_MAP(gradius3_map2,0) - MDRV_CPU_VBLANK_INT(cpuB_interrupt,2) /* has three interrupt vectors, 1 2 and 4 */ + MDRV_CPU_VBLANK_INT_HACK(cpuB_interrupt,2) /* has three interrupt vectors, 1 2 and 4 */ /* 4 is triggered by cpu A, the others are unknown but */ /* required for the game to run. */ MDRV_CPU_ADD(Z80, 3579545) diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c index a41d767497b..80416923382 100644 --- a/src/mame/drivers/grchamp.c +++ b/src/mame/drivers/grchamp.c @@ -675,13 +675,13 @@ static MACHINE_DRIVER_START( grchamp ) MDRV_CPU_ADD(Z80, PIXEL_CLOCK/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) - MDRV_CPU_VBLANK_INT(grchamp_cpu0_interrupt,1) + MDRV_CPU_VBLANK_INT("main", grchamp_cpu0_interrupt) /* GAME BOARD */ MDRV_CPU_ADD(Z80, PIXEL_CLOCK/2) MDRV_CPU_PROGRAM_MAP(sub_map,0) MDRV_CPU_IO_MAP(sub_portmap,0) - MDRV_CPU_VBLANK_INT(grchamp_cpu1_interrupt,1) + MDRV_CPU_VBLANK_INT("main", grchamp_cpu1_interrupt) /* SOUND BOARD */ MDRV_CPU_ADD(Z80, SOUND_CLOCK/2) diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c index 6a87e05defe..efd661351f0 100644 --- a/src/mame/drivers/groundfx.c +++ b/src/mame/drivers/groundfx.c @@ -409,7 +409,7 @@ static MACHINE_DRIVER_START( groundfx ) /* basic machine hardware */ MDRV_CPU_ADD(M68EC020, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(groundfx_readmem,groundfx_writemem) - MDRV_CPU_VBLANK_INT(groundfx_interrupt,1) + MDRV_CPU_VBLANK_INT("main", groundfx_interrupt) TAITO_F3_SOUND_SYSTEM_CPU(16000000) diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c index 0978490c25b..bcbb1d3c8a3 100644 --- a/src/mame/drivers/gstream.c +++ b/src/mame/drivers/gstream.c @@ -389,7 +389,7 @@ static MACHINE_DRIVER_START( gstream ) MDRV_CPU_ADD_TAG("main", E132XT, 16000000*4) /* 4x internal multiplier */ MDRV_CPU_PROGRAM_MAP(gstream_32bit_map,0) MDRV_CPU_IO_MAP(gstream_io,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c index 31a8f9951ba..d18d9da3961 100644 --- a/src/mame/drivers/gstriker.c +++ b/src/mame/drivers/gstriker.c @@ -441,7 +441,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( gstriker ) MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80,8000000/2) /* audio CPU */ /* 4 MHz ??? */ diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c index 6aeadbc1546..9779ff9f3cf 100644 --- a/src/mame/drivers/gsword.c +++ b/src/mame/drivers/gsword.c @@ -691,12 +691,12 @@ static MACHINE_DRIVER_START( gsword ) MDRV_CPU_ADD(Z80, XTAL_18MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpu1_map,0) MDRV_CPU_IO_MAP(cpu1_io_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, XTAL_18MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpu2_map,0) MDRV_CPU_IO_MAP(cpu2_io_map,0) - MDRV_CPU_VBLANK_INT(gsword_snd_interrupt,4) + MDRV_CPU_VBLANK_INT_HACK(gsword_snd_interrupt,4) MDRV_CPU_ADD(Z80, XTAL_18MHz/6) /* verified on pcb */ /* audio CPU */ @@ -747,14 +747,14 @@ static MACHINE_DRIVER_START( josvolly ) MDRV_CPU_ADD(Z80, 18000000/6) /* ? */ MDRV_CPU_PROGRAM_MAP(cpu1_map,0) MDRV_CPU_IO_MAP(josvolly_cpu1_io_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_CPU_ADD(Z80, 12000000/4) /* ? */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(josvolly_cpu2_map,0) MDRV_CPU_IO_MAP(josvolly_cpu2_io_map,0) -// MDRV_CPU_VBLANK_INT(gsword_snd_interrupt,1) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) +// MDRV_CPU_VBLANK_INT("main", gsword_snd_interrupt) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_RESET(josvolly) diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c index e84c30061db..3800739b96b 100644 --- a/src/mame/drivers/gticlub.c +++ b/src/mame/drivers/gticlub.c @@ -755,7 +755,7 @@ static MACHINE_DRIVER_START( gticlub ) MDRV_CPU_ADD(PPC403, 64000000/2) /* PowerPC 403GA 32MHz */ MDRV_CPU_CONFIG(gticlub_ppc_cfg) MDRV_CPU_PROGRAM_MAP(gticlub_map, 0) - MDRV_CPU_VBLANK_INT(gticlub_vblank, 1) + MDRV_CPU_VBLANK_INT("main", gticlub_vblank) MDRV_CPU_ADD(M68000, 64000000/4) /* 16MHz */ MDRV_CPU_PROGRAM_MAP(sound_memmap, 0) diff --git a/src/mame/drivers/gtipoker.c b/src/mame/drivers/gtipoker.c index 03c35dd1e28..843f0b08a92 100644 --- a/src/mame/drivers/gtipoker.c +++ b/src/mame/drivers/gtipoker.c @@ -58,7 +58,7 @@ static MACHINE_DRIVER_START( gtipoker ) MDRV_CPU_ADD(Z80,4000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(gtipoker_memmap,0) MDRV_CPU_IO_MAP(gtipoker_iomap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/gumbo.c b/src/mame/drivers/gumbo.c index d28bae2577d..5f2f626e708 100644 --- a/src/mame/drivers/gumbo.c +++ b/src/mame/drivers/gumbo.c @@ -309,7 +309,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( gumbo ) MDRV_CPU_ADD_TAG("main", M68000, 14318180 /2) // or 10mhz? ? MDRV_CPU_PROGRAM_MAP(gumbo_readmem,gumbo_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) // all the same + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) // all the same MDRV_GFXDECODE(gumbo) diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c index b8c873b042f..33eda236af5 100644 --- a/src/mame/drivers/gunbustr.c +++ b/src/mame/drivers/gunbustr.c @@ -377,7 +377,7 @@ static MACHINE_DRIVER_START( gunbustr ) /* basic machine hardware */ MDRV_CPU_ADD(M68EC020, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(gunbustr_readmem,gunbustr_writemem) - MDRV_CPU_VBLANK_INT(gunbustr_interrupt,1) /* VBL */ + MDRV_CPU_VBLANK_INT("main", gunbustr_interrupt) /* VBL */ TAITO_F3_SOUND_SYSTEM_CPU(16000000) diff --git a/src/mame/drivers/gundealr.c b/src/mame/drivers/gundealr.c index 2d86d1d51de..99405327347 100644 --- a/src/mame/drivers/gundealr.c +++ b/src/mame/drivers/gundealr.c @@ -465,7 +465,7 @@ static MACHINE_DRIVER_START( gundealr ) MDRV_CPU_ADD(Z80, 8000000) /* 8 MHz ??? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) - MDRV_CPU_VBLANK_INT(yamyam_interrupt,4) /* ? */ + MDRV_CPU_VBLANK_INT_HACK(yamyam_interrupt,4) /* ? */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/gunpey.c b/src/mame/drivers/gunpey.c index 61302b0c48e..1d8afaa9fae 100644 --- a/src/mame/drivers/gunpey.c +++ b/src/mame/drivers/gunpey.c @@ -124,7 +124,7 @@ static MACHINE_DRIVER_START( gunpey ) MDRV_CPU_ADD(V30, 57242400 / 4) MDRV_CPU_PROGRAM_MAP(mem_map,0) MDRV_CPU_IO_MAP(io_map,0) - MDRV_CPU_VBLANK_INT(gunpey_interrupt,1) + MDRV_CPU_VBLANK_INT("main", gunpey_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/gunsmoke.c b/src/mame/drivers/gunsmoke.c index cc113d73bdd..39aa4bca334 100644 --- a/src/mame/drivers/gunsmoke.c +++ b/src/mame/drivers/gunsmoke.c @@ -67,6 +67,7 @@ Stephh's notes (based on the games Z80 code and some tests) : ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "sound/2203intf.h" extern UINT8 *gunsmoke_scrollx; @@ -287,12 +288,12 @@ static MACHINE_DRIVER_START( gunsmoke ) // basic machine hardware MDRV_CPU_ADD(Z80, 4000000) // 4 MHz MDRV_CPU_PROGRAM_MAP(gunsmoke_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 3000000) // 3 MHz /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 4) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4) // video hardware diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c index e7d6f407d44..2a37918fd1f 100644 --- a/src/mame/drivers/gyruss.c +++ b/src/mame/drivers/gyruss.c @@ -56,6 +56,7 @@ and 1 SFX channel controlled by an 8039: ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "cpu/i8039/i8039.h" #include "sound/ay8910.h" #include "sound/dac.h" @@ -366,11 +367,11 @@ static MACHINE_DRIVER_START( gyruss ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz (?) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(M6809, 2000000) /* 2 MHz ??? */ MDRV_CPU_PROGRAM_MAP(m6809_readmem,m6809_writemem) - MDRV_CPU_VBLANK_INT(gyruss_6809_interrupt,256) + MDRV_CPU_VBLANK_INT_HACK(gyruss_6809_interrupt,256) MDRV_CPU_ADD(Z80,14318180/4) /* audio CPU */ /* 3.579545 MHz */ diff --git a/src/mame/drivers/hal21.c b/src/mame/drivers/hal21.c index 90e5a352241..4f8d18a6756 100644 --- a/src/mame/drivers/hal21.c +++ b/src/mame/drivers/hal21.c @@ -700,16 +700,16 @@ static MACHINE_DRIVER_START( aso ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(aso_cpuA_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(aso_cpuB_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(aso_sound_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(100) @@ -744,17 +744,17 @@ static MACHINE_DRIVER_START( hal21 ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(hal21_cpuA_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(hal21_cpuB_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(hal21_sound_map,0) MDRV_CPU_IO_MAP(hal21_sound_portmap,0) - MDRV_CPU_VBLANK_INT(hal21_sound_interrupt,1) + MDRV_CPU_VBLANK_INT("main", hal21_sound_interrupt) MDRV_CPU_PERIODIC_INT(irq0_line_hold, 220) // music tempo, hand tuned MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c index 5176922521d..d83c4695483 100644 --- a/src/mame/drivers/halleys.c +++ b/src/mame/drivers/halleys.c @@ -1950,7 +1950,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( halleys ) MDRV_CPU_ADD_TAG("main", M6809, 1664000) /* 19968000/12 (verified on pcb) */ MDRV_CPU_PROGRAM_MAP(readmem, writemem) - MDRV_CPU_VBLANK_INT(halleys_interrupt, 4) + MDRV_CPU_VBLANK_INT_HACK(halleys_interrupt, 4) MDRV_CPU_ADD(Z80, 6000000/2) /* (verified on pcb) */ /* audio CPU */ @@ -1995,7 +1995,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( benberob ) MDRV_IMPORT_FROM(halleys) MDRV_CPU_REPLACE("main", M6809, 1000000) // 19.968MHz/20? (CAUTION: timing critical) - MDRV_CPU_VBLANK_INT(benberob_interrupt, 4) + MDRV_CPU_VBLANK_INT_HACK(benberob_interrupt, 4) MDRV_VIDEO_UPDATE(benberob) MACHINE_DRIVER_END diff --git a/src/mame/drivers/hanaawas.c b/src/mame/drivers/hanaawas.c index 79100d14df1..a8b15daccd8 100644 --- a/src/mame/drivers/hanaawas.c +++ b/src/mame/drivers/hanaawas.c @@ -208,7 +208,7 @@ static MACHINE_DRIVER_START( hanaawas ) MDRV_CPU_ADD(Z80,18432000/6) /* 3.072 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/hanaroku.c b/src/mame/drivers/hanaroku.c index 868ad13cda6..f6ec2543432 100644 --- a/src/mame/drivers/hanaroku.c +++ b/src/mame/drivers/hanaroku.c @@ -238,7 +238,7 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( hanaroku ) MDRV_CPU_ADD(Z80,6000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c index a5ef9689180..2a91a791d7f 100644 --- a/src/mame/drivers/harddriv.c +++ b/src/mame/drivers/harddriv.c @@ -963,7 +963,7 @@ static MACHINE_DRIVER_START( driver_nomsp ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68010, 32000000/4) MDRV_CPU_PROGRAM_MAP(driver_68k_map,0) - MDRV_CPU_VBLANK_INT(atarigen_video_int_gen,1) + MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) MDRV_CPU_PERIODIC_INT(hd68k_irq_gen, (double)32000000/16/16/16/16/2) MDRV_CPU_ADD_TAG("gsp", TMS34010, 48000000) diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c index e6b16f1cfdd..4925c600d31 100644 --- a/src/mame/drivers/hcastle.c +++ b/src/mame/drivers/hcastle.c @@ -269,7 +269,7 @@ static MACHINE_DRIVER_START( hcastle ) /* basic machine hardware */ MDRV_CPU_ADD(KONAMI, 3000000) /* Derived from 24 MHz clock */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ diff --git a/src/mame/drivers/hexa.c b/src/mame/drivers/hexa.c index f26c5983c69..888c6bbe515 100644 --- a/src/mame/drivers/hexa.c +++ b/src/mame/drivers/hexa.c @@ -134,7 +134,7 @@ static MACHINE_DRIVER_START( hexa ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ??????? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/hexion.c b/src/mame/drivers/hexion.c index dbde47da38f..fe8c6234cfa 100644 --- a/src/mame/drivers/hexion.c +++ b/src/mame/drivers/hexion.c @@ -284,7 +284,7 @@ static MACHINE_DRIVER_START( hexion ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,24000000/4) /* Z80B 6 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(hexion_interrupt,3) /* both IRQ and NMI are used */ + MDRV_CPU_VBLANK_INT_HACK(hexion_interrupt,3) /* both IRQ and NMI are used */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/higemaru.c b/src/mame/drivers/higemaru.c index 0588dfec021..59998dfff03 100644 --- a/src/mame/drivers/higemaru.c +++ b/src/mame/drivers/higemaru.c @@ -175,7 +175,7 @@ static MACHINE_DRIVER_START( higemaru ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ? Main xtal is 12MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(higemaru_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(higemaru_interrupt,2) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/hnayayoi.c b/src/mame/drivers/hnayayoi.c index 4d861651cf9..019a2a9e0ab 100644 --- a/src/mame/drivers/hnayayoi.c +++ b/src/mame/drivers/hnayayoi.c @@ -624,7 +624,7 @@ static MACHINE_DRIVER_START( hnayayoi ) MDRV_CPU_ADD_TAG("main", Z80, 20000000/4 ) /* 5 MHz ???? */ MDRV_CPU_PROGRAM_MAP(hnayayoi_readmem,hnayayoi_writemem) MDRV_CPU_IO_MAP(hnayayoi_readport,hnayayoi_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 8000) MDRV_MACHINE_RESET(hnayayoi) diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c index 307003703b3..011f860f5e2 100644 --- a/src/mame/drivers/hng64.c +++ b/src/mame/drivers/hng64.c @@ -1518,7 +1518,7 @@ static MACHINE_DRIVER_START( hng64 ) MDRV_CPU_ADD(R4600BE, MASTER_CLOCK) // actually R4300 MDRV_CPU_CONFIG(config) MDRV_CPU_PROGRAM_MAP(hng_map, 0) - MDRV_CPU_VBLANK_INT(irq_start,3) + MDRV_CPU_VBLANK_INT_HACK(irq_start,3) MDRV_CPU_ADD(V30,8000000) // v53, 16? mhz! MDRV_CPU_PROGRAM_MAP(hng_sound_map,0) diff --git a/src/mame/drivers/holeland.c b/src/mame/drivers/holeland.c index 29f4fb2a9ba..c95cd4729a2 100644 --- a/src/mame/drivers/holeland.c +++ b/src/mame/drivers/holeland.c @@ -300,7 +300,7 @@ static MACHINE_DRIVER_START( holeland ) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -369,7 +369,7 @@ static MACHINE_DRIVER_START( crzrally ) MDRV_CPU_ADD(Z80, 20000000/4) /* 5 MHz */ MDRV_CPU_PROGRAM_MAP(crzrally_readmem,crzrally_writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c index 16314974181..d4e9172a608 100644 --- a/src/mame/drivers/homedata.c +++ b/src/mame/drivers/homedata.c @@ -1262,7 +1262,7 @@ static MACHINE_DRIVER_START( mrokumei ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 16000000/4) /* 4MHz ? */ MDRV_CPU_PROGRAM_MAP(mrokumei_readmem,mrokumei_writemem) - MDRV_CPU_VBLANK_INT(homedata_irq,1) /* also triggered by the blitter */ + MDRV_CPU_VBLANK_INT("main", homedata_irq) /* also triggered by the blitter */ MDRV_CPU_ADD(Z80, 16000000/4) /* 4MHz ? */ /* audio CPU */ @@ -1319,13 +1319,13 @@ static MACHINE_DRIVER_START( reikaids ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 16000000/4) /* 4MHz ? */ MDRV_CPU_PROGRAM_MAP(reikaids_readmem,reikaids_writemem) - MDRV_CPU_VBLANK_INT(homedata_irq,1) /* also triggered by the blitter */ + MDRV_CPU_VBLANK_INT("main", homedata_irq) /* also triggered by the blitter */ MDRV_CPU_ADD(UPD7807, 8000000) /* ??? MHz (max speed for the 7807 is 12MHz) */ MDRV_CPU_CONFIG(upd_config) MDRV_CPU_PROGRAM_MAP(reikaids_upd7807_readmem,reikaids_upd7807_writemem) MDRV_CPU_IO_MAP(reikaids_upd7807_readport,reikaids_upd7807_writeport) - MDRV_CPU_VBLANK_INT(upd7807_irq,1) + MDRV_CPU_VBLANK_INT("main", upd7807_irq) MDRV_INTERLEAVE(500) // very high interleave required to sync for startup tests @@ -1369,13 +1369,13 @@ static MACHINE_DRIVER_START( pteacher ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 16000000/4) /* 4MHz ? */ MDRV_CPU_PROGRAM_MAP(pteacher_readmem,pteacher_writemem) - MDRV_CPU_VBLANK_INT(homedata_irq,1) /* also triggered by the blitter */ + MDRV_CPU_VBLANK_INT("main", homedata_irq) /* also triggered by the blitter */ MDRV_CPU_ADD_TAG("sound", UPD7807, 9000000) /* 9MHz ? */ MDRV_CPU_CONFIG(upd_config) MDRV_CPU_PROGRAM_MAP(pteacher_upd7807_readmem,pteacher_upd7807_writemem) MDRV_CPU_IO_MAP(pteacher_upd7807_readport,pteacher_upd7807_writeport) - MDRV_CPU_VBLANK_INT(upd7807_irq,1) + MDRV_CPU_VBLANK_INT("main", upd7807_irq) MDRV_INTERLEAVE(100) // should be enough diff --git a/src/mame/drivers/homerun.c b/src/mame/drivers/homerun.c index 0057de48450..950ebf7dabc 100644 --- a/src/mame/drivers/homerun.c +++ b/src/mame/drivers/homerun.c @@ -189,7 +189,7 @@ static MACHINE_DRIVER_START( homerun ) MDRV_CPU_ADD(Z80, 5000000) MDRV_CPU_PROGRAM_MAP(homerun_memmap, 0) MDRV_CPU_IO_MAP(homerun_iomap, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_RESET(homerun) diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c index 3d28f970922..3c03099ecd6 100644 --- a/src/mame/drivers/hotblock.c +++ b/src/mame/drivers/hotblock.c @@ -188,7 +188,7 @@ static MACHINE_DRIVER_START( hotblock ) MDRV_CPU_ADD(I8088, 10000000) MDRV_CPU_PROGRAM_MAP(hotblock_map, 0) MDRV_CPU_IO_MAP(hotblock_io,0) - MDRV_CPU_VBLANK_INT(hotblocks_irq,1) + MDRV_CPU_VBLANK_INT("main", hotblocks_irq) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/hshavoc.c b/src/mame/drivers/hshavoc.c index ef1c130f1b7..1c8da525c23 100644 --- a/src/mame/drivers/hshavoc.c +++ b/src/mame/drivers/hshavoc.c @@ -134,11 +134,11 @@ ADDRESS_MAP_END static MACHINE_DRIVER_START( genesis_base ) /*basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK / 7) - MDRV_CPU_VBLANK_INT(genesis_vblank_interrupt,1) + MDRV_CPU_VBLANK_INT("main", genesis_vblank_interrupt) MDRV_CPU_ADD_TAG("sound", Z80, MASTER_CLOCK / 15) MDRV_CPU_PROGRAM_MAP(genesis_z80_readmem, genesis_z80_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) /* from vdp at scanline 0xe0 */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* from vdp at scanline 0xe0 */ MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/hyhoo.c b/src/mame/drivers/hyhoo.c index bd7f33acb7f..b34b0d3d643 100644 --- a/src/mame/drivers/hyhoo.c +++ b/src/mame/drivers/hyhoo.c @@ -268,7 +268,7 @@ static MACHINE_DRIVER_START( hyhoo ) MDRV_CPU_ADD(Z80, 5000000/1) /* 5.00 MHz ?? */ MDRV_CPU_PROGRAM_MAP(readmem_hyhoo, writemem_hyhoo) MDRV_CPU_IO_MAP(readport_hyhoo, writeport_hyhoo) - MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", nb1413m3_interrupt) MDRV_MACHINE_RESET(nb1413m3) MDRV_NVRAM_HANDLER(nb1413m3) diff --git a/src/mame/drivers/hyperspt.c b/src/mame/drivers/hyperspt.c index 1f045ede438..a66f730cd9a 100644 --- a/src/mame/drivers/hyperspt.c +++ b/src/mame/drivers/hyperspt.c @@ -462,7 +462,7 @@ static MACHINE_DRIVER_START( hyperspt ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M6809, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(hyperspt_readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,XTAL_14_31818MHz/4) /* verified on pcb */ /* audio CPU */ diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c index 36b0e8f7027..62da70638f8 100644 --- a/src/mame/drivers/hyprduel.c +++ b/src/mame/drivers/hyprduel.c @@ -710,7 +710,7 @@ static MACHINE_DRIVER_START( hyprduel ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,20000000/2) /* 10MHz */ MDRV_CPU_PROGRAM_MAP(hyprduel_readmem,hyprduel_writemem) - MDRV_CPU_VBLANK_INT(hyprduel_interrupt,RASTER_LINES) + MDRV_CPU_VBLANK_INT_HACK(hyprduel_interrupt,RASTER_LINES) MDRV_CPU_ADD(M68000,20000000/2) /* 10MHz */ MDRV_CPU_PROGRAM_MAP(hyprduel_readmem2,hyprduel_writemem2) @@ -751,7 +751,7 @@ static MACHINE_DRIVER_START( magerror ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,20000000/2) /* 10MHz */ MDRV_CPU_PROGRAM_MAP(magerror_readmem,magerror_writemem) - MDRV_CPU_VBLANK_INT(hyprduel_interrupt,RASTER_LINES) + MDRV_CPU_VBLANK_INT_HACK(hyprduel_interrupt,RASTER_LINES) MDRV_CPU_ADD(M68000,20000000/2) /* 10MHz */ MDRV_CPU_PROGRAM_MAP(magerror_readmem2,magerror_writemem2) diff --git a/src/mame/drivers/igs_180.c b/src/mame/drivers/igs_180.c index 42fc6f10437..c313f43def0 100644 --- a/src/mame/drivers/igs_180.c +++ b/src/mame/drivers/igs_180.c @@ -129,8 +129,8 @@ static MACHINE_DRIVER_START( igs_180 ) MDRV_CPU_ADD(Z180,16000000) /* 16 MHz? */ MDRV_CPU_PROGRAM_MAP(igs_180_map,0) MDRV_CPU_IO_MAP(igs_180_portmap,0) - MDRV_CPU_VBLANK_INT(igs_180_interrupt,2) - //MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT_HACK(igs_180_interrupt,2) + //MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/igs_blit.c b/src/mame/drivers/igs_blit.c index 7c36e1e93bd..d1db1769314 100644 --- a/src/mame/drivers/igs_blit.c +++ b/src/mame/drivers/igs_blit.c @@ -2399,7 +2399,7 @@ static MACHINE_DRIVER_START( chmplst2 ) MDRV_IMPORT_FROM(igs_base) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(chmplst2_readmem,chmplst2_writemem) - MDRV_CPU_VBLANK_INT(chmplst2_interrupt,1+4) // lev5 frequency drives the music tempo + MDRV_CPU_VBLANK_INT_HACK(chmplst2_interrupt,1+4) // lev5 frequency drives the music tempo // MDRV_GFXDECODE(chmplst2) @@ -2412,7 +2412,7 @@ static MACHINE_DRIVER_START( chindrag ) MDRV_IMPORT_FROM(igs_base) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(chindrag_readmem,chindrag_writemem) - MDRV_CPU_VBLANK_INT(chmplst2_interrupt,1+4) // lev5 frequency drives the music tempo + MDRV_CPU_VBLANK_INT_HACK(chmplst2_interrupt,1+4) // lev5 frequency drives the music tempo MDRV_SOUND_ADD(YM3812, 3579545) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0) @@ -2432,7 +2432,7 @@ static MACHINE_DRIVER_START( grtwall ) MDRV_IMPORT_FROM(igs_base) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(grtwall_readmem,grtwall_writemem) - MDRV_CPU_VBLANK_INT(grtwall_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(grtwall_interrupt,2) MACHINE_DRIVER_END @@ -2451,7 +2451,7 @@ static MACHINE_DRIVER_START( lhb ) MDRV_IMPORT_FROM(igs_base) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(lhb_readmem,lhb_writemem) - MDRV_CPU_VBLANK_INT(lhb_interrupt,3) + MDRV_CPU_VBLANK_INT_HACK(lhb_interrupt,3) MACHINE_DRIVER_END @@ -2482,7 +2482,7 @@ static MACHINE_DRIVER_START( vbowl ) MDRV_IMPORT_FROM(igs_base) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(vbowl_readmem,vbowl_writemem) - MDRV_CPU_VBLANK_INT(vbowl_interrupt,3+4) + MDRV_CPU_VBLANK_INT_HACK(vbowl_interrupt,3+4) MDRV_VIDEO_EOF(vbowl) // trackball // MDRV_GFXDECODE(chmplst2) @@ -2499,7 +2499,7 @@ static MACHINE_DRIVER_START( xymg ) MDRV_IMPORT_FROM(igs_base) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(xymg_readmem,xymg_writemem) - MDRV_CPU_VBLANK_INT(grtwall_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(grtwall_interrupt,2) MACHINE_DRIVER_END diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c index 40d8713508c..04423222fab 100644 --- a/src/mame/drivers/igs_m027.c +++ b/src/mame/drivers/igs_m027.c @@ -368,7 +368,7 @@ static MACHINE_DRIVER_START( igs_majhong ) MDRV_CPU_PROGRAM_MAP(igs_majhong_map,0) - MDRV_CPU_VBLANK_INT(igs_majhong_interrupt,1) + MDRV_CPU_VBLANK_INT("main", igs_majhong_interrupt) //MDRV_NVRAM_HANDLER(generic_0fill) MDRV_GFXDECODE(igs_m027) diff --git a/src/mame/drivers/igs_m68.c b/src/mame/drivers/igs_m68.c index c71a0a5f476..b37173cb65d 100644 --- a/src/mame/drivers/igs_m68.c +++ b/src/mame/drivers/igs_m68.c @@ -41,7 +41,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( igs_m68 ) MDRV_CPU_ADD_TAG("main", M68000, 22000000 /2) // 11mhz MDRV_CPU_PROGRAM_MAP(igs_m68_map,0) - //MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + //MDRV_CPU_VBLANK_INT("main", irq1_line_hold) //MDRV_GFXDECODE(igs_m68) diff --git a/src/mame/drivers/ikki.c b/src/mame/drivers/ikki.c index ee7ec51ca52..59ba30eff8c 100644 --- a/src/mame/drivers/ikki.c +++ b/src/mame/drivers/ikki.c @@ -195,11 +195,11 @@ static MACHINE_DRIVER_START( ikki ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,8000000/2) /* 4.000MHz */ MDRV_CPU_PROGRAM_MAP(ikki_cpu1,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_CPU_ADD(Z80,8000000/2) /* 4.000MHz */ MDRV_CPU_PROGRAM_MAP(ikki_cpu2,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_INTERLEAVE(10) diff --git a/src/mame/drivers/imolagp.c b/src/mame/drivers/imolagp.c index b9086519670..41d42d09683 100644 --- a/src/mame/drivers/imolagp.c +++ b/src/mame/drivers/imolagp.c @@ -396,12 +396,12 @@ static MACHINE_DRIVER_START( imolagp ) MDRV_CPU_ADD(Z80,8000000) /* ? */ MDRV_CPU_PROGRAM_MAP(imolagp_master,0) MDRV_CPU_IO_MAP(readport_master,0) - MDRV_CPU_VBLANK_INT(master_interrupt,4) + MDRV_CPU_VBLANK_INT_HACK(master_interrupt,4) MDRV_CPU_ADD(Z80,8000000) /* ? */ MDRV_CPU_PROGRAM_MAP(imolagp_slave,0) MDRV_CPU_IO_MAP(readport_slave,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/intrscti.c b/src/mame/drivers/intrscti.c index 44693c37d06..468d5aa03f9 100644 --- a/src/mame/drivers/intrscti.c +++ b/src/mame/drivers/intrscti.c @@ -92,7 +92,7 @@ static MACHINE_DRIVER_START( intrscti ) MDRV_CPU_ADD(Z80,4000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c index 0864c886a06..522e496b69f 100644 --- a/src/mame/drivers/inufuku.c +++ b/src/mame/drivers/inufuku.c @@ -401,7 +401,7 @@ static MACHINE_DRIVER_START( inufuku ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 32000000/2) /* 16.00 MHz */ MDRV_CPU_PROGRAM_MAP(inufuku_readmem, inufuku_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, 32000000/4) /* 8.00 MHz */ /* audio CPU */ diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c index 6dc71dab672..0066fdebd6c 100644 --- a/src/mame/drivers/iqblock.c +++ b/src/mame/drivers/iqblock.c @@ -306,7 +306,7 @@ static MACHINE_DRIVER_START( iqblock ) MDRV_CPU_ADD(Z80,12000000/2) /* 6 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) - MDRV_CPU_VBLANK_INT(iqblock_interrupt,16) + MDRV_CPU_VBLANK_INT_HACK(iqblock_interrupt,16) MDRV_MACHINE_RESET(iqblock) @@ -337,7 +337,7 @@ static MACHINE_DRIVER_START( cabaret ) MDRV_CPU_ADD(Z180,12000000/2) /* 6 MHz , appears to use Z180 instructions */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) - MDRV_CPU_VBLANK_INT(iqblock_interrupt,16) + MDRV_CPU_VBLANK_INT_HACK(iqblock_interrupt,16) MDRV_MACHINE_RESET(iqblock) @@ -368,7 +368,7 @@ static MACHINE_DRIVER_START( pokerigs ) MDRV_CPU_ADD(Z180,12000000/2) /* 6 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(pokerigs_portmap,0) - MDRV_CPU_VBLANK_INT(iqblock_interrupt,16) + MDRV_CPU_VBLANK_INT_HACK(iqblock_interrupt,16) MDRV_MACHINE_RESET(iqblock) diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c index 121fd27bb26..362244bc7c0 100644 --- a/src/mame/drivers/ironhors.c +++ b/src/mame/drivers/ironhors.c @@ -397,7 +397,7 @@ static MACHINE_DRIVER_START( ironhors ) /* basic machine hardware */ MDRV_CPU_ADD(M6809,18432000/6) /* 3.072 MHz??? mod by Shingo Suzuki 1999/10/15 */ MDRV_CPU_PROGRAM_MAP(master_map, 0) - MDRV_CPU_VBLANK_INT(ironhors_interrupt,8) + MDRV_CPU_VBLANK_INT_HACK(ironhors_interrupt,8) MDRV_CPU_ADD_TAG("sound",Z80,18432000/6) /* audio CPU */ /* 3.072 MHz */ diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c index 8ac52b66401..293c6af8a23 100644 --- a/src/mame/drivers/istellar.c +++ b/src/mame/drivers/istellar.c @@ -333,7 +333,7 @@ static MACHINE_DRIVER_START( istellar ) MDRV_CPU_ADD(Z80, GUESSED_CLOCK) MDRV_CPU_PROGRAM_MAP(z80_0_mem,0) MDRV_CPU_IO_MAP(z80_0_io,0) - MDRV_CPU_VBLANK_INT(vblank_callback_istellar, 1) + MDRV_CPU_VBLANK_INT("main", vblank_callback_istellar) /* sound cpu */ MDRV_CPU_ADD(Z80, GUESSED_CLOCK) diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c index 0e9579c20bd..463db958619 100644 --- a/src/mame/drivers/itech32.c +++ b/src/mame/drivers/itech32.c @@ -1561,7 +1561,7 @@ static MACHINE_DRIVER_START( timekill ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(timekill_map,0) - MDRV_CPU_VBLANK_INT(generate_int1,1) + MDRV_CPU_VBLANK_INT("main", generate_int1) MDRV_CPU_ADD_TAG("sound", M6809, SOUND_CLOCK/8) MDRV_CPU_PROGRAM_MAP(sound_map,0) @@ -1609,7 +1609,7 @@ static MACHINE_DRIVER_START( drivedge ) MDRV_CPU_REPLACE("main", M68EC020, CPU020_CLOCK) MDRV_CPU_PROGRAM_MAP(drivedge_map,0) - MDRV_CPU_VBLANK_INT(NULL,0) + MDRV_CPU_VBLANK_INT_HACK(NULL,0) MDRV_CPU_ADD(TMS32031, TMS_CLOCK) MDRV_CPU_PROGRAM_MAP(drivedge_tms1_map,0) @@ -1634,7 +1634,7 @@ static MACHINE_DRIVER_START( sftm ) MDRV_CPU_MODIFY("sound") MDRV_CPU_PROGRAM_MAP(sound_020_map,0) - MDRV_CPU_VBLANK_INT(irq1_line_assert,4) + MDRV_CPU_VBLANK_INT_HACK(irq1_line_assert,4) MDRV_NVRAM_HANDLER(itech020) MACHINE_DRIVER_END diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c index d94cc2cd28e..2bc66b310ea 100644 --- a/src/mame/drivers/itech8.c +++ b/src/mame/drivers/itech8.c @@ -1764,7 +1764,7 @@ static MACHINE_DRIVER_START( itech8_core_lo ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M6809, CLOCK_8MHz/4) MDRV_CPU_PROGRAM_MAP(tmslo_map,0) - MDRV_CPU_VBLANK_INT(generate_nmi,1) + MDRV_CPU_VBLANK_INT("main", generate_nmi) MDRV_MACHINE_START(itech8) MDRV_MACHINE_RESET(itech8) diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c index 95b6c6517b4..52f80b73177 100644 --- a/src/mame/drivers/jack.c +++ b/src/mame/drivers/jack.c @@ -875,7 +875,7 @@ static MACHINE_DRIVER_START( jack ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", Z80, 18000000/6) /* 3 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* jack needs 1 or its too fast */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* jack needs 1 or its too fast */ MDRV_CPU_ADD(Z80,18000000/12) /* audio CPU */ /* 1.5 MHz */ @@ -909,7 +909,7 @@ static MACHINE_DRIVER_START( tripool ) /* basic machine hardware */ MDRV_IMPORT_FROM(jack) MDRV_CPU_MODIFY("main") - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) /* tripool needs 2 or the palette is broken */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* tripool needs 2 or the palette is broken */ MACHINE_DRIVER_END static INTERRUPT_GEN( joinem_interrupts ) @@ -929,7 +929,7 @@ static MACHINE_DRIVER_START( joinem ) MDRV_IMPORT_FROM(jack) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(joinem_map,0) - MDRV_CPU_VBLANK_INT(joinem_interrupts,3) + MDRV_CPU_VBLANK_INT_HACK(joinem_interrupts,3) MDRV_GFXDECODE(joinem) MDRV_PALETTE_LENGTH(0x100) @@ -949,7 +949,7 @@ static MACHINE_DRIVER_START( loverboy ) MDRV_IMPORT_FROM(jack) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(joinem_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_GFXDECODE(joinem) MDRV_PALETTE_LENGTH(0x100) diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c index 211148e137b..ae82dfffecd 100644 --- a/src/mame/drivers/jackal.c +++ b/src/mame/drivers/jackal.c @@ -259,7 +259,7 @@ static MACHINE_DRIVER_START( jackal ) // basic machine hardware MDRV_CPU_ADD(M6809, MASTER_CLOCK/12) // verified on pcb MDRV_CPU_PROGRAM_MAP(master_map, 0) - MDRV_CPU_VBLANK_INT(jackal_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", jackal_interrupt) MDRV_CPU_ADD(M6809, MASTER_CLOCK/12) // verified on pcb MDRV_CPU_PROGRAM_MAP(slave_map, 0) diff --git a/src/mame/drivers/jackpool.c b/src/mame/drivers/jackpool.c index 20716356dd9..ed7436a9b20 100644 --- a/src/mame/drivers/jackpool.c +++ b/src/mame/drivers/jackpool.c @@ -175,7 +175,7 @@ static INTERRUPT_GEN( jackpool_interrupt ) static MACHINE_DRIVER_START( jackpool ) MDRV_CPU_ADD(M68000, 12000000) // ? MDRV_CPU_PROGRAM_MAP(jackpool_readmem,jackpool_writemem) - MDRV_CPU_VBLANK_INT(jackpool_interrupt,3) // ? + MDRV_CPU_VBLANK_INT_HACK(jackpool_interrupt,3) // ? MDRV_GFXDECODE(jackpool) diff --git a/src/mame/drivers/jailbrek.c b/src/mame/drivers/jailbrek.c index 436d03b4832..e3a48866bfa 100644 --- a/src/mame/drivers/jailbrek.c +++ b/src/mame/drivers/jailbrek.c @@ -243,7 +243,7 @@ static MACHINE_DRIVER_START( jailbrek ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, MASTER_CLOCK/12) MDRV_CPU_PROGRAM_MAP(jailbrek_map, 0) - MDRV_CPU_VBLANK_INT(jb_interrupt,1) + MDRV_CPU_VBLANK_INT("main", jb_interrupt) MDRV_CPU_PERIODIC_INT(jb_interrupt_nmi, 500) /* ? */ MDRV_MACHINE_START(jailbrek) diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c index c0b342d6a34..113bb3c41ee 100644 --- a/src/mame/drivers/jalmah.c +++ b/src/mame/drivers/jalmah.c @@ -1002,7 +1002,7 @@ static MACHINE_RESET (daireika) static MACHINE_DRIVER_START( jalmah ) MDRV_CPU_ADD_TAG("main" , M68000, 8000000) /* 68000-8 */ MDRV_CPU_PROGRAM_MAP(jalmah,0) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_GFXDECODE(jalmah) diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c index 4934c4bf428..6dedfa335a7 100644 --- a/src/mame/drivers/jchan.c +++ b/src/mame/drivers/jchan.c @@ -749,7 +749,7 @@ static MACHINE_DRIVER_START( jchan ) MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(jchan_main,0) - MDRV_CPU_VBLANK_INT(jchan_vblank, 2) + MDRV_CPU_VBLANK_INT_HACK(jchan_vblank, 2) MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(jchan_sub,0) diff --git a/src/mame/drivers/jcross.c b/src/mame/drivers/jcross.c index 78915e38b8c..44304366a7b 100644 --- a/src/mame/drivers/jcross.c +++ b/src/mame/drivers/jcross.c @@ -261,11 +261,11 @@ static MACHINE_DRIVER_START( jcross ) MDRV_CPU_ADD(Z80, 3360000) MDRV_CPU_PROGRAM_MAP(cpuA_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 3360000) MDRV_CPU_PROGRAM_MAP(cpuB_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c index 393697aaa87..b169c96fd0a 100644 --- a/src/mame/drivers/jollyjgr.c +++ b/src/mame/drivers/jollyjgr.c @@ -400,7 +400,7 @@ static INTERRUPT_GEN( jollyjgr_interrupt ) static MACHINE_DRIVER_START( jollyjgr ) MDRV_CPU_ADD(Z80, 3579545) /* 3,579545 MHz */ MDRV_CPU_PROGRAM_MAP(jollyjgr_map,0) - MDRV_CPU_VBLANK_INT(jollyjgr_interrupt,1) + MDRV_CPU_VBLANK_INT("main", jollyjgr_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c index 01ee0d997c0..fe053412c60 100644 --- a/src/mame/drivers/jongkyo.c +++ b/src/mame/drivers/jongkyo.c @@ -591,7 +591,7 @@ static MACHINE_DRIVER_START( jongkyo ) MDRV_CPU_ADD(Z80,JONGKYO_CLOCK/4) MDRV_CPU_PROGRAM_MAP(jongkyo_memmap,0) MDRV_CPU_IO_MAP(jongkyo_portmap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/jrpacman.c b/src/mame/drivers/jrpacman.c index 5803f7ea1c6..b4af17749d7 100644 --- a/src/mame/drivers/jrpacman.c +++ b/src/mame/drivers/jrpacman.c @@ -269,7 +269,7 @@ static MACHINE_DRIVER_START( jrpacman ) MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(port_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c index 5a6b71d9d5a..558bd87ef79 100644 --- a/src/mame/drivers/junofrst.c +++ b/src/mame/drivers/junofrst.c @@ -337,7 +337,7 @@ static MACHINE_DRIVER_START( junofrst ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 1500000) /* 1.5 MHz ??? */ MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,14318000/8) /* audio CPU */ /* 1.78975 MHz */ diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c index 07e2878e320..8596f0c09a0 100644 --- a/src/mame/drivers/kaneko16.c +++ b/src/mame/drivers/kaneko16.c @@ -1680,7 +1680,7 @@ static MACHINE_DRIVER_START( berlwall ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* MC68000P12 */ MDRV_CPU_PROGRAM_MAP(berlwall,0) - MDRV_CPU_VBLANK_INT(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM) MDRV_MACHINE_RESET(berlwall) @@ -1727,7 +1727,7 @@ static MACHINE_DRIVER_START( bakubrkr ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_12MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(bakubrkr,0) - MDRV_CPU_VBLANK_INT(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM) MDRV_MACHINE_RESET(bakubrkr) MDRV_NVRAM_HANDLER(93C46) @@ -1783,7 +1783,7 @@ static MACHINE_DRIVER_START( blazeon ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,12000000) /* TMP68HC000-12 */ MDRV_CPU_PROGRAM_MAP(blazeon,0) - MDRV_CPU_VBLANK_INT(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM) MDRV_CPU_ADD(Z80,4000000) /* D780C-2 */ MDRV_CPU_PROGRAM_MAP(blazeon_soundmem,0) @@ -1836,7 +1836,7 @@ static MACHINE_DRIVER_START( gtmr ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("gtmr", M68000, 16000000) /* ? Most likely a 68000-HC16 */ MDRV_CPU_PROGRAM_MAP(gtmr_readmem,gtmr_writemem) - MDRV_CPU_VBLANK_INT(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM) MDRV_MACHINE_RESET(gtmr) @@ -1914,7 +1914,7 @@ static MACHINE_DRIVER_START( bonkadv ) MDRV_IMPORT_FROM(gtmr) MDRV_CPU_MODIFY("gtmr") MDRV_CPU_PROGRAM_MAP(bonkadv,0) - MDRV_CPU_VBLANK_INT(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM + 1 ) // comment above + MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM + 1 ) // comment above MDRV_MACHINE_RESET( bonkadv ) MACHINE_DRIVER_END @@ -1928,7 +1928,7 @@ static MACHINE_DRIVER_START( mgcrystl ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_12MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(mgcrystl,0) - MDRV_CPU_VBLANK_INT(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM) MDRV_MACHINE_RESET(mgcrystl) MDRV_NVRAM_HANDLER(93C46) @@ -1998,7 +1998,7 @@ static MACHINE_DRIVER_START( shogwarr ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(shogwarr,0) - MDRV_CPU_VBLANK_INT(shogwarr_interrupt,SHOGWARR_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(shogwarr_interrupt,SHOGWARR_INTERRUPTS_NUM) MDRV_MACHINE_RESET(shogwarr) diff --git a/src/mame/drivers/kangaroo.c b/src/mame/drivers/kangaroo.c index f19f6d86cbe..68b54d23b7f 100644 --- a/src/mame/drivers/kangaroo.c +++ b/src/mame/drivers/kangaroo.c @@ -372,12 +372,12 @@ static MACHINE_DRIVER_START( nomcu ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, MASTER_CLOCK/8) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_START(kangaroo) MDRV_MACHINE_RESET(kangaroo) diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c index e23157d57d5..125033f8a74 100644 --- a/src/mame/drivers/karnov.c +++ b/src/mame/drivers/karnov.c @@ -689,7 +689,7 @@ static MACHINE_DRIVER_START( karnov ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz */ MDRV_CPU_PROGRAM_MAP(karnov_readmem,karnov_writemem) - MDRV_CPU_VBLANK_INT(karnov_interrupt,1) + MDRV_CPU_VBLANK_INT("main", karnov_interrupt) MDRV_CPU_ADD(M6502, 1500000) /* audio CPU */ /* Accurate */ @@ -731,7 +731,7 @@ static MACHINE_DRIVER_START( wndrplnt ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz */ MDRV_CPU_PROGRAM_MAP(karnov_readmem,karnov_writemem) - MDRV_CPU_VBLANK_INT(karnov_interrupt,1) + MDRV_CPU_VBLANK_INT("main", karnov_interrupt) MDRV_CPU_ADD(M6502, 1500000) /* audio CPU */ /* Accurate */ diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c index c00d169d7db..56e40d0c8cb 100644 --- a/src/mame/drivers/kchamp.c +++ b/src/mame/drivers/kchamp.c @@ -444,7 +444,7 @@ static MACHINE_DRIVER_START( kchampvs ) MDRV_CPU_ADD(Z80, 3000000) /* 12MHz / 4 = 3.0 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(kc_interrupt,1) + MDRV_CPU_VBLANK_INT("main", kc_interrupt) MDRV_CPU_ADD(Z80, 3000000) /* audio CPU */ /* 12MHz / 4 = 3.0 MHz */ @@ -492,7 +492,7 @@ static MACHINE_DRIVER_START( kchamp ) MDRV_CPU_ADD(Z80, 3000000) /* 12MHz / 4 = 3.0 MHz */ MDRV_CPU_PROGRAM_MAP(kc_readmem,kc_writemem) MDRV_CPU_IO_MAP(kc_readport,kc_writeport) - MDRV_CPU_VBLANK_INT(kc_interrupt,1) + MDRV_CPU_VBLANK_INT("main", kc_interrupt) MDRV_CPU_ADD(Z80, 3000000) /* audio CPU */ /* 12MHz / 4 = 3.0 MHz */ diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c index 77aa0bab834..0600a264727 100644 --- a/src/mame/drivers/kickgoal.c +++ b/src/mame/drivers/kickgoal.c @@ -665,7 +665,7 @@ static MACHINE_DRIVER_START( kickgoal ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(kickgoal_program_map, 0) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_PERIODIC_INT(kickgoal_interrupt, 240) MDRV_CPU_ADD(PIC16C57, 12000000/4) /* 3MHz ? */ @@ -701,7 +701,7 @@ static MACHINE_DRIVER_START( actionhw ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(kickgoal_program_map, 0) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(PIC16C57, 12000000/4) /* 3MHz ? */ MDRV_CPU_FLAGS(CPU_DISABLE) /* Disables since the internal rom isn't dumped */ diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c index b635a5d0512..c9fb58dbacd 100644 --- a/src/mame/drivers/kingobox.c +++ b/src/mame/drivers/kingobox.c @@ -553,15 +553,15 @@ static MACHINE_DRIVER_START( kingofb ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4.0 MHz */ MDRV_CPU_PROGRAM_MAP(main_readmem,main_writemem) - MDRV_CPU_VBLANK_INT(kingofb_interrupt,1) + MDRV_CPU_VBLANK_INT("main", kingofb_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* 4.0 MHz */ MDRV_CPU_PROGRAM_MAP(video_readmem,video_writemem) - MDRV_CPU_VBLANK_INT(kingofb_interrupt,1) + MDRV_CPU_VBLANK_INT("main", kingofb_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* 4.0 MHz */ MDRV_CPU_PROGRAM_MAP(sprite_readmem,sprite_writemem) - MDRV_CPU_VBLANK_INT(kingofb_interrupt,1) + MDRV_CPU_VBLANK_INT("main", kingofb_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* 4.0 MHz */ @@ -604,15 +604,15 @@ static MACHINE_DRIVER_START( ringking ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4.0 MHz */ MDRV_CPU_PROGRAM_MAP(rk_main_readmem,rk_main_writemem) - MDRV_CPU_VBLANK_INT(kingofb_interrupt,1) + MDRV_CPU_VBLANK_INT("main", kingofb_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* 4.0 MHz */ MDRV_CPU_PROGRAM_MAP(rk_video_readmem,rk_video_writemem) - MDRV_CPU_VBLANK_INT(kingofb_interrupt,1) + MDRV_CPU_VBLANK_INT("main", kingofb_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* 4.0 MHz */ MDRV_CPU_PROGRAM_MAP(rk_sprite_readmem,rk_sprite_writemem) - MDRV_CPU_VBLANK_INT(kingofb_interrupt,1) + MDRV_CPU_VBLANK_INT("main", kingofb_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* 4.0 MHz */ diff --git a/src/mame/drivers/kingpin.c b/src/mame/drivers/kingpin.c index 2add8e8bbde..7532b567ad5 100644 --- a/src/mame/drivers/kingpin.c +++ b/src/mame/drivers/kingpin.c @@ -149,7 +149,7 @@ static MACHINE_DRIVER_START( kingpin ) MDRV_CPU_ADD(Z80, 3579545) MDRV_CPU_PROGRAM_MAP(kingpin_program_map,0) MDRV_CPU_IO_MAP(kingpin_readport,kingpin_writeport) - MDRV_CPU_VBLANK_INT(kingpin_video_interrupt,1) + MDRV_CPU_VBLANK_INT("main", kingpin_video_interrupt) /* SOUND CPU */ MDRV_CPU_ADD(Z80, 3579545) diff --git a/src/mame/drivers/kinst.c b/src/mame/drivers/kinst.c index 29389ea72cc..30075815b5d 100644 --- a/src/mame/drivers/kinst.c +++ b/src/mame/drivers/kinst.c @@ -657,7 +657,7 @@ static MACHINE_DRIVER_START( kinst ) MDRV_CPU_ADD(R4600LE, MASTER_CLOCK*2) MDRV_CPU_CONFIG(config) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(irq0_start,1) + MDRV_CPU_VBLANK_INT("main", irq0_start) MDRV_MACHINE_START(kinst) MDRV_MACHINE_RESET(kinst) diff --git a/src/mame/drivers/kinstb.c b/src/mame/drivers/kinstb.c index b09a5328fca..78587f0fc75 100644 --- a/src/mame/drivers/kinstb.c +++ b/src/mame/drivers/kinstb.c @@ -214,7 +214,6 @@ static MACHINE_DRIVER_START( kinstb ) MDRV_CPU_ADD_TAG("sound", SPC700, 2048000/2) /* 2.048 Mhz, but internal divider */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(spc_mem, 0) - MDRV_CPU_VBLANK_INT(NULL, 0) MDRV_INTERLEAVE(400) diff --git a/src/mame/drivers/klax.c b/src/mame/drivers/klax.c index be3f8dcd4d7..3c782feaf52 100644 --- a/src/mame/drivers/klax.c +++ b/src/mame/drivers/klax.c @@ -198,7 +198,7 @@ static MACHINE_DRIVER_START( klax ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_readmem,main_writemem) - MDRV_CPU_VBLANK_INT(atarigen_video_int_gen,1) + MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) MDRV_MACHINE_RESET(klax) MDRV_NVRAM_HANDLER(atarigen) diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c index 7bd2fea316e..07c55f96444 100644 --- a/src/mame/drivers/kncljoe.c +++ b/src/mame/drivers/kncljoe.c @@ -175,7 +175,7 @@ static MACHINE_DRIVER_START( kncljoe ) // MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_ADD(Z80, 5500000) /* 4 MHz is too low. The game loop never finishes a frame in time. */ MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK) diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c index c07c6ed96c3..ea7539caf9a 100644 --- a/src/mame/drivers/koikoi.c +++ b/src/mame/drivers/koikoi.c @@ -252,7 +252,7 @@ static MACHINE_DRIVER_START( koikoi ) MDRV_CPU_ADD(Z80,KOIKOI_CRYSTAL/4) /* ?? */ MDRV_CPU_PROGRAM_MAP(readmem, 0) MDRV_CPU_IO_MAP(readport, 0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c index 662f0f10e27..eaaf0037afc 100644 --- a/src/mame/drivers/konamigq.c +++ b/src/mame/drivers/konamigq.c @@ -376,7 +376,7 @@ static MACHINE_DRIVER_START( konamigq ) /* basic machine hardware */ MDRV_CPU_ADD( PSXCPU, XTAL_67_7376MHz ) MDRV_CPU_PROGRAM_MAP( konamigq_map, 0 ) - MDRV_CPU_VBLANK_INT( psx_vblank, 1 ) + MDRV_CPU_VBLANK_INT("main", psx_vblank) MDRV_CPU_ADD_TAG( "sound", M68000, 8000000 ) /* audio CPU */ diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c index d83aad1b15c..8d935d13092 100644 --- a/src/mame/drivers/konamigv.c +++ b/src/mame/drivers/konamigv.c @@ -349,7 +349,7 @@ static MACHINE_DRIVER_START( konamigv ) /* basic machine hardware */ MDRV_CPU_ADD( PSXCPU, XTAL_67_7376MHz ) MDRV_CPU_PROGRAM_MAP( konamigv_map, 0 ) - MDRV_CPU_VBLANK_INT( psx_vblank, 1 ) + MDRV_CPU_VBLANK_INT("main", psx_vblank) MDRV_MACHINE_RESET( konamigv ) MDRV_NVRAM_HANDLER(konamigv_93C46) diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c index 754a2d676f0..ec13b2f8099 100644 --- a/src/mame/drivers/konamigx.c +++ b/src/mame/drivers/konamigx.c @@ -1313,7 +1313,7 @@ static MACHINE_DRIVER_START( konamigx ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68EC020, 24000000) MDRV_CPU_PROGRAM_MAP(gx_base_memmap, gx_type2_map) - MDRV_CPU_VBLANK_INT(konamigx_vbinterrupt, 1) + MDRV_CPU_VBLANK_INT("main", konamigx_vbinterrupt) /* note: part is a -8, crystals are 18.4 and 32.0 MHz, and twinbee yahhoo will not pass POST if the 68000 isn't @@ -1408,7 +1408,7 @@ static MACHINE_DRIVER_START( gxtype3 ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(gx_base_memmap, gx_type3_map) - MDRV_CPU_VBLANK_INT(konamigx_hbinterrupt, 262) + MDRV_CPU_VBLANK_INT_HACK(konamigx_hbinterrupt, 262) MDRV_VIDEO_START(konamigx_type3) MDRV_PALETTE_LENGTH(16384) @@ -1423,7 +1423,7 @@ static MACHINE_DRIVER_START( gxtype4 ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(gx_base_memmap, gx_type4_map) - MDRV_CPU_VBLANK_INT(konamigx_hbinterrupt, 262) + MDRV_CPU_VBLANK_INT_HACK(konamigx_hbinterrupt, 262) MDRV_SCREEN_MODIFY("main") MDRV_SCREEN_SIZE(64*8, 32*8) diff --git a/src/mame/drivers/konamim2.c b/src/mame/drivers/konamim2.c index a2ae740b0cf..a45719d9a9c 100644 --- a/src/mame/drivers/konamim2.c +++ b/src/mame/drivers/konamim2.c @@ -1048,7 +1048,7 @@ static MACHINE_DRIVER_START( m2 ) MDRV_CPU_ADD(PPC602, 33000000) /* actually PPC602, 66MHz */ MDRV_CPU_CONFIG(ppc602_config) MDRV_CPU_PROGRAM_MAP(m2_main, 0) - MDRV_CPU_VBLANK_INT(m2, 1) + MDRV_CPU_VBLANK_INT("main", m2) MDRV_CPU_ADD(PPC602, 33000000) /* actually PPC602, 66MHz */ MDRV_CPU_CONFIG(ppc602_config) diff --git a/src/mame/drivers/kopunch.c b/src/mame/drivers/kopunch.c index 530bef71d95..907471ebcf5 100644 --- a/src/mame/drivers/kopunch.c +++ b/src/mame/drivers/kopunch.c @@ -168,7 +168,7 @@ static MACHINE_DRIVER_START( kopunch ) MDRV_CPU_ADD(8080, 4000000) /* 4 MHz ???? appears to use 8080 instructions, not z80 */ MDRV_CPU_PROGRAM_MAP(kopunch_map,0) MDRV_CPU_IO_MAP(kopunch_io_map,0) - MDRV_CPU_VBLANK_INT(kopunch_interrupt,4) /* ??? */ + MDRV_CPU_VBLANK_INT_HACK(kopunch_interrupt,4) /* ??? */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c index 7f374675bbe..138422d0e32 100644 --- a/src/mame/drivers/ksayakyu.c +++ b/src/mame/drivers/ksayakyu.c @@ -64,6 +64,7 @@ SRAM: */ #include "driver.h" +#include "deprecat.h" #include "sound/ay8910.h" #include "sound/dac.h" @@ -240,12 +241,12 @@ GFXDECODE_END static MACHINE_DRIVER_START( ksayakyu ) MDRV_CPU_ADD(Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(maincpu_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 80000000/2) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(soundcpu_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) MDRV_INTERLEAVE(1000) diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c index af97a8e68f9..ea01837e696 100644 --- a/src/mame/drivers/ksys573.c +++ b/src/mame/drivers/ksys573.c @@ -2727,7 +2727,7 @@ static MACHINE_DRIVER_START( konami573 ) /* basic machine hardware */ MDRV_CPU_ADD( PSXCPU, XTAL_67_7376MHz ) MDRV_CPU_PROGRAM_MAP( konami573_map, 0 ) - MDRV_CPU_VBLANK_INT( sys573_vblank, 1 ) + MDRV_CPU_VBLANK_INT("main", sys573_vblank) MDRV_MACHINE_RESET( konami573 ) MDRV_NVRAM_HANDLER( konami573 ) diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c index 7aec39860fc..27e48428b77 100644 --- a/src/mame/drivers/kyugo.c +++ b/src/mame/drivers/kyugo.c @@ -496,12 +496,12 @@ static MACHINE_DRIVER_START( gyrodine ) MDRV_CPU_ADD_TAG("main", Z80, 18432000 / 4) /* 18.432 MHz crystal */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(0,gyrodine_portmap) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD_TAG("sub", Z80, 18432000 / 4) /* 18.432 MHz crystal */ MDRV_CPU_PROGRAM_MAP(gyrodine_sub_map,0) MDRV_CPU_IO_MAP(gyrodine_sub_portmap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/labyrunr.c b/src/mame/drivers/labyrunr.c index 339ae585fdd..a67f9c22876 100644 --- a/src/mame/drivers/labyrunr.c +++ b/src/mame/drivers/labyrunr.c @@ -241,7 +241,7 @@ static MACHINE_DRIVER_START( labyrunr ) /* basic machine hardware */ MDRV_CPU_ADD(HD6309, 3000000*4) /* 24MHz/8? */ MDRV_CPU_PROGRAM_MAP(labyrunr_readmem,labyrunr_writemem) - MDRV_CPU_VBLANK_INT(labyrunr_interrupt,8) /* 1 IRQ + 4 NMI (generated by 007121) */ + MDRV_CPU_VBLANK_INT_HACK(labyrunr_interrupt,8) /* 1 IRQ + 4 NMI (generated by 007121) */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/ladybug.c b/src/mame/drivers/ladybug.c index 685b454a512..47d4f2aad4f 100644 --- a/src/mame/drivers/ladybug.c +++ b/src/mame/drivers/ladybug.c @@ -660,7 +660,7 @@ static MACHINE_DRIVER_START( ladybug ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(ladybug_interrupt,1) + MDRV_CPU_VBLANK_INT("main", ladybug_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -731,12 +731,12 @@ static MACHINE_DRIVER_START( sraider ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sraider_cpu1_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sraider_cpu2_map,0) MDRV_CPU_IO_MAP(sraider_cpu2_io,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c index 055995b344a..0c2a205d675 100644 --- a/src/mame/drivers/ladyfrog.c +++ b/src/mame/drivers/ladyfrog.c @@ -281,12 +281,12 @@ GFXDECODE_END static MACHINE_DRIVER_START( ladyfrog ) MDRV_CPU_ADD(Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,8000000/2) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* video hardware */ MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/laserbas.c b/src/mame/drivers/laserbas.c index f5b72de4171..c1927f9986f 100644 --- a/src/mame/drivers/laserbas.c +++ b/src/mame/drivers/laserbas.c @@ -131,7 +131,7 @@ static MACHINE_DRIVER_START( laserbas ) MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(laserbas_memory,0) MDRV_CPU_IO_MAP(laserbas_io,0) - MDRV_CPU_VBLANK_INT(laserbas_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(laserbas_interrupt,2) MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c index 2105ba56668..56cf854c662 100644 --- a/src/mame/drivers/laserbat.c +++ b/src/mame/drivers/laserbat.c @@ -693,7 +693,7 @@ static MACHINE_DRIVER_START( laserbat ) MDRV_CPU_ADD(S2650, 14318180/4) // ??? MDRV_CPU_PROGRAM_MAP(laserbat_map,0) MDRV_CPU_IO_MAP(laserbat_io_map,0) - MDRV_CPU_VBLANK_INT(laserbat_interrupt,1) + MDRV_CPU_VBLANK_INT("main", laserbat_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -727,7 +727,7 @@ static MACHINE_DRIVER_START( catnmous ) MDRV_CPU_ADD(S2650, 14318000/4) /* ? */ MDRV_CPU_PROGRAM_MAP(laserbat_map,0) MDRV_CPU_IO_MAP(catnmous_io_map,0) - MDRV_CPU_VBLANK_INT(laserbat_interrupt,1) + MDRV_CPU_VBLANK_INT("main", laserbat_interrupt) MDRV_CPU_ADD(M6802,3580000) /* ? */ MDRV_CPU_PROGRAM_MAP(catnmous_sound_map,0) diff --git a/src/mame/drivers/lasso.c b/src/mame/drivers/lasso.c index fe5a19dd5eb..77647779abc 100644 --- a/src/mame/drivers/lasso.c +++ b/src/mame/drivers/lasso.c @@ -577,7 +577,7 @@ static MACHINE_DRIVER_START( base ) MDRV_CPU_ADD_TAG("audio", M6502, 600000) MDRV_CPU_PROGRAM_MAP(lasso_audio_map, 0) - MDRV_CPU_VBLANK_INT(lasso_interrupt,2) /* IRQ = VBlank, NMI = Coin Insertion */ + MDRV_CPU_VBLANK_INT_HACK(lasso_interrupt,2) /* IRQ = VBlank, NMI = Coin Insertion */ MDRV_INTERLEAVE(100) MDRV_MACHINE_START(lasso) diff --git a/src/mame/drivers/lastduel.c b/src/mame/drivers/lastduel.c index 0e73d8b208c..8fe5448812c 100644 --- a/src/mame/drivers/lastduel.c +++ b/src/mame/drivers/lastduel.c @@ -261,7 +261,7 @@ static MACHINE_DRIVER_START( lastduel ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* Could be 8 MHz */ MDRV_CPU_PROGRAM_MAP(lastduel_readmem,lastduel_writemem) - MDRV_CPU_VBLANK_INT(lastduel_interrupt,3) /* 1 for vbl, 2 for control reads?? */ + MDRV_CPU_VBLANK_INT_HACK(lastduel_interrupt,3) /* 1 for vbl, 2 for control reads?? */ MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* Accurate */ @@ -301,7 +301,7 @@ static MACHINE_DRIVER_START( madgear ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* Accurate */ MDRV_CPU_PROGRAM_MAP(madgear_readmem,madgear_writemem) - MDRV_CPU_VBLANK_INT(madgear_interrupt,3) /* 1 for vbl, 2 for control reads?? */ + MDRV_CPU_VBLANK_INT_HACK(madgear_interrupt,3) /* 1 for vbl, 2 for control reads?? */ MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) /* verified on pcb */ /* audio CPU */ diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c index f5b017177f3..bc0b138d5a9 100644 --- a/src/mame/drivers/lastfght.c +++ b/src/mame/drivers/lastfght.c @@ -463,7 +463,7 @@ static INTERRUPT_GEN( unknown_interrupt ) static MACHINE_DRIVER_START( lastfght ) MDRV_CPU_ADD(H83044, 32000000/2) MDRV_CPU_PROGRAM_MAP( lastfght_map, 0 ) - MDRV_CPU_VBLANK_INT(unknown_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(unknown_interrupt,2) MDRV_NVRAM_HANDLER(generic_0fill) diff --git a/src/mame/drivers/lazercmd.c b/src/mame/drivers/lazercmd.c index 7e4468c053b..539bd6758ac 100644 --- a/src/mame/drivers/lazercmd.c +++ b/src/mame/drivers/lazercmd.c @@ -221,6 +221,7 @@ ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "lazercmd.h" #include "cpu/s2650/s2650.h" #include "sound/dac.h" @@ -620,7 +621,7 @@ static MACHINE_DRIVER_START( lazercmd ) thus requiring an extra loading of approx 3-5 */ MDRV_CPU_PROGRAM_MAP(lazercmd_map,0) MDRV_CPU_IO_MAP(lazercmd_portmap,0) - MDRV_CPU_VBLANK_INT(lazercmd_timer, 128) /* 7680 Hz */ + MDRV_CPU_VBLANK_INT_HACK(lazercmd_timer, 128) /* 7680 Hz */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -655,7 +656,7 @@ static MACHINE_DRIVER_START( medlanes ) thus requiring an extra loading of approx 3-5 */ MDRV_CPU_PROGRAM_MAP(medlanes_map,0) MDRV_CPU_IO_MAP(lazercmd_portmap,0) - MDRV_CPU_VBLANK_INT(lazercmd_timer, 128) /* 7680 Hz */ + MDRV_CPU_VBLANK_INT_HACK(lazercmd_timer, 128) /* 7680 Hz */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -690,7 +691,7 @@ static MACHINE_DRIVER_START( bbonk ) thus requiring an extra loading of approx 3-5 */ MDRV_CPU_PROGRAM_MAP(bbonk_map,0) MDRV_CPU_IO_MAP(lazercmd_portmap,0) - MDRV_CPU_VBLANK_INT(bbonk_timer, 128) /* 7680 Hz */ + MDRV_CPU_VBLANK_INT_HACK(bbonk_timer, 128) /* 7680 Hz */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c index f3f9ec9e2b4..9e09d219b9b 100644 --- a/src/mame/drivers/legionna.c +++ b/src/mame/drivers/legionna.c @@ -3465,7 +3465,7 @@ static MACHINE_DRIVER_START( legionna ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,20000000/2) /* ??? */ MDRV_CPU_PROGRAM_MAP(legionna_readmem,legionna_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1)/* VBL */ + MDRV_CPU_VBLANK_INT("main", irq4_line_hold)/* VBL */ SEIBU_SOUND_SYSTEM_CPU(14318180/4) @@ -3497,7 +3497,7 @@ static MACHINE_DRIVER_START( heatbrl ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,20000000/2) /* ??? */ MDRV_CPU_PROGRAM_MAP(heatbrl_readmem,heatbrl_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1)/* VBL */ + MDRV_CPU_VBLANK_INT("main", irq4_line_hold)/* VBL */ SEIBU_SOUND_SYSTEM_CPU(14318180/4) @@ -3528,7 +3528,7 @@ static MACHINE_DRIVER_START( godzilla ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 20000000/2) MDRV_CPU_PROGRAM_MAP(godzilla_readmem,godzilla_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) SEIBU2_SOUND_SYSTEM_CPU(14318180/4) @@ -3559,7 +3559,7 @@ static MACHINE_DRIVER_START( denjinmk ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 20000000/2) MDRV_CPU_PROGRAM_MAP(denjinmk_readmem,denjinmk_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) SEIBU2_SOUND_SYSTEM_CPU(14318180/4) @@ -3590,7 +3590,7 @@ static MACHINE_DRIVER_START( sdgndmrb ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 20000000/2) MDRV_CPU_PROGRAM_MAP(sdgndmrb_readmem,sdgndmrb_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) SEIBU2_SOUND_SYSTEM_CPU(14318180/4) @@ -3622,7 +3622,7 @@ static MACHINE_DRIVER_START( cupsoc ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,20000000/2) MDRV_CPU_PROGRAM_MAP(cupsoc_mem,0) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1)/* VBL */ + MDRV_CPU_VBLANK_INT("main", irq4_line_hold)/* VBL */ SEIBU_SOUND_SYSTEM_CPU(14318180/4) @@ -3654,13 +3654,13 @@ static MACHINE_DRIVER_START( cupsocbl ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,12000000) MDRV_CPU_PROGRAM_MAP(cupsocbl_mem,0) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) /* VBL */ + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) /* VBL */ /*Different Sound hardware*/ //SEIBU_SOUND_SYSTEM_CPU(14318180/4) MDRV_CPU_ADD(Z80,14318180/4) MDRV_CPU_PROGRAM_MAP(cupsocbl_sound_mem,0) - //MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + //MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) //MDRV_MACHINE_INIT(seibu_sound_1) diff --git a/src/mame/drivers/leland.c b/src/mame/drivers/leland.c index a0a29172803..e33043ed9bd 100644 --- a/src/mame/drivers/leland.c +++ b/src/mame/drivers/leland.c @@ -719,7 +719,7 @@ static MACHINE_DRIVER_START( leland ) MDRV_CPU_ADD_TAG("master", Z80, MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(master_map_program,0) MDRV_CPU_IO_MAP(master_map_io,0) - MDRV_CPU_VBLANK_INT(leland_master_interrupt,1) + MDRV_CPU_VBLANK_INT("main", leland_master_interrupt) MDRV_CPU_ADD_TAG("slave", Z80, MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(slave_small_map_program,0) diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c index eaed1436db3..3de0eb8c93d 100644 --- a/src/mame/drivers/lemmings.c +++ b/src/mame/drivers/lemmings.c @@ -275,7 +275,7 @@ static MACHINE_DRIVER_START( lemmings ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14000000) MDRV_CPU_PROGRAM_MAP(lemmings_readmem,lemmings_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(M6809,32220000/8) /* audio CPU */ diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c index ad797fe9142..e6425f92afb 100644 --- a/src/mame/drivers/lethal.c +++ b/src/mame/drivers/lethal.c @@ -656,7 +656,7 @@ static MACHINE_DRIVER_START( lethalen ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", HD6309, MAIN_CLOCK/2) // ??? MDRV_CPU_PROGRAM_MAP(le_main, 0) - MDRV_CPU_VBLANK_INT(lethalen_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", lethalen_interrupt) MDRV_CPU_ADD_TAG("sound", Z80, 8000000) MDRV_CPU_PROGRAM_MAP(le_sound, 0) diff --git a/src/mame/drivers/lgp.c b/src/mame/drivers/lgp.c index 0e0f5a5e768..9cd8fe44373 100644 --- a/src/mame/drivers/lgp.c +++ b/src/mame/drivers/lgp.c @@ -345,7 +345,7 @@ static MACHINE_DRIVER_START( lgp ) MDRV_CPU_ADD(Z80, CPU_PCB_CLOCK) MDRV_CPU_PROGRAM_MAP(main_program_map,0) MDRV_CPU_IO_MAP(main_io_map,0) - MDRV_CPU_VBLANK_INT(vblank_callback_lgp, 1) + MDRV_CPU_VBLANK_INT("main", vblank_callback_lgp) /* sound cpu */ MDRV_CPU_ADD(Z80, SOUND_PCB_CLOCK) diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c index b3c87b646b3..e027ad30d57 100644 --- a/src/mame/drivers/liberate.c +++ b/src/mame/drivers/liberate.c @@ -15,6 +15,7 @@ *******************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "cpu/m6502/m6502.h" #include "sound/ay8910.h" @@ -519,12 +520,12 @@ static MACHINE_DRIVER_START( liberate ) MDRV_CPU_ADD_TAG("main",DECO16, 2000000) MDRV_CPU_PROGRAM_MAP(liberate_readmem,liberate_writemem) MDRV_CPU_IO_MAP(deco16_readport,deco16_writeport) - MDRV_CPU_VBLANK_INT(deco16_interrupt,1) + MDRV_CPU_VBLANK_INT("main", deco16_interrupt) MDRV_CPU_ADD_TAG("sound",M6502, 1500000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,16) + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,16) MDRV_INTERLEAVE(200) @@ -558,7 +559,7 @@ static MACHINE_DRIVER_START( liberatb ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 2000000) MDRV_CPU_PROGRAM_MAP(liberatb_readmem,liberatb_writemem) - MDRV_CPU_VBLANK_INT(deco16_interrupt,1) + MDRV_CPU_VBLANK_INT("main", deco16_interrupt) MDRV_IMPORT_FROM(liberate) MDRV_CPU_REMOVE("main") @@ -595,7 +596,7 @@ static MACHINE_DRIVER_START( prosport ) MDRV_CPU_ADD(M6502, 1500000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,16) + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,16) MDRV_INTERLEAVE(200) diff --git a/src/mame/drivers/liberatr.c b/src/mame/drivers/liberatr.c index 45fc6991f1f..d778f0ae67d 100644 --- a/src/mame/drivers/liberatr.c +++ b/src/mame/drivers/liberatr.c @@ -134,6 +134,7 @@ ******************************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "machine/atari_vg.h" #include "sound/pokey.h" #include "liberatr.h" @@ -383,7 +384,7 @@ static MACHINE_DRIVER_START( liberatr ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M6502, MASTER_CLOCK/16) /* 1.25Mhz divided from 20Mhz master clock */ MDRV_CPU_PROGRAM_MAP(liberatr_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) MDRV_NVRAM_HANDLER(atari_vg) diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c index 75b068ae5c0..aaf5c3f4e64 100644 --- a/src/mame/drivers/limenko.c +++ b/src/mame/drivers/limenko.c @@ -479,7 +479,7 @@ static MACHINE_DRIVER_START( limenko ) MDRV_CPU_ADD(E132XN, 20000000*4) /* 4x internal multiplier */ MDRV_CPU_PROGRAM_MAP(limenko_map,0) MDRV_CPU_IO_MAP(limenko_io_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_NVRAM_HANDLER(93C46) @@ -504,7 +504,7 @@ static MACHINE_DRIVER_START( spotty ) MDRV_CPU_ADD(GMS30C2232, 20000000) /* 20 MHz, no internal multiplier */ MDRV_CPU_PROGRAM_MAP(spotty_map,0) MDRV_CPU_IO_MAP(spotty_io_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(I8051, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(spotty_sound_prg_map, 0) diff --git a/src/mame/drivers/littlerb.c b/src/mame/drivers/littlerb.c index bf638bed02f..a632afd0b0e 100644 --- a/src/mame/drivers/littlerb.c +++ b/src/mame/drivers/littlerb.c @@ -362,7 +362,7 @@ static VIDEO_UPDATE(littlerb) static MACHINE_DRIVER_START( littlerb ) MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(littlerb_main, 0) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c index fa5001663ab..013610c69cc 100644 --- a/src/mame/drivers/lkage.c +++ b/src/mame/drivers/lkage.c @@ -328,7 +328,7 @@ static MACHINE_DRIVER_START( lkage ) MDRV_CPU_ADD(Z80,6000000) MDRV_CPU_PROGRAM_MAP(lkage,0) MDRV_CPU_IO_MAP(readport,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 6000000) MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) @@ -373,7 +373,7 @@ static MACHINE_DRIVER_START( lkageb ) MDRV_CPU_ADD(Z80,6000000) MDRV_CPU_PROGRAM_MAP(lkage,0) MDRV_CPU_IO_MAP(readport,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 6000000) MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c index 028c3bbb30e..7f8361232da 100644 --- a/src/mame/drivers/looping.c +++ b/src/mame/drivers/looping.c @@ -581,7 +581,7 @@ static MACHINE_DRIVER_START( looping ) MDRV_CPU_ADD(TMS9995, MAIN_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(looping_map,0) MDRV_CPU_IO_MAP(looping_io_map,0) - MDRV_CPU_VBLANK_INT(looping_interrupt,1) + MDRV_CPU_VBLANK_INT("main", looping_interrupt) MDRV_CPU_ADD(TMS9980, SOUND_CLOCK/4) MDRV_CPU_PROGRAM_MAP(looping_sound_map,0) diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c index 40b5ff543e2..583883d4c7d 100644 --- a/src/mame/drivers/lordgun.c +++ b/src/mame/drivers/lordgun.c @@ -438,7 +438,7 @@ static const struct YM3812interface lordgun_ym3812_interface = static MACHINE_DRIVER_START( lordgun ) MDRV_CPU_ADD_TAG("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(lordgun_map,0) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD_TAG("sound", Z80, 5000000) MDRV_CPU_PROGRAM_MAP(lordgun_soundmem_map,0) diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c index 39995024e37..a779cdb6b93 100644 --- a/src/mame/drivers/lsasquad.c +++ b/src/mame/drivers/lsasquad.c @@ -591,7 +591,7 @@ static MACHINE_DRIVER_START( lsasquad ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 6000000) /* 6 MHz? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* 4 MHz? */ @@ -637,7 +637,7 @@ static MACHINE_DRIVER_START( daikaiju ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 6000000) MDRV_CPU_PROGRAM_MAP(mem_daikaiju, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 3000000) /* audio CPU */ diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c index 8f718e652a7..9761e5f15ce 100644 --- a/src/mame/drivers/ltcasino.c +++ b/src/mame/drivers/ltcasino.c @@ -649,7 +649,7 @@ static MACHINE_DRIVER_START( ltcasino ) /* basic machine hardware */ MDRV_CPU_ADD(M6502,2000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/lucky8.c b/src/mame/drivers/lucky8.c index 1700158de6d..236816b2062 100644 --- a/src/mame/drivers/lucky8.c +++ b/src/mame/drivers/lucky8.c @@ -356,7 +356,7 @@ static MACHINE_DRIVER_START( lucky8 ) // basic machine hardware MDRV_CPU_ADD(Z80, 12000000/4) // ??? Runs far too fast MDRV_CPU_PROGRAM_MAP(lucky8_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) // video hardware diff --git a/src/mame/drivers/lvcards.c b/src/mame/drivers/lvcards.c index 6fbf0ad9489..a25d5391248 100644 --- a/src/mame/drivers/lvcards.c +++ b/src/mame/drivers/lvcards.c @@ -469,7 +469,7 @@ static MACHINE_DRIVER_START( lvcards ) MDRV_CPU_PROGRAM_MAP(lvcards_map, 0) MDRV_CPU_IO_MAP(lvcards_io_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) // video hardware diff --git a/src/mame/drivers/lwings.c b/src/mame/drivers/lwings.c index 556b2ef8a42..7c234a783a0 100644 --- a/src/mame/drivers/lwings.c +++ b/src/mame/drivers/lwings.c @@ -46,6 +46,7 @@ Notes: ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "lwings.h" #include "sound/2203intf.h" #include "sound/msm5205.h" @@ -855,12 +856,12 @@ static MACHINE_DRIVER_START( lwings ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 6000000) /* 4 MHz (?) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(lwings_interrupt,1) + MDRV_CPU_VBLANK_INT("main", lwings_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM) @@ -901,12 +902,12 @@ static MACHINE_DRIVER_START( trojan ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 6000000) /* 4 MHz (?) */ MDRV_CPU_PROGRAM_MAP(readmem,trojan_writemem) - MDRV_CPU_VBLANK_INT(lwings_interrupt,1) + MDRV_CPU_VBLANK_INT("main", lwings_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) MDRV_CPU_ADD(Z80, 4000000) // 3.579545 Mhz (?) /* audio CPU */ /* ? */ @@ -957,12 +958,12 @@ static MACHINE_DRIVER_START( avengers ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 6000000) //AT: (avengers37b16gre) MDRV_CPU_PROGRAM_MAP(avengers_readmem,avengers_writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) // RST 38h triggered by software + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) // RST 38h triggered by software MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) MDRV_CPU_ADD(Z80, 4000000) // 3.579545 Mhz (?) /* audio CPU */ /* ? */ diff --git a/src/mame/drivers/m10.c b/src/mame/drivers/m10.c index 97d58e18102..b307d4f1f3a 100644 --- a/src/mame/drivers/m10.c +++ b/src/mame/drivers/m10.c @@ -762,7 +762,7 @@ static MACHINE_DRIVER_START( m10 ) MDRV_MACHINE_RESET(irem) - MDRV_CPU_VBLANK_INT(m10_interrupt,1) + MDRV_CPU_VBLANK_INT("main", m10_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -794,7 +794,7 @@ static MACHINE_DRIVER_START( m11 ) MDRV_CPU_REPLACE("main", M6502,IREMM10_CPU_CLOCK / 2) //MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(m11_main,0) - MDRV_CPU_VBLANK_INT(m11_interrupt,1) + MDRV_CPU_VBLANK_INT("main", m11_interrupt) /* sound hardware */ MACHINE_DRIVER_END @@ -809,7 +809,7 @@ static MACHINE_DRIVER_START( m15 ) MDRV_MACHINE_RESET(irem) - MDRV_CPU_VBLANK_INT(m15_interrupt,1) + MDRV_CPU_VBLANK_INT("main", m15_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/m52.c b/src/mame/drivers/m52.c index cc8bd337d58..23b6441c995 100644 --- a/src/mame/drivers/m52.c +++ b/src/mame/drivers/m52.c @@ -390,7 +390,7 @@ static MACHINE_DRIVER_START( m52 ) MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/6) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_GFXDECODE(m52) diff --git a/src/mame/drivers/m57.c b/src/mame/drivers/m57.c index b61ccd23ef8..9bb15de232c 100644 --- a/src/mame/drivers/m57.c +++ b/src/mame/drivers/m57.c @@ -224,7 +224,7 @@ static MACHINE_DRIVER_START( m57 ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, XTAL_18_432MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/m58.c b/src/mame/drivers/m58.c index eaab8272a2e..abddc199fca 100644 --- a/src/mame/drivers/m58.c +++ b/src/mame/drivers/m58.c @@ -192,7 +192,7 @@ static MACHINE_DRIVER_START( yard ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, MASTER_CLOCK/3/2) MDRV_CPU_PROGRAM_MAP(yard_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_GFXDECODE(yard) diff --git a/src/mame/drivers/m62.c b/src/mame/drivers/m62.c index a272c1a6d28..16f0743f0f3 100644 --- a/src/mame/drivers/m62.c +++ b/src/mame/drivers/m62.c @@ -1308,7 +1308,7 @@ static MACHINE_DRIVER_START( ldrun ) MDRV_CPU_ADD_TAG("main", Z80, 24000000/6) MDRV_CPU_PROGRAM_MAP(ldrun_readmem,ldrun_writemem) MDRV_CPU_IO_MAP(kungfum_readport,kungfum_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c index d507672faa9..ceb4a4ae5a9 100644 --- a/src/mame/drivers/m72.c +++ b/src/mame/drivers/m72.c @@ -71,6 +71,7 @@ kengo 0x18 -------------- ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "machine/irem_cpu.h" #include "audio/m72.h" #include "sound/dac.h" @@ -1993,7 +1994,7 @@ static MACHINE_DRIVER_START( m72 ) MDRV_CPU_ADD_TAG("sound",Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_ram_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) - MDRV_CPU_VBLANK_INT(fake_nmi,128) /* clocked by V1? (Vigilante) */ + MDRV_CPU_VBLANK_INT_HACK(fake_nmi,128) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MDRV_MACHINE_START(m72) @@ -2029,7 +2030,7 @@ static MACHINE_DRIVER_START( m72_8751 ) MDRV_CPU_ADD_TAG("mcu",I8751, 8000000) MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_CPU_DATA_MAP(mcu_data_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_pulse) MACHINE_DRIVER_END @@ -2043,7 +2044,7 @@ static MACHINE_DRIVER_START( dkgenm72 ) MDRV_CPU_ADD_TAG("sound",Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_ram_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) - MDRV_CPU_VBLANK_INT(fake_nmi,128) /* clocked by V1? (Vigilante) */ + MDRV_CPU_VBLANK_INT_HACK(fake_nmi,128) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MDRV_MACHINE_START(m72) @@ -2084,7 +2085,7 @@ static MACHINE_DRIVER_START( xmultipl ) MDRV_CPU_ADD_TAG("sound",Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_ram_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MDRV_MACHINE_START(m72) @@ -2125,7 +2126,7 @@ static MACHINE_DRIVER_START( dbreed ) MDRV_CPU_ADD_TAG("sound",Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_rom_map,0) MDRV_CPU_IO_MAP(rtype2_sound_portmap,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MDRV_MACHINE_START(m72) @@ -2165,7 +2166,7 @@ static MACHINE_DRIVER_START( dbreed72 ) MDRV_CPU_ADD_TAG("sound", Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_ram_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MDRV_MACHINE_START(m72) @@ -2206,7 +2207,7 @@ static MACHINE_DRIVER_START( rtype2 ) MDRV_CPU_ADD_TAG("sound", Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_rom_map,0) MDRV_CPU_IO_MAP(rtype2_sound_portmap,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MDRV_MACHINE_START(m72) @@ -2246,7 +2247,7 @@ static MACHINE_DRIVER_START( majtitle ) MDRV_CPU_ADD_TAG("sound", Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_rom_map,0) MDRV_CPU_IO_MAP(rtype2_sound_portmap,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MDRV_MACHINE_START(m72) @@ -2286,7 +2287,7 @@ static MACHINE_DRIVER_START( hharry ) MDRV_CPU_ADD_TAG("sound", Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_rom_map,0) MDRV_CPU_IO_MAP(rtype2_sound_portmap,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MDRV_MACHINE_START(m72) @@ -2327,7 +2328,7 @@ static MACHINE_DRIVER_START( hharryu ) MDRV_CPU_ADD_TAG("sound", Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_rom_map,0) MDRV_CPU_IO_MAP(rtype2_sound_portmap,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MDRV_MACHINE_START(m72) @@ -2368,7 +2369,7 @@ static MACHINE_DRIVER_START( poundfor ) MDRV_CPU_ADD_TAG("sound", Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_rom_map,0) MDRV_CPU_IO_MAP(poundfor_sound_portmap,0) - MDRV_CPU_VBLANK_INT(fake_nmi,128) /* clocked by V1? (Vigilante) */ + MDRV_CPU_VBLANK_INT_HACK(fake_nmi,128) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MDRV_MACHINE_START(m72) @@ -2408,7 +2409,7 @@ static MACHINE_DRIVER_START( cosmccop ) MDRV_CPU_ADD_TAG("sound", Z80, SOUND_CLOCK) MDRV_CPU_PROGRAM_MAP(sound_rom_map,0) MDRV_CPU_IO_MAP(rtype2_sound_portmap,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MDRV_MACHINE_START(m72) diff --git a/src/mame/drivers/m79amb.c b/src/mame/drivers/m79amb.c index 7facf0acfde..ee594ecd428 100644 --- a/src/mame/drivers/m79amb.c +++ b/src/mame/drivers/m79amb.c @@ -195,7 +195,7 @@ static MACHINE_DRIVER_START( m79amb ) /* basic machine hardware */ MDRV_CPU_ADD(8080, 1996800) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(m79amb_interrupt,1) + MDRV_CPU_VBLANK_INT("main", m79amb_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c index 95711c25dd2..5a635849b36 100644 --- a/src/mame/drivers/m90.c +++ b/src/mame/drivers/m90.c @@ -25,6 +25,7 @@ Notes: *****************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "m92.h" #include "machine/irem_cpu.h" #include "audio/m72.h" @@ -655,13 +656,13 @@ static MACHINE_DRIVER_START( m90 ) MDRV_CPU_ADD_TAG("main", V30,32000000/4) MDRV_CPU_PROGRAM_MAP(main_cpu,0) MDRV_CPU_IO_MAP(main_cpu_io,0) - MDRV_CPU_VBLANK_INT(m90_interrupt,1) + MDRV_CPU_VBLANK_INT("main", m90_interrupt) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MDRV_MACHINE_RESET(m72_sound) @@ -738,13 +739,13 @@ static MACHINE_DRIVER_START( bombrman ) MDRV_CPU_PROGRAM_MAP(main_cpu,0) MDRV_CPU_IO_MAP(main_cpu_io,0) - MDRV_CPU_VBLANK_INT(m90_interrupt,1) + MDRV_CPU_VBLANK_INT("main", m90_interrupt) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MDRV_MACHINE_RESET(m72_sound) @@ -784,13 +785,13 @@ static MACHINE_DRIVER_START( bbmanw ) MDRV_CPU_PROGRAM_MAP(main_cpu,0) MDRV_CPU_IO_MAP(main_cpu_io,0) - MDRV_CPU_VBLANK_INT(m90_interrupt,1) + MDRV_CPU_VBLANK_INT("main", m90_interrupt) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(bbmanw_sound_readport,bbmanw_sound_writeport) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MDRV_MACHINE_RESET(m72_sound) @@ -829,7 +830,7 @@ static MACHINE_DRIVER_START( bomblord ) MDRV_CPU_MODIFY("main") MDRV_CPU_CONFIG(no_table) - MDRV_CPU_VBLANK_INT(bomblord_interrupt,1) + MDRV_CPU_VBLANK_INT("main", bomblord_interrupt) MACHINE_DRIVER_END @@ -841,13 +842,13 @@ static MACHINE_DRIVER_START( bootleg ) MDRV_CPU_ADD_TAG("main", V30,32000000/4) MDRV_CPU_PROGRAM_MAP(bootleg_main_cpu,0) MDRV_CPU_IO_MAP(main_cpu_io,0) - MDRV_CPU_VBLANK_INT(m90_interrupt,1) + MDRV_CPU_VBLANK_INT("main", m90_interrupt) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MDRV_MACHINE_RESET(m72_sound) diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c index 476c5c7225f..eb802995faa 100644 --- a/src/mame/drivers/macrossp.c +++ b/src/mame/drivers/macrossp.c @@ -534,7 +534,7 @@ static MACHINE_DRIVER_START( macrossp ) /* basic machine hardware */ MDRV_CPU_ADD(M68EC020, 50000000/2) /* 25 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq3_line_hold,1) // there are others ... + MDRV_CPU_VBLANK_INT("main", irq3_line_hold) // there are others ... MDRV_CPU_ADD(M68000, 32000000/2) /* 16 MHz */ /* audio CPU */ diff --git a/src/mame/drivers/macs.c b/src/mame/drivers/macs.c index 65c71b65695..edb1228d8fd 100644 --- a/src/mame/drivers/macs.c +++ b/src/mame/drivers/macs.c @@ -351,7 +351,7 @@ static MACHINE_DRIVER_START( macs ) MDRV_CPU_PROGRAM_MAP(macs_mem,0) MDRV_CPU_IO_MAP(macs_io,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_RESET(macs) diff --git a/src/mame/drivers/madalien.c b/src/mame/drivers/madalien.c index 75fcb79228a..b4ab76702b4 100644 --- a/src/mame/drivers/madalien.c +++ b/src/mame/drivers/madalien.c @@ -177,7 +177,7 @@ static MACHINE_DRIVER_START( madalien ) /* main CPU */ MDRV_CPU_ADD(M6502, MADALIEN_MAIN_CLOCK / 8) /* 1324kHz */ MDRV_CPU_PROGRAM_MAP(main_map, 0) - MDRV_CPU_VBLANK_INT(madalien_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", madalien_interrupt) /* audio CPU */ MDRV_CPU_ADD(M6502, SOUND_CLOCK / 8) /* 512kHz */ diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c index 96a87cc7ec4..5bdddbcedc1 100644 --- a/src/mame/drivers/madmotor.c +++ b/src/mame/drivers/madmotor.c @@ -287,7 +287,7 @@ static MACHINE_DRIVER_START( madmotor ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* Custom chip 59, 24 MHz crystal */ MDRV_CPU_PROGRAM_MAP(madmotor_readmem,madmotor_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1)/* VBL */ + MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL */ MDRV_CPU_ADD(H6280, 8053000/2) /* Custom chip 45, Crystal near CPU is 8.053 MHz */ /* audio CPU */ diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c index 516f1f53c32..c9eee4cba38 100644 --- a/src/mame/drivers/magic10.c +++ b/src/mame/drivers/magic10.c @@ -346,7 +346,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( magic10 ) MDRV_CPU_ADD_TAG("cpu", M68000, 10000000) // ? MDRV_CPU_PROGRAM_MAP(magic10_map,0) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_NVRAM_HANDLER(generic_0fill) diff --git a/src/mame/drivers/magicfly.c b/src/mame/drivers/magicfly.c index 179b8bad986..0a526d7ab40 100644 --- a/src/mame/drivers/magicfly.c +++ b/src/mame/drivers/magicfly.c @@ -660,7 +660,7 @@ static MACHINE_DRIVER_START( magicfly ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M6502, MASTER_CLOCK/12) /* guess */ MDRV_CPU_PROGRAM_MAP(magicfly_map, 0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse, 1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_NVRAM_HANDLER(generic_0fill) diff --git a/src/mame/drivers/magmax.c b/src/mame/drivers/magmax.c index 998ffb366b7..11c97036e38 100644 --- a/src/mame/drivers/magmax.c +++ b/src/mame/drivers/magmax.c @@ -365,7 +365,7 @@ static MACHINE_DRIVER_START( magmax ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_16MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(magmax_readmem,magmax_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80,XTAL_20MHz/8) /* verified on pcb */ /* audio CPU */ diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c index 817055593a6..c0f6ecee75f 100644 --- a/src/mame/drivers/mainevt.c +++ b/src/mame/drivers/mainevt.c @@ -709,12 +709,12 @@ static MACHINE_DRIVER_START( mainevt ) /* basic machine hardware */ MDRV_CPU_ADD(HD6309, 3000000*4) /* ?? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(mainevt_interrupt,1) + MDRV_CPU_VBLANK_INT("main", mainevt_interrupt) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,8) /* ??? */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,8) /* ??? */ /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS) @@ -750,12 +750,12 @@ static MACHINE_DRIVER_START( devstors ) /* basic machine hardware */ MDRV_CPU_ADD(HD6309, 3000000*4) /* ?? */ MDRV_CPU_PROGRAM_MAP(dv_readmem,dv_writemem) - MDRV_CPU_VBLANK_INT(dv_interrupt,1) + MDRV_CPU_VBLANK_INT("main", dv_interrupt) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(dv_sound_readmem,dv_sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS) diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c index 17719161600..52a613067d4 100644 --- a/src/mame/drivers/mainsnk.c +++ b/src/mame/drivers/mainsnk.c @@ -374,7 +374,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( mainsnk ) MDRV_CPU_ADD(Z80, 3360000) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,4000000) /* audio CPU */ diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c index cc71950b9c7..60a9e4acb94 100644 --- a/src/mame/drivers/mappy.c +++ b/src/mame/drivers/mappy.c @@ -1573,11 +1573,11 @@ static MACHINE_DRIVER_START( superpac ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, PIXEL_CLOCK/4) /* 1.536 MHz */ MDRV_CPU_PROGRAM_MAP(superpac_cpu1_map,0) - MDRV_CPU_VBLANK_INT(mappy_interrupt_1,1) // also update the custom I/O chips + MDRV_CPU_VBLANK_INT("main", mappy_interrupt_1) // also update the custom I/O chips MDRV_CPU_ADD(M6809, PIXEL_CLOCK/4) /* 1.536 MHz */ MDRV_CPU_PROGRAM_MAP(superpac_cpu2_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_WATCHDOG_VBLANK_INIT(8) MDRV_INTERLEAVE(100) /* 100 CPU slices per frame - an high value to ensure proper */ @@ -1620,15 +1620,15 @@ static MACHINE_DRIVER_START( phozon ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, PIXEL_CLOCK/4) /* MAIN CPU */ MDRV_CPU_PROGRAM_MAP(phozon_cpu1_map,0) - MDRV_CPU_VBLANK_INT(mappy_interrupt_1,1) // also update the custom I/O chips + MDRV_CPU_VBLANK_INT("main", mappy_interrupt_1) // also update the custom I/O chips MDRV_CPU_ADD(M6809, PIXEL_CLOCK/4) /* SOUND CPU */ MDRV_CPU_PROGRAM_MAP(phozon_cpu2_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_CPU_ADD(M6809, PIXEL_CLOCK/4) /* SUB CPU */ MDRV_CPU_PROGRAM_MAP(phozon_cpu3_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_WATCHDOG_VBLANK_INIT(8) MDRV_INTERLEAVE(100) /* 100 CPU slices per frame - an high value to ensure proper */ @@ -1661,11 +1661,11 @@ static MACHINE_DRIVER_START( mappy ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, PIXEL_CLOCK/4) /* 1.536 MHz */ MDRV_CPU_PROGRAM_MAP(mappy_cpu1_map,0) - MDRV_CPU_VBLANK_INT(mappy_interrupt_1,1) // also update the custom I/O chips + MDRV_CPU_VBLANK_INT("main", mappy_interrupt_1) // also update the custom I/O chips MDRV_CPU_ADD(M6809, PIXEL_CLOCK/4) /* 1.536 MHz */ MDRV_CPU_PROGRAM_MAP(mappy_cpu2_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_WATCHDOG_VBLANK_INIT(8) MDRV_INTERLEAVE(100) /* 100 CPU slices per frame - an high value to ensure proper */ diff --git a/src/mame/drivers/marineb.c b/src/mame/drivers/marineb.c index c4dc3a397f2..78afe78e5f1 100644 --- a/src/mame/drivers/marineb.c +++ b/src/mame/drivers/marineb.c @@ -511,7 +511,7 @@ static MACHINE_DRIVER_START( marineb ) MDRV_CPU_ADD_TAG("main", Z80, 3072000) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(marineb_map,0) MDRV_CPU_IO_MAP(marineb_io_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_MACHINE_RESET(marineb) @@ -576,7 +576,7 @@ static MACHINE_DRIVER_START( wanted ) MDRV_IMPORT_FROM(marineb) MDRV_CPU_MODIFY("main") MDRV_CPU_IO_MAP(wanted_io_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_GFXDECODE(wanted) diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c index 0880a80443c..6adf9aa59c0 100644 --- a/src/mame/drivers/marinedt.c +++ b/src/mame/drivers/marinedt.c @@ -587,7 +587,7 @@ static MACHINE_DRIVER_START( marinedt ) MDRV_CPU_ADD(Z80,10000000/4) MDRV_CPU_PROGRAM_MAP(marinedt_readmem,marinedt_writemem) MDRV_CPU_IO_MAP(marinedt_readport,marinedt_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/mario.c b/src/mame/drivers/mario.c index 6854dbfeba1..8945e4fe1c5 100644 --- a/src/mame/drivers/mario.c +++ b/src/mame/drivers/mario.c @@ -361,7 +361,7 @@ static MACHINE_DRIVER_START( mario_base ) MDRV_CPU_ADD_TAG("main", Z80, Z80_CLOCK) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(mario_map, 0) MDRV_CPU_IO_MAP(0,mario_writeport) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_MACHINE_START(mario) MDRV_MACHINE_RESET(mario) @@ -397,7 +397,7 @@ static MACHINE_DRIVER_START( masao ) MDRV_CPU_REPLACE("main", Z80, 4000000) /* 4.000 MHz (?) */ MDRV_CPU_PROGRAM_MAP(masao_map, 0) MDRV_CPU_IO_MAP(0,mario_writeport) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* sound hardware */ MDRV_IMPORT_FROM(masao_audio) diff --git a/src/mame/drivers/markham.c b/src/mame/drivers/markham.c index 1f4eaaaeee1..65c7dba3c2d 100644 --- a/src/mame/drivers/markham.c +++ b/src/mame/drivers/markham.c @@ -200,11 +200,11 @@ static MACHINE_DRIVER_START( markham ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,8000000/2) /* 4.000MHz */ MDRV_CPU_PROGRAM_MAP(readmem1,writemem1) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,8000000/2) /* 4.000MHz */ MDRV_CPU_PROGRAM_MAP(readmem2,writemem2) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/marvins.c b/src/mame/drivers/marvins.c index 2614a6d5af6..919f0f277ce 100644 --- a/src/mame/drivers/marvins.c +++ b/src/mame/drivers/marvins.c @@ -513,11 +513,11 @@ static MACHINE_DRIVER_START( marvins ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 3360000) /* 3.36 MHz */ MDRV_CPU_PROGRAM_MAP(marvins_cpuA_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 3360000) /* 3.36 MHz */ MDRV_CPU_PROGRAM_MAP(marvins_cpuB_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* 4.0 MHz */ /* audio CPU */ @@ -563,11 +563,11 @@ static MACHINE_DRIVER_START( vangrd2 ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", Z80, 3360000) /* 3.36 MHz */ MDRV_CPU_PROGRAM_MAP(madcrash_cpuA_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD_TAG("sub", Z80, 3360000) /* 3.36 MHz */ MDRV_CPU_PROGRAM_MAP(madcrash_cpuB_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* 4.0 MHz */ /* audio CPU */ @@ -614,10 +614,10 @@ static MACHINE_DRIVER_START( madcrash ) MDRV_IMPORT_FROM( vangrd2 ) MDRV_CPU_MODIFY("main") - MDRV_CPU_VBLANK_INT(0, 0) + MDRV_CPU_VBLANK_INT_HACK(0, 0) MDRV_CPU_MODIFY("sub") - MDRV_CPU_VBLANK_INT(snk_irq_BA, 1) + MDRV_CPU_VBLANK_INT("main", snk_irq_BA) MDRV_INTERLEAVE(300) diff --git a/src/mame/drivers/mastboy.c b/src/mame/drivers/mastboy.c index 7f65b9aeb85..26159f883e1 100644 --- a/src/mame/drivers/mastboy.c +++ b/src/mame/drivers/mastboy.c @@ -862,7 +862,7 @@ static MACHINE_DRIVER_START( mastboy ) MDRV_CPU_ADD_TAG("main", Z180, 12000000/2) /* HD647180X0CP6-1M1R */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(port_readmem,0) - MDRV_CPU_VBLANK_INT(mastboy_interrupt,1) + MDRV_CPU_VBLANK_INT("main", mastboy_interrupt) MDRV_NVRAM_HANDLER(generic_1fill) diff --git a/src/mame/drivers/matmania.c b/src/mame/drivers/matmania.c index 4a289556e65..962aebd0e70 100644 --- a/src/mame/drivers/matmania.c +++ b/src/mame/drivers/matmania.c @@ -338,12 +338,12 @@ static MACHINE_DRIVER_START( matmania ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 1500000) /* 1.5 MHz ???? */ MDRV_CPU_PROGRAM_MAP(matmania_readmem,matmania_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(M6502, 1200000) /* audio CPU */ /* 1.2 MHz ???? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,15) /* ???? */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,15) /* ???? */ /* IRQs are caused by the main CPU */ MDRV_INTERLEAVE(10) @@ -394,7 +394,7 @@ static MACHINE_DRIVER_START( maniach ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 1500000) /* 1.5 MHz ???? */ MDRV_CPU_PROGRAM_MAP(maniach_readmem,maniach_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(M6809, 1500000) /* audio CPU */ /* 1.5 MHz ???? */ diff --git a/src/mame/drivers/maxaflex.c b/src/mame/drivers/maxaflex.c index 9a41469d15c..113d3919c00 100644 --- a/src/mame/drivers/maxaflex.c +++ b/src/mame/drivers/maxaflex.c @@ -433,7 +433,7 @@ static MACHINE_DRIVER_START( a600xl ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M6502, FREQ_17_EXACT) MDRV_CPU_PROGRAM_MAP(a600xl_mem, 0) - MDRV_CPU_VBLANK_INT(a800xl_interrupt, TOTAL_LINES_60HZ) + MDRV_CPU_VBLANK_INT_HACK(a800xl_interrupt, TOTAL_LINES_60HZ) MDRV_CPU_ADD(M68705, 3579545) MDRV_CPU_PROGRAM_MAP(mcu_mem,0) diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c index 6f10b526746..8a7429e4f0d 100644 --- a/src/mame/drivers/mayumi.c +++ b/src/mame/drivers/mayumi.c @@ -273,7 +273,7 @@ static MACHINE_DRIVER_START( mayumi ) MDRV_CPU_ADD(Z80, MCLK/2) /* 5.000 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(mayumi_interrupt,1) + MDRV_CPU_VBLANK_INT("main", mayumi_interrupt) MDRV_MACHINE_RESET( mayumi ) diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c index 5388ad10121..52f1ec14243 100644 --- a/src/mame/drivers/mazerbla.c +++ b/src/mame/drivers/mazerbla.c @@ -1502,7 +1502,7 @@ static MACHINE_DRIVER_START( mazerbla ) and cleared on ANY port access. but handled differently for now */ - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* synchronization forced on the fly */ @@ -1544,7 +1544,7 @@ static MACHINE_DRIVER_START( greatgun ) and cleared on ANY port access. but handled differently for now */ - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_RESET(greatgun) diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c index 862322f7f67..69952ab752c 100644 --- a/src/mame/drivers/mcatadv.c +++ b/src/mame/drivers/mcatadv.c @@ -495,7 +495,7 @@ static MACHINE_DRIVER_START( mcatadv ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_16MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(mcatadv_readmem,mcatadv_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD_TAG("sound", Z80, XTAL_16MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(mcatadv_sound_readmem,mcatadv_sound_writemem) diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c index 0375577590b..6af8d5f375e 100644 --- a/src/mame/drivers/mcr.c +++ b/src/mame/drivers/mcr.c @@ -283,6 +283,7 @@ #include "driver.h" +#include "deprecat.h" #include "machine/z80ctc.h" #include "machine/z80pio.h" #include "machine/z80sio.h" @@ -1507,7 +1508,7 @@ static MACHINE_DRIVER_START( mcr_90009 ) MDRV_CPU_CONFIG(mcr_daisy_chain) MDRV_CPU_PROGRAM_MAP(cpu_90009_map,0) MDRV_CPU_IO_MAP(cpu_90009_portmap,0) - MDRV_CPU_VBLANK_INT(mcr_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(mcr_interrupt,2) MDRV_WATCHDOG_VBLANK_INIT(16) MDRV_MACHINE_START(mcr) @@ -1595,7 +1596,7 @@ static MACHINE_DRIVER_START( mcr_91490_ipu ) MDRV_CPU_CONFIG(mcr_ipu_daisy_chain) MDRV_CPU_PROGRAM_MAP(ipu_91695_map,0) MDRV_CPU_IO_MAP(ipu_91695_portmap,0) - MDRV_CPU_VBLANK_INT(mcr_ipu_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(mcr_ipu_interrupt,2) MACHINE_DRIVER_END diff --git a/src/mame/drivers/mcr3.c b/src/mame/drivers/mcr3.c index 3e0ddb68055..ee2997cbbb9 100644 --- a/src/mame/drivers/mcr3.c +++ b/src/mame/drivers/mcr3.c @@ -1055,7 +1055,7 @@ static MACHINE_DRIVER_START( mcr3_base ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/4) MDRV_CPU_CONFIG(mcr_daisy_chain) - MDRV_CPU_VBLANK_INT(mcr_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(mcr_interrupt,2) MDRV_WATCHDOG_VBLANK_INIT(16) MDRV_MACHINE_START(mcr) diff --git a/src/mame/drivers/mcr68.c b/src/mame/drivers/mcr68.c index acae811547d..0b096f38554 100644 --- a/src/mame/drivers/mcr68.c +++ b/src/mame/drivers/mcr68.c @@ -880,7 +880,7 @@ static MACHINE_DRIVER_START( zwackery ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 7652400) /* should be XTAL_16MHz/2 */ MDRV_CPU_PROGRAM_MAP(zwackery_map,0) - MDRV_CPU_VBLANK_INT(mcr68_interrupt,1) + MDRV_CPU_VBLANK_INT("main", mcr68_interrupt) // MDRV_WATCHDOG_VBLANK_INIT(8) MDRV_MACHINE_START(zwackery) @@ -910,7 +910,7 @@ static MACHINE_DRIVER_START( mcr68 ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 7723800) MDRV_CPU_PROGRAM_MAP(mcr68_map,0) - MDRV_CPU_VBLANK_INT(mcr68_interrupt,1) + MDRV_CPU_VBLANK_INT("main", mcr68_interrupt) MDRV_WATCHDOG_VBLANK_INIT(8) MDRV_MACHINE_START(mcr68) diff --git a/src/mame/drivers/meadows.c b/src/mame/drivers/meadows.c index c519f7058af..130dbfc3c74 100644 --- a/src/mame/drivers/meadows.c +++ b/src/mame/drivers/meadows.c @@ -614,7 +614,7 @@ static MACHINE_DRIVER_START( meadows ) /* basic machine hardware */ MDRV_CPU_ADD(S2650, 5000000/8) /* 5MHz / 8 = 625 kHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(meadows_interrupt,1) /* one interrupt per frame!? */ + MDRV_CPU_VBLANK_INT("main", meadows_interrupt) /* one interrupt per frame!? */ MDRV_CPU_ADD(S2650, 5000000/8) /* audio CPU */ /* 5MHz / 8 = 625 kHz */ @@ -655,7 +655,7 @@ static MACHINE_DRIVER_START( minferno ) MDRV_CPU_ADD(S2650, 5000000/8/3) /* 5MHz / 8 = 625 kHz */ MDRV_CPU_PROGRAM_MAP(minferno_readmem,minferno_writemem) MDRV_CPU_IO_MAP(minferno_readport,0) - MDRV_CPU_VBLANK_INT(minferno_interrupt,1) + MDRV_CPU_VBLANK_INT("main", minferno_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c index 70facaa208c..b5a69b12035 100644 --- a/src/mame/drivers/megaplay.c +++ b/src/mame/drivers/megaplay.c @@ -674,7 +674,7 @@ static MACHINE_DRIVER_START( mpnew ) MDRV_CPU_ADD_TAG("megaplay_bios", Z80, MASTER_CLOCK / 15) /* ?? */ MDRV_CPU_PROGRAM_MAP(megaplay_bios_readmem, megaplay_bios_writemem) MDRV_CPU_IO_MAP(megaplay_bios_readport,megaplay_bios_writeport) - MDRV_CPU_VBLANK_INT(megaplay_bios_irq, 262) + MDRV_CPU_VBLANK_INT_HACK(megaplay_bios_irq, 262) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c index 7991bf83a13..3b0272cca1d 100644 --- a/src/mame/drivers/megasys1.c +++ b/src/mame/drivers/megasys1.c @@ -360,7 +360,6 @@ ADDRESS_MAP_END [ Main CPU - System D ] ***************************************************************************/ -#define INTERRUPT_NUM_D 1 static INTERRUPT_GEN( interrupt_D ) { cpunum_set_input_line(machine, 0, 2, HOLD_LINE); @@ -636,7 +635,7 @@ static MACHINE_DRIVER_START( system_A ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, SYS_A_CPU_CLOCK) /* 6MHz verified */ MDRV_CPU_PROGRAM_MAP(readmem_A,writemem_A) - MDRV_CPU_VBLANK_INT(interrupt_A,INTERRUPT_NUM_A) + MDRV_CPU_VBLANK_INT_HACK(interrupt_A,INTERRUPT_NUM_A) MDRV_CPU_ADD_TAG("sound", M68000, SOUND_CPU_CLOCK) /* 7MHz verified */ /* audio CPU */ @@ -693,7 +692,7 @@ static MACHINE_DRIVER_START( system_B ) MDRV_CPU_REPLACE("main", M68000, SYS_B_CPU_CLOCK) /* 8MHz */ MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(readmem_B,writemem_B) - MDRV_CPU_VBLANK_INT(interrupt_B,INTERRUPT_NUM_B) + MDRV_CPU_VBLANK_INT_HACK(interrupt_B,INTERRUPT_NUM_B) MDRV_CPU_MODIFY("sound") MDRV_CPU_PROGRAM_MAP(sound_readmem_B,sound_writemem_B) @@ -723,7 +722,7 @@ static MACHINE_DRIVER_START( system_C ) MDRV_CPU_REPLACE("main", M68000, SYS_C_CPU_CLOCK) /* 12MHz */ MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(readmem_C,writemem_C) - MDRV_CPU_VBLANK_INT(interrupt_C,INTERRUPT_NUM_C) + MDRV_CPU_VBLANK_INT_HACK(interrupt_C,INTERRUPT_NUM_C) MDRV_CPU_MODIFY("sound") MDRV_CPU_PROGRAM_MAP(sound_readmem_B,sound_writemem_B) @@ -746,7 +745,7 @@ static MACHINE_DRIVER_START( system_D ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* 8MHz?? */ MDRV_CPU_PROGRAM_MAP(readmem_D,writemem_D) - MDRV_CPU_VBLANK_INT(interrupt_D,INTERRUPT_NUM_D) + MDRV_CPU_VBLANK_INT("main", interrupt_D) MDRV_MACHINE_RESET(megasys1) @@ -807,7 +806,7 @@ static MACHINE_DRIVER_START( system_Z ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, SYS_A_CPU_CLOCK) /* 6MHz (12MHz / 2) */ MDRV_CPU_PROGRAM_MAP(readmem_A,writemem_A) - MDRV_CPU_VBLANK_INT(interrupt_A,INTERRUPT_NUM_A) + MDRV_CPU_VBLANK_INT_HACK(interrupt_A,INTERRUPT_NUM_A) MDRV_CPU_ADD(Z80, 3000000) /* OSC 12MHz divided by 4 ??? */ /* audio CPU */ diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c index 116059e0cdd..ec88dfc6207 100644 --- a/src/mame/drivers/megazone.c +++ b/src/mame/drivers/megazone.c @@ -301,12 +301,12 @@ static MACHINE_DRIVER_START( megazone ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 18432000/9) /* 2 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,18432000/6) /* Z80 Clock is derived from the H1 signal */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(I8039,14318000/2) /* audio CPU */ /* 1/2 14MHz crystal */ diff --git a/src/mame/drivers/meijinsn.c b/src/mame/drivers/meijinsn.c index 91f96e71b4f..91444f0dc90 100644 --- a/src/mame/drivers/meijinsn.c +++ b/src/mame/drivers/meijinsn.c @@ -305,12 +305,12 @@ static MACHINE_RESET( meijinsn ) static MACHINE_DRIVER_START( meijinsn ) MDRV_CPU_ADD_TAG("main", M68000, 9000000 ) MDRV_CPU_PROGRAM_MAP(meijinsn_map, 0) - MDRV_CPU_VBLANK_INT(meijinsn_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(meijinsn_interrupt,2) MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(meijinsn_sound_map,0) MDRV_CPU_IO_MAP(meijinsn_sound_io_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 160) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 160) MDRV_MACHINE_RESET(meijinsn) diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c index 15a4dd58dc1..2a0ba608755 100644 --- a/src/mame/drivers/merit.c +++ b/src/mame/drivers/merit.c @@ -797,7 +797,7 @@ static MACHINE_DRIVER_START( pitboss ) MDRV_CPU_ADD_TAG("main",Z80,2500000) /* ?? */ MDRV_CPU_PROGRAM_MAP(pitboss_map,0) MDRV_CPU_IO_MAP(trvwhiz_io_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_NVRAM_HANDLER(generic_0fill) MDRV_MACHINE_RESET(merit) diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c index a05fd67d295..0ffd70943f0 100644 --- a/src/mame/drivers/meritm.c +++ b/src/mame/drivers/meritm.c @@ -58,7 +58,7 @@ static MACHINE_DRIVER_START( meritm ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,6000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) -// MDRV_CPU_VBLANK_INT(irq0_line_hold,1) +// MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/mermaid.c b/src/mame/drivers/mermaid.c index b46978f48d1..a31d5cce637 100644 --- a/src/mame/drivers/mermaid.c +++ b/src/mame/drivers/mermaid.c @@ -255,7 +255,7 @@ static MACHINE_DRIVER_START( mermaid ) // basic machine hardware MDRV_CPU_ADD(Z80, 4000000) // ??? MDRV_CPU_PROGRAM_MAP(mermaid_map, 0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse, 1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) // video hardware diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c index ebbcf18116e..82eb6d7cf47 100644 --- a/src/mame/drivers/metlclsh.c +++ b/src/mame/drivers/metlclsh.c @@ -320,7 +320,7 @@ static MACHINE_DRIVER_START( metlclsh ) MDRV_CPU_ADD(M6809, 1500000) // ? MDRV_CPU_PROGRAM_MAP(metlclsh_readmem2, metlclsh_writemem2) - MDRV_CPU_VBLANK_INT(metlclsh_interrupt2,2) + MDRV_CPU_VBLANK_INT_HACK(metlclsh_interrupt2,2) // IRQ by cpu #1, NMI by coins insertion MDRV_MACHINE_RESET(metlclsh) diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c index 7e0c98b5404..0946c4dda1d 100644 --- a/src/mame/drivers/metro.c +++ b/src/mame/drivers/metro.c @@ -3803,7 +3803,7 @@ static MACHINE_DRIVER_START( balcube ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(balcube_readmem,balcube_writemem) - MDRV_CPU_VBLANK_INT(metro_interrupt,10) /* ? */ + MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */ MDRV_MACHINE_RESET(metro) @@ -3836,7 +3836,7 @@ static MACHINE_DRIVER_START( bangball ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(bangball_readmem,bangball_writemem) - MDRV_CPU_VBLANK_INT(bangball_interrupt,1) + MDRV_CPU_VBLANK_INT("main", bangball_interrupt) MDRV_MACHINE_RESET(metro) @@ -3869,7 +3869,7 @@ static MACHINE_DRIVER_START( batlbubl ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(batlbubl_readmem,batlbubl_writemem) - MDRV_CPU_VBLANK_INT(bangball_interrupt,1) + MDRV_CPU_VBLANK_INT("main", bangball_interrupt) MDRV_MACHINE_RESET(metro) @@ -3901,7 +3901,7 @@ static MACHINE_DRIVER_START( daitorid ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(daitorid_readmem,daitorid_writemem) - MDRV_CPU_VBLANK_INT(metro_interrupt,10) /* ? */ + MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */ MDRV_CPU_ADD(UPD7810, 12000000) /* audio CPU */ @@ -3945,7 +3945,7 @@ static MACHINE_DRIVER_START( dharma ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(dharma_readmem,dharma_writemem) - MDRV_CPU_VBLANK_INT(metro_interrupt,10) /* ? */ + MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */ MDRV_CPU_ADD(UPD7810, 12000000) /* audio CPU */ @@ -3988,7 +3988,7 @@ static MACHINE_DRIVER_START( karatour ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(karatour_readmem,karatour_writemem) - MDRV_CPU_VBLANK_INT(karatour_interrupt,10) /* ? */ + MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */ MDRV_CPU_ADD(UPD7810, 12000000) /* audio CPU */ @@ -4031,7 +4031,7 @@ static MACHINE_DRIVER_START( 3kokushi ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(kokushi_readmem,kokushi_writemem) - MDRV_CPU_VBLANK_INT(karatour_interrupt,10) /* ? */ + MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */ MDRV_CPU_ADD(UPD7810, 12000000) /* audio CPU */ @@ -4074,7 +4074,7 @@ static MACHINE_DRIVER_START( lastfort ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(lastfort_readmem,lastfort_writemem) - MDRV_CPU_VBLANK_INT(metro_interrupt,10) /* ? */ + MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */ MDRV_CPU_ADD(UPD7810, 12000000) /* audio CPU */ @@ -4116,7 +4116,7 @@ static MACHINE_DRIVER_START( lastforg ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(lastforg_readmem,lastforg_writemem) - MDRV_CPU_VBLANK_INT(karatour_interrupt,10) /* ? */ + MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */ MDRV_CPU_ADD(UPD7810, 12000000) /* audio CPU */ @@ -4158,7 +4158,7 @@ static MACHINE_DRIVER_START( dokyusei ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(dokyusei_readmem,dokyusei_writemem) - MDRV_CPU_VBLANK_INT(dokyusei_interrupt,2) /* ? */ + MDRV_CPU_VBLANK_INT_HACK(dokyusei_interrupt,2) /* ? */ MDRV_MACHINE_RESET(metro) @@ -4208,7 +4208,7 @@ static MACHINE_DRIVER_START( dokyusp ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(dokyusp_readmem,dokyusp_writemem) - MDRV_CPU_VBLANK_INT(gakusai_interrupt,1) + MDRV_CPU_VBLANK_INT("main", gakusai_interrupt) MDRV_MACHINE_RESET(metro) MDRV_NVRAM_HANDLER(dokyusp) @@ -4246,7 +4246,7 @@ static MACHINE_DRIVER_START( gakusai ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(gakusai_readmem,gakusai_writemem) - MDRV_CPU_VBLANK_INT(gakusai_interrupt,1) + MDRV_CPU_VBLANK_INT("main", gakusai_interrupt) MDRV_MACHINE_RESET(metro) MDRV_NVRAM_HANDLER(93C46) @@ -4284,7 +4284,7 @@ static MACHINE_DRIVER_START( gakusai2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(gakusai2_readmem,gakusai2_writemem) - MDRV_CPU_VBLANK_INT(gakusai_interrupt,1) + MDRV_CPU_VBLANK_INT("main", gakusai_interrupt) MDRV_MACHINE_RESET(metro) MDRV_NVRAM_HANDLER(93C46) @@ -4322,7 +4322,7 @@ static MACHINE_DRIVER_START( pangpoms ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(pangpoms_readmem,pangpoms_writemem) - MDRV_CPU_VBLANK_INT(metro_interrupt,10) /* ? */ + MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */ MDRV_CPU_ADD(UPD7810, 12000000) /* audio CPU */ @@ -4365,7 +4365,7 @@ static MACHINE_DRIVER_START( poitto ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(poitto_readmem,poitto_writemem) - MDRV_CPU_VBLANK_INT(metro_interrupt,10) /* ? */ + MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */ MDRV_CPU_ADD(UPD7810, 12000000) /* audio CPU */ @@ -4408,7 +4408,7 @@ static MACHINE_DRIVER_START( pururun ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(pururun_readmem,pururun_writemem) - MDRV_CPU_VBLANK_INT(metro_interrupt,10) /* ? */ + MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */ MDRV_CPU_ADD(UPD7810, 12000000) /* audio CPU */ @@ -4452,7 +4452,7 @@ static MACHINE_DRIVER_START( skyalert ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(skyalert_readmem,skyalert_writemem) - MDRV_CPU_VBLANK_INT(metro_interrupt,10) /* ? */ + MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */ MDRV_CPU_ADD(UPD7810, 12000000) /* audio CPU */ @@ -4495,7 +4495,7 @@ static MACHINE_DRIVER_START( toride2g ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(toride2g_readmem,toride2g_writemem) - MDRV_CPU_VBLANK_INT(metro_interrupt,10) /* ? */ + MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */ MDRV_CPU_ADD(UPD7810, 12000000) /* audio CPU */ @@ -4538,7 +4538,7 @@ static MACHINE_DRIVER_START( mouja ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(mouja_readmem,mouja_writemem) - MDRV_CPU_VBLANK_INT(mouja_interrupt,1) + MDRV_CPU_VBLANK_INT("main", mouja_interrupt) MDRV_MACHINE_RESET(metro) @@ -4574,7 +4574,7 @@ static MACHINE_DRIVER_START( blzntrnd ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(blzntrnd_readmem,blzntrnd_writemem) - MDRV_CPU_VBLANK_INT(karatour_interrupt,10) /* ? */ + MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */ MDRV_CPU_ADD(Z80, 8000000) /* audio CPU */ @@ -4614,7 +4614,7 @@ static MACHINE_DRIVER_START( gstrik2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(blzntrnd_readmem,blzntrnd_writemem) - MDRV_CPU_VBLANK_INT(karatour_interrupt,10) /* ? */ + MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */ MDRV_CPU_ADD(Z80, 8000000) /* audio CPU */ @@ -4686,7 +4686,7 @@ static MACHINE_DRIVER_START( puzzlet ) MDRV_CPU_PROGRAM_MAP(puzzlet_map,0) MDRV_CPU_IO_MAP(puzzlet_io_map,0) - MDRV_CPU_VBLANK_INT(puzzlet_interrupt, 5) + MDRV_CPU_VBLANK_INT_HACK(puzzlet_interrupt, 5) MDRV_MACHINE_RESET(metro) diff --git a/src/mame/drivers/mexico86.c b/src/mame/drivers/mexico86.c index b41d2c275c1..a3b6d5a4e97 100644 --- a/src/mame/drivers/mexico86.c +++ b/src/mame/drivers/mexico86.c @@ -45,6 +45,7 @@ PS4 J8648 PS4 J8635 ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "cpu/z80/z80.h" #include "cpu/m6805/m6805.h" #include "sound/2203intf.h" @@ -385,15 +386,15 @@ static MACHINE_DRIVER_START( mexico86 ) MDRV_CPU_ADD(Z80, 24000000/4) /* 6 MHz, Uses clock divided 24MHz OSC */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD_TAG("mcu", M68705, 4000000) /* xtal is 4MHz, divided by 4 internally */ MDRV_CPU_PROGRAM_MAP(m68705_readmem,m68705_writemem) - MDRV_CPU_VBLANK_INT(mexico86_m68705_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(mexico86_m68705_interrupt,2) MDRV_CPU_ADD_TAG("sub", Z80, 8000000/2) /* 4 MHz, Uses 8Mhz OSC */ MDRV_CPU_PROGRAM_MAP(sub_cpu_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(100) /* 100 CPU slices per frame - an high value to ensure proper */ /* synchronization of the CPUs */ @@ -441,7 +442,7 @@ static MACHINE_DRIVER_START( kikikai ) MDRV_IMPORT_FROM(knightb) MDRV_CPU_MODIFY("main") - MDRV_CPU_VBLANK_INT(kikikai_interrupt, 1) // IRQs should be triggered by the MCU, but we don't have it + MDRV_CPU_VBLANK_INT("main", kikikai_interrupt) // IRQs should be triggered by the MCU, but we don't have it MDRV_CPU_REMOVE("mcu") // we don't have code for the 68701 diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c index 92e539ae7d5..d7378a8a0a4 100644 --- a/src/mame/drivers/micro3d.c +++ b/src/mame/drivers/micro3d.c @@ -861,7 +861,7 @@ static const tms34010_config vgb_config = static MACHINE_DRIVER_START( micro3d ) MDRV_CPU_ADD(M68000, 12000000 ) MDRV_CPU_PROGRAM_MAP(hostmem,0) - MDRV_CPU_VBLANK_INT(micro3d_vblank,1) + MDRV_CPU_VBLANK_INT("main", micro3d_vblank) MDRV_CPU_ADD(TMS34010, 40000000) MDRV_CPU_CONFIG(vgb_config) diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c index cb6c06da2e7..e2fb5eb8a79 100644 --- a/src/mame/drivers/midas.c +++ b/src/mame/drivers/midas.c @@ -442,7 +442,7 @@ static MACHINE_DRIVER_START( livequiz ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 24000000 / 2) MDRV_CPU_PROGRAM_MAP(mem_map,0) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_NVRAM_HANDLER(93C46) diff --git a/src/mame/drivers/midzeus.c b/src/mame/drivers/midzeus.c index c7b4333211e..28754a38555 100644 --- a/src/mame/drivers/midzeus.c +++ b/src/mame/drivers/midzeus.c @@ -1116,7 +1116,7 @@ static MACHINE_DRIVER_START( midzeus ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", TMS32032, CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(zeus_map,0) - MDRV_CPU_VBLANK_INT(display_irq,1) + MDRV_CPU_VBLANK_INT("main", display_irq) MDRV_MACHINE_START(midzeus) MDRV_MACHINE_RESET(midzeus) @@ -1142,7 +1142,7 @@ static MACHINE_DRIVER_START( midzeus2 ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", TMS32032, CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(zeus2_map,0) - MDRV_CPU_VBLANK_INT(display_irq,1) + MDRV_CPU_VBLANK_INT("main", display_irq) MDRV_MACHINE_START(midzeus2) MDRV_MACHINE_RESET(midzeus) diff --git a/src/mame/drivers/mikie.c b/src/mame/drivers/mikie.c index e56463529c2..12fdcc074ef 100644 --- a/src/mame/drivers/mikie.c +++ b/src/mame/drivers/mikie.c @@ -247,7 +247,7 @@ static MACHINE_DRIVER_START( mikie ) // basic machine hardware MDRV_CPU_ADD(M6809, 1250000) // ??? MC68A09E MDRV_CPU_PROGRAM_MAP(mikie_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, CLK) // 3.58 MHz /* audio CPU */ diff --git a/src/mame/drivers/miniboy7.c b/src/mame/drivers/miniboy7.c index 894584f7f6f..747e863a1cf 100644 --- a/src/mame/drivers/miniboy7.c +++ b/src/mame/drivers/miniboy7.c @@ -273,7 +273,7 @@ static MACHINE_DRIVER_START( miniboy7 ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M6502, MASTER_CLOCK/16) /* guess */ MDRV_CPU_PROGRAM_MAP(miniboy7_map, 0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse, 1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/minivadr.c b/src/mame/drivers/minivadr.c index 8d06357013a..d4fe5cb3036 100644 --- a/src/mame/drivers/minivadr.c +++ b/src/mame/drivers/minivadr.c @@ -72,7 +72,7 @@ static MACHINE_DRIVER_START( minivadr ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,24000000 / 6) /* 4 MHz ? */ MDRV_CPU_PROGRAM_MAP(minivadr_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c index a14897e6e91..c3ab1f2bd1e 100644 --- a/src/mame/drivers/mirage.c +++ b/src/mame/drivers/mirage.c @@ -349,7 +349,7 @@ static MACHINE_DRIVER_START( mirage ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 28000000/2) MDRV_CPU_PROGRAM_MAP(mirage_readmem,mirage_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/mirax.c b/src/mame/drivers/mirax.c index 53b66226c53..01cd792e8fe 100644 --- a/src/mame/drivers/mirax.c +++ b/src/mame/drivers/mirax.c @@ -61,6 +61,7 @@ The End */ #include "driver.h" +#include "deprecat.h" #include "sound/ay8910.h" static int nSndNum=0x10; @@ -179,7 +180,7 @@ static MACHINE_DRIVER_START( mirax ) MDRV_CPU_ADD(Z80, 12000000) // audio cpu ? MDRV_CPU_PROGRAM_MAP(memory_map,0) MDRV_CPU_IO_MAP(io_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 2) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c index 9fe5c338e71..b45d28d2cb2 100644 --- a/src/mame/drivers/missb2.c +++ b/src/mame/drivers/missb2.c @@ -368,17 +368,17 @@ static MACHINE_DRIVER_START( missb2 ) // basic machine hardware MDRV_CPU_ADD(Z80, MAIN_XTAL/4) // 6 MHz MDRV_CPU_PROGRAM_MAP(master_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, MAIN_XTAL/4) // 6 MHz MDRV_CPU_PROGRAM_MAP(slave_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, MAIN_XTAL/8) /* audio CPU */ // 3 MHz MDRV_CPU_PROGRAM_MAP(sound_map, 0) -// MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) - MDRV_CPU_VBLANK_INT(missb2_interrupt, 1) +// MDRV_CPU_VBLANK_INT("main", irq0_line_hold) + MDRV_CPU_VBLANK_INT("main", missb2_interrupt) MDRV_INTERLEAVE(100) // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c index 5c09ecb7067..0fb3d9455d9 100644 --- a/src/mame/drivers/mitchell.c +++ b/src/mame/drivers/mitchell.c @@ -1331,7 +1331,7 @@ static MACHINE_DRIVER_START( mgakuen ) MDRV_CPU_ADD(Z80, 6000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(mgakuen_readmem,mgakuen_writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) /* ??? one extra irq seems to be needed for music (see input5_r) */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? one extra irq seems to be needed for music (see input5_r) */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -1365,7 +1365,7 @@ static MACHINE_DRIVER_START( pang ) MDRV_CPU_ADD_TAG("main",Z80, 8000000) /* (verified on pcb) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) /* ??? one extra irq seems to be needed for music (see input5_r) */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? one extra irq seems to be needed for music (see input5_r) */ MDRV_NVRAM_HANDLER(mitchell) @@ -1436,13 +1436,13 @@ static MACHINE_DRIVER_START( spangbl ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(spangb_memmap,0) MDRV_CPU_IO_MAP(spangb_portmap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD_TAG("sound",Z80, 8000000) MDRV_CPU_PROGRAM_MAP(spangb_sound_memmap,0 ) MDRV_CPU_IO_MAP(spangb_sound_portmap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) -// MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) +// MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_GFXDECODE(spangbl) @@ -1464,7 +1464,7 @@ static MACHINE_DRIVER_START( mstworld ) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(mstworld_readport,mstworld_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,6000000) /* 6 MHz? */ /* audio CPU */ @@ -1499,7 +1499,7 @@ static MACHINE_DRIVER_START( marukin ) MDRV_CPU_ADD(Z80, 8000000) /* Super Pang says 8MHZ ORIGINAL BOARD */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) /* ??? one extra irq seems to be needed for music (see input5_r) */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? one extra irq seems to be needed for music (see input5_r) */ MDRV_NVRAM_HANDLER(mitchell) diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c index d43346baf0f..54b4a67a8ac 100644 --- a/src/mame/drivers/mjkjidai.c +++ b/src/mame/drivers/mjkjidai.c @@ -356,7 +356,7 @@ static MACHINE_DRIVER_START( mjkjidai ) MDRV_CPU_ADD(Z80,10000000/2) /* 5 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_NVRAM_HANDLER(mjkjidai) diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c index 917c15cc7a1..b4350c3b77c 100644 --- a/src/mame/drivers/mjsister.c +++ b/src/mame/drivers/mjsister.c @@ -7,6 +7,7 @@ Mahjong Sisters (c) 1986 Toa Plan *****************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "sound/dac.h" #include "sound/ay8910.h" @@ -308,7 +309,7 @@ static MACHINE_DRIVER_START( mjsister ) MDRV_CPU_ADD(Z80, MCLK/2) /* 6.000 MHz */ MDRV_CPU_PROGRAM_MAP(mjsister_readmem,mjsister_writemem) MDRV_CPU_IO_MAP(mjsister_readport,mjsister_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_MACHINE_RESET(mjsister) diff --git a/src/mame/drivers/mjsiyoub.c b/src/mame/drivers/mjsiyoub.c index 68fff716127..90f3cbfa246 100644 --- a/src/mame/drivers/mjsiyoub.c +++ b/src/mame/drivers/mjsiyoub.c @@ -82,11 +82,11 @@ static MACHINE_DRIVER_START( mjsiyoub ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,18432000/4) MDRV_CPU_PROGRAM_MAP(readmem1,writemem1) -// MDRV_CPU_VBLANK_INT(irq0_line_hold,1) +// MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,18432000/4) MDRV_CPU_PROGRAM_MAP(readmem2,writemem2) -// MDRV_CPU_VBLANK_INT(irq0_line_hold,1) +// MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c index 04475b3fdd6..4766ef7ee77 100644 --- a/src/mame/drivers/mlanding.c +++ b/src/mame/drivers/mlanding.c @@ -363,18 +363,18 @@ static MACHINE_DRIVER_START( mlanding ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000 ) /* 12 MHz ??? (guess) */ MDRV_CPU_PROGRAM_MAP(mlanding_mem, 0) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(Z80, 4000000 ) /* 4 MHz ??? (guess) */ MDRV_CPU_PROGRAM_MAP(mlanding_z80_mem,0) MDRV_CPU_ADD(M68000, 12000000 ) /* 12 MHz ??? (guess) */ MDRV_CPU_PROGRAM_MAP(mlanding_sub_mem,0) - MDRV_CPU_VBLANK_INT(irq6_line_hold,7) + MDRV_CPU_VBLANK_INT_HACK(irq6_line_hold,7) MDRV_CPU_ADD(Z80, 4000000 ) /* 4 MHz ??? (guess) */ MDRV_CPU_PROGRAM_MAP(mlanding_z80_sub_mem,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c index 71a186fb3a3..0078a0f8db7 100644 --- a/src/mame/drivers/model1.c +++ b/src/mame/drivers/model1.c @@ -1534,7 +1534,7 @@ static MACHINE_DRIVER_START( model1 ) MDRV_CPU_ADD(V60, 16000000) MDRV_CPU_PROGRAM_MAP(model1_mem, 0) MDRV_CPU_IO_MAP(model1_io, 0) - MDRV_CPU_VBLANK_INT(model1_interrupt, 2) + MDRV_CPU_VBLANK_INT_HACK(model1_interrupt, 2) MDRV_CPU_ADD(M68000, 10000000) // verified on real h/w MDRV_CPU_PROGRAM_MAP(model1_snd, 0) @@ -1580,7 +1580,7 @@ static MACHINE_DRIVER_START( model1_vr ) MDRV_CPU_ADD(V60, 16000000) MDRV_CPU_PROGRAM_MAP(model1_vr_mem, 0) MDRV_CPU_IO_MAP(model1_vr_io, 0) - MDRV_CPU_VBLANK_INT(model1_interrupt, 2) + MDRV_CPU_VBLANK_INT_HACK(model1_interrupt, 2) MDRV_CPU_ADD(M68000, 10000000) // verified on real h/w MDRV_CPU_PROGRAM_MAP(model1_snd, 0) diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c index 98b6c9895a5..d4658cdbead 100644 --- a/src/mame/drivers/model2.c +++ b/src/mame/drivers/model2.c @@ -1789,7 +1789,7 @@ static const struct mb86233_config tgp_config = static MACHINE_DRIVER_START( model2o ) MDRV_CPU_ADD(I960, 25000000) MDRV_CPU_PROGRAM_MAP(model2_base_mem, model2o_mem) - MDRV_CPU_VBLANK_INT(model2_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(model2_interrupt,2) MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(model1_snd, 0) @@ -1836,7 +1836,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( model2a ) MDRV_CPU_ADD(I960, 25000000) MDRV_CPU_PROGRAM_MAP(model2_base_mem, model2a_crx_mem) - MDRV_CPU_VBLANK_INT(model2_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(model2_interrupt,2) MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(model2_snd, 0) @@ -1880,7 +1880,7 @@ static const sharc_config sharc_cfg = static MACHINE_DRIVER_START( model2b ) MDRV_CPU_ADD(I960, 25000000) MDRV_CPU_PROGRAM_MAP(model2_base_mem, model2b_crx_mem) - MDRV_CPU_VBLANK_INT(model2_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(model2_interrupt,2) MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(model2_snd, 0) @@ -1924,7 +1924,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( model2c ) MDRV_CPU_ADD(I960, 25000000) MDRV_CPU_PROGRAM_MAP(model2_base_mem, model2c_crx_mem) - MDRV_CPU_VBLANK_INT(model2c_interrupt,3) + MDRV_CPU_VBLANK_INT_HACK(model2c_interrupt,3) MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(model2_snd, 0) diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c index d8026867f3d..45eeb6488dd 100644 --- a/src/mame/drivers/model3.c +++ b/src/mame/drivers/model3.c @@ -4083,7 +4083,7 @@ static MACHINE_DRIVER_START( model3_10 ) MDRV_CPU_ADD(PPC603, 66000000) MDRV_CPU_CONFIG(model3_10) MDRV_CPU_PROGRAM_MAP(model3_mem, 0) - MDRV_CPU_VBLANK_INT(model3_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(model3_interrupt,2) MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(model3_snd, 0) @@ -4122,7 +4122,7 @@ static MACHINE_DRIVER_START( model3_15 ) MDRV_CPU_ADD(PPC603, 100000000) MDRV_CPU_CONFIG(model3_15) MDRV_CPU_PROGRAM_MAP(model3_mem, 0) - MDRV_CPU_VBLANK_INT(model3_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(model3_interrupt,2) MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(model3_snd, 0) @@ -4159,7 +4159,7 @@ static MACHINE_DRIVER_START( model3_20 ) MDRV_CPU_ADD(PPC603, 166000000) MDRV_CPU_CONFIG(model3_2x) MDRV_CPU_PROGRAM_MAP(model3_mem, 0) - MDRV_CPU_VBLANK_INT(model3_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(model3_interrupt,2) MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(model3_snd, 0) @@ -4195,7 +4195,7 @@ static MACHINE_DRIVER_START( model3_21 ) MDRV_CPU_ADD(PPC603, 166000000) MDRV_CPU_CONFIG(model3_2x) MDRV_CPU_PROGRAM_MAP(model3_mem, 0) - MDRV_CPU_VBLANK_INT(model3_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(model3_interrupt,2) MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(model3_snd, 0) diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c index df25edf7f22..7a7d12687e8 100644 --- a/src/mame/drivers/mogura.c +++ b/src/mame/drivers/mogura.c @@ -214,7 +214,7 @@ static MACHINE_DRIVER_START( mogura ) MDRV_CPU_ADD(Z80,3000000) /* 3 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_GFXDECODE(mogura) diff --git a/src/mame/drivers/mole.c b/src/mame/drivers/mole.c index c0cd04d3173..b1634460b19 100644 --- a/src/mame/drivers/mole.c +++ b/src/mame/drivers/mole.c @@ -197,7 +197,7 @@ static MACHINE_DRIVER_START( mole ) // basic machine hardware MDRV_CPU_ADD(M6502, 4000000) // ??? MDRV_CPU_PROGRAM_MAP(mole_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) // video hardware diff --git a/src/mame/drivers/momoko.c b/src/mame/drivers/momoko.c index f17f3a3a5bd..edffd48b091 100644 --- a/src/mame/drivers/momoko.c +++ b/src/mame/drivers/momoko.c @@ -253,7 +253,7 @@ static MACHINE_DRIVER_START( momoko ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 5000000) /* 5.0MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 2500000) /* audio CPU */ /* 2.5MHz */ diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c index 4d81581db64..3d0a4b833b6 100644 --- a/src/mame/drivers/moo.c +++ b/src/mame/drivers/moo.c @@ -629,7 +629,7 @@ static MACHINE_DRIVER_START( moo ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(moo_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", moo_interrupt) MDRV_CPU_ADD_TAG("sound", Z80, 8000000) /* audio CPU */ @@ -673,7 +673,7 @@ static MACHINE_DRIVER_START( moobl ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 16100000) MDRV_CPU_PROGRAM_MAP(readmembl,writemembl) - MDRV_CPU_VBLANK_INT(moobl_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", moobl_interrupt) MDRV_MACHINE_START(moo) MDRV_MACHINE_RESET(moo) diff --git a/src/mame/drivers/mosaic.c b/src/mame/drivers/mosaic.c index 6558c58fe5f..722d3eec523 100644 --- a/src/mame/drivers/mosaic.c +++ b/src/mame/drivers/mosaic.c @@ -285,7 +285,7 @@ static MACHINE_DRIVER_START( mosaic ) MDRV_CPU_ADD_TAG("main", Z180, 7000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c index d7e3a7b3d94..9db89a9d562 100644 --- a/src/mame/drivers/mouser.c +++ b/src/mame/drivers/mouser.c @@ -202,13 +202,13 @@ static MACHINE_DRIVER_START( mouser ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(mouser_nmi_interrupt,1) /* NMI is masked externally */ + MDRV_CPU_VBLANK_INT("main", mouser_nmi_interrupt) /* NMI is masked externally */ MDRV_CPU_ADD(Z80, 4000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(readmem2,writemem2) MDRV_CPU_IO_MAP(readport2,writeport2) /* audio CPU */ - MDRV_CPU_VBLANK_INT(nmi_line_pulse,4) /* ??? This controls the sound tempo */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,4) /* ??? This controls the sound tempo */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c index 8464c03b781..8c0b3904686 100644 --- a/src/mame/drivers/mpu4drvr.c +++ b/src/mame/drivers/mpu4drvr.c @@ -1627,7 +1627,7 @@ static MACHINE_DRIVER_START( mpu4_vid ) MDRV_CPU_ADD_TAG("video", M68000, VIDEO_MASTER_CLOCK ) MDRV_CPU_PROGRAM_MAP(mpu4_68k_map,0) - MDRV_CPU_VBLANK_INT(mpu4_vid_irq,1) + MDRV_CPU_VBLANK_INT("main", mpu4_vid_irq) MDRV_NVRAM_HANDLER(generic_0fill) // confirm @@ -1676,7 +1676,7 @@ static MACHINE_DRIVER_START( dealem ) MDRV_CPU_PERIODIC_INT(gen_50hz, 100) // generate 50 hz signal - MDRV_CPU_VBLANK_INT(nmi_line_pulse, 1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_SPEAKER_STANDARD_MONO("mono") MDRV_SOUND_ADD_TAG("AY8913",AY8913, MPU4_MASTER_CLOCK/4) diff --git a/src/mame/drivers/mrdo.c b/src/mame/drivers/mrdo.c index 11b220bfdf4..fe51711a636 100644 --- a/src/mame/drivers/mrdo.c +++ b/src/mame/drivers/mrdo.c @@ -178,7 +178,7 @@ static MACHINE_DRIVER_START( mrdo ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,8000000/2) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c index 3f397038035..d2d25ce1bef 100644 --- a/src/mame/drivers/mrflea.c +++ b/src/mame/drivers/mrflea.c @@ -278,12 +278,12 @@ static MACHINE_DRIVER_START( mrflea ) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* NMI resets the game */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* NMI resets the game */ MDRV_CPU_ADD(Z80, 6000000) MDRV_CPU_PROGRAM_MAP(readmem_io,writemem_io) MDRV_CPU_IO_MAP(readport_io,writeport_io) - MDRV_CPU_VBLANK_INT(mrflea_io_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(mrflea_io_interrupt,2) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/mrjong.c b/src/mame/drivers/mrjong.c index 3bc17666a4b..c132b0fd937 100644 --- a/src/mame/drivers/mrjong.c +++ b/src/mame/drivers/mrjong.c @@ -182,7 +182,7 @@ static MACHINE_DRIVER_START( mrjong ) MDRV_CPU_ADD(Z80,15468000/6) /* 2.578 MHz?? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c index 6a06b7e7bec..994b743d0c7 100644 --- a/src/mame/drivers/ms32.c +++ b/src/mame/drivers/ms32.c @@ -1366,7 +1366,7 @@ static MACHINE_DRIVER_START( ms32 ) /* basic machine hardware */ MDRV_CPU_ADD(V70, 20000000) // 20MHz MDRV_CPU_PROGRAM_MAP(ms32_readmem,ms32_writemem) - MDRV_CPU_VBLANK_INT(ms32_interrupt,32) + MDRV_CPU_VBLANK_INT_HACK(ms32_interrupt,32) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c index 58a5a2e9b1b..25ea60ffee8 100644 --- a/src/mame/drivers/msisaac.c +++ b/src/mame/drivers/msisaac.c @@ -530,12 +530,12 @@ static MACHINE_DRIVER_START( msisaac ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* source of IRQs is unknown */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* source of IRQs is unknown */ #ifdef USE_MCU MDRV_CPU_ADD(M68705,8000000/2) /* 4 MHz */ diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c index 0af82ea4c55..a486705818b 100644 --- a/src/mame/drivers/mugsmash.c +++ b/src/mame/drivers/mugsmash.c @@ -430,7 +430,7 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( mugsmash ) MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(mugsmash_readmem,mugsmash_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* Guess */ diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c index a798fe1f9a3..b38d6d1d434 100644 --- a/src/mame/drivers/munchmo.c +++ b/src/mame/drivers/munchmo.c @@ -283,12 +283,12 @@ static MACHINE_DRIVER_START( munchmo ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 3750000) /* ? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(mnchmobl_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(mnchmobl_interrupt,2) MDRV_CPU_ADD(Z80, 3750000) /* ? */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) - MDRV_CPU_VBLANK_INT(nmi_line_assert,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_assert) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/murogem.c b/src/mame/drivers/murogem.c index e33ef05465d..d7fa23afcf5 100644 --- a/src/mame/drivers/murogem.c +++ b/src/mame/drivers/murogem.c @@ -213,7 +213,7 @@ static MACHINE_DRIVER_START( murogem ) /* basic machine hardware */ MDRV_CPU_ADD(M6802,8000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(murogem_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/mustache.c b/src/mame/drivers/mustache.c index f64ce26cff7..0494245609c 100644 --- a/src/mame/drivers/mustache.c +++ b/src/mame/drivers/mustache.c @@ -206,7 +206,7 @@ static MACHINE_DRIVER_START( mustache ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(memmap, 0) - MDRV_CPU_VBLANK_INT(assert_irq,1) + MDRV_CPU_VBLANK_INT("main", assert_irq) MDRV_CPU_ADD_TAG(CPUTAG_T5182,Z80, T5182_CLOCK) MDRV_CPU_PROGRAM_MAP(t5182_map, 0) diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c index f3548337fa0..d03a502359e 100644 --- a/src/mame/drivers/mwarr.c +++ b/src/mame/drivers/mwarr.c @@ -453,7 +453,7 @@ static VIDEO_UPDATE( mwarr ) static MACHINE_DRIVER_START( mwarr ) MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(mwarr_map,0) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_GFXDECODE(mwarr) diff --git a/src/mame/drivers/mystston.c b/src/mame/drivers/mystston.c index 89eb3ed4e75..cc1c8d023a0 100644 --- a/src/mame/drivers/mystston.c +++ b/src/mame/drivers/mystston.c @@ -246,7 +246,7 @@ static MACHINE_DRIVER_START( mystston ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 12000000/8) // 1.5 MHz MDRV_CPU_PROGRAM_MAP(readmem, writemem) - MDRV_CPU_VBLANK_INT(mystston_interrupt, 272) + MDRV_CPU_VBLANK_INT_HACK(mystston_interrupt, 272) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c index 5edffc184f7..5ebbd608f56 100644 --- a/src/mame/drivers/mystwarr.c +++ b/src/mame/drivers/mystwarr.c @@ -931,7 +931,7 @@ static MACHINE_DRIVER_START( mystwarr ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz (confirmed) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(mystwarr_interrupt, 3) + MDRV_CPU_VBLANK_INT_HACK(mystwarr_interrupt, 3) MDRV_CPU_ADD_TAG("sound", Z80, 8000000) /* audio CPU */ @@ -981,7 +981,7 @@ static MACHINE_DRIVER_START( viostorm ) /* basic machine hardware */ MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(vsreadmem,vswritemem) - MDRV_CPU_VBLANK_INT(metamrph_interrupt, 40) + MDRV_CPU_VBLANK_INT_HACK(metamrph_interrupt, 40) /* video hardware */ MDRV_VIDEO_START(viostorm) @@ -1001,7 +1001,7 @@ static MACHINE_DRIVER_START( metamrph ) /* basic machine hardware */ MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(mmreadmem,mmwritemem) - MDRV_CPU_VBLANK_INT(metamrph_interrupt, 40) + MDRV_CPU_VBLANK_INT_HACK(metamrph_interrupt, 40) /* video hardware */ MDRV_VIDEO_START(metamrph) @@ -1021,7 +1021,7 @@ static MACHINE_DRIVER_START( dadandrn ) /* basic machine hardware */ MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(dddreadmem, dddwritemem) - MDRV_CPU_VBLANK_INT(ddd_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", ddd_interrupt) MDRV_GFXDECODE(dadandrn) @@ -1043,7 +1043,7 @@ static MACHINE_DRIVER_START( gaiapols ) /* basic machine hardware */ MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(gaiareadmem,gaiawritemem) - MDRV_CPU_VBLANK_INT(ddd_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", ddd_interrupt) MDRV_GFXDECODE(gaiapols) @@ -1067,7 +1067,7 @@ static MACHINE_DRIVER_START( martchmp ) /* basic machine hardware */ MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(mcreadmem,mcwritemem) - MDRV_CPU_VBLANK_INT(mchamp_interrupt, 2) + MDRV_CPU_VBLANK_INT_HACK(mchamp_interrupt, 2) MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_BEFORE_VBLANK) diff --git a/src/mame/drivers/n8080.c b/src/mame/drivers/n8080.c index 1c6a64b9794..0e8742cde25 100644 --- a/src/mame/drivers/n8080.c +++ b/src/mame/drivers/n8080.c @@ -11,6 +11,7 @@ ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "includes/n8080.h" static unsigned shift_data; @@ -78,7 +79,7 @@ static MACHINE_DRIVER_START( spacefev ) MDRV_CPU_ADD(8080, 20160000 / 10) MDRV_CPU_PROGRAM_MAP(main_cpu_map, 0) MDRV_CPU_IO_MAP(main_io_map, 0) - MDRV_CPU_VBLANK_INT(interrupt, 2) + MDRV_CPU_VBLANK_INT_HACK(interrupt, 2) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -103,7 +104,7 @@ static MACHINE_DRIVER_START( sheriff ) MDRV_CPU_ADD(8080, 20160000 / 10) MDRV_CPU_PROGRAM_MAP(main_cpu_map, 0) MDRV_CPU_IO_MAP(main_io_map, 0) - MDRV_CPU_VBLANK_INT(interrupt, 2) + MDRV_CPU_VBLANK_INT_HACK(interrupt, 2) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -128,7 +129,7 @@ static MACHINE_DRIVER_START( helifire ) MDRV_CPU_ADD(8080, 20160000 / 10) MDRV_CPU_PROGRAM_MAP(helifire_main_cpu_map, 0) MDRV_CPU_IO_MAP(main_io_map, 0) - MDRV_CPU_VBLANK_INT(interrupt, 2) + MDRV_CPU_VBLANK_INT_HACK(interrupt, 2) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/namcofl.c b/src/mame/drivers/namcofl.c index 93946edf92d..befc473cd2f 100644 --- a/src/mame/drivers/namcofl.c +++ b/src/mame/drivers/namcofl.c @@ -122,6 +122,7 @@ OSC3: 48.384MHz */ #include "driver.h" +#include "deprecat.h" #include "machine/eeprom.h" #include "namconb1.h" #include "namcos2.h" diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c index 016695ff104..3e258588888 100644 --- a/src/mame/drivers/namcona1.c +++ b/src/mame/drivers/namcona1.c @@ -1346,12 +1346,12 @@ static MACHINE_DRIVER_START( namcona1 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 50113000/4) MDRV_CPU_PROGRAM_MAP(namcona1_mcu_readmem,namcona1_mcu_writemem) - MDRV_CPU_VBLANK_INT(namcona1_interrupt,5) + MDRV_CPU_VBLANK_INT_HACK(namcona1_interrupt,5) MDRV_CPU_ADD(M37710, 50113000/4) MDRV_CPU_PROGRAM_MAP(namcona1_mcu_map, 0) MDRV_CPU_IO_MAP( namcona1_mcu_io_map, 0 ) - MDRV_CPU_VBLANK_INT(mcu_interrupt, 2) + MDRV_CPU_VBLANK_INT_HACK(mcu_interrupt, 2) MDRV_NVRAM_HANDLER(namcosna1) MDRV_MACHINE_START(namcona1) @@ -1445,7 +1445,7 @@ static MACHINE_DRIVER_START( namcona2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 50113000/4) MDRV_CPU_PROGRAM_MAP(namcona2_readmem,namcona2_writemem) - MDRV_CPU_VBLANK_INT(namcona1_interrupt,5) + MDRV_CPU_VBLANK_INT_HACK(namcona1_interrupt,5) MDRV_NVRAM_HANDLER(namcosna1) MDRV_INTERLEAVE(40) diff --git a/src/mame/drivers/namconb1.c b/src/mame/drivers/namconb1.c index e3d7723b95e..a4737b5801a 100644 --- a/src/mame/drivers/namconb1.c +++ b/src/mame/drivers/namconb1.c @@ -753,7 +753,7 @@ NAMCO_C7X_HARDWARE static MACHINE_DRIVER_START( namconb1 ) MDRV_CPU_ADD(M68EC020,MASTER_CLOCK_HZ/2) MDRV_CPU_PROGRAM_MAP(namconb1_am,0) - MDRV_CPU_VBLANK_INT(namconb1_interrupt,1) + MDRV_CPU_VBLANK_INT("main", namconb1_interrupt) NAMCO_C7X_MCU(MASTER_CLOCK_HZ/3) @@ -777,7 +777,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( namconb2 ) MDRV_CPU_ADD(M68EC020,MASTER_CLOCK_HZ/2) MDRV_CPU_PROGRAM_MAP(namconb2_am,0) - MDRV_CPU_VBLANK_INT(namconb2_interrupt,1) + MDRV_CPU_VBLANK_INT("main", namconb2_interrupt) NAMCO_C7X_MCU(MASTER_CLOCK_HZ/3) diff --git a/src/mame/drivers/namcond1.c b/src/mame/drivers/namcond1.c index 6c534c0490e..64728bff4e2 100644 --- a/src/mame/drivers/namcond1.c +++ b/src/mame/drivers/namcond1.c @@ -295,13 +295,13 @@ static MACHINE_DRIVER_START( namcond1 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12288000) MDRV_CPU_PROGRAM_MAP(namcond1_map,0) - MDRV_CPU_VBLANK_INT(irq1_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_PERIODIC_INT(ygv608_timed_interrupt, 1000) MDRV_CPU_ADD(H83002, 16384000 ) MDRV_CPU_PROGRAM_MAP( nd1h8rwmap, 0 ) MDRV_CPU_IO_MAP( nd1h8iomap, 0 ) - MDRV_CPU_VBLANK_INT( mcu_interrupt, 1 ) + MDRV_CPU_VBLANK_INT("main", mcu_interrupt) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c index 879edbd6128..65bd8fa2e75 100644 --- a/src/mame/drivers/namcos1.c +++ b/src/mame/drivers/namcos1.c @@ -998,20 +998,20 @@ static MACHINE_DRIVER_START( ns1 ) /* basic machine hardware */ MDRV_CPU_ADD(M6809,49152000/32) MDRV_CPU_PROGRAM_MAP(main_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_CPU_ADD(M6809,49152000/32) MDRV_CPU_PROGRAM_MAP(sub_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_CPU_ADD(M6809,49152000/32) MDRV_CPU_PROGRAM_MAP(sound_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_CPU_ADD_TAG("MCU",HD63701,49152000/8) MDRV_CPU_PROGRAM_MAP(mcu_map, 0) MDRV_CPU_IO_MAP(mcu_port_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) // heavy sync required to prevent CPUs from fighting for video RAM access and going into deadlocks MDRV_INTERLEAVE(640) diff --git a/src/mame/drivers/namcos10.c b/src/mame/drivers/namcos10.c index ac37ca851f8..b5a9ef3c58d 100644 --- a/src/mame/drivers/namcos10.c +++ b/src/mame/drivers/namcos10.c @@ -379,7 +379,7 @@ static MACHINE_DRIVER_START( namcos10 ) /* basic machine hardware */ MDRV_CPU_ADD( PSXCPU, XTAL_101_4912MHz ) MDRV_CPU_PROGRAM_MAP( namcos10_map, 0 ) - MDRV_CPU_VBLANK_INT( psx_vblank, 1 ) + MDRV_CPU_VBLANK_INT("main", psx_vblank) MDRV_MACHINE_RESET( namcos10 ) diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c index b098cdad90b..03bb713e679 100644 --- a/src/mame/drivers/namcos11.c +++ b/src/mame/drivers/namcos11.c @@ -264,8 +264,8 @@ Notes: ***************************************************************************/ -#include #include "driver.h" +#include "deprecat.h" #include "cpu/mips/psx.h" #include "includes/psx.h" #include "machine/at28c16.h" @@ -877,7 +877,7 @@ static MACHINE_DRIVER_START( coh100 ) /* basic machine hardware */ MDRV_CPU_ADD( PSXCPU, XTAL_67_7376MHz ) MDRV_CPU_PROGRAM_MAP( namcos11_map, 0 ) - MDRV_CPU_VBLANK_INT( namcos11_vblank, 1 ) + MDRV_CPU_VBLANK_INT("main", namcos11_vblank) MDRV_MACHINE_RESET( namcos11 ) MDRV_NVRAM_HANDLER( at28c16_0 ) diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c index 45390421f1d..024ea71f86d 100644 --- a/src/mame/drivers/namcos12.c +++ b/src/mame/drivers/namcos12.c @@ -1476,12 +1476,12 @@ static MACHINE_DRIVER_START( coh700 ) /* basic machine hardware */ MDRV_CPU_ADD( PSXCPU, XTAL_100MHz ) MDRV_CPU_PROGRAM_MAP( namcos12_map, 0 ) - MDRV_CPU_VBLANK_INT( psx_vblank, 1 ) + MDRV_CPU_VBLANK_INT("main", psx_vblank) MDRV_CPU_ADD(H83002, 14745600 ) /* verified 14.7456 MHz */ MDRV_CPU_PROGRAM_MAP( s12h8rwmap, 0 ) MDRV_CPU_IO_MAP( s12h8iomap, 0 ) - MDRV_CPU_VBLANK_INT( irq1_line_pulse, 1 ) + MDRV_CPU_VBLANK_INT("main", irq1_line_pulse) MDRV_MACHINE_RESET( namcos12 ) MDRV_NVRAM_HANDLER( at28c16_0 ) diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c index 40cd0ddae2f..66bdac63d48 100644 --- a/src/mame/drivers/namcos2.c +++ b/src/mame/drivers/namcos2.c @@ -447,6 +447,7 @@ $a00000 checks have been seen on the Final Lap boards. ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "namcos2.h" #include "cpu/m6809/m6809.h" #include "namcoic.h" @@ -1571,20 +1572,20 @@ via software as INT1 static MACHINE_DRIVER_START( default ) MDRV_CPU_ADD(M68000, 12288000) MDRV_CPU_PROGRAM_MAP(master_default_am,common_default_am) - MDRV_CPU_VBLANK_INT(namcos2_68k_master_vblank,1) + MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank) MDRV_CPU_ADD(M68000, 12288000) MDRV_CPU_PROGRAM_MAP(slave_default_am,common_default_am) - MDRV_CPU_VBLANK_INT(namcos2_68k_slave_vblank,1) + MDRV_CPU_VBLANK_INT("main", namcos2_68k_slave_vblank) MDRV_CPU_ADD(M6809,3072000) // Sound handling MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold, 120) MDRV_CPU_ADD(HD63705,2048000) // I/O handling MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(100) /* CPU slices per frame */ @@ -1645,20 +1646,20 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( gollygho ) MDRV_CPU_ADD(M68000, 12288000) MDRV_CPU_PROGRAM_MAP(master_default_am,common_default_am) - MDRV_CPU_VBLANK_INT(namcos2_68k_master_vblank,1) + MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank) MDRV_CPU_ADD(M68000, 12288000) MDRV_CPU_PROGRAM_MAP(slave_default_am,common_default_am) - MDRV_CPU_VBLANK_INT(namcos2_68k_slave_vblank,1) + MDRV_CPU_VBLANK_INT("main", namcos2_68k_slave_vblank) MDRV_CPU_ADD(M6809,3072000) // Sound handling MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold, 120) MDRV_CPU_ADD(HD63705,2048000) // I/O handling MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(100) /* CPU slices per frame */ @@ -1695,20 +1696,20 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( finallap ) MDRV_CPU_ADD(M68000, 12288000) MDRV_CPU_PROGRAM_MAP(master_finallap_am,common_finallap_am) - MDRV_CPU_VBLANK_INT(namcos2_68k_master_vblank,1) + MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank) MDRV_CPU_ADD(M68000, 12288000) MDRV_CPU_PROGRAM_MAP(slave_finallap_am,common_finallap_am) - MDRV_CPU_VBLANK_INT(namcos2_68k_slave_vblank,1) + MDRV_CPU_VBLANK_INT("main", namcos2_68k_slave_vblank) MDRV_CPU_ADD(M6809,3072000) // Sound handling MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold, 120) MDRV_CPU_ADD(HD63705,2048000) // I/O handling MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(100) /* CPU slices per frame */ @@ -1745,20 +1746,20 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( sgunner ) MDRV_CPU_ADD(M68000, 12288000) MDRV_CPU_PROGRAM_MAP(master_sgunner_am,common_sgunner_am) - MDRV_CPU_VBLANK_INT(namcos2_68k_master_vblank,1) + MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank) MDRV_CPU_ADD(M68000, 12288000) MDRV_CPU_PROGRAM_MAP(slave_sgunner_am,common_sgunner_am) - MDRV_CPU_VBLANK_INT(namcos2_68k_slave_vblank,1) + MDRV_CPU_VBLANK_INT("main", namcos2_68k_slave_vblank) MDRV_CPU_ADD(M6809,3072000) // Sound handling MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold, 120) MDRV_CPU_ADD(HD63705,2048000) // I/O handling MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(100) /* CPU slices per frame */ @@ -1795,20 +1796,20 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( luckywld ) MDRV_CPU_ADD(M68000, 12288000) MDRV_CPU_PROGRAM_MAP(master_luckywld_am,common_luckywld_am) - MDRV_CPU_VBLANK_INT(namcos2_68k_master_vblank,1) + MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank) MDRV_CPU_ADD(M68000, 12288000) MDRV_CPU_PROGRAM_MAP(slave_luckywld_am,common_luckywld_am) - MDRV_CPU_VBLANK_INT(namcos2_68k_slave_vblank,1) + MDRV_CPU_VBLANK_INT("main", namcos2_68k_slave_vblank) MDRV_CPU_ADD(M6809,3072000) /* Sound handling */ MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,120) MDRV_CPU_ADD(HD63705,2048000) /* I/O handling */ MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(100) /* CPU slices per frame */ @@ -1845,20 +1846,20 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( metlhawk ) MDRV_CPU_ADD(M68000, 12288000) MDRV_CPU_PROGRAM_MAP(master_metlhawk_am,common_metlhawk_am) - MDRV_CPU_VBLANK_INT(namcos2_68k_master_vblank,1) + MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank) MDRV_CPU_ADD(M68000, 12288000) MDRV_CPU_PROGRAM_MAP(slave_metlhawk_am,common_metlhawk_am) - MDRV_CPU_VBLANK_INT(namcos2_68k_slave_vblank,1) + MDRV_CPU_VBLANK_INT("main", namcos2_68k_slave_vblank) MDRV_CPU_ADD(M6809,3072000) /* Sound handling */ MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,120) MDRV_CPU_ADD(HD63705,2048000) /* I/O handling */ MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(100) /* CPU slices per frame */ diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c index d3ba112cc55..4af0445d5f0 100644 --- a/src/mame/drivers/namcos21.c +++ b/src/mame/drivers/namcos21.c @@ -1518,20 +1518,20 @@ static const struct C140interface C140_interface_typeB = static MACHINE_DRIVER_START( s21base ) MDRV_CPU_ADD(M68000,12288000) /* Master */ MDRV_CPU_PROGRAM_MAP(namcos21_68k_master, namcos21_68k_common) - MDRV_CPU_VBLANK_INT(namcos2_68k_master_vblank,1) + MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank) MDRV_CPU_ADD(M68000,12288000) /* Slave */ MDRV_CPU_PROGRAM_MAP(namcos21_68k_slave, namcos21_68k_common) - MDRV_CPU_VBLANK_INT(namcos2_68k_slave_vblank,1) + MDRV_CPU_VBLANK_INT("main", namcos2_68k_slave_vblank) MDRV_CPU_ADD(M6809,3072000) /* Sound */ MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,120) MDRV_CPU_ADD(HD63705,2048000) /* IO */ MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(TMS32025,24000000) /* 24 MHz? overclocked */ MDRV_CPU_PROGRAM_MAP(master_dsp_program,0) @@ -1597,20 +1597,20 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( driveyes ) MDRV_CPU_ADD(M68000,12288000) /* Master */ MDRV_CPU_PROGRAM_MAP(driveyes_68k_master, driveyes_68k_common) - MDRV_CPU_VBLANK_INT(namcos2_68k_master_vblank,1) + MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank) MDRV_CPU_ADD(M68000,12288000) /* Slave */ MDRV_CPU_PROGRAM_MAP(driveyes_68k_slave, driveyes_68k_common) - MDRV_CPU_VBLANK_INT(namcos2_68k_slave_vblank,1) + MDRV_CPU_VBLANK_INT("main", namcos2_68k_slave_vblank) MDRV_CPU_ADD(M6809,3072000) /* Sound */ MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,120) MDRV_CPU_ADD(HD63705,2048000) /* IO */ MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(TMS32025,24000000*2) /* 24 MHz? overclocked */ MDRV_CPU_PROGRAM_MAP(winrun_dsp_program,0) @@ -1652,20 +1652,20 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( winrun_c140_typeB ) MDRV_CPU_ADD(M68000,12288000) /* Master */ MDRV_CPU_PROGRAM_MAP(am_master_winrun,0) - MDRV_CPU_VBLANK_INT(namcos2_68k_master_vblank,1) + MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank) MDRV_CPU_ADD(M68000,12288000) /* Slave */ MDRV_CPU_PROGRAM_MAP(am_slave_winrun,0) - MDRV_CPU_VBLANK_INT(namcos2_68k_slave_vblank,1) + MDRV_CPU_VBLANK_INT("main", namcos2_68k_slave_vblank) MDRV_CPU_ADD(M6809,3072000) /* Sound */ MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,120) MDRV_CPU_ADD(HD63705,2048000) /* IO */ MDRV_CPU_PROGRAM_MAP(readmem_mcu,writemem_mcu) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(TMS32025,24000000) /* 24 MHz? overclocked */ MDRV_CPU_PROGRAM_MAP(winrun_dsp_program,0) @@ -1674,7 +1674,7 @@ static MACHINE_DRIVER_START( winrun_c140_typeB ) MDRV_CPU_ADD(M68000,12288000) /* graphics coprocessor */ MDRV_CPU_PROGRAM_MAP(am_gpu_winrun,0) - MDRV_CPU_VBLANK_INT(namcos2_68k_gpu_vblank,1) + MDRV_CPU_VBLANK_INT("main", namcos2_68k_gpu_vblank) MDRV_INTERLEAVE(100) /* 100 CPU slices per frame */ diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c index fbbda14e8b9..34034a99a0f 100644 --- a/src/mame/drivers/namcos22.c +++ b/src/mame/drivers/namcos22.c @@ -1807,13 +1807,13 @@ static const struct C352interface c352_interface = static MACHINE_DRIVER_START( namcos22s ) MDRV_CPU_ADD_TAG("main", M68EC020,SS22_MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(namcos22s_am,0) - MDRV_CPU_VBLANK_INT(namcos22s_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(namcos22s_interrupt,2) MDRV_CPU_ADD(TMS32025,SS22_MASTER_CLOCK) MDRV_CPU_PROGRAM_MAP(master_dsp_program,0) MDRV_CPU_DATA_MAP(master_dsp_data,0) MDRV_CPU_IO_MAP(master_dsp_io,0) - MDRV_CPU_VBLANK_INT(dsp_serial_pulse1,SERIAL_IO_PERIOD) + MDRV_CPU_VBLANK_INT_HACK(dsp_serial_pulse1,SERIAL_IO_PERIOD) MDRV_CPU_ADD(TMS32025,SS22_MASTER_CLOCK) MDRV_CPU_PROGRAM_MAP(slave_dsp_program,0) @@ -1823,7 +1823,7 @@ static MACHINE_DRIVER_START( namcos22s ) MDRV_CPU_ADD(M37710, SS22_MASTER_CLOCK/3) MDRV_CPU_PROGRAM_MAP(mcu_program, 0) MDRV_CPU_IO_MAP( mcu_io, 0 ) - MDRV_CPU_VBLANK_INT(mcu_interrupt, 3) + MDRV_CPU_VBLANK_INT_HACK(mcu_interrupt, 3) MDRV_NVRAM_HANDLER(namcos22) MDRV_SCREEN_ADD("main", RASTER) @@ -2222,13 +2222,13 @@ static MACHINE_RESET(namcos22) static MACHINE_DRIVER_START( namcos22 ) MDRV_CPU_ADD(M68020,SS22_MASTER_CLOCK/2) /* 25 MHz? */ MDRV_CPU_PROGRAM_MAP(namcos22_am,0) - MDRV_CPU_VBLANK_INT(namcos22_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(namcos22_interrupt,2) MDRV_CPU_ADD(TMS32025,SS22_MASTER_CLOCK) /* ? */ MDRV_CPU_PROGRAM_MAP(master_dsp_program,0) MDRV_CPU_DATA_MAP(master_dsp_data,0) MDRV_CPU_IO_MAP(master_dsp_io,0) - MDRV_CPU_VBLANK_INT(dsp_serial_pulse1,SERIAL_IO_PERIOD) + MDRV_CPU_VBLANK_INT_HACK(dsp_serial_pulse1,SERIAL_IO_PERIOD) MDRV_CPU_ADD(TMS32025,SS22_MASTER_CLOCK) /* ? */ MDRV_CPU_PROGRAM_MAP(slave_dsp_program,0) diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index 20ca4698952..abf1e053605 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -861,7 +861,7 @@ static MACHINE_DRIVER_START( s23 ) MDRV_CPU_ADD(H83002, 14745600 ) MDRV_CPU_PROGRAM_MAP( s23h8rwmap, 0 ) MDRV_CPU_IO_MAP( s23h8iomap, 0 ) - MDRV_CPU_VBLANK_INT( irq1_line_pulse, 1 ) + MDRV_CPU_VBLANK_INT("main", irq1_line_pulse) MDRV_SCREEN_ADD("main", RASTER) @@ -895,12 +895,12 @@ static MACHINE_DRIVER_START( ss23 ) MDRV_CPU_ADD(R4650BE, 166000000) MDRV_CPU_CONFIG(config) MDRV_CPU_PROGRAM_MAP(ss23_map, 0) - MDRV_CPU_VBLANK_INT(namcos23_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", namcos23_interrupt) MDRV_CPU_ADD(H83002, 14745600 ) MDRV_CPU_PROGRAM_MAP( s23h8rwmap, 0 ) MDRV_CPU_IO_MAP( s23h8iomap, 0 ) - MDRV_CPU_VBLANK_INT( irq1_line_pulse, 1 ) + MDRV_CPU_VBLANK_INT("main", irq1_line_pulse) MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c index 772889c29c0..34693dd6882 100644 --- a/src/mame/drivers/namcos86.c +++ b/src/mame/drivers/namcos86.c @@ -1066,16 +1066,16 @@ static MACHINE_DRIVER_START( hopmappy ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("cpu1", M6809, 49152000/32) MDRV_CPU_PROGRAM_MAP(cpu1_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_CPU_ADD_TAG("cpu2", M6809, 49152000/32) MDRV_CPU_PROGRAM_MAP(hopmappy_cpu2_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_CPU_ADD_TAG("mcu", HD63701, 49152000/8) /* or compatible 6808 with extra instructions */ MDRV_CPU_PROGRAM_MAP(hopmappy_mcu_map,0) MDRV_CPU_IO_MAP(mcu_port_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* ??? */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* ??? */ MDRV_INTERLEAVE(800) /* heavy interleaving needed to avoid hangs in rthunder */ diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index 3a4156ca55e..27d8456f862 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -774,7 +774,7 @@ static MACHINE_DRIVER_START( naomi ) MDRV_CPU_CONFIG(sh4cpu_config) MDRV_CPU_PROGRAM_MAP(naomi_map,0) MDRV_CPU_IO_MAP(naomi_port,0) - MDRV_CPU_VBLANK_INT(naomi_vblank,1) + MDRV_CPU_VBLANK_INT("main", naomi_vblank) MDRV_CPU_ADD_TAG("sound", ARM7, ((XTAL_33_8688MHz*2)/3)/8) // AICA bus clock is 2/3rds * 33.8688. ARM7 gets 1 bus cycle out of each 8. MDRV_CPU_PROGRAM_MAP(dc_audio_map, 0) diff --git a/src/mame/drivers/naughtyb.c b/src/mame/drivers/naughtyb.c index ab321395452..eb80c0152c1 100644 --- a/src/mame/drivers/naughtyb.c +++ b/src/mame/drivers/naughtyb.c @@ -381,7 +381,7 @@ static MACHINE_DRIVER_START( naughtyb ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(naughtyb_interrupt,1) + MDRV_CPU_VBLANK_INT("main", naughtyb_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -418,7 +418,7 @@ static MACHINE_DRIVER_START( popflame ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */ MDRV_CPU_PROGRAM_MAP(readmem,popflame_writemem) - MDRV_CPU_VBLANK_INT(naughtyb_interrupt,1) + MDRV_CPU_VBLANK_INT("main", naughtyb_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/nbmj8688.c b/src/mame/drivers/nbmj8688.c index 1ccbf47511f..941044c258f 100644 --- a/src/mame/drivers/nbmj8688.c +++ b/src/mame/drivers/nbmj8688.c @@ -3138,7 +3138,7 @@ static MACHINE_DRIVER_START( NBMJDRV_4096 ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", Z80, 5000000) /* 5.00 MHz */ - MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", nb1413m3_interrupt) MDRV_MACHINE_RESET(nb1413m3) MDRV_NVRAM_HANDLER(nb1413m3) @@ -3206,7 +3206,7 @@ static MACHINE_DRIVER_START( crystalg ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(readmem_secolove, writemem_secolove) MDRV_CPU_IO_MAP(readport_secolove, writeport_crystalg) -// MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 96) // nmiclock = 2f +// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 96) // nmiclock = 2f MACHINE_DRIVER_END @@ -3217,7 +3217,7 @@ static MACHINE_DRIVER_START( apparel ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(readmem_secolove, writemem_secolove) MDRV_CPU_IO_MAP(readport_secolove, writeport_secolove) -// MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 128) // nmiclock = 60 +// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60 MACHINE_DRIVER_END @@ -3228,7 +3228,7 @@ static MACHINE_DRIVER_START( mbmj_h12bit ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(readmem_secolove, writemem_secolove) MDRV_CPU_IO_MAP(readport_secolove, writeport_secolove) -// MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 128) // nmiclock = 60 +// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60 /* video hardware */ MDRV_VIDEO_START(mbmj8688_hybrid_12bit) @@ -3242,7 +3242,7 @@ static MACHINE_DRIVER_START( mbmj_p16bit ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(readmem_secolove, writemem_secolove) MDRV_CPU_IO_MAP(readport_secolove, writeport_secolove) -// MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 128) // nmiclock = 60/40 +// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60/40 /* video hardware */ MDRV_VIDEO_START(mbmj8688_pure_16bit) @@ -3253,7 +3253,7 @@ static MACHINE_DRIVER_START( mbmj_p16bit_LCD ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", Z80, 5000000) /* 5.00 MHz */ - MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", nb1413m3_interrupt) MDRV_CPU_PROGRAM_MAP(readmem_secolove, writemem_secolove) MDRV_CPU_IO_MAP(readport_secolove, writeport_p16bit_LCD) @@ -3308,7 +3308,7 @@ static MACHINE_DRIVER_START( seiha ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(readmem_secolove, writemem_secolove) MDRV_CPU_IO_MAP(readport_secolove, writeport_seiha) -// MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 128) // nmiclock = 60 +// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60 MACHINE_DRIVER_END @@ -3319,7 +3319,7 @@ static MACHINE_DRIVER_START( iemoto ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(readmem_secolove, writemem_secolove) MDRV_CPU_IO_MAP(readport_secolove, writeport_iemoto) -// MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 128) // nmiclock = 60 +// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60 MACHINE_DRIVER_END @@ -3330,7 +3330,7 @@ static MACHINE_DRIVER_START( ojousan ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(readmem_ojousan, writemem_ojousan) MDRV_CPU_IO_MAP(readport_secolove, writeport_iemoto) -// MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 128) // nmiclock = 60 +// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) // nmiclock = 60 MACHINE_DRIVER_END @@ -3341,7 +3341,7 @@ static MACHINE_DRIVER_START( mbmj_p12bit ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(readmem_mjsikaku, writemem_mjsikaku) MDRV_CPU_IO_MAP(readport_kaguya, writeport_kaguya) -// MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 128) +// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) MACHINE_DRIVER_END @@ -3352,7 +3352,7 @@ static MACHINE_DRIVER_START( mjsikaku ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(readmem_mjsikaku, writemem_mjsikaku) MDRV_CPU_IO_MAP(readport_mjsikaku, writeport_mjsikaku) -// MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 144) // nmiclock = 70 +// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 144) // nmiclock = 70 /* sound hardware */ MDRV_SOUND_REPLACE("8910", YM3812, 20000000/8) @@ -3367,7 +3367,7 @@ static MACHINE_DRIVER_START( mmsikaku ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(readmem_secolove, writemem_secolove) MDRV_CPU_IO_MAP(readport_mmsikaku, writeport_mmsikaku) -// MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 128) +// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) MACHINE_DRIVER_END diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c index 8a82dfa83b6..8cde95dc8bc 100644 --- a/src/mame/drivers/nbmj8891.c +++ b/src/mame/drivers/nbmj8891.c @@ -3028,8 +3028,8 @@ static MACHINE_DRIVER_START( gionbana ) MDRV_CPU_ADD_TAG("main", Z80, 20000000/4) /* 5.00 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem_gionbana, writemem_gionbana) MDRV_CPU_IO_MAP(readport_gionbana, writeport_gionbana) -// MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 132) // nmiclock = 60 - MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 1) +// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 132) // nmiclock = 60 + MDRV_CPU_VBLANK_INT("main", nb1413m3_interrupt) MDRV_MACHINE_RESET(nb1413m3) @@ -3093,7 +3093,7 @@ static MACHINE_DRIVER_START( mjcamerb ) MDRV_IMPORT_FROM(gionbana) MDRV_CPU_MODIFY("main") MDRV_CPU_IO_MAP(readport_gionbana, writeport_hanamomo) -// MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 142) // ? +// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 142) // ? MDRV_NVRAM_HANDLER(nb1413m3) @@ -3109,7 +3109,7 @@ static MACHINE_DRIVER_START( mmcamera ) MDRV_IMPORT_FROM(gionbana) MDRV_CPU_MODIFY("main") MDRV_CPU_IO_MAP(readport_gionbana, writeport_hanamomo) -// MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 128) +// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) MDRV_NVRAM_HANDLER(nb1413m3) @@ -3126,7 +3126,7 @@ static MACHINE_DRIVER_START( hanamomo ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(readmem_hanamomo, writemem_hanamomo) MDRV_CPU_IO_MAP(readport_gionbana, writeport_hanamomo) -// MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 128) +// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) /* video hardware */ MDRV_SCREEN_MODIFY("main") @@ -3142,7 +3142,7 @@ static MACHINE_DRIVER_START( msjiken ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(readmem_gionbana, writemem_gionbana) MDRV_CPU_IO_MAP(readport_gionbana, writeport_msjiken) -// MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 142) // nmiclock = 70 +// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 142) // nmiclock = 70 MACHINE_DRIVER_END @@ -3153,7 +3153,7 @@ static MACHINE_DRIVER_START( telmahjn ) /* basic machine hardware */ MDRV_IMPORT_FROM(gionbana) MDRV_CPU_MODIFY("main") -// MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 142) // nmiclock = 70 +// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 142) // nmiclock = 70 /* video hardware */ MDRV_VIDEO_START(nbmj8891_1layer) @@ -3165,7 +3165,7 @@ static MACHINE_DRIVER_START( mgmen89 ) /* basic machine hardware */ MDRV_IMPORT_FROM(telmahjn) MDRV_CPU_MODIFY("main") -// MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 128) +// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) MACHINE_DRIVER_END @@ -3264,7 +3264,7 @@ static MACHINE_DRIVER_START( mjfocusm ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(readmem_scandalm, writemem_scandalm) MDRV_CPU_IO_MAP(readport_scandalm, writeport_scandalm) -// MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 128) +// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) MDRV_NVRAM_HANDLER(nb1413m3) @@ -3287,7 +3287,7 @@ static MACHINE_DRIVER_START( taiwanmb ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(readmem_taiwanmb, writemem_taiwanmb) MDRV_CPU_IO_MAP(readport_taiwanmb, writeport_taiwanmb) -// MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 1) +// MDRV_CPU_VBLANK_INT("main", nb1413m3_interrupt) MDRV_NVRAM_HANDLER(nb1413m3) diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c index b4669df4b41..5e5531c1879 100644 --- a/src/mame/drivers/nbmj8991.c +++ b/src/mame/drivers/nbmj8991.c @@ -29,6 +29,7 @@ Notes: ******************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "nb1413m3.h" #include "sound/ay8910.h" #include "sound/3812intf.h" @@ -1759,8 +1760,8 @@ static MACHINE_DRIVER_START( nbmjdrv1 ) // galkoku MDRV_CPU_ADD_TAG("main", Z80, 25000000/5) /* 5.00 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem_galkoku, writemem_galkoku) MDRV_CPU_IO_MAP(readport_galkoku, writeport_galkoku) -// MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 128) - MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 1) +// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt, 128) + MDRV_CPU_VBLANK_INT("main", nb1413m3_interrupt) MDRV_MACHINE_RESET(nbmj8991) @@ -1793,13 +1794,13 @@ static MACHINE_DRIVER_START( nbmjdrv2 ) // pstadium MDRV_CPU_ADD_TAG("main", Z80, 6000000/2) /* 3.00 MHz */ MDRV_CPU_PROGRAM_MAP(readmem_pstadium, writemem_pstadium) MDRV_CPU_IO_MAP(readport_pstadium, writeport_pstadium) - MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", nb1413m3_interrupt) MDRV_CPU_ADD(Z80, 3900000) /* 4.00 MHz */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem_nbmj8991, sound_writemem_nbmj8991) MDRV_CPU_IO_MAP(sound_readport_nbmj8991, sound_writeport_nbmj8991) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 128) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 128) MDRV_MACHINE_RESET(nbmj8991) diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c index 24ffa79bc2b..e8a778e8265 100644 --- a/src/mame/drivers/nbmj9195.c +++ b/src/mame/drivers/nbmj9195.c @@ -4139,7 +4139,7 @@ static MACHINE_DRIVER_START( NBMJDRV1 ) MDRV_CPU_CONFIG(daisy_chain_main) MDRV_CPU_PROGRAM_MAP(readmem_sailorws, writemem_sailorws) MDRV_CPU_IO_MAP(readport_sailorws, writeport_sailorws) - MDRV_CPU_VBLANK_INT(ctc0_trg1, 1) /* vblank is connect to ctc triggfer */ + MDRV_CPU_VBLANK_INT("main", ctc0_trg1) /* vblank is connect to ctc triggfer */ MDRV_CPU_ADD(Z80, 8000000/1) /* TMPZ84C011, 8.00 MHz */ /* audio CPU */ diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c index 0e6d365062c..20c561ac359 100644 --- a/src/mame/drivers/nemesis.c +++ b/src/mame/drivers/nemesis.c @@ -2149,7 +2149,7 @@ static MACHINE_DRIVER_START( nemesis ) MDRV_CPU_ADD(M68000,18432000/2) /* 9.216 MHz? */ // 14318180/2, /* From schematics, should be accurate */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(nemesis_interrupt,1) + MDRV_CPU_VBLANK_INT("main", nemesis_interrupt) MDRV_CPU_ADD(Z80,14318180/4) /* audio CPU */ /* From schematics, should be accurate */ @@ -2197,7 +2197,7 @@ static MACHINE_DRIVER_START( konamigt ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,18432000/2) /* 9.216 MHz? */ MDRV_CPU_PROGRAM_MAP(konamigt_readmem,konamigt_writemem) - MDRV_CPU_VBLANK_INT(konamigt_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(konamigt_interrupt,2) MDRV_CPU_ADD(Z80,14318180/4) /* audio CPU */ /* 3.579545 MHz */ @@ -2241,7 +2241,7 @@ static MACHINE_DRIVER_START( salamand ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,18432000/2) /* 9.216MHz */ MDRV_CPU_PROGRAM_MAP(salamand_readmem,salamand_writemem) - MDRV_CPU_VBLANK_INT(salamand_interrupt,1) + MDRV_CPU_VBLANK_INT("main", salamand_interrupt) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* 3.579545 MHz */ @@ -2292,7 +2292,7 @@ static MACHINE_DRIVER_START( blkpnthr ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,18432000/2) /* 9.216 MHz? */ MDRV_CPU_PROGRAM_MAP(blkpnthr_readmem,blkpnthr_writemem) - MDRV_CPU_VBLANK_INT(blkpnthr_interrupt,1) + MDRV_CPU_VBLANK_INT("main", blkpnthr_interrupt) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* 3.579545 MHz */ @@ -2338,7 +2338,7 @@ static MACHINE_DRIVER_START( citybomb ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,18432000/2) /* 9.216 MHz? */ MDRV_CPU_PROGRAM_MAP(citybomb_readmem,citybomb_writemem) - MDRV_CPU_VBLANK_INT(salamand_interrupt,1) + MDRV_CPU_VBLANK_INT("main", salamand_interrupt) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* 3.579545 MHz */ @@ -2388,7 +2388,7 @@ static MACHINE_DRIVER_START( nyanpani ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,18432000/2) /* 9.216 MHz? */ MDRV_CPU_PROGRAM_MAP(nyanpani_readmem,nyanpani_writemem) - MDRV_CPU_VBLANK_INT(salamand_interrupt,1) + MDRV_CPU_VBLANK_INT("main", salamand_interrupt) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* 3.579545 MHz */ @@ -2438,11 +2438,11 @@ static MACHINE_DRIVER_START( gx400 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,18432000/2) /* 9.216MHz */ MDRV_CPU_PROGRAM_MAP(gx400_readmem,gx400_writemem) - MDRV_CPU_VBLANK_INT(gx400_interrupt,3) + MDRV_CPU_VBLANK_INT_HACK(gx400_interrupt,3) MDRV_CPU_ADD(Z80,14318180/4) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(gx400_sound_readmem,gx400_sound_writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) /* interrupts are triggered by the main CPU */ + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* interrupts are triggered by the main CPU */ MDRV_MACHINE_RESET(nemesis) @@ -2486,12 +2486,12 @@ static MACHINE_DRIVER_START( rf2_gx400 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,18432000/2) /* 9.216MHz */ MDRV_CPU_PROGRAM_MAP(rf2_gx400_readmem,rf2_gx400_writemem) - MDRV_CPU_VBLANK_INT(gx400_interrupt,3) + MDRV_CPU_VBLANK_INT_HACK(gx400_interrupt,3) MDRV_CPU_ADD(Z80,14318180/4) /* audio CPU */ /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(gx400_sound_readmem,gx400_sound_writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) /* interrupts are triggered by the main CPU */ + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* interrupts are triggered by the main CPU */ MDRV_MACHINE_RESET(nemesis) @@ -2534,7 +2534,7 @@ static MACHINE_DRIVER_START( hcrash ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,18432000/3) /* 6.144MHz */ MDRV_CPU_PROGRAM_MAP(hcrash_map,0) - MDRV_CPU_VBLANK_INT(konamigt_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(konamigt_interrupt,2) MDRV_CPU_ADD(Z80,14318180/4) /* audio CPU */ /* 3.579545 MHz */ diff --git a/src/mame/drivers/news.c b/src/mame/drivers/news.c index a50cc653526..11b4bc17e7b 100644 --- a/src/mame/drivers/news.c +++ b/src/mame/drivers/news.c @@ -123,7 +123,7 @@ static MACHINE_DRIVER_START( news ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,8000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c index e83178d9b70..90080f66f70 100644 --- a/src/mame/drivers/ninjakd2.c +++ b/src/mame/drivers/ninjakd2.c @@ -925,7 +925,7 @@ static MACHINE_DRIVER_START( ninjakd2 ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", Z80, MAIN_CLOCK_12/2) /* verified */ MDRV_CPU_PROGRAM_MAP(ninjakd2_main_cpu,0) - MDRV_CPU_VBLANK_INT(ninjakd2_interrupt,1) + MDRV_CPU_VBLANK_INT("main", ninjakd2_interrupt) MDRV_CPU_ADD_TAG("sound", Z80, MAIN_CLOCK_5) /* verified */ MDRV_CPU_PROGRAM_MAP(ninjakd2_sound_cpu,0) diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c index 4f29b9588b3..89fbb57c4c0 100644 --- a/src/mame/drivers/ninjaw.c +++ b/src/mame/drivers/ninjaw.c @@ -625,7 +625,7 @@ static MACHINE_DRIVER_START( ninjaw ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,16000000/2) /* 8 MHz ? */ MDRV_CPU_PROGRAM_MAP(ninjaw_readmem,ninjaw_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("left", irq4_line_hold) MDRV_CPU_ADD(Z80,16000000/4) /* audio CPU */ /* 16/4 MHz ? */ @@ -633,7 +633,7 @@ static MACHINE_DRIVER_START( ninjaw ) MDRV_CPU_ADD(M68000,16000000/2) /* 8 MHz ? */ MDRV_CPU_PROGRAM_MAP(ninjaw_cpub_readmem,ninjaw_cpub_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("left", irq4_line_hold) MDRV_INTERLEAVE(100) /* CPU slices */ @@ -699,7 +699,7 @@ static MACHINE_DRIVER_START( darius2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,16000000/2) /* 8 MHz ? */ MDRV_CPU_PROGRAM_MAP(darius2_readmem,darius2_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("left", irq4_line_hold) MDRV_CPU_ADD(Z80,16000000/4) /* audio CPU */ /* 4 MHz ? */ @@ -707,7 +707,7 @@ static MACHINE_DRIVER_START( darius2 ) MDRV_CPU_ADD(M68000,16000000/2) /* 8 MHz ? */ MDRV_CPU_PROGRAM_MAP(darius2_cpub_readmem,darius2_cpub_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("left", irq4_line_hold) MDRV_INTERLEAVE(100) /* CPU slices */ diff --git a/src/mame/drivers/nitedrvr.c b/src/mame/drivers/nitedrvr.c index 9966e2ad1e2..1b1b9872b65 100644 --- a/src/mame/drivers/nitedrvr.c +++ b/src/mame/drivers/nitedrvr.c @@ -164,7 +164,7 @@ static MACHINE_DRIVER_START( nitedrvr ) // basic machine hardware MDRV_CPU_ADD(M6502, 12096000/12) // 1 MHz MDRV_CPU_PROGRAM_MAP(nitedrvr_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_WATCHDOG_VBLANK_INIT(3) MDRV_MACHINE_RESET(nitedrvr) diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c index 70f38eba9e4..63a5f649470 100644 --- a/src/mame/drivers/niyanpai.c +++ b/src/mame/drivers/niyanpai.c @@ -852,7 +852,7 @@ static MACHINE_DRIVER_START( niyanpai ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 12288000/2) /* TMP68301, 6.144 MHz */ MDRV_CPU_PROGRAM_MAP(niyanpai_readmem,niyanpai_writemem) - MDRV_CPU_VBLANK_INT(niyanpai_interrupt,1) + MDRV_CPU_VBLANK_INT("main", niyanpai_interrupt) MDRV_CPU_ADD(Z80, 8000000/1) /* TMPZ84C011, 8.00 MHz */ MDRV_CPU_CONFIG(daisy_chain_sound) diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c index 3be1102e103..72140a44e7e 100644 --- a/src/mame/drivers/nmg5.c +++ b/src/mame/drivers/nmg5.c @@ -985,7 +985,7 @@ static MACHINE_DRIVER_START( nmg5 ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(nmg5_map,0) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD_TAG("sound", Z80, 4000000) /* 4 MHz */ /* audio CPU */ diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c index bc2cfeba7d6..7655224e55f 100644 --- a/src/mame/drivers/nmk16.c +++ b/src/mame/drivers/nmk16.c @@ -3696,7 +3696,7 @@ static MACHINE_DRIVER_START( tharrier ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz */ MDRV_CPU_PROGRAM_MAP(tharrier_readmem,tharrier_writemem) - MDRV_CPU_VBLANK_INT(nmk_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ MDRV_CPU_ADD(Z80, 3000000) @@ -3746,7 +3746,7 @@ static MACHINE_DRIVER_START( manybloc ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* 10? MHz - check */ MDRV_CPU_PROGRAM_MAP(manybloc_readmem,manybloc_writemem) - MDRV_CPU_VBLANK_INT(nmk_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,56)/* this needs to equal the framerate on this, rather than being double it .. */ MDRV_CPU_ADD(Z80, 3000000) @@ -3793,7 +3793,7 @@ static MACHINE_DRIVER_START( mustang ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz ? */ MDRV_CPU_PROGRAM_MAP(mustang_map,0) - MDRV_CPU_VBLANK_INT(nmk_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ MDRV_MACHINE_RESET(NMK004) @@ -3838,7 +3838,7 @@ static MACHINE_DRIVER_START( mustangb ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz ? */ MDRV_CPU_PROGRAM_MAP(mustangb_map,0) - MDRV_CPU_VBLANK_INT(nmk_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ SEIBU_SOUND_SYSTEM_CPU(14318180/4) @@ -3920,7 +3920,7 @@ static MACHINE_DRIVER_START( bioship ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, BIOSHIP_CRYSTAL1 ) /* 10.0 MHz (verified) */ MDRV_CPU_PROGRAM_MAP(bioship_readmem,bioship_writemem) - MDRV_CPU_VBLANK_INT(nmk_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ MDRV_MACHINE_RESET(NMK004) @@ -3964,7 +3964,7 @@ static MACHINE_DRIVER_START( vandyke ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_10MHz) /* 68000p12 running at 10Mhz, verified on pcb */ MDRV_CPU_PROGRAM_MAP(vandyke_readmem,vandyke_writemem) - MDRV_CPU_VBLANK_INT(nmk_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ MDRV_MACHINE_RESET(NMK004) @@ -4008,7 +4008,7 @@ static MACHINE_DRIVER_START( vandykeb ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz ? */ MDRV_CPU_PROGRAM_MAP(vandyke_readmem,vandyke_writemem) - MDRV_CPU_VBLANK_INT(nmk_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ MDRV_CPU_ADD(PIC16C57, 12000000) /* 3MHz */ @@ -4044,7 +4044,7 @@ static MACHINE_DRIVER_START( acrobatm ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz (verified on pcb) */ MDRV_CPU_PROGRAM_MAP(acrobatm_readmem,acrobatm_writemem) - MDRV_CPU_VBLANK_INT(nmk_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ MDRV_MACHINE_RESET(NMK004) @@ -4090,8 +4090,8 @@ static MACHINE_DRIVER_START( tdragonb ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(tdragon_readmem,tdragonb_writemem) - //MDRV_CPU_VBLANK_INT(irq4_line_hold,1) - MDRV_CPU_VBLANK_INT(nmk_interrupt,2) + //MDRV_CPU_VBLANK_INT("main", irq4_line_hold) + MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ?? drives music */ SEIBU_SOUND_SYSTEM_CPU(14318180/4) @@ -4122,8 +4122,8 @@ static MACHINE_DRIVER_START( tdragon ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(tdragon_readmem,tdragon_writemem) - MDRV_CPU_VBLANK_INT(nmk_interrupt,2) - //MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) + //MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ?? drives music */ MDRV_MACHINE_RESET(NMK004) @@ -4167,7 +4167,7 @@ static MACHINE_DRIVER_START( ssmissin ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* 8 Mhz */ MDRV_CPU_PROGRAM_MAP(ssmissin_readmem,ssmissin_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112) /* input related */ MDRV_CPU_ADD(Z80, 8000000/2) /* 4 Mhz */ @@ -4204,7 +4204,7 @@ static MACHINE_DRIVER_START( strahl ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ? */ MDRV_CPU_PROGRAM_MAP(strahl_readmem,strahl_writemem) - MDRV_CPU_VBLANK_INT(nmk_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ MDRV_MACHINE_RESET(NMK004) @@ -4249,7 +4249,7 @@ static MACHINE_DRIVER_START( hachamf ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz ? */ MDRV_CPU_PROGRAM_MAP(hachamf_map,0) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ MDRV_MACHINE_RESET(NMK004) @@ -4294,7 +4294,7 @@ static MACHINE_DRIVER_START( macross ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz ? */ MDRV_CPU_PROGRAM_MAP(macross_readmem,macross_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ MDRV_MACHINE_RESET(NMK004) @@ -4339,7 +4339,7 @@ static MACHINE_DRIVER_START( gunnail ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz? */ MDRV_CPU_PROGRAM_MAP(gunnail_readmem,gunnail_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112) MDRV_MACHINE_RESET(NMK004) @@ -4384,7 +4384,7 @@ static MACHINE_DRIVER_START( macross2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz ? */ MDRV_CPU_PROGRAM_MAP(macross2_readmem,macross2_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ MDRV_CPU_ADD(Z80, 4000000) @@ -4430,7 +4430,7 @@ static MACHINE_DRIVER_START( tdragon2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz */ MDRV_CPU_PROGRAM_MAP(macross2_readmem,macross2_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ MDRV_CPU_ADD(Z80, 4000000) @@ -4476,7 +4476,7 @@ static MACHINE_DRIVER_START( raphero ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14000000) /* 14 MHz measured */ MDRV_CPU_PROGRAM_MAP(macross2_readmem,raphero_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ MDRV_CPU_ADD_TAG("sound",TMP90841, 8000000) @@ -4520,7 +4520,7 @@ static MACHINE_DRIVER_START( bjtwin ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(bjtwin_readmem,bjtwin_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ?? drives music */ MDRV_MACHINE_RESET(nmk16) @@ -5023,7 +5023,7 @@ static MACHINE_DRIVER_START( stagger1 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,12000000) MDRV_CPU_PROGRAM_MAP(afega,0) - MDRV_CPU_VBLANK_INT(nmk_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* ? */ @@ -5091,7 +5091,7 @@ static MACHINE_DRIVER_START( firehawk ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,12000000) MDRV_CPU_PROGRAM_MAP(afega,0) - MDRV_CPU_VBLANK_INT(nmk_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) MDRV_CPU_ADD(Z80,4000000) /* audio CPU */ @@ -5131,7 +5131,7 @@ static MACHINE_DRIVER_START( twinactn ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,12000000) MDRV_CPU_PROGRAM_MAP(twinactn_map,0) - MDRV_CPU_VBLANK_INT(nmk_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2) MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */ MDRV_CPU_ADD(Z80, 4000000) diff --git a/src/mame/drivers/nova2001.c b/src/mame/drivers/nova2001.c index 795765cb769..304c9da5223 100644 --- a/src/mame/drivers/nova2001.c +++ b/src/mame/drivers/nova2001.c @@ -118,6 +118,7 @@ e000 - e7ff R/W Work RAM ******************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "sound/ay8910.h" #include "nova2001.h" @@ -689,7 +690,7 @@ static MACHINE_DRIVER_START( nova2001 ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, MAIN_CLOCK/4) // 3 MHz verified on schematics MDRV_CPU_PROGRAM_MAP(nova2001_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -722,11 +723,11 @@ static MACHINE_DRIVER_START( ninjakun ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, MAIN_CLOCK/4) // 3 MHz MDRV_CPU_PROGRAM_MAP(ninjakun_cpu1_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, MAIN_CLOCK/4) // 3 MHz MDRV_CPU_PROGRAM_MAP(ninjakun_cpu2_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) /* ? */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* ? */ MDRV_INTERLEAVE(100) /* 100 CPU slices per frame */ @@ -764,7 +765,7 @@ static MACHINE_DRIVER_START( pkunwar ) MDRV_CPU_ADD(Z80, MAIN_CLOCK/4) // 3 MHz MDRV_CPU_PROGRAM_MAP(pkunwar_map,0) MDRV_CPU_IO_MAP(pkunwar_io,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -798,11 +799,11 @@ static MACHINE_DRIVER_START( raiders5 ) MDRV_CPU_ADD(Z80, MAIN_CLOCK/4) // 3 MHz MDRV_CPU_PROGRAM_MAP(raiders5_cpu1_map,0) MDRV_CPU_IO_MAP(raiders5_io,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, MAIN_CLOCK/4) // 3 MHz MDRV_CPU_PROGRAM_MAP(raiders5_cpu2_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) /* ? */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* ? */ MDRV_INTERLEAVE(400) diff --git a/src/mame/drivers/nss.c b/src/mame/drivers/nss.c index a97720bf6e9..0629ea91792 100644 --- a/src/mame/drivers/nss.c +++ b/src/mame/drivers/nss.c @@ -420,7 +420,6 @@ static MACHINE_DRIVER_START( snes ) MDRV_CPU_ADD_TAG("sound", SPC700, 2048000/2) /* 2.048 Mhz, but internal divider */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(spc_mem, 0) - MDRV_CPU_VBLANK_INT(NULL, 0) MDRV_INTERLEAVE(400) diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c index bc0b336d395..e298d965e47 100644 --- a/src/mame/drivers/nycaptor.c +++ b/src/mame/drivers/nycaptor.c @@ -800,16 +800,16 @@ static MACHINE_DRIVER_START( nycaptor ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,8000000/2) /* ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(readmem_sub,writemem_sub) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* IRQ generated by ??? */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* IRQ generated by ??? */ MDRV_CPU_ADD(Z80,8000000/2) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) /* IRQ generated by ??? */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* IRQ generated by ??? */ MDRV_CPU_ADD(M68705,2000000) MDRV_CPU_PROGRAM_MAP(m68705_readmem,m68705_writemem) @@ -853,16 +853,16 @@ static MACHINE_DRIVER_START( cyclshtg ) MDRV_CPU_ADD(Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(cyclshtg_readmem,cyclshtg_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(cyclshtg_readmem_sub,cyclshtg_writemem_sub) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,8000000/2) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) #ifdef USE_MCU MDRV_CPU_ADD(M68705,2000000) @@ -905,18 +905,18 @@ static MACHINE_DRIVER_START( bronx ) MDRV_CPU_ADD(Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(bronx_readmem, bronx_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(bronx_readmem_sub, bronx_writemem_sub) MDRV_CPU_IO_MAP(bronx_io, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,8000000/2) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_INTERLEAVE(2) MDRV_MACHINE_RESET(ta7630) diff --git a/src/mame/drivers/ohmygod.c b/src/mame/drivers/ohmygod.c index 55f31678520..cf8c41fe211 100644 --- a/src/mame/drivers/ohmygod.c +++ b/src/mame/drivers/ohmygod.c @@ -332,7 +332,7 @@ static MACHINE_DRIVER_START( ohmygod ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_MACHINE_RESET(ohmygod) MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_SEC(3)) /* a guess, and certainly wrong */ diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c index 17cb549d355..dc3547906b1 100644 --- a/src/mame/drivers/ojankohs.c +++ b/src/mame/drivers/ojankohs.c @@ -956,7 +956,7 @@ static MACHINE_DRIVER_START( ojankohs ) MDRV_CPU_ADD(Z80,12000000/2) /* 6.00 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem_ojankohs,writemem_ojankohs) MDRV_CPU_IO_MAP(readport_ojankohs,writeport_ojankohs) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_RESET(ojankohs) MDRV_NVRAM_HANDLER(generic_0fill) @@ -993,7 +993,7 @@ static MACHINE_DRIVER_START( ojankoy ) MDRV_CPU_ADD(Z80,12000000/2) /* 6.00 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem_ojankoy,writemem_ojankoy) MDRV_CPU_IO_MAP(readport_ojankohs,writeport_ojankoy) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_RESET(ojankohs) MDRV_NVRAM_HANDLER(generic_0fill) @@ -1031,7 +1031,7 @@ static MACHINE_DRIVER_START( ccasino ) MDRV_CPU_ADD(Z80,12000000/2) /* 6.00 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem_ojankoy,writemem_ojankoy) MDRV_CPU_IO_MAP(readport_ccasino,writeport_ccasino) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_RESET(ojankohs) MDRV_NVRAM_HANDLER(generic_0fill) @@ -1068,7 +1068,7 @@ static MACHINE_DRIVER_START( ojankoc ) MDRV_CPU_ADD(Z80,8000000/2) /* 4.00 MHz */ MDRV_CPU_PROGRAM_MAP(readmem_ojankoc,writemem_ojankoc) MDRV_CPU_IO_MAP(readport_ojankoc,writeport_ojankoc) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_RESET(ojankohs) MDRV_NVRAM_HANDLER(generic_0fill) diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c index c49af2be020..8b10adb126b 100644 --- a/src/mame/drivers/olibochu.c +++ b/src/mame/drivers/olibochu.c @@ -368,12 +368,12 @@ static MACHINE_DRIVER_START( olibochu ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ?? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(olibochu_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(olibochu_interrupt,2) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* 4 MHz ?? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c index 2a947fe3994..cd38201c0a3 100644 --- a/src/mame/drivers/oneshot.c +++ b/src/mame/drivers/oneshot.c @@ -372,7 +372,7 @@ static MACHINE_DRIVER_START( oneshot ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(oneshot_readmem,oneshot_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD(Z80, 5000000) MDRV_CPU_PROGRAM_MAP(snd_readmem, snd_writemem) diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c index 40c41a52742..d9406f181bb 100644 --- a/src/mame/drivers/onetwo.c +++ b/src/mame/drivers/onetwo.c @@ -266,7 +266,7 @@ static MACHINE_DRIVER_START( onetwo ) MDRV_CPU_ADD(Z80,4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(main_cpu,0) MDRV_CPU_IO_MAP(main_cpu_io,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,4000000) /* 4 MHz */ /* audio CPU */ diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c index e0314fe335b..9de460e40a2 100644 --- a/src/mame/drivers/opwolf.c +++ b/src/mame/drivers/opwolf.c @@ -567,7 +567,7 @@ static MACHINE_DRIVER_START( opwolf ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000 ) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(opwolf_readmem,opwolf_writemem) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq5_line_hold) MDRV_CPU_ADD(Z80, 4000000 ) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(z80_readmem,z80_writemem) @@ -616,14 +616,14 @@ static MACHINE_DRIVER_START( opwolfb ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(opwolfb_readmem,opwolfb_writemem) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq5_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(z80_readmem,z80_writemem) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sub_z80_readmem,sub_z80_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(10) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ diff --git a/src/mame/drivers/orbit.c b/src/mame/drivers/orbit.c index ba1ba93714e..605df85b5cc 100644 --- a/src/mame/drivers/orbit.c +++ b/src/mame/drivers/orbit.c @@ -264,7 +264,7 @@ static MACHINE_DRIVER_START( orbit ) /* basic machine hardware */ MDRV_CPU_ADD(M6800, 12096000 / 16) MDRV_CPU_PROGRAM_MAP(orbit_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_pulse, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_pulse) MDRV_CPU_PERIODIC_INT(orbit_interrupt, 240) MDRV_MACHINE_RESET(orbit) diff --git a/src/mame/drivers/othldrby.c b/src/mame/drivers/othldrby.c index c411ff3fe5d..3497d09a4e5 100644 --- a/src/mame/drivers/othldrby.c +++ b/src/mame/drivers/othldrby.c @@ -243,7 +243,7 @@ static MACHINE_DRIVER_START( othldrby ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c index 1d42dd042aa..6d621508207 100644 --- a/src/mame/drivers/othunder.c +++ b/src/mame/drivers/othunder.c @@ -704,7 +704,7 @@ static MACHINE_DRIVER_START( othunder ) // MDRV_CPU_ADD(M68000, 24000000/2 ) /* 12 MHz */ MDRV_CPU_ADD(M68000, 13000000 ) /* fixes garbage graphics on startup */ MDRV_CPU_PROGRAM_MAP(othunder_map,0) - MDRV_CPU_VBLANK_INT(vblank_interrupt,1) + MDRV_CPU_VBLANK_INT("main", vblank_interrupt) MDRV_CPU_ADD(Z80,16000000/4 ) /* 4 MHz */ /* audio CPU */ diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c index 6b6f1fc9259..f8c35aa8821 100644 --- a/src/mame/drivers/overdriv.c +++ b/src/mame/drivers/overdriv.c @@ -398,11 +398,11 @@ static MACHINE_DRIVER_START( overdriv ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(overdriv_readmem,overdriv_writemem) - MDRV_CPU_VBLANK_INT(cpuA_interrupt,4) /* ??? IRQ 4 is vblank, IRQ 5 of unknown origin */ + MDRV_CPU_VBLANK_INT_HACK(cpuA_interrupt,4) /* ??? IRQ 4 is vblank, IRQ 5 of unknown origin */ MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(overdriv_readmem2,overdriv_writemem2) - MDRV_CPU_VBLANK_INT(cpuB_interrupt,1) /* IRQ 5 and 6 are generated by the main CPU. */ + MDRV_CPU_VBLANK_INT("main", cpuB_interrupt) /* IRQ 5 and 6 are generated by the main CPU. */ /* IRQ 5 is used only in test mode, to request the checksums of the gfx ROMs. */ MDRV_CPU_ADD(M6809,3579545/2) /* 1.789 MHz?? This might be the right speed, but ROM testing */ /* takes a little too much (the counter wraps from 0000 to 9999). */ diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c index e9e2516804a..529eafa9524 100644 --- a/src/mame/drivers/pacland.c +++ b/src/mame/drivers/pacland.c @@ -415,12 +415,12 @@ static MACHINE_DRIVER_START( pacland ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 49152000/32) /* 1.536 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_CPU_ADD(HD63701, 49152000/8) /* 1.536 MHz? */ MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_CPU_IO_MAP(mcu_port_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_INTERLEAVE(100) /* we need heavy synching between the MCU and the CPU */ diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c index df1dea930e7..d3ac1b2e219 100644 --- a/src/mame/drivers/pacman.c +++ b/src/mame/drivers/pacman.c @@ -3075,7 +3075,7 @@ static MACHINE_DRIVER_START( pacman ) MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/6) MDRV_CPU_PROGRAM_MAP(pacman_map,0) MDRV_CPU_IO_MAP(0,writeport) - MDRV_CPU_VBLANK_INT(pacman_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(pacman_interrupt,2) MDRV_WATCHDOG_VBLANK_INIT(16) /* video hardware */ @@ -3149,7 +3149,7 @@ static MACHINE_DRIVER_START( alibaba ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(alibaba_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MACHINE_DRIVER_END @@ -3161,7 +3161,7 @@ static MACHINE_DRIVER_START( dremshpr ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(dremshpr_map,0) MDRV_CPU_IO_MAP(0,dremshpr_writeport) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* sound hardware */ MDRV_SOUND_REPLACE("namco", AY8910, 14318000/8) @@ -3203,7 +3203,7 @@ static MACHINE_DRIVER_START( vanvan ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(vanvan_map,0) MDRV_CPU_IO_MAP(0,vanvan_writeport) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* video hardware */ MDRV_SCREEN_MODIFY("main") @@ -3225,7 +3225,7 @@ static MACHINE_DRIVER_START( bigbucks ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(bigbucks_map,0) MDRV_CPU_IO_MAP(bigbucks_readport,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,20) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,20) MDRV_SCREEN_MODIFY("main") MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1) @@ -3240,7 +3240,7 @@ static MACHINE_DRIVER_START( s2650games ) MDRV_CPU_REMOVE("main") MDRV_CPU_ADD_TAG("main", S2650, MASTER_CLOCK/6/2) /* 2H */ MDRV_CPU_PROGRAM_MAP(s2650games_map,0) - MDRV_CPU_VBLANK_INT(s2650_interrupt,1) + MDRV_CPU_VBLANK_INT("main", s2650_interrupt) MDRV_GFXDECODE(s2650games) @@ -3295,7 +3295,7 @@ static MACHINE_DRIVER_START( rocktrv2 ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(rocktrv2_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_SCREEN_MODIFY("main") MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1) @@ -3310,7 +3310,7 @@ static MACHINE_DRIVER_START( mschamp ) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(mschamp_map,0) MDRV_CPU_IO_MAP(mschamp_readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_RESET(mschamp) MACHINE_DRIVER_END diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c index f73c0d98c61..2ab569ad0ec 100644 --- a/src/mame/drivers/pandoras.c +++ b/src/mame/drivers/pandoras.c @@ -379,11 +379,11 @@ static MACHINE_DRIVER_START( pandoras ) /* basic machine hardware */ MDRV_CPU_ADD(M6809,18432000/6) /* CPU A */ MDRV_CPU_PROGRAM_MAP(pandoras_readmem_a,pandoras_writemem_a) - MDRV_CPU_VBLANK_INT(pandoras_interrupt_a,1) + MDRV_CPU_VBLANK_INT("main", pandoras_interrupt_a) MDRV_CPU_ADD(M6809,18432000/6) /* CPU B */ MDRV_CPU_PROGRAM_MAP(pandoras_readmem_b,pandoras_writemem_b) - MDRV_CPU_VBLANK_INT(pandoras_interrupt_b,1) + MDRV_CPU_VBLANK_INT("main", pandoras_interrupt_b) MDRV_CPU_ADD(Z80,14318000/8) /* audio CPU */ diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c index 62408e47d3f..a5cf9790640 100644 --- a/src/mame/drivers/panicr.c +++ b/src/mame/drivers/panicr.c @@ -358,7 +358,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( panicr ) MDRV_CPU_ADD(V20,16000000/2) /* Sony 8623h9 CXQ70116D-8 (V20 compatible) */ MDRV_CPU_PROGRAM_MAP(panicr_map,0) - MDRV_CPU_VBLANK_INT(panicr_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(panicr_interrupt,2) MDRV_CPU_ADD_TAG(CPUTAG_T5182,Z80,14318180/4) /* 3.579545 MHz */ MDRV_CPU_PROGRAM_MAP(t5182_map, 0) diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c index 29f5d040cdc..173cff20444 100644 --- a/src/mame/drivers/paradise.c +++ b/src/mame/drivers/paradise.c @@ -30,6 +30,7 @@ paradise: I'm not sure it's working correctly: ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "paradise.h" #include "sound/okim6295.h" @@ -539,7 +540,7 @@ static MACHINE_DRIVER_START( paradise ) MDRV_CPU_ADD_TAG("main", Z80, XTAL_12MHz/2) /* Z8400B - 6mhz Verified */ MDRV_CPU_PROGRAM_MAP(paradise_map,0) MDRV_CPU_IO_MAP(paradise_readport,paradise_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) /* No nmi routine */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No nmi routine */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/paranoia.c b/src/mame/drivers/paranoia.c index 310424a1b63..984976c1963 100644 --- a/src/mame/drivers/paranoia.c +++ b/src/mame/drivers/paranoia.c @@ -34,6 +34,7 @@ HuC6280A (Hudson) ****************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "machine/pcecommn.h" #include "video/vdc.h" #include "cpu/h6280/h6280.h" @@ -132,7 +133,7 @@ static MACHINE_DRIVER_START( paranoia ) MDRV_CPU_ADD(H6280, PCE_MAIN_CLOCK/3) MDRV_CPU_PROGRAM_MAP(pce_mem, 0) MDRV_CPU_IO_MAP(pce_io, 0) - MDRV_CPU_VBLANK_INT(pce_interrupt, VDC_LPF) + MDRV_CPU_VBLANK_INT_HACK(pce_interrupt, VDC_LPF) MDRV_INTERLEAVE(1) diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c index 6072482aa27..1d47cae3ce7 100644 --- a/src/mame/drivers/parodius.c +++ b/src/mame/drivers/parodius.c @@ -299,7 +299,7 @@ static MACHINE_DRIVER_START( parodius ) /* basic machine hardware */ MDRV_CPU_ADD(KONAMI, 3000000) /* 053248 */ MDRV_CPU_PROGRAM_MAP(parodius_readmem,parodius_writemem) - MDRV_CPU_VBLANK_INT(parodius_interrupt,1) + MDRV_CPU_VBLANK_INT("main", parodius_interrupt) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c index 1ddd46a227c..82743f9726a 100644 --- a/src/mame/drivers/pasha2.c +++ b/src/mame/drivers/pasha2.c @@ -390,7 +390,7 @@ static MACHINE_DRIVER_START( pasha2 ) MDRV_CPU_ADD(E116XT, 20000000*4) /* 4x internal multiplier */ MDRV_CPU_PROGRAM_MAP(pasha2_map,0) MDRV_CPU_IO_MAP(pasha2_io,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_NVRAM_HANDLER(93C46) diff --git a/src/mame/drivers/pass.c b/src/mame/drivers/pass.c index 6d9330eb158..59b8f9bf72f 100644 --- a/src/mame/drivers/pass.c +++ b/src/mame/drivers/pass.c @@ -273,13 +273,13 @@ static MACHINE_DRIVER_START( pass ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14318180/2 ) MDRV_CPU_PROGRAM_MAP(pass_readmem,pass_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) /* all the same */ + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) /* all the same */ MDRV_CPU_ADD(Z80, 14318180/4 ) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(pass_sound_readmem,pass_sound_writemem) MDRV_CPU_IO_MAP(pass_sound_readport,pass_sound_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/pastelg.c b/src/mame/drivers/pastelg.c index a8769e3a26e..9dbb2a4e9b5 100644 --- a/src/mame/drivers/pastelg.c +++ b/src/mame/drivers/pastelg.c @@ -204,8 +204,8 @@ static MACHINE_DRIVER_START( pastelg ) MDRV_CPU_ADD(Z80, 19968000/8) /* 2.496 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem_pastelg, writemem_pastelg) MDRV_CPU_IO_MAP(readport_pastelg, writeport_pastelg) -// MDRV_CPU_VBLANK_INT(nb1413m3_interrupt,96) // nmiclock not written, chip is 1411M1 instead of 1413M3 - MDRV_CPU_VBLANK_INT(nb1413m3_interrupt, 1) +// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt,96) // nmiclock not written, chip is 1411M1 instead of 1413M3 + MDRV_CPU_VBLANK_INT("main", nb1413m3_interrupt) MDRV_MACHINE_RESET(nb1413m3) MDRV_NVRAM_HANDLER(nb1413m3) diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c index 874f2045dfb..d2b79a7586d 100644 --- a/src/mame/drivers/pbaction.c +++ b/src/mame/drivers/pbaction.c @@ -267,13 +267,13 @@ static MACHINE_DRIVER_START( pbaction ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(Z80, 3072000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(0,sound_writeport) - MDRV_CPU_VBLANK_INT(pbaction_interrupt,2) /* ??? */ + MDRV_CPU_VBLANK_INT_HACK(pbaction_interrupt,2) /* ??? */ /* IRQs are caused by the main CPU */ /* video hardware */ diff --git a/src/mame/drivers/pcktgal.c b/src/mame/drivers/pcktgal.c index f0cdfa0e7a9..4b9800c2ec6 100644 --- a/src/mame/drivers/pcktgal.c +++ b/src/mame/drivers/pcktgal.c @@ -239,7 +239,7 @@ static MACHINE_DRIVER_START( pcktgal ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 2000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(M6502, 1500000) /* audio CPU */ diff --git a/src/mame/drivers/pengo.c b/src/mame/drivers/pengo.c index a81a58cfa5d..8b100022d67 100644 --- a/src/mame/drivers/pengo.c +++ b/src/mame/drivers/pengo.c @@ -348,7 +348,7 @@ static MACHINE_DRIVER_START( pengo ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/6) MDRV_CPU_PROGRAM_MAP(pengo_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_GFXDECODE(pengo) diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c index 2bdbcf2676c..44b2d6d78c9 100644 --- a/src/mame/drivers/peplus.c +++ b/src/mame/drivers/peplus.c @@ -978,7 +978,7 @@ static MACHINE_DRIVER_START( peplus ) MDRV_CPU_PROGRAM_MAP(peplus_map, 0) MDRV_CPU_DATA_MAP(peplus_datamap, 0) MDRV_CPU_IO_MAP(peplus_iomap, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_RESET(peplus) MDRV_NVRAM_HANDLER(peplus) diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c index 2bee14365cb..e3df45ae402 100644 --- a/src/mame/drivers/pgm.c +++ b/src/mame/drivers/pgm.c @@ -1559,7 +1559,7 @@ static MACHINE_DRIVER_START( pgm ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 20000000) /* 20 mhz! verified on real board */ MDRV_CPU_PROGRAM_MAP(pgm_mem,0) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD_TAG("sound", Z80, 8468000) MDRV_CPU_PROGRAM_MAP(z80_mem, 0) @@ -1593,7 +1593,7 @@ static MACHINE_DRIVER_START( drgw2 ) MDRV_IMPORT_FROM(pgm) MDRV_CPU_MODIFY("main") - MDRV_CPU_VBLANK_INT(drgw_interrupt,2) // needs an extra IRQ, puzzli2 doesn't want this irq! + MDRV_CPU_VBLANK_INT_HACK(drgw_interrupt,2) // needs an extra IRQ, puzzli2 doesn't want this irq! MACHINE_DRIVER_END static MACHINE_RESET( killbld ); diff --git a/src/mame/drivers/pingpong.c b/src/mame/drivers/pingpong.c index ac2a5e968b2..24c6fdfd14f 100644 --- a/src/mame/drivers/pingpong.c +++ b/src/mame/drivers/pingpong.c @@ -457,7 +457,7 @@ static MACHINE_DRIVER_START( pingpong ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("cpu",Z80,18432000/6) /* 3.072 MHz (probably) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(pingpong_interrupt,16) /* 1 IRQ + 8 NMI */ + MDRV_CPU_VBLANK_INT_HACK(pingpong_interrupt,16) /* 1 IRQ + 8 NMI */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -486,7 +486,7 @@ static MACHINE_DRIVER_START( merlinmm ) MDRV_IMPORT_FROM( pingpong ) MDRV_CPU_MODIFY("cpu") MDRV_CPU_PROGRAM_MAP(merlinmm_map,0) - MDRV_CPU_VBLANK_INT(pingpong_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(pingpong_interrupt,2) MDRV_NVRAM_HANDLER(generic_0fill) MACHINE_DRIVER_END diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c index 5292396fd43..9f39bee5f0c 100644 --- a/src/mame/drivers/pipedrm.c +++ b/src/mame/drivers/pipedrm.c @@ -559,7 +559,7 @@ static MACHINE_DRIVER_START( pipedrm ) MDRV_CPU_ADD(Z80,12000000/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,14318000/4) /* audio CPU */ @@ -599,7 +599,7 @@ static MACHINE_DRIVER_START( hatris ) MDRV_CPU_ADD(Z80,12000000/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,14318000/4) /* audio CPU */ diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c index 2e78f4fe5e5..6165fa95f71 100644 --- a/src/mame/drivers/pipeline.c +++ b/src/mame/drivers/pipeline.c @@ -357,7 +357,7 @@ static MACHINE_DRIVER_START( pipeline ) MDRV_CPU_ADD(Z80, 7372800/2) MDRV_CPU_PROGRAM_MAP(cpu0_mem, 0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(Z80, 7372800/2) MDRV_CPU_CONFIG(daisy_chain_sound) diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c index 72751999b23..1744c3ec027 100644 --- a/src/mame/drivers/pirates.c +++ b/src/mame/drivers/pirates.c @@ -287,7 +287,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( pirates ) MDRV_CPU_ADD(M68000, 16000000) /* 16mhz */ MDRV_CPU_PROGRAM_MAP(pirates_readmem,pirates_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_NVRAM_HANDLER(pirates) diff --git a/src/mame/drivers/pitnrun.c b/src/mame/drivers/pitnrun.c index 4306e64f1d5..b3b63705177 100644 --- a/src/mame/drivers/pitnrun.c +++ b/src/mame/drivers/pitnrun.c @@ -286,14 +286,14 @@ GFXDECODE_END static MACHINE_DRIVER_START( pitnrun ) MDRV_CPU_ADD(Z80,8000000/2) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(pitnrun_nmi_source,1) + MDRV_CPU_VBLANK_INT("main", pitnrun_nmi_source) MDRV_CPU_ADD(Z80, 10000000/4) /* 2.5 MHz */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(M68705,3000000) MDRV_CPU_PROGRAM_MAP(mcu_readmem,mcu_writemem) diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c index 00b9b62cf06..a08b444289a 100644 --- a/src/mame/drivers/pkscram.c +++ b/src/mame/drivers/pkscram.c @@ -285,7 +285,7 @@ static MACHINE_DRIVER_START( pkscramble ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000 ) MDRV_CPU_PROGRAM_MAP(pkscramble_map,0) - //MDRV_CPU_VBLANK_INT(irq1_line_hold,1) /* only valid irq */ + //MDRV_CPU_VBLANK_INT("main", irq1_line_hold) /* only valid irq */ MDRV_NVRAM_HANDLER(generic_0fill) diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c index 8f969c75b28..b518dcc5159 100644 --- a/src/mame/drivers/pktgaldx.c +++ b/src/mame/drivers/pktgaldx.c @@ -347,7 +347,7 @@ static MACHINE_DRIVER_START( pktgaldx ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14000000) MDRV_CPU_PROGRAM_MAP(pktgaldx_map,0) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -382,7 +382,7 @@ static MACHINE_DRIVER_START( pktgaldb ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(pktgaldb_readmem,pktgaldb_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/playch10.c b/src/mame/drivers/playch10.c index dad0f47f2a8..ee32b2806be 100644 --- a/src/mame/drivers/playch10.c +++ b/src/mame/drivers/playch10.c @@ -735,7 +735,7 @@ static MACHINE_DRIVER_START( playch10 ) MDRV_CPU_ADD(Z80, 8000000/2) // 4 MHz MDRV_CPU_PROGRAM_MAP(bios_map, 0) MDRV_CPU_IO_MAP(bios_io_map, 0) - MDRV_CPU_VBLANK_INT(playch10_interrupt, 1) + MDRV_CPU_VBLANK_INT("top", playch10_interrupt) MDRV_CPU_ADD(N2A03, N2A03_DEFAULTCLOCK) MDRV_CPU_PROGRAM_MAP(cart_map, 0) diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c index fa11eec6295..bd1e523f1b8 100644 --- a/src/mame/drivers/playmark.c +++ b/src/mame/drivers/playmark.c @@ -970,7 +970,7 @@ static MACHINE_DRIVER_START( bigtwin ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(bigtwin_main_map, 0) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_CPU_ADD(PIC16C57, 12000000) /* 3MHz */ /* Program and Data Maps are internal to the MCU */ @@ -1004,7 +1004,7 @@ static MACHINE_DRIVER_START( wbeachvl ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(wbeachvl_main_map, 0) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) // MDRV_CPU_ADD(PIC16C57, 12000000) /* 3MHz */ /* Program and Data Maps are internal to the MCU */ @@ -1039,7 +1039,7 @@ static MACHINE_DRIVER_START( excelsr ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(excelsr_main_map, 0) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_CPU_ADD(PIC16C57, 12000000) /* 3MHz */ /* Program and Data Maps are internal to the MCU */ @@ -1072,7 +1072,7 @@ static MACHINE_DRIVER_START( hotmind ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(hotmind_main_map, 0) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_CPU_ADD(PIC16C57, 12000000) /* 3MHz */ /* Program and Data Maps are internal to the MCU */ @@ -1107,7 +1107,7 @@ static MACHINE_DRIVER_START( hrdtimes ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(hrdtimes_main_map, 0) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) // MDRV_CPU_ADD(PIC16C57, 12000000) /* 3MHz */ /* Program and Data Maps are internal to the MCU */ diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c index 69436feae4a..7bd1a6b98eb 100644 --- a/src/mame/drivers/plygonet.c +++ b/src/mame/drivers/plygonet.c @@ -684,7 +684,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( plygonet ) MDRV_CPU_ADD(M68EC020, 16000000) /* 16 MHz (xtal is 32.0 MHz) */ MDRV_CPU_PROGRAM_MAP(polygonet_map, 0) - MDRV_CPU_VBLANK_INT(polygonet_interrupt, 2) + MDRV_CPU_VBLANK_INT_HACK(polygonet_interrupt, 2) MDRV_CPU_ADD(DSP56156, 10000000) /* should be 40.0 MHz */ MDRV_CPU_FLAGS(CPU_DISABLE) diff --git a/src/mame/drivers/pmpoker.c b/src/mame/drivers/pmpoker.c index 77aee098367..d9126975798 100644 --- a/src/mame/drivers/pmpoker.c +++ b/src/mame/drivers/pmpoker.c @@ -1003,7 +1003,7 @@ static MACHINE_DRIVER_START( pmpoker ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M6502, MASTER_CLOCK/16) /* guess */ MDRV_CPU_PROGRAM_MAP(pmpoker_map, 0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse, 1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_NVRAM_HANDLER(generic_0fill) diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c index 81ff2846f9e..f00ead68866 100644 --- a/src/mame/drivers/pntnpuzl.c +++ b/src/mame/drivers/pntnpuzl.c @@ -455,7 +455,7 @@ INPUT_PORTS_END static MACHINE_DRIVER_START( pntnpuzl ) MDRV_CPU_ADD_TAG("main", M68000, 12000000)//?? MDRV_CPU_PROGRAM_MAP(pntnpuzl_map,0) - MDRV_CPU_VBLANK_INT(pntnpuzl_irq,1) // irq1 = coin irq2 = service irq4 = coin + MDRV_CPU_VBLANK_INT("main", pntnpuzl_irq) // irq1 = coin irq2 = service irq4 = coin MDRV_NVRAM_HANDLER(pntnpuzl) diff --git a/src/mame/drivers/pokechmp.c b/src/mame/drivers/pokechmp.c index 5f797a87fdb..9a5f9a6e2e9 100644 --- a/src/mame/drivers/pokechmp.c +++ b/src/mame/drivers/pokechmp.c @@ -249,11 +249,11 @@ static MACHINE_DRIVER_START( pokechmp ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 4000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(M6502, 4000000) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c index d29cb21aead..f62d747fe7b 100644 --- a/src/mame/drivers/polepos.c +++ b/src/mame/drivers/polepos.c @@ -882,15 +882,15 @@ static MACHINE_DRIVER_START( polepos ) MDRV_CPU_ADD(Z80, 24576000/8) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(z80_map,0) MDRV_CPU_IO_MAP(z80_io,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,2) /* 64V */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_assert,2) /* 64V */ MDRV_CPU_ADD(Z8000, 24576000/8) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(z8002_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_CPU_ADD(Z8000, 24576000/8) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(z8002_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_CPU_ADD_TAG(CPUTAG_54XX, MB8844, 18432000/12/6) /* 1.536 MHz, internally divided by 6 */ MDRV_CPU_PROGRAM_MAP(namco_54xx_map_program,0) diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c index 6c871d30443..7416b6baaf8 100644 --- a/src/mame/drivers/policetr.c +++ b/src/mame/drivers/policetr.c @@ -466,7 +466,7 @@ static MACHINE_DRIVER_START( policetr ) MDRV_CPU_ADD_TAG("main", R3000BE, MASTER_CLOCK/2) MDRV_CPU_CONFIG(config) MDRV_CPU_PROGRAM_MAP(policetr_map,0) - MDRV_CPU_VBLANK_INT(irq4_gen,1) + MDRV_CPU_VBLANK_INT("main", irq4_gen) MDRV_NVRAM_HANDLER(policetr) diff --git a/src/mame/drivers/polyplay.c b/src/mame/drivers/polyplay.c index bf96c4ff245..c6bdda3bb4b 100644 --- a/src/mame/drivers/polyplay.c +++ b/src/mame/drivers/polyplay.c @@ -294,7 +294,7 @@ static MACHINE_DRIVER_START( polyplay ) MDRV_CPU_PROGRAM_MAP(polyplay_map,0) MDRV_CPU_IO_MAP(polyplay_io_map,0) MDRV_CPU_PERIODIC_INT(periodic_interrupt,75) - MDRV_CPU_VBLANK_INT(coin_interrupt,1) + MDRV_CPU_VBLANK_INT("main", coin_interrupt) MDRV_MACHINE_RESET(polyplay) diff --git a/src/mame/drivers/poolshrk.c b/src/mame/drivers/poolshrk.c index 66f95911e08..df2666712fd 100644 --- a/src/mame/drivers/poolshrk.c +++ b/src/mame/drivers/poolshrk.c @@ -216,7 +216,7 @@ static MACHINE_DRIVER_START( poolshrk ) /* basic machine hardware */ MDRV_CPU_ADD(M6800, 11055000 / 8) /* ? */ MDRV_CPU_PROGRAM_MAP(poolshrk_cpu_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_assert, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/pooyan.c b/src/mame/drivers/pooyan.c index 527c6005184..119e912d355 100644 --- a/src/mame/drivers/pooyan.c +++ b/src/mame/drivers/pooyan.c @@ -216,7 +216,7 @@ static MACHINE_DRIVER_START( pooyan ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, MASTER_CLOCK/3/2) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(pooyan_interrupt,1) + MDRV_CPU_VBLANK_INT("main", pooyan_interrupt) MDRV_MACHINE_START(pooyan) diff --git a/src/mame/drivers/popeye.c b/src/mame/drivers/popeye.c index 015982fdc13..4499b57e303 100644 --- a/src/mame/drivers/popeye.c +++ b/src/mame/drivers/popeye.c @@ -484,7 +484,7 @@ static MACHINE_DRIVER_START( skyskipr ) MDRV_CPU_ADD_TAG("main", Z80, 8000000/2) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(skyskipr_readmem,skyskipr_writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(popeye_interrupt,1) + MDRV_CPU_VBLANK_INT("main", popeye_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c index d6bbae8bad9..7ad0e102f4e 100644 --- a/src/mame/drivers/popper.c +++ b/src/mame/drivers/popper.c @@ -312,12 +312,12 @@ static MACHINE_DRIVER_START( popper ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,18432000/6) MDRV_CPU_PROGRAM_MAP(popper_readmem,popper_writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(Z80,18432000/12) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(popper_sound_readmem,popper_sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) //NMIs caused by the main CPU + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) //NMIs caused by the main CPU MDRV_INTERLEAVE(30) diff --git a/src/mame/drivers/portrait.c b/src/mame/drivers/portrait.c index ddcf0a73774..f8d1e2d5a5b 100644 --- a/src/mame/drivers/portrait.c +++ b/src/mame/drivers/portrait.c @@ -250,7 +250,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( portrait ) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ? */ MDRV_CPU_PROGRAM_MAP(portrait_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(I8039, 3120000) /* ? */ /* audio CPU */ diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c index 38890fc54af..2c69bffde48 100644 --- a/src/mame/drivers/powerbal.c +++ b/src/mame/drivers/powerbal.c @@ -413,7 +413,7 @@ static MACHINE_DRIVER_START( powerbal ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(powerbal_main_map, 0) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -441,7 +441,7 @@ static MACHINE_DRIVER_START( magicstk ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(magicstk_main_map, 0) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_NVRAM_HANDLER(magicstk) diff --git a/src/mame/drivers/powerins.c b/src/mame/drivers/powerins.c index 8cceb5bd64e..d67f1db5057 100644 --- a/src/mame/drivers/powerins.c +++ b/src/mame/drivers/powerins.c @@ -349,7 +349,7 @@ static MACHINE_DRIVER_START( powerins ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12MHz */ MDRV_CPU_PROGRAM_MAP(powerins_readmem,powerins_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD_TAG("sound", Z80, 6000000) /* 6 MHz */ /* audio CPU */ diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c index e0356859c89..4535c2d30ef 100644 --- a/src/mame/drivers/ppmast93.c +++ b/src/mame/drivers/ppmast93.c @@ -347,7 +347,7 @@ static MACHINE_DRIVER_START( ppmast93 ) MDRV_CPU_ADD(Z80,5000000) /* 5 MHz */ MDRV_CPU_PROGRAM_MAP(ppmast93_cpu1_map,0) MDRV_CPU_IO_MAP(ppmast93_cpu1_io,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,5000000) /* 5 MHz */ MDRV_CPU_PROGRAM_MAP(ppmast93_cpu2_map,0) diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c index 593bc11e95d..c64bc174f63 100644 --- a/src/mame/drivers/prehisle.c +++ b/src/mame/drivers/prehisle.c @@ -237,7 +237,7 @@ static MACHINE_DRIVER_START( prehisle ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(prehisle_readmem,prehisle_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c index 5c53822040f..830b25b2776 100644 --- a/src/mame/drivers/progolf.c +++ b/src/mame/drivers/progolf.c @@ -202,11 +202,11 @@ static MACHINE_DRIVER_START( progolf ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 2000000) /* ? */ MDRV_CPU_PROGRAM_MAP(main_cpu,0) -// MDRV_CPU_VBLANK_INT(progolf_interrupt,1) +// MDRV_CPU_VBLANK_INT("main", progolf_interrupt) // MDRV_CPU_ADD(M6502, 500000) // MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) -// MDRV_CPU_VBLANK_INT(nmi_line_pulse,16) +// MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,16) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c index fc81942777a..efc57e7d553 100644 --- a/src/mame/drivers/psikyo.c +++ b/src/mame/drivers/psikyo.c @@ -1565,7 +1565,7 @@ static MACHINE_DRIVER_START( sngkace ) /* basic machine hardware */ MDRV_CPU_ADD(M68EC020, 16000000) MDRV_CPU_PROGRAM_MAP(psikyo_readmem,psikyo_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* ? */ @@ -1619,7 +1619,7 @@ static MACHINE_DRIVER_START( gunbird ) /* basic machine hardware */ MDRV_CPU_ADD(M68EC020, 16000000) MDRV_CPU_PROGRAM_MAP(psikyo_readmem,psikyo_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* ! LZ8420M (Z80 core) ! */ /* audio CPU */ @@ -1681,7 +1681,7 @@ static MACHINE_DRIVER_START( s1945 ) /* basic machine hardware */ MDRV_CPU_ADD(M68EC020, 16000000) MDRV_CPU_PROGRAM_MAP(psikyo_readmem,psikyo_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* ! LZ8420M (Z80 core) ! */ /* audio CPU */ diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c index 3cb62e8ec78..d4a8cbfc2e8 100644 --- a/src/mame/drivers/psikyo4.c +++ b/src/mame/drivers/psikyo4.c @@ -492,7 +492,7 @@ static MACHINE_DRIVER_START( ps4big ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", SH2, MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(ps4_readmem,ps4_writemem) - MDRV_CPU_VBLANK_INT(psikyosh_interrupt,1) + MDRV_CPU_VBLANK_INT("left", psikyosh_interrupt) MDRV_NVRAM_HANDLER(93C56) diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c index de129487d74..e57eb6f8b97 100644 --- a/src/mame/drivers/psikyosh.c +++ b/src/mame/drivers/psikyosh.c @@ -598,7 +598,7 @@ static MACHINE_DRIVER_START( psikyo3v1 ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", SH2, MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(ps3v1_readmem,ps3v1_writemem) - MDRV_CPU_VBLANK_INT(psikyosh_interrupt,1) + MDRV_CPU_VBLANK_INT("main", psikyosh_interrupt) MDRV_NVRAM_HANDLER(93C56) diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c index 0337a7286a2..b132b2ec339 100644 --- a/src/mame/drivers/psychic5.c +++ b/src/mame/drivers/psychic5.c @@ -550,7 +550,7 @@ static MACHINE_DRIVER_START( psychic5 ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 6000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(psychic5_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(psychic5_interrupt,2) MDRV_CPU_ADD(Z80, 6000000) /* audio CPU */ diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c index 92b2bddfca2..cc7dd080053 100644 --- a/src/mame/drivers/pturn.c +++ b/src/mame/drivers/pturn.c @@ -75,6 +75,7 @@ ROMS: All ROM labels say only "PROM" and a number. */ #include "driver.h" +#include "deprecat.h" #include "sound/ay8910.h" static tilemap *pturn_fgmap,*pturn_bgmap; @@ -446,13 +447,13 @@ static MACHINE_RESET( pturn ) static MACHINE_DRIVER_START( pturn ) MDRV_CPU_ADD(Z80, 12000000/3) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(pturn_main_intgen,1) + MDRV_CPU_VBLANK_INT("main", pturn_main_intgen) MDRV_MACHINE_RESET(pturn) MDRV_CPU_ADD(Z80, 12000000/3) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sub_map,0) - MDRV_CPU_VBLANK_INT(pturn_sub_intgen,3) + MDRV_CPU_VBLANK_INT_HACK(pturn_sub_intgen,3) MDRV_GFXDECODE(pturn) diff --git a/src/mame/drivers/puckpkmn.c b/src/mame/drivers/puckpkmn.c index 9305361177b..6769c257af0 100644 --- a/src/mame/drivers/puckpkmn.c +++ b/src/mame/drivers/puckpkmn.c @@ -158,7 +158,7 @@ static MACHINE_DRIVER_START( puckpkmn ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main",M68000, MASTER_CLOCK/7) /*???*/ MDRV_CPU_PROGRAM_MAP(puckpkmn_readmem,puckpkmn_writemem) - MDRV_CPU_VBLANK_INT(genesis_vblank_interrupt,1) + MDRV_CPU_VBLANK_INT("main", genesis_vblank_interrupt) MDRV_MACHINE_START(genesis) MDRV_MACHINE_RESET(genesis) diff --git a/src/mame/drivers/punchout.c b/src/mame/drivers/punchout.c index fa2fa4305fe..19a468f826c 100644 --- a/src/mame/drivers/punchout.c +++ b/src/mame/drivers/punchout.c @@ -787,12 +787,12 @@ static MACHINE_DRIVER_START( punchout ) MDRV_CPU_ADD_TAG("main", Z80, 8000000/2) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(punchout_map,0) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("top", nmi_line_pulse) MDRV_CPU_ADD(N2A03, N2A03_DEFAULTCLOCK) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("top", nmi_line_pulse) MDRV_NVRAM_HANDLER(generic_0fill) diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c index c382e64c437..2bc8e1ee927 100644 --- a/src/mame/drivers/pushman.c +++ b/src/mame/drivers/pushman.c @@ -435,7 +435,7 @@ static MACHINE_DRIVER_START( pushman ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ @@ -478,7 +478,7 @@ static MACHINE_DRIVER_START( bballs ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) MDRV_CPU_PROGRAM_MAP(bballs_readmem,bballs_writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c index 3821e0754f5..5ad13b2e829 100644 --- a/src/mame/drivers/qdrmfgp.c +++ b/src/mame/drivers/qdrmfgp.c @@ -676,7 +676,7 @@ static MACHINE_DRIVER_START( qdrmfgp ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 32000000/2) /* 16.000 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(qdrmfgp_interrupt, 2) + MDRV_CPU_VBLANK_INT_HACK(qdrmfgp_interrupt, 2) MDRV_MACHINE_START(qdrmfgp) MDRV_MACHINE_RESET(qdrmfgp) @@ -709,7 +709,7 @@ static MACHINE_DRIVER_START( qdrmfgp2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 32000000/2) /* 16.000 MHz */ MDRV_CPU_PROGRAM_MAP(gp2_readmem,gp2_writemem) - MDRV_CPU_VBLANK_INT(qdrmfgp2_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", qdrmfgp2_interrupt) MDRV_MACHINE_START(qdrmfgp) MDRV_MACHINE_RESET(qdrmfgp2) diff --git a/src/mame/drivers/qix.c b/src/mame/drivers/qix.c index dc558866720..fc11c95e50e 100644 --- a/src/mame/drivers/qix.c +++ b/src/mame/drivers/qix.c @@ -547,7 +547,7 @@ static MACHINE_DRIVER_START( qix ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M6809, MAIN_CLOCK_OSC/4/4) /* 1.25 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(qix_vblank_start,1) + MDRV_CPU_VBLANK_INT("main", qix_vblank_start) /* high interleave needed to ensure correct text in service mode */ /* Zookeeper settings and high score table seem especially sensitive to this */ diff --git a/src/mame/drivers/quasar.c b/src/mame/drivers/quasar.c index ea301408042..9b040adb18e 100644 --- a/src/mame/drivers/quasar.c +++ b/src/mame/drivers/quasar.c @@ -345,7 +345,7 @@ static MACHINE_DRIVER_START( quasar ) MDRV_CPU_ADD_TAG("main", S2650, 14318000/4) /* 14 mhz crystal divide by 4 on board */ MDRV_CPU_PROGRAM_MAP(quasar,0) MDRV_CPU_IO_MAP(quasar_io,0) - MDRV_CPU_VBLANK_INT(quasar_interrupt,1) + MDRV_CPU_VBLANK_INT("main", quasar_interrupt) MDRV_CPU_ADD_TAG("sound",I8035,6000000) /* 6MHz crystal divide by 15 in CPU */ /* audio CPU */ diff --git a/src/mame/drivers/quizdna.c b/src/mame/drivers/quizdna.c index 77cfa9b6b51..3174c2f1fc8 100644 --- a/src/mame/drivers/quizdna.c +++ b/src/mame/drivers/quizdna.c @@ -456,7 +456,7 @@ static MACHINE_DRIVER_START( quizdna ) MDRV_CPU_ADD_TAG("main", Z80, MCLK/2) /* 8.000 MHz */ MDRV_CPU_PROGRAM_MAP(quizdna_readmem,quizdna_writemem) MDRV_CPU_IO_MAP(quizdna_readport,quizdna_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/quizo.c b/src/mame/drivers/quizo.c index 5520e0872ea..30f7dacf97d 100644 --- a/src/mame/drivers/quizo.c +++ b/src/mame/drivers/quizo.c @@ -194,7 +194,7 @@ static MACHINE_DRIVER_START( quizo ) MDRV_CPU_PROGRAM_MAP(memmap, 0) MDRV_CPU_IO_MAP(portmap, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/quizpani.c b/src/mame/drivers/quizpani.c index ef8c918404a..2a6b43c50dc 100644 --- a/src/mame/drivers/quizpani.c +++ b/src/mame/drivers/quizpani.c @@ -249,7 +249,7 @@ static MACHINE_RESET( quizpani ) static MACHINE_DRIVER_START( quizpani ) MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(quizpani_readmem,quizpani_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_PERIODIC_INT(irq1_line_hold,164) // music tempo MDRV_MACHINE_RESET( quizpani ) diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c index 51d66dfa483..331f776b4cf 100644 --- a/src/mame/drivers/rabbit.c +++ b/src/mame/drivers/rabbit.c @@ -1068,7 +1068,7 @@ static INTERRUPT_GEN( rabbit_interrupts ) static MACHINE_DRIVER_START( rabbit ) MDRV_CPU_ADD_TAG("main",M68EC020,24000000) /* 24 MHz */ MDRV_CPU_PROGRAM_MAP(rabbit_readmem,rabbit_writemem) - MDRV_CPU_VBLANK_INT(rabbit_interrupts,262) + MDRV_CPU_VBLANK_INT_HACK(rabbit_interrupts,262) /* (rabbit) */ /* lev 1 : 0x64 : 0000 027c - lev 2 : 0x68 : 0000 3106 - unused? @@ -1197,7 +1197,7 @@ static MACHINE_DRIVER_START( tmmjprd ) MDRV_IMPORT_FROM(rabbit) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(tmmjprd_readmem,tmmjprd_writemem) - MDRV_CPU_VBLANK_INT(tmmjprd_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(tmmjprd_interrupt,2) MDRV_VIDEO_START(tmmjprd) MDRV_VIDEO_UPDATE(tmmjprd) diff --git a/src/mame/drivers/raiden.c b/src/mame/drivers/raiden.c index 9dd253ead25..1ab121e636d 100644 --- a/src/mame/drivers/raiden.c +++ b/src/mame/drivers/raiden.c @@ -236,11 +236,11 @@ static MACHINE_DRIVER_START( raiden ) /* basic machine hardware */ MDRV_CPU_ADD(V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */ MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(raiden_interrupt,1) + MDRV_CPU_VBLANK_INT("main", raiden_interrupt) MDRV_CPU_ADD(V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */ MDRV_CPU_PROGRAM_MAP(sub_map,0) - MDRV_CPU_VBLANK_INT(raiden_interrupt,1) + MDRV_CPU_VBLANK_INT("main", raiden_interrupt) SEIBU_SOUND_SYSTEM_CPU(XTAL_14_31818MHz/4) /* verified on pcb */ @@ -275,11 +275,11 @@ static MACHINE_DRIVER_START( raidena ) /* basic machine hardware */ MDRV_CPU_ADD(V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */ MDRV_CPU_PROGRAM_MAP(alt_map,0) - MDRV_CPU_VBLANK_INT(raiden_interrupt,1) + MDRV_CPU_VBLANK_INT("main", raiden_interrupt) MDRV_CPU_ADD(V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */ MDRV_CPU_PROGRAM_MAP(sub_map,0) - MDRV_CPU_VBLANK_INT(raiden_interrupt,1) + MDRV_CPU_VBLANK_INT("main", raiden_interrupt) SEIBU_SOUND_SYSTEM_CPU(XTAL_14_31818MHz/4) /* verified on pcb */ diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index 733858523cf..cf5076f4e90 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -1181,7 +1181,7 @@ static MACHINE_DRIVER_START( raiden2 ) /* basic machine hardware */ MDRV_CPU_ADD(V30,XTAL_32MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(raiden2_mem, 0) - MDRV_CPU_VBLANK_INT(raiden2_interrupt,1) + MDRV_CPU_VBLANK_INT("main", raiden2_interrupt) MDRV_MACHINE_RESET(raiden2) @@ -2237,7 +2237,7 @@ static MACHINE_DRIVER_START( rdx_v33 ) /* basic machine hardware */ MDRV_CPU_ADD(V33, 32000000/2 ) // ? MDRV_CPU_PROGRAM_MAP(rdx_v33_map, 0) - MDRV_CPU_VBLANK_INT(rdx_v33_interrupt,1) + MDRV_CPU_VBLANK_INT("main", rdx_v33_interrupt) MDRV_NVRAM_HANDLER(rdx_v33) diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c index 8a670de3ed8..3b2973db301 100644 --- a/src/mame/drivers/rainbow.c +++ b/src/mame/drivers/rainbow.c @@ -618,7 +618,7 @@ static MACHINE_DRIVER_START( rainbow ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_16MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(rainbow_readmem,rainbow_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD(Z80, XTAL_16MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(rainbow_s_readmem,rainbow_s_writemem) @@ -654,7 +654,7 @@ static MACHINE_DRIVER_START( jumping ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) MDRV_CPU_PROGRAM_MAP(jumping_readmem,jumping_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(jumping_sound_readmem,jumping_sound_writemem) diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c index d168873e240..7b3cb2d2014 100644 --- a/src/mame/drivers/rallyx.c +++ b/src/mame/drivers/rallyx.c @@ -840,7 +840,7 @@ static MACHINE_DRIVER_START( rallyx ) MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(rallyx_map,0) MDRV_CPU_IO_MAP(0,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS) @@ -877,7 +877,7 @@ static MACHINE_DRIVER_START( jungler ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(jungler_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS) diff --git a/src/mame/drivers/rampart.c b/src/mame/drivers/rampart.c index cd70674c516..05622795dcd 100644 --- a/src/mame/drivers/rampart.c +++ b/src/mame/drivers/rampart.c @@ -385,7 +385,7 @@ static MACHINE_DRIVER_START( rampart ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(main_map, 0) - MDRV_CPU_VBLANK_INT(atarigen_video_int_gen,1) + MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) MDRV_MACHINE_RESET(rampart) MDRV_NVRAM_HANDLER(atarigen) diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c index a39242e2538..428efaae0ac 100644 --- a/src/mame/drivers/rastan.c +++ b/src/mame/drivers/rastan.c @@ -383,7 +383,7 @@ static MACHINE_DRIVER_START( rastan ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(rastan_map,0) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq5_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(rastan_s_map,0) diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c index e599bc0882e..ad48f136544 100644 --- a/src/mame/drivers/rbmk.c +++ b/src/mame/drivers/rbmk.c @@ -501,7 +501,7 @@ static NVRAM_HANDLER( syf ) static MACHINE_DRIVER_START( rbmk ) MDRV_CPU_ADD_TAG("main", M68000, 22000000 /2) MDRV_CPU_PROGRAM_MAP(rbmk_mem,0) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_GFXDECODE(rbmk) diff --git a/src/mame/drivers/rcasino.c b/src/mame/drivers/rcasino.c index 399c6a161d2..3ea0f03a3de 100644 --- a/src/mame/drivers/rcasino.c +++ b/src/mame/drivers/rcasino.c @@ -296,7 +296,7 @@ static MACHINE_DRIVER_START( rcasino ) MDRV_CPU_ADD(Z80, 8000000/2) // ??? MDRV_CPU_PROGRAM_MAP(rcasino_map, 0) MDRV_CPU_IO_MAP(rcasino_io_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) // video hardware diff --git a/src/mame/drivers/rcorsair.c b/src/mame/drivers/rcorsair.c index 298a604d222..9785f760ced 100644 --- a/src/mame/drivers/rcorsair.c +++ b/src/mame/drivers/rcorsair.c @@ -121,7 +121,7 @@ static MACHINE_DRIVER_START( rcorsair ) MDRV_CPU_ADD(8085A,8000000) /* Sound CPU? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) -// MDRV_CPU_VBLANK_INT(irq0_line_hold,1) +// MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_SCREEN_ADD("main", RASTER) MDRV_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/realbrk.c b/src/mame/drivers/realbrk.c index 0faf08c3897..eb8f01d925b 100644 --- a/src/mame/drivers/realbrk.c +++ b/src/mame/drivers/realbrk.c @@ -683,7 +683,7 @@ static MACHINE_DRIVER_START( realbrk ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main",M68000,32000000 / 2) /* !! TMP68301 !! */ MDRV_CPU_PROGRAM_MAP(base_mem,realbrk_mem) - MDRV_CPU_VBLANK_INT(realbrk_interrupt,1) + MDRV_CPU_VBLANK_INT("main", realbrk_interrupt) MDRV_MACHINE_RESET( tmp68301 ) diff --git a/src/mame/drivers/redalert.c b/src/mame/drivers/redalert.c index 2ed65c98dc7..9675b69b77f 100644 --- a/src/mame/drivers/redalert.c +++ b/src/mame/drivers/redalert.c @@ -275,7 +275,7 @@ static MACHINE_DRIVER_START( redalert ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, MAIN_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(redalert_main_map,0) - MDRV_CPU_VBLANK_INT(redalert_vblank_interrupt,1) + MDRV_CPU_VBLANK_INT("main", redalert_vblank_interrupt) /* video hardware */ MDRV_IMPORT_FROM(redalert_video) @@ -290,7 +290,7 @@ static MACHINE_DRIVER_START( demoneye ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, MAIN_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(demoneye_main_map,0) - MDRV_CPU_VBLANK_INT(redalert_vblank_interrupt,1) + MDRV_CPU_VBLANK_INT("main", redalert_vblank_interrupt) /* video hardware */ MDRV_IMPORT_FROM(demoneye_video) diff --git a/src/mame/drivers/redclash.c b/src/mame/drivers/redclash.c index 42f4140830b..e9e4ecb0edd 100644 --- a/src/mame/drivers/redclash.c +++ b/src/mame/drivers/redclash.c @@ -351,7 +351,7 @@ static MACHINE_DRIVER_START( zerohour ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(zero_readmem,zero_writemem) - MDRV_CPU_VBLANK_INT(redclash_interrupt,1) + MDRV_CPU_VBLANK_INT("main", redclash_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -378,7 +378,7 @@ static MACHINE_DRIVER_START( redclash ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(redclash_interrupt,1) + MDRV_CPU_VBLANK_INT("main", redclash_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c index 57d7c1bf72a..dc48f83d4ca 100644 --- a/src/mame/drivers/renegade.c +++ b/src/mame/drivers/renegade.c @@ -788,7 +788,7 @@ static MACHINE_DRIVER_START( renegade ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 12000000/8) /* 1.5 MHz (measured) */ MDRV_CPU_PROGRAM_MAP(main_readmem,main_writemem) - MDRV_CPU_VBLANK_INT(renegade_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(renegade_interrupt,2) MDRV_CPU_ADD(M6809, 12000000/8) /* audio CPU */ diff --git a/src/mame/drivers/retofinv.c b/src/mame/drivers/retofinv.c index ac02d7831c3..a6f01307d9a 100644 --- a/src/mame/drivers/retofinv.c +++ b/src/mame/drivers/retofinv.c @@ -367,15 +367,15 @@ static MACHINE_DRIVER_START( retofinv ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz? */ MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz? */ MDRV_CPU_PROGRAM_MAP(sub_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz? */ MDRV_CPU_PROGRAM_MAP(sound_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,2) + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,2) MDRV_CPU_ADD_TAG("68705", M68705,18432000/6) /* 3.072 MHz? */ MDRV_CPU_PROGRAM_MAP(mcu_map,0) diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c index eb133e65e83..31cff61f9a9 100644 --- a/src/mame/drivers/rmhaihai.c +++ b/src/mame/drivers/rmhaihai.c @@ -514,7 +514,7 @@ static MACHINE_DRIVER_START( rmhaihai ) MDRV_CPU_ADD_TAG("main",Z80,20000000/4) /* 5 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/rockola.c b/src/mame/drivers/rockola.c index 16959551abc..1fad8c954c4 100644 --- a/src/mame/drivers/rockola.c +++ b/src/mame/drivers/rockola.c @@ -1081,7 +1081,7 @@ static MACHINE_DRIVER_START( sasuke ) // basic machine hardware MDRV_CPU_ADD_TAG("main", M6502, 11289000/16) // 700 kHz MDRV_CPU_PROGRAM_MAP(sasuke_map, 0) - MDRV_CPU_VBLANK_INT(satansat_interrupt, 2) + MDRV_CPU_VBLANK_INT_HACK(satansat_interrupt, 2) MDRV_MACHINE_RESET(sasuke) @@ -1156,7 +1156,7 @@ static MACHINE_DRIVER_START( vanguard ) //MDRV_CPU_ADD_TAG("main", M6502, 11289000/8) // 1.4 MHz MDRV_CPU_ADD_TAG("main", M6502, 930000) // adjusted MDRV_CPU_PROGRAM_MAP(vanguard_map, 0) - MDRV_CPU_VBLANK_INT(rockola_interrupt, 2) + MDRV_CPU_VBLANK_INT_HACK(rockola_interrupt, 2) MDRV_MACHINE_RESET(vanguard) diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c index 923532dc316..f755548bd06 100644 --- a/src/mame/drivers/rockrage.c +++ b/src/mame/drivers/rockrage.c @@ -295,7 +295,7 @@ static MACHINE_DRIVER_START( rockrage ) /* basic machine hardware */ MDRV_CPU_ADD(HD6309, 3000000*4) /* 24MHz/8 */ MDRV_CPU_PROGRAM_MAP(rockrage_readmem,rockrage_writemem) - MDRV_CPU_VBLANK_INT(rockrage_interrupt,1) + MDRV_CPU_VBLANK_INT("main", rockrage_interrupt) MDRV_CPU_ADD(M6809, 1500000) /* 24MHz/16 */ /* audio CPU */ diff --git a/src/mame/drivers/rocnrope.c b/src/mame/drivers/rocnrope.c index 7fae34ddf1d..71017c1663c 100644 --- a/src/mame/drivers/rocnrope.c +++ b/src/mame/drivers/rocnrope.c @@ -223,7 +223,7 @@ static MACHINE_DRIVER_START( rocnrope ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 1600000) /* 1.6 MHz??? Attract mode depends on this to work correctly */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c index e9e29449d71..98b9034ec7c 100644 --- a/src/mame/drivers/rohga.c +++ b/src/mame/drivers/rohga.c @@ -817,7 +817,7 @@ static MACHINE_DRIVER_START( rohga ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14000000) MDRV_CPU_PROGRAM_MAP(rohga_readmem,rohga_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) @@ -862,7 +862,7 @@ static MACHINE_DRIVER_START( wizdfire ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14000000) MDRV_CPU_PROGRAM_MAP(wizdfire_readmem,wizdfire_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) @@ -907,7 +907,7 @@ static MACHINE_DRIVER_START( nitrobal ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14000000) MDRV_CPU_PROGRAM_MAP(nitrobal_readmem,nitrobal_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) @@ -952,7 +952,7 @@ static MACHINE_DRIVER_START( schmeisr ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14000000) MDRV_CPU_PROGRAM_MAP(schmeisr_readmem,schmeisr_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c index f088a6eba9a..422e16bcbb3 100644 --- a/src/mame/drivers/rollerg.c +++ b/src/mame/drivers/rollerg.c @@ -247,7 +247,7 @@ static MACHINE_DRIVER_START( rollerg ) /* basic machine hardware */ MDRV_CPU_ADD(KONAMI, 3000000) /* ? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ diff --git a/src/mame/drivers/rollrace.c b/src/mame/drivers/rollrace.c index 10fa3e8dcf0..0b5d7c68bfd 100644 --- a/src/mame/drivers/rollrace.c +++ b/src/mame/drivers/rollrace.c @@ -5,6 +5,7 @@ Issues: ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "cpu/z80/z80.h" #include "sound/ay8910.h" @@ -237,12 +238,12 @@ static MACHINE_DRIVER_START( rollrace ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,XTAL_24MHz/8) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(Z80,XTAL_24MHz/16) /* verified on pcb */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(readmem_snd,writemem_snd) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,4) + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,4) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/rotaryf.c b/src/mame/drivers/rotaryf.c index f47b6caceb2..593d387517a 100644 --- a/src/mame/drivers/rotaryf.c +++ b/src/mame/drivers/rotaryf.c @@ -11,6 +11,7 @@ driver by Barry Rodewald */ #include "driver.h" +#include "deprecat.h" #include "cpu/i8085/i8085.h" @@ -151,7 +152,7 @@ static MACHINE_DRIVER_START( rotaryf ) MDRV_CPU_ADD_TAG("main",8085A,4000000) /* 8080? */ /* 2 MHz? */ MDRV_CPU_PROGRAM_MAP(rotaryf_map,0) MDRV_CPU_IO_MAP(rotaryf_io_map,0) - MDRV_CPU_VBLANK_INT(rotaryf_interrupt,5) + MDRV_CPU_VBLANK_INT_HACK(rotaryf_interrupt,5) /* video hardware */ MDRV_VIDEO_UPDATE(rotaryf) diff --git a/src/mame/drivers/route16.c b/src/mame/drivers/route16.c index ccb7568a428..49c151d0498 100644 --- a/src/mame/drivers/route16.c +++ b/src/mame/drivers/route16.c @@ -68,6 +68,7 @@ ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "sound/dac.h" #include "sound/sn76477.h" #include "sound/ay8910.h" @@ -609,7 +610,7 @@ static MACHINE_DRIVER_START( route16 ) MDRV_CPU_ADD_TAG("cpu1", Z80, 2500000) /* 10MHz / 4 = 2.5MHz */ MDRV_CPU_PROGRAM_MAP(route16_cpu1_map,0) MDRV_CPU_IO_MAP(cpu1_io_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD_TAG("cpu2", Z80, 2500000) /* 10MHz / 4 = 2.5MHz */ MDRV_CPU_PROGRAM_MAP(route16_cpu2_map,0) @@ -681,7 +682,7 @@ static MACHINE_DRIVER_START( spacecho ) /* basic machine hardware */ MDRV_IMPORT_FROM(speakres) MDRV_CPU_MODIFY("cpu2") - MDRV_CPU_VBLANK_INT(irq0_line_hold,48) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,48) MACHINE_DRIVER_END diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c index 3f4f11e7e2b..05f394bf0f6 100644 --- a/src/mame/drivers/royalmah.c +++ b/src/mame/drivers/royalmah.c @@ -3315,7 +3315,7 @@ static MACHINE_DRIVER_START( royalmah ) MDRV_CPU_ADD_TAG("main", Z80, 3000000) /* 3.00 MHz ? */ MDRV_CPU_PROGRAM_MAP(royalmah_map,0) MDRV_CPU_IO_MAP(royalmah_iomap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_NVRAM_HANDLER(generic_0fill) @@ -3361,7 +3361,7 @@ static MACHINE_DRIVER_START( suzume ) MDRV_IMPORT_FROM(dondenmj) MDRV_CPU_MODIFY("main") MDRV_CPU_IO_MAP(suzume_iomap,0) - MDRV_CPU_VBLANK_INT(suzume_irq,1) + MDRV_CPU_VBLANK_INT("main", suzume_irq) MACHINE_DRIVER_END static MACHINE_DRIVER_START( tontonb ) @@ -3415,7 +3415,7 @@ static MACHINE_DRIVER_START( janptr96 ) MDRV_CPU_REPLACE("main",Z80,24000000/4) /* 6 MHz? */ MDRV_CPU_PROGRAM_MAP(janptr96_map,0) MDRV_CPU_IO_MAP(janptr96_iomap,0) - MDRV_CPU_VBLANK_INT(janptr96_interrupt,3) /* IM 2 needs a vector on the data bus */ + MDRV_CPU_VBLANK_INT_HACK(janptr96_interrupt,3) /* IM 2 needs a vector on the data bus */ MDRV_SCREEN_MODIFY("main") MDRV_SCREEN_VISIBLE_AREA(0, 255, 9, 255-8) @@ -3427,7 +3427,7 @@ static MACHINE_DRIVER_START( mjifb ) MDRV_CPU_REPLACE("main",TMP90841, 8000000) /* ? */ MDRV_CPU_PROGRAM_MAP(mjifb_map,0) MDRV_CPU_IO_MAP(mjifb_iomap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_SCREEN_MODIFY("main") MDRV_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8) @@ -3439,7 +3439,7 @@ static MACHINE_DRIVER_START( mjdejavu ) MDRV_CPU_REPLACE("main",TMP90841, 8000000) /* ? */ MDRV_CPU_PROGRAM_MAP(mjdejavu_map,0) MDRV_CPU_IO_MAP(mjifb_iomap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_SCREEN_MODIFY("main") MDRV_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8) @@ -3460,7 +3460,7 @@ static MACHINE_DRIVER_START( mjtensin ) MDRV_CPU_REPLACE("main",TMP90841, 12000000) /* ? */ MDRV_CPU_PROGRAM_MAP(mjtensin_map,0) MDRV_CPU_IO_MAP(mjtensin_iomap,0) - MDRV_CPU_VBLANK_INT( mjtensin_interrupt,2 ) + MDRV_CPU_VBLANK_INT_HACK( mjtensin_interrupt,2 ) MDRV_SCREEN_MODIFY("main") MDRV_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8) @@ -3471,7 +3471,7 @@ static MACHINE_DRIVER_START( cafetime ) MDRV_CPU_REPLACE("main",TMP90841, 12000000) /* ? */ MDRV_CPU_PROGRAM_MAP(cafetime_map,0) MDRV_CPU_IO_MAP(cafetime_iomap,0) - MDRV_CPU_VBLANK_INT(mjtensin_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(mjtensin_interrupt,2) MDRV_SCREEN_MODIFY("main") MDRV_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8) diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c index f046d6693a2..74bfbce1644 100644 --- a/src/mame/drivers/rungun.c +++ b/src/mame/drivers/rungun.c @@ -331,7 +331,7 @@ static MACHINE_DRIVER_START( rng ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(rngreadmem,rngwritemem) - MDRV_CPU_VBLANK_INT(rng_interrupt,1) + MDRV_CPU_VBLANK_INT("main", rng_interrupt) MDRV_CPU_ADD_TAG("sound", Z80, 10000000) // 8Mhz (10Mhz is much safer in self-test due to heavy sync) /* audio CPU */ diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c index 515a206589a..673fc0f0fb4 100644 --- a/src/mame/drivers/sandscrp.c +++ b/src/mame/drivers/sandscrp.c @@ -435,7 +435,7 @@ static MACHINE_DRIVER_START( sandscrp ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,12000000) /* TMP68HC000N-12 */ MDRV_CPU_PROGRAM_MAP(sandscrp,0) - MDRV_CPU_VBLANK_INT(sandscrp_interrupt,1) + MDRV_CPU_VBLANK_INT("main", sandscrp_interrupt) MDRV_CPU_ADD(Z80,4000000) /* Z8400AB1, Reads the DSWs: it can't be disabled */ MDRV_CPU_PROGRAM_MAP(sandscrp_soundmem,0) diff --git a/src/mame/drivers/sangho.c b/src/mame/drivers/sangho.c index 9ed1117a99a..8c83bf0245b 100644 --- a/src/mame/drivers/sangho.c +++ b/src/mame/drivers/sangho.c @@ -235,7 +235,7 @@ static MACHINE_DRIVER_START(pzlestar) MDRV_CPU_ADD(Z80,8000000) // ? MDRV_CPU_PROGRAM_MAP(readmem, 0) MDRV_CPU_IO_MAP(readport_pzlestar,writeport_pzlestar) - MDRV_CPU_VBLANK_INT(sangho_interrupt,262) + MDRV_CPU_VBLANK_INT_HACK(sangho_interrupt,262) MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) @@ -268,7 +268,7 @@ static MACHINE_DRIVER_START(sexyboom ) MDRV_CPU_ADD(Z80,8000000) // ? MDRV_CPU_PROGRAM_MAP(readmem, 0) MDRV_CPU_IO_MAP(readport_sexyboom,writeport_sexyboom) - MDRV_CPU_VBLANK_INT(sangho_interrupt,262) + MDRV_CPU_VBLANK_INT_HACK(sangho_interrupt,262) MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) diff --git a/src/mame/drivers/sauro.c b/src/mame/drivers/sauro.c index 800391f6463..8a07c4be3dd 100644 --- a/src/mame/drivers/sauro.c +++ b/src/mame/drivers/sauro.c @@ -363,7 +363,7 @@ static INTERRUPT_GEN( sauro_interrupt ) static MACHINE_DRIVER_START( tecfri ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", Z80, 4000000) // 4 MHz??? - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -406,7 +406,7 @@ static MACHINE_DRIVER_START( sauro ) MDRV_CPU_ADD(Z80, 4000000) // 4 MHz? /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sauro_sound_readmem, sauro_sound_writemem) - MDRV_CPU_VBLANK_INT(sauro_interrupt, 8) // ? + MDRV_CPU_VBLANK_INT_HACK(sauro_interrupt, 8) // ? MDRV_GFXDECODE(sauro) diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c index 8742e2049d6..cd227da9dcc 100644 --- a/src/mame/drivers/sbasketb.c +++ b/src/mame/drivers/sbasketb.c @@ -240,7 +240,7 @@ static MACHINE_DRIVER_START( sbasketb ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 1400000) /* 1.400 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,14318000/4) /* audio CPU */ /* 3.5795 MHz */ diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c index 959d9ecf47c..07dd3f63b89 100644 --- a/src/mame/drivers/sbowling.c +++ b/src/mame/drivers/sbowling.c @@ -38,6 +38,7 @@ PROMs : NEC B406 (1kx4) x2 ***********************************************************/ #include "driver.h" +#include "deprecat.h" #include "cpu/i8039/i8039.h" #include "video/resnet.h" #include "sound/ay8910.h" @@ -330,7 +331,7 @@ static MACHINE_DRIVER_START( sbowling ) MDRV_CPU_ADD(8080, 19968000/10 ) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(port_map,0) - MDRV_CPU_VBLANK_INT(sbw_interrupt, 2) + MDRV_CPU_VBLANK_INT_HACK(sbw_interrupt, 2) MDRV_GFXDECODE(sbowling) /* video hardware */ diff --git a/src/mame/drivers/sbugger.c b/src/mame/drivers/sbugger.c index 7375b26c404..a6379542f29 100644 --- a/src/mame/drivers/sbugger.c +++ b/src/mame/drivers/sbugger.c @@ -98,6 +98,7 @@ Sound PCB */ #include "driver.h" +#include "deprecat.h" #include "sound/sn76496.h" //arbitrary @@ -229,7 +230,7 @@ static MACHINE_DRIVER_START( sbugger ) MDRV_CPU_ADD(8085A, 6000000) /* 3.00 MHz??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,0) - MDRV_CPU_VBLANK_INT(irq3_line_hold,NUM_INTS_FRAME) + MDRV_CPU_VBLANK_INT_HACK(irq3_line_hold,NUM_INTS_FRAME) MDRV_GFXDECODE(sbugger) diff --git a/src/mame/drivers/scotrsht.c b/src/mame/drivers/scotrsht.c index b1ce78bcb1b..bbcafd71053 100644 --- a/src/mame/drivers/scotrsht.c +++ b/src/mame/drivers/scotrsht.c @@ -226,7 +226,7 @@ static MACHINE_DRIVER_START( scotrsht ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(scotrsht_map,0) - MDRV_CPU_VBLANK_INT(scotrsht_interrupt,1) + MDRV_CPU_VBLANK_INT("main", scotrsht_interrupt) MDRV_CPU_ADD(Z80, 18432000/6) /* audio CPU */ /* 3.072 MHz */ diff --git a/src/mame/drivers/scramble.c b/src/mame/drivers/scramble.c index 4fbf68c1985..d9f0d75606c 100644 --- a/src/mame/drivers/scramble.c +++ b/src/mame/drivers/scramble.c @@ -2406,7 +2406,7 @@ static MACHINE_DRIVER_START( hunchbks ) MDRV_CPU_REPLACE("main", S2650, 18432000/6) MDRV_CPU_PROGRAM_MAP(hunchbks_readmem,hunchbks_writemem) MDRV_CPU_IO_MAP(hunchbks_readport,0) - MDRV_CPU_VBLANK_INT(hunchbks_vh_interrupt,1) + MDRV_CPU_VBLANK_INT("main", hunchbks_vh_interrupt) MDRV_SCREEN_MODIFY("main") MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) diff --git a/src/mame/drivers/scregg.c b/src/mame/drivers/scregg.c index 755c2285002..b0c1f9b9185 100644 --- a/src/mame/drivers/scregg.c +++ b/src/mame/drivers/scregg.c @@ -50,6 +50,7 @@ it as ASCII text. ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "sound/ay8910.h" @@ -232,7 +233,7 @@ static MACHINE_DRIVER_START( dommy ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 1500000) MDRV_CPU_PROGRAM_MAP(dommy_readmem,dommy_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,16) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,16) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -265,7 +266,7 @@ static MACHINE_DRIVER_START( scregg ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 1500000) MDRV_CPU_PROGRAM_MAP(eggs_readmem,eggs_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,16) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,16) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/sderby.c b/src/mame/drivers/sderby.c index aecb77dd504..9528e92ab04 100644 --- a/src/mame/drivers/sderby.c +++ b/src/mame/drivers/sderby.c @@ -253,7 +253,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( sderby ) MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(sderby_readmem,sderby_writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_GFXDECODE(sderby) @@ -281,7 +281,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( pmroulet ) MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(roulette_map,0) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_GFXDECODE(sderby) diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c index 45bd76ea219..52497eddf10 100644 --- a/src/mame/drivers/segac2.c +++ b/src/mame/drivers/segac2.c @@ -1365,7 +1365,7 @@ static MACHINE_DRIVER_START( segac ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, XL2_CLOCK/6) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(genesis_vblank_interrupt,1) + MDRV_CPU_VBLANK_INT("main", genesis_vblank_interrupt) MDRV_MACHINE_START(segac2) MDRV_MACHINE_RESET(segac2) diff --git a/src/mame/drivers/segag80r.c b/src/mame/drivers/segag80r.c index dca0f57701e..59468399a3c 100644 --- a/src/mame/drivers/segag80r.c +++ b/src/mame/drivers/segag80r.c @@ -821,7 +821,7 @@ static MACHINE_DRIVER_START( g80r_base ) MDRV_CPU_ADD_TAG("main", Z80, VIDEO_CLOCK/4) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) - MDRV_CPU_VBLANK_INT(segag80r_vblank_start,1) + MDRV_CPU_VBLANK_INT("main", segag80r_vblank_start) MDRV_MACHINE_START(g80r) @@ -914,7 +914,7 @@ static MACHINE_DRIVER_START( sindbadm ) MDRV_IMPORT_FROM(g80r_base) MDRV_CPU_MODIFY("main") MDRV_CPU_IO_MAP(sindbadm_portmap,0) - MDRV_CPU_VBLANK_INT(sindbadm_vblank_start,1) + MDRV_CPU_VBLANK_INT("main", sindbadm_vblank_start) /* video hardware */ MDRV_GFXDECODE(monsterb) @@ -924,7 +924,7 @@ static MACHINE_DRIVER_START( sindbadm ) MDRV_CPU_ADD(Z80, SINDBADM_SOUND_CLOCK/2) MDRV_CPU_PROGRAM_MAP(sindbadm_sound_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* sound hardware */ MDRV_SOUND_ADD(SN76496, SINDBADM_SOUND_CLOCK/4) diff --git a/src/mame/drivers/segag80v.c b/src/mame/drivers/segag80v.c index b6d92eeb1cd..74d66bb67da 100644 --- a/src/mame/drivers/segag80v.c +++ b/src/mame/drivers/segag80v.c @@ -914,7 +914,7 @@ static MACHINE_DRIVER_START( g80v_base ) MDRV_CPU_ADD(Z80, CPU_CLOCK/2) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_START(g80v) MDRV_MACHINE_RESET(g80v) diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c index 76b256eee78..3091d7ec696 100644 --- a/src/mame/drivers/segahang.c +++ b/src/mame/drivers/segahang.c @@ -845,7 +845,7 @@ static MACHINE_DRIVER_START( hangon_base ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK_25MHz/4) MDRV_CPU_PROGRAM_MAP(hangon_map,0) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD_TAG("sub", M68000, MASTER_CLOCK_25MHz/4) MDRV_CPU_PROGRAM_MAP(sub_map,0) @@ -872,7 +872,7 @@ static MACHINE_DRIVER_START( sharrier_base ) /* basic machine hardware */ MDRV_CPU_REPLACE("main", M68000, MASTER_CLOCK_10MHz) MDRV_CPU_PROGRAM_MAP(sharrier_map,0) - MDRV_CPU_VBLANK_INT(i8751_main_cpu_vblank,1) + MDRV_CPU_VBLANK_INT("main", i8751_main_cpu_vblank) MDRV_CPU_REPLACE("sub", M68000, MASTER_CLOCK_10MHz) @@ -999,7 +999,7 @@ static MACHINE_DRIVER_START( sharrier ) MDRV_CPU_ADD_TAG("mcu", I8751, 8000000) MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_CPU_DATA_MAP(mcu_data_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_pulse) MACHINE_DRIVER_END diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c index bcc30f78d80..ca613429442 100644 --- a/src/mame/drivers/segald.c +++ b/src/mame/drivers/segald.c @@ -346,7 +346,7 @@ static MACHINE_DRIVER_START( astron ) MDRV_CPU_ADD(Z80, SCHEMATIC_CLOCK/4) MDRV_CPU_PROGRAM_MAP(mainmem,0) MDRV_CPU_IO_MAP(mainport,0) - MDRV_CPU_VBLANK_INT(vblank_callback_astron, 1) + MDRV_CPU_VBLANK_INT("main", vblank_callback_astron) MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 1000.0/59.94) MDRV_MACHINE_START(astron) diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c index 7a6930aaf4c..cf1193afc17 100644 --- a/src/mame/drivers/segas16a.c +++ b/src/mame/drivers/segas16a.c @@ -1778,7 +1778,7 @@ static MACHINE_DRIVER_START( system16a ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(system16a_map,0) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD_TAG("sound", Z80, 4000000) /* audio CPU */ @@ -1831,12 +1831,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( system16a_8751 ) MDRV_IMPORT_FROM(system16a) MDRV_CPU_MODIFY("main") - MDRV_CPU_VBLANK_INT(i8751_main_cpu_vblank,1) + MDRV_CPU_VBLANK_INT("main", i8751_main_cpu_vblank) MDRV_CPU_ADD_TAG("mcu", I8751, 8000000) MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_CPU_DATA_MAP(mcu_data_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_pulse) MACHINE_DRIVER_END diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c index ad43c5d39ef..fb949af20c7 100644 --- a/src/mame/drivers/segas16b.c +++ b/src/mame/drivers/segas16b.c @@ -3217,7 +3217,7 @@ static MACHINE_DRIVER_START( system16b ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK_10MHz) MDRV_CPU_PROGRAM_MAP(system16b_map,0) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD_TAG("sound", Z80, MASTER_CLOCK_10MHz/2) MDRV_CPU_PROGRAM_MAP(sound_map,0) @@ -3252,12 +3252,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( system16b_8751 ) MDRV_IMPORT_FROM(system16b) MDRV_CPU_MODIFY("main") - MDRV_CPU_VBLANK_INT(i8751_main_cpu_vblank,1) + MDRV_CPU_VBLANK_INT("main", i8751_main_cpu_vblank) MDRV_CPU_ADD_TAG("mcu", I8751, MASTER_CLOCK_8MHz) MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_CPU_DATA_MAP(mcu_data_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_pulse) MACHINE_DRIVER_END diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c index 4cd643ce0ac..cb0466c6514 100644 --- a/src/mame/drivers/segas18.c +++ b/src/mame/drivers/segas18.c @@ -1258,7 +1258,7 @@ static MACHINE_DRIVER_START( system18 ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 10000000) MDRV_CPU_PROGRAM_MAP(system18_map,0) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD_TAG("sound", Z80, 8000000) /* audio CPU */ @@ -1298,12 +1298,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( system18_8751 ) MDRV_IMPORT_FROM(system18) MDRV_CPU_MODIFY("main") - MDRV_CPU_VBLANK_INT(irq0_line_hold,0) + MDRV_CPU_VBLANK_INT_HACK(NULL,0) MDRV_CPU_ADD(I8751, 8000000) MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_CPU_DATA_MAP(mcu_data_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_pulse) MACHINE_DRIVER_END diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c index 513a7a90c24..d6edf873659 100644 --- a/src/mame/drivers/segas24.c +++ b/src/mame/drivers/segas24.c @@ -1908,7 +1908,7 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( system24 ) MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(system24_cpu1_map, 0) - MDRV_CPU_VBLANK_INT(irq_vbl, 2) + MDRV_CPU_VBLANK_INT_HACK(irq_vbl, 2) MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(system24_cpu2_map, 0) diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c index 430d604b583..21d493d68d2 100644 --- a/src/mame/drivers/segas32.c +++ b/src/mame/drivers/segas32.c @@ -2192,7 +2192,7 @@ static MACHINE_DRIVER_START( system32 ) /* basic machine hardware */ MDRV_CPU_ADD(V60, MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(system32_map,0) - MDRV_CPU_VBLANK_INT(start_of_vblank_int,1) + MDRV_CPU_VBLANK_INT("main", start_of_vblank_int) MDRV_CPU_ADD_TAG("sound", Z80, MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(system32_sound_map,0) @@ -2246,7 +2246,7 @@ static MACHINE_DRIVER_START( multi32 ) /* basic machine hardware */ MDRV_CPU_ADD(V70, MULTI32_CLOCK/2) MDRV_CPU_PROGRAM_MAP(multi32_map,0) - MDRV_CPU_VBLANK_INT(start_of_vblank_int,1) + MDRV_CPU_VBLANK_INT("left", start_of_vblank_int) MDRV_CPU_ADD_TAG("sound", Z80, MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(multi32_sound_map,0) diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c index 0617e523b60..6c4563e78d4 100644 --- a/src/mame/drivers/seibuspi.c +++ b/src/mame/drivers/seibuspi.c @@ -1780,7 +1780,7 @@ static MACHINE_DRIVER_START( spi ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main",I386, 50000000/2) /* Intel 386DX, 25MHz */ MDRV_CPU_PROGRAM_MAP(spi_map, 0) - MDRV_CPU_VBLANK_INT(spi_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", spi_interrupt) MDRV_CPU_ADD_TAG("sound", Z80, 28636360/4) /* audio CPU */ @@ -2099,7 +2099,7 @@ static MACHINE_DRIVER_START( seibu386 ) /* basic machine hardware */ MDRV_CPU_ADD(I386, 40000000) /* AMD 386DX, 40MHz */ MDRV_CPU_PROGRAM_MAP(seibu386_map, 0) - MDRV_CPU_VBLANK_INT(spi_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", spi_interrupt) MDRV_NVRAM_HANDLER(sxx2f) MDRV_MACHINE_RESET(seibu386) diff --git a/src/mame/drivers/seicross.c b/src/mame/drivers/seicross.c index ce21a43ed5f..af42f7902e4 100644 --- a/src/mame/drivers/seicross.c +++ b/src/mame/drivers/seicross.c @@ -404,7 +404,7 @@ static MACHINE_DRIVER_START( nvram ) MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz? */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD_TAG("mcu", NSC8105, 6000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(mcu_nvram_map,0) diff --git a/src/mame/drivers/sengokmj.c b/src/mame/drivers/sengokmj.c index 14e4c4b2fc7..10c3bc0acd6 100644 --- a/src/mame/drivers/sengokmj.c +++ b/src/mame/drivers/sengokmj.c @@ -289,7 +289,7 @@ static MACHINE_DRIVER_START( sengokmj ) MDRV_CPU_ADD(V30, 16000000/2) /* V30-8 */ MDRV_CPU_PROGRAM_MAP(sengokmj_map,0) MDRV_CPU_IO_MAP(sengokmj_io_map,0) - MDRV_CPU_VBLANK_INT(sengokmj_interrupt,1) + MDRV_CPU_VBLANK_INT("main", sengokmj_interrupt) SEIBU_SOUND_SYSTEM_CPU(14318180/4) diff --git a/src/mame/drivers/senjyo.c b/src/mame/drivers/senjyo.c index 7f5af20e514..eb6bcb6c9a2 100644 --- a/src/mame/drivers/senjyo.c +++ b/src/mame/drivers/senjyo.c @@ -664,7 +664,7 @@ static MACHINE_DRIVER_START( senjyo ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(senjyo_interrupt,1) + MDRV_CPU_VBLANK_INT("main", senjyo_interrupt) MDRV_CPU_ADD_TAG("sub", Z80, 2000000) MDRV_CPU_CONFIG(daisy_chain) diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index cef07d58161..7537a905610 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -6686,11 +6686,11 @@ static MACHINE_DRIVER_START( tndrcade ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000/2) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(tndrcade_readmem,tndrcade_writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_CPU_ADD(M65C02, 16000000/8) /* 2 MHz */ MDRV_CPU_PROGRAM_MAP(tndrcade_sub_readmem,tndrcade_sub_writemem) - MDRV_CPU_VBLANK_INT(tndrcade_sub_interrupt,TNDRCADE_SUB_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(tndrcade_sub_interrupt,TNDRCADE_SUB_INTERRUPTS_NUM) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -6736,11 +6736,11 @@ static MACHINE_DRIVER_START( twineagl ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000/2) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(downtown_readmem,downtown_writemem) - MDRV_CPU_VBLANK_INT(irq3_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq3_line_hold) MDRV_CPU_ADD(M65C02, 16000000/8) /* 2 MHz */ MDRV_CPU_PROGRAM_MAP(twineagl_sub_readmem,twineagl_sub_writemem) - MDRV_CPU_VBLANK_INT(seta_sub_interrupt,SETA_SUB_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(seta_sub_interrupt,SETA_SUB_INTERRUPTS_NUM) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -6778,11 +6778,11 @@ static MACHINE_DRIVER_START( downtown ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_16MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(downtown_readmem,downtown_writemem) - MDRV_CPU_VBLANK_INT(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) MDRV_CPU_ADD(M65C02, XTAL_16MHz/8) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(downtown_sub_readmem,downtown_sub_writemem) - MDRV_CPU_VBLANK_INT(seta_sub_interrupt,SETA_SUB_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(seta_sub_interrupt,SETA_SUB_INTERRUPTS_NUM) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -6838,11 +6838,11 @@ static MACHINE_DRIVER_START( usclssic ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000/2) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(usclssic_readmem,usclssic_writemem) - MDRV_CPU_VBLANK_INT(calibr50_interrupt,calibr50_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(calibr50_interrupt,calibr50_INTERRUPTS_NUM) MDRV_CPU_ADD(M65C02, 16000000/8) /* 2 MHz */ MDRV_CPU_PROGRAM_MAP(calibr50_sub_readmem,calibr50_sub_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* NMI caused by main cpu when writing to the sound latch */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* NMI caused by main cpu when writing to the sound latch */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -6883,11 +6883,11 @@ static MACHINE_DRIVER_START( calibr50 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000/2) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(calibr50_readmem,calibr50_writemem) - MDRV_CPU_VBLANK_INT(calibr50_interrupt,calibr50_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(calibr50_interrupt,calibr50_INTERRUPTS_NUM) MDRV_CPU_ADD(M65C02, 16000000/8) /* 2 MHz */ MDRV_CPU_PROGRAM_MAP(calibr50_sub_readmem,calibr50_sub_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) /* IRQ: 4/frame + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* IRQ: 4/frame NMI: when the 68k writes the sound latch */ /* video hardware */ @@ -6925,11 +6925,11 @@ static MACHINE_DRIVER_START( metafox ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000/2) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(downtown_readmem,downtown_writemem) - MDRV_CPU_VBLANK_INT(irq3_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq3_line_hold) MDRV_CPU_ADD(M65C02, 16000000/8) /* 2 MHz */ MDRV_CPU_PROGRAM_MAP(metafox_sub_readmem,metafox_sub_writemem) - MDRV_CPU_VBLANK_INT(seta_sub_interrupt,SETA_SUB_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(seta_sub_interrupt,SETA_SUB_INTERRUPTS_NUM) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -6968,7 +6968,7 @@ static MACHINE_DRIVER_START( atehate ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(atehate_readmem,atehate_writemem) - MDRV_CPU_VBLANK_INT(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -7010,7 +7010,7 @@ static MACHINE_DRIVER_START( blandia ) MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(blandia_readmem,blandia_writemem) - MDRV_CPU_VBLANK_INT(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -7042,7 +7042,7 @@ static MACHINE_DRIVER_START( blandiap ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(blandiap_readmem,blandiap_writemem) - MDRV_CPU_VBLANK_INT(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -7079,7 +7079,7 @@ static MACHINE_DRIVER_START( blockcar ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000/2) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(blockcar_readmem,blockcar_writemem) - MDRV_CPU_VBLANK_INT(irq3_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq3_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -7114,7 +7114,7 @@ static MACHINE_DRIVER_START( daioh ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(daioh_readmem,daioh_writemem) - MDRV_CPU_VBLANK_INT(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -7154,7 +7154,7 @@ static MACHINE_DRIVER_START( drgnunit ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000/2) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(drgnunit_readmem,drgnunit_writemem) - MDRV_CPU_VBLANK_INT(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -7188,7 +7188,7 @@ static MACHINE_DRIVER_START( qzkklgy2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(drgnunit_readmem,drgnunit_writemem) - MDRV_CPU_VBLANK_INT(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -7224,7 +7224,7 @@ static MACHINE_DRIVER_START( eightfrc ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(wrofaero_readmem,wrofaero_writemem) - MDRV_CPU_VBLANK_INT(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -7264,7 +7264,7 @@ static MACHINE_DRIVER_START( extdwnhl ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(extdwnhl_readmem,extdwnhl_writemem) - MDRV_CPU_VBLANK_INT(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -7317,10 +7317,10 @@ static MACHINE_DRIVER_START( gundhara ) MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(wrofaero_readmem,wrofaero_writemem) #if __uPD71054_TIMER -// MDRV_CPU_VBLANK_INT( wrofaero_interrupt, 1 ) - MDRV_CPU_VBLANK_INT(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) +// MDRV_CPU_VBLANK_INT("main", wrofaero_interrupt) + MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) #else - MDRV_CPU_VBLANK_INT(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM) #endif // __uPD71054_TIMER #if __uPD71054_TIMER @@ -7365,7 +7365,7 @@ static MACHINE_DRIVER_START( jjsquawk ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(wrofaero_readmem,wrofaero_writemem) - MDRV_CPU_VBLANK_INT(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -7401,7 +7401,7 @@ static MACHINE_DRIVER_START( kamenrid ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(kamenrid_readmem,kamenrid_writemem) - MDRV_CPU_VBLANK_INT( wrofaero_interrupt, 1 ) + MDRV_CPU_VBLANK_INT("main", wrofaero_interrupt) #if __uPD71054_TIMER MDRV_MACHINE_RESET( wrofaero ) @@ -7441,7 +7441,7 @@ static MACHINE_DRIVER_START( orbs ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14318180/2) /* 7.143 MHz */ MDRV_CPU_PROGRAM_MAP(orbs_readmem,orbs_writemem) - MDRV_CPU_VBLANK_INT(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -7476,7 +7476,7 @@ static MACHINE_DRIVER_START( krzybowl ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(krzybowl_readmem,krzybowl_writemem) - MDRV_CPU_VBLANK_INT(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -7512,7 +7512,7 @@ static MACHINE_DRIVER_START( madshark ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(madshark_readmem,madshark_writemem) - MDRV_CPU_VBLANK_INT( wrofaero_interrupt, 1 ) + MDRV_CPU_VBLANK_INT("main", wrofaero_interrupt) #if __uPD71054_TIMER MDRV_MACHINE_RESET( wrofaero ) @@ -7555,9 +7555,9 @@ static MACHINE_DRIVER_START( msgundam ) MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(msgundam_readmem,msgundam_writemem) #if __uPD71054_TIMER - MDRV_CPU_VBLANK_INT( wrofaero_interrupt, 1 ) + MDRV_CPU_VBLANK_INT("main", wrofaero_interrupt) #else - MDRV_CPU_VBLANK_INT(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM) #endif // __uPD71054_TIMER #if __uPD71054_TIMER @@ -7599,7 +7599,7 @@ static MACHINE_DRIVER_START( oisipuzl ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(oisipuzl_readmem,oisipuzl_writemem) - MDRV_CPU_VBLANK_INT(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -7635,7 +7635,7 @@ static MACHINE_DRIVER_START( triplfun ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(triplfun_readmem,triplfun_writemem) - MDRV_CPU_VBLANK_INT(irq3_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq3_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -7669,7 +7669,7 @@ static MACHINE_DRIVER_START( kiwame ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(kiwame_readmem,kiwame_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1)/* lev 1-7 are the same. WARNING: + MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* lev 1-7 are the same. WARNING: the interrupt table is written to. */ /* video hardware */ @@ -7708,7 +7708,7 @@ static MACHINE_DRIVER_START( rezon ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(wrofaero_readmem,wrofaero_writemem) - MDRV_CPU_VBLANK_INT(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -7746,7 +7746,7 @@ static MACHINE_DRIVER_START( thunderl ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000/2) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(thunderl_readmem,thunderl_writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -7777,7 +7777,7 @@ static MACHINE_DRIVER_START( wiggie ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000/2) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(thunderl_readmem,thunderl_writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_CPU_ADD(Z80, 16000000/4) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(wiggie_sound_readmem,wiggie_sound_writemem) @@ -7810,7 +7810,7 @@ static MACHINE_DRIVER_START( wits ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000/2) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(thunderl_readmem,thunderl_writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -7846,7 +7846,7 @@ static MACHINE_DRIVER_START( umanclub ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(umanclub_readmem,umanclub_writemem) - MDRV_CPU_VBLANK_INT(irq3_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq3_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -7881,7 +7881,7 @@ static MACHINE_DRIVER_START( utoukond ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(utoukond_readmem,utoukond_writemem) - MDRV_CPU_VBLANK_INT(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) MDRV_CPU_ADD(Z80, 16000000/4) /* 4 MHz */ /* audio CPU */ @@ -7927,9 +7927,9 @@ static MACHINE_DRIVER_START( wrofaero ) MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(wrofaero_readmem,wrofaero_writemem) #if __uPD71054_TIMER - MDRV_CPU_VBLANK_INT( wrofaero_interrupt, 1 ) + MDRV_CPU_VBLANK_INT("main", wrofaero_interrupt) #else - MDRV_CPU_VBLANK_INT(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM) #endif // __uPD71054_TIMER #if __uPD71054_TIMER @@ -7976,7 +7976,7 @@ static MACHINE_DRIVER_START( zingzip ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(wrofaero_readmem,wrofaero_writemem) - MDRV_CPU_VBLANK_INT(irq3_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq3_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -8011,7 +8011,7 @@ static MACHINE_DRIVER_START( pairlove ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000/2) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(pairlove_readmem,pairlove_writemem) - MDRV_CPU_VBLANK_INT(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) + MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -8055,7 +8055,7 @@ static MACHINE_DRIVER_START( crazyfgt ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(crazyfgt_map,0) - MDRV_CPU_VBLANK_INT(crazyfgt_interrupt,1+5) + MDRV_CPU_VBLANK_INT_HACK(crazyfgt_interrupt,1+5) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -8114,7 +8114,7 @@ static MACHINE_DRIVER_START( inttoote ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(inttoote_map,0) - MDRV_CPU_VBLANK_INT(inttoote_interrupt,8+1+1+1) + MDRV_CPU_VBLANK_INT_HACK(inttoote_interrupt,8+1+1+1) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c index 5cd1ca017e9..e3ee68b84b0 100644 --- a/src/mame/drivers/seta2.c +++ b/src/mame/drivers/seta2.c @@ -1814,7 +1814,7 @@ static MACHINE_DRIVER_START( mj4simai ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main",M68000,50000000/3) /* !! TMP68301 @ 16.666666MHz !! */ MDRV_CPU_PROGRAM_MAP(mj4simai_readmem,mj4simai_writemem) - MDRV_CPU_VBLANK_INT(seta2_interrupt,1) + MDRV_CPU_VBLANK_INT("main", seta2_interrupt) MDRV_MACHINE_RESET( tmp68301 ) @@ -1929,7 +1929,7 @@ static MACHINE_DRIVER_START( samshoot ) MDRV_IMPORT_FROM(mj4simai) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(samshoot_map,0) - MDRV_CPU_VBLANK_INT(samshoot_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(samshoot_interrupt,2) MDRV_NVRAM_HANDLER(generic_0fill) diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c index a20ba5ea804..8731f406236 100644 --- a/src/mame/drivers/sf.c +++ b/src/mame/drivers/sf.c @@ -820,7 +820,7 @@ static MACHINE_DRIVER_START( sf ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz ? (xtal is 16MHz) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* ? xtal is 3.579545MHz */ @@ -889,7 +889,7 @@ static MACHINE_DRIVER_START( sfp ) /* basic machine hardware */ MDRV_IMPORT_FROM(sf) MDRV_CPU_MODIFY("main") - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MACHINE_DRIVER_END diff --git a/src/mame/drivers/sfkick.c b/src/mame/drivers/sfkick.c index 28df06cc819..0c274f07d4d 100644 --- a/src/mame/drivers/sfkick.c +++ b/src/mame/drivers/sfkick.c @@ -82,11 +82,11 @@ static MACHINE_DRIVER_START( sfkick ) MDRV_CPU_ADD(Z80,8000000) // ? MDRV_CPU_PROGRAM_MAP(readmem,writemem) -// MDRV_CPU_VBLANK_INT(irq0_line_hold,1) +// MDRV_CPU_VBLANK_INT("main", irq0_line_hold) //MDRV_CPU_ADD(Z80,8000000) // ? //MDRV_CPU_PROGRAM_MAP(readmem2,writemem2) -// MDRV_CPU_VBLANK_INT(irq0_line_hold,1) +// MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_SCREEN_ADD("main", RASTER) MDRV_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/sg1000a.c b/src/mame/drivers/sg1000a.c index c1efc2ddd62..19e29526ca7 100644 --- a/src/mame/drivers/sg1000a.c +++ b/src/mame/drivers/sg1000a.c @@ -270,7 +270,7 @@ static MACHINE_DRIVER_START( sg1000a ) MDRV_CPU_ADD(Z80, 3579545) /* 3.579545 Mhz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(sg100a_interrupt,1) + MDRV_CPU_VBLANK_INT("main", sg100a_interrupt) /* video hardware */ MDRV_IMPORT_FROM(tms9928a) diff --git a/src/mame/drivers/sgladiat.c b/src/mame/drivers/sgladiat.c index 42441df82d7..29251a41f51 100644 --- a/src/mame/drivers/sgladiat.c +++ b/src/mame/drivers/sgladiat.c @@ -147,11 +147,11 @@ static MACHINE_DRIVER_START( sgladiat ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(sgladiat_cpuA_map,0) -// MDRV_CPU_VBLANK_INT(irq0_line_hold,1) +// MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 5000000) MDRV_CPU_PROGRAM_MAP(sgladiat_cpuB_map,0) - MDRV_CPU_VBLANK_INT(snk_irq_BA,1) + MDRV_CPU_VBLANK_INT("main", snk_irq_BA) MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(sgladiat_sound_map,0) diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c index 521c92fe99f..777efa7d087 100644 --- a/src/mame/drivers/shadfrce.c +++ b/src/mame/drivers/shadfrce.c @@ -553,7 +553,7 @@ static INTERRUPT_GEN( shadfrce_interrupt ) { static MACHINE_DRIVER_START( shadfrce ) MDRV_CPU_ADD(M68000, 28000000/2) /* ? Guess - CPU is rated for 16MHz */ MDRV_CPU_PROGRAM_MAP(shadfrce_readmem,shadfrce_writemem) - MDRV_CPU_VBLANK_INT(shadfrce_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(shadfrce_interrupt,2) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c index ed07811fe52..37af87006b5 100644 --- a/src/mame/drivers/shangha3.c +++ b/src/mame/drivers/shangha3.c @@ -499,7 +499,7 @@ static MACHINE_DRIVER_START( shangha3 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) MDRV_CPU_PROGRAM_MAP(shangha3_readmem,shangha3_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS ) @@ -535,7 +535,7 @@ static MACHINE_DRIVER_START( heberpop ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) MDRV_CPU_PROGRAM_MAP(heberpop_readmem,heberpop_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD(Z80, 6000000) /* 6 MHz ??? */ MDRV_CPU_PROGRAM_MAP(heberpop_sound_readmem,heberpop_sound_writemem) @@ -577,7 +577,7 @@ static MACHINE_DRIVER_START( blocken ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) MDRV_CPU_PROGRAM_MAP(blocken_readmem,blocken_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD(Z80, 6000000) /* 6 MHz ??? */ MDRV_CPU_PROGRAM_MAP(heberpop_sound_readmem,heberpop_sound_writemem) diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c index 68dd70c88e5..bf759d6cabd 100644 --- a/src/mame/drivers/shanghai.c +++ b/src/mame/drivers/shanghai.c @@ -986,7 +986,7 @@ static MACHINE_DRIVER_START( shanghai ) MDRV_CPU_ADD(V30,16000000/2) /* ? */ MDRV_CPU_PROGRAM_MAP(shanghai_map,0) MDRV_CPU_IO_MAP(shanghai_portmap,0) - MDRV_CPU_VBLANK_INT(shanghai_interrupt,1) + MDRV_CPU_VBLANK_INT("main", shanghai_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -1019,7 +1019,7 @@ static MACHINE_DRIVER_START( shangha2 ) MDRV_CPU_ADD(V30,16000000/2) /* ? */ MDRV_CPU_PROGRAM_MAP(shangha2_map,0) MDRV_CPU_IO_MAP(shangha2_portmap,0) - MDRV_CPU_VBLANK_INT(shanghai_interrupt,1) + MDRV_CPU_VBLANK_INT("main", shanghai_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -1050,7 +1050,7 @@ static MACHINE_DRIVER_START( kothello ) /* basic machine hardware */ MDRV_CPU_ADD(V30,16000000/2) /* ? */ MDRV_CPU_PROGRAM_MAP(kothello_map, 0) - MDRV_CPU_VBLANK_INT(shanghai_interrupt,1) + MDRV_CPU_VBLANK_INT("main", shanghai_interrupt) SEIBU3A_SOUND_SYSTEM_CPU(14318180/4) diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c index 001bf06596e..d94812320e4 100644 --- a/src/mame/drivers/shangkid.c +++ b/src/mame/drivers/shangkid.c @@ -387,12 +387,12 @@ static MACHINE_DRIVER_START( chinhero ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", Z80, XTAL_18_432MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(chinhero_main_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD_TAG("bbx", Z80, XTAL_18_432MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(chinhero_bbx_map,0) MDRV_CPU_IO_MAP(chinhero_bbx_portmap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD_TAG("audio", Z80, XTAL_18_432MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(chinhero_sound_map,0) @@ -478,7 +478,7 @@ static MACHINE_DRIVER_START( dynamski ) MDRV_CPU_ADD(Z80, 3000000) /* ? */ MDRV_CPU_PROGRAM_MAP(dynamski_map,0) MDRV_CPU_IO_MAP(dynamski_portmap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/shaolins.c b/src/mame/drivers/shaolins.c index cc4108d74ea..ae2c086cc1c 100644 --- a/src/mame/drivers/shaolins.c +++ b/src/mame/drivers/shaolins.c @@ -220,7 +220,7 @@ static MACHINE_DRIVER_START( shaolins ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(shaolins_interrupt,16) /* 1 IRQ + 8 NMI */ + MDRV_CPU_VBLANK_INT_HACK(shaolins_interrupt,16) /* 1 IRQ + 8 NMI */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c index 932249e9b91..dfe6c29887a 100644 --- a/src/mame/drivers/shisen.c +++ b/src/mame/drivers/shisen.c @@ -6,6 +6,7 @@ driver by Nicola Salmoria ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "audio/m72.h" #include "sound/dac.h" #include "sound/2151intf.h" @@ -243,13 +244,13 @@ static MACHINE_DRIVER_START( shisen ) MDRV_CPU_ADD(Z80, 6000000) /* 6 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 3579645) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ MDRV_MACHINE_RESET(m72_sound) diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c index 828b53c79c9..f32ed2b4597 100644 --- a/src/mame/drivers/shootout.c +++ b/src/mame/drivers/shootout.c @@ -305,7 +305,7 @@ static MACHINE_DRIVER_START( shootout ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 2000000) /* 2 MHz? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(shootout_interrupt,1) /* nmi's are triggered at coin up */ + MDRV_CPU_VBLANK_INT("main", shootout_interrupt) /* nmi's are triggered at coin up */ MDRV_CPU_ADD(M6502, 1500000) /* audio CPU */ @@ -340,7 +340,7 @@ static MACHINE_DRIVER_START( shootouj ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 2000000) /* 2 MHz? */ MDRV_CPU_PROGRAM_MAP(readmem_alt,writemem_alt) - MDRV_CPU_VBLANK_INT(shootout_interrupt,1) /* nmi's are triggered at coin up */ + MDRV_CPU_VBLANK_INT("main", shootout_interrupt) /* nmi's are triggered at coin up */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c index a4ae22c679d..feddb5f3c91 100644 --- a/src/mame/drivers/shougi.c +++ b/src/mame/drivers/shougi.c @@ -357,7 +357,7 @@ static MACHINE_DRIVER_START( shougi ) MDRV_CPU_ADD(Z80,10000000/4) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(shougi_vblank_nmi,1) + MDRV_CPU_VBLANK_INT("main", shougi_vblank_nmi) MDRV_CPU_ADD(Z80,10000000/4) MDRV_CPU_PROGRAM_MAP(sub_map,0) diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c index 035848a0375..603b4ca9151 100644 --- a/src/mame/drivers/sidearms.c +++ b/src/mame/drivers/sidearms.c @@ -718,7 +718,7 @@ static MACHINE_DRIVER_START( sidearms ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz (?) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz (?) */ /* audio CPU */ @@ -764,7 +764,7 @@ static MACHINE_DRIVER_START( turtship ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz (?) */ MDRV_CPU_PROGRAM_MAP(turtship_readmem,turtship_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz (?) */ /* audio CPU */ @@ -809,13 +809,13 @@ static MACHINE_DRIVER_START( whizz ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz (?) */ MDRV_CPU_PROGRAM_MAP(whizz_readmem,whizz_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(whizz_sound_readmem,whizz_sound_writemem) MDRV_CPU_IO_MAP(whizz_readport,whizz_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(1000) diff --git a/src/mame/drivers/sidepckt.c b/src/mame/drivers/sidepckt.c index 12ad7b3db3d..1946ccb16a8 100644 --- a/src/mame/drivers/sidepckt.c +++ b/src/mame/drivers/sidepckt.c @@ -295,7 +295,7 @@ static MACHINE_DRIVER_START( sidepckt ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 2000000) /* 2 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(M6502, 1500000) /* audio CPU */ /* 1.5 MHz */ @@ -334,7 +334,7 @@ static MACHINE_DRIVER_START( sidepctj ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 2000000) /* 2 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,j_writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(M6502, 1500000) /* audio CPU */ /* 1.5 MHz */ diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c index 16ca6d69f37..d031e3e26da 100644 --- a/src/mame/drivers/silkroad.c +++ b/src/mame/drivers/silkroad.c @@ -373,7 +373,7 @@ static MACHINE_DRIVER_START( silkroad ) /* basic machine hardware */ MDRV_CPU_ADD(M68EC020, 16000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c index d1796fcccfc..e400054efe1 100644 --- a/src/mame/drivers/simpl156.c +++ b/src/mame/drivers/simpl156.c @@ -484,7 +484,7 @@ static MACHINE_DRIVER_START( chainrec ) MDRV_CPU_ADD_TAG("DE156", ARM, 28000000 /* /4 */) /*DE156*/ /* 7.000 MHz */ /* measured at 7.. seems to need 28? */ MDRV_CPU_PROGRAM_MAP(chainrec_map,0) - MDRV_CPU_VBLANK_INT(simpl156_vbl_interrupt,1) + MDRV_CPU_VBLANK_INT("main", simpl156_vbl_interrupt) MDRV_NVRAM_HANDLER(simpl156) // 93C45 diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c index 87bfe8701ad..02fdca1c0c2 100644 --- a/src/mame/drivers/simpsons.c +++ b/src/mame/drivers/simpsons.c @@ -279,7 +279,7 @@ static MACHINE_DRIVER_START( simpsons ) /* basic machine hardware */ MDRV_CPU_ADD(KONAMI, XTAL_24MHz/2/4) /* pin 18 of konami cpu is 12Mhz, while pin 17 is 3mhz. Clock probably divided internally by 4 */ MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(simpsons_irq,1) /* IRQ triggered by the 052109, FIRQ by the sprite hardware */ + MDRV_CPU_VBLANK_INT("main", simpsons_irq) /* IRQ triggered by the 052109, FIRQ by the sprite hardware */ MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(z80_map,0) diff --git a/src/mame/drivers/skullxbo.c b/src/mame/drivers/skullxbo.c index 5905b12e8f6..4fe01080418 100644 --- a/src/mame/drivers/skullxbo.c +++ b/src/mame/drivers/skullxbo.c @@ -251,7 +251,7 @@ static MACHINE_DRIVER_START( skullxbo ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(atarigen_video_int_gen,1) + MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) MDRV_MACHINE_RESET(skullxbo) MDRV_NVRAM_HANDLER(atarigen) diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c index 836c4710d7c..18d4875fd80 100644 --- a/src/mame/drivers/skyarmy.c +++ b/src/mame/drivers/skyarmy.c @@ -264,7 +264,7 @@ static MACHINE_DRIVER_START( skyarmy ) MDRV_CPU_ADD(Z80,4000000) MDRV_CPU_PROGRAM_MAP(skyarmy_readmem,skyarmy_writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_PERIODIC_INT(skyarmy_nmi_source,650) /* Hz */ /* video hardware */ diff --git a/src/mame/drivers/skydiver.c b/src/mame/drivers/skydiver.c index 9e6e16fc9ea..82fc7e34e2a 100644 --- a/src/mame/drivers/skydiver.c +++ b/src/mame/drivers/skydiver.c @@ -87,6 +87,7 @@ ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "skydiver.h" #include "sound/discrete.h" @@ -370,7 +371,7 @@ static MACHINE_DRIVER_START( skydiver ) /* basic machine hardware */ MDRV_CPU_ADD(M6800,3000000/4) /* ???? */ MDRV_CPU_PROGRAM_MAP(skydiver_map, 0) - MDRV_CPU_VBLANK_INT(skydiver_interrupt, 5) + MDRV_CPU_VBLANK_INT_HACK(skydiver_interrupt, 5) MDRV_WATCHDOG_VBLANK_INIT(8) // 128V clocks the same as VBLANK MDRV_MACHINE_RESET(skydiver) diff --git a/src/mame/drivers/skyfox.c b/src/mame/drivers/skyfox.c index 6c0c93a791a..d8998ae411c 100644 --- a/src/mame/drivers/skyfox.c +++ b/src/mame/drivers/skyfox.c @@ -256,7 +256,7 @@ static MACHINE_DRIVER_START( skyfox ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(skyfox_readmem,skyfox_writemem) - MDRV_CPU_VBLANK_INT(skyfox_interrupt,1) /* NMI caused by coin insertion */ + MDRV_CPU_VBLANK_INT("main", skyfox_interrupt) /* NMI caused by coin insertion */ MDRV_CPU_ADD(Z80, 1748000) /* audio CPU */ diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c index e923e60ed09..83f08bafb89 100644 --- a/src/mame/drivers/skykid.c +++ b/src/mame/drivers/skykid.c @@ -454,12 +454,12 @@ static MACHINE_DRIVER_START( skykid ) /* basic machine hardware */ MDRV_CPU_ADD(M6809,49152000/32) MDRV_CPU_PROGRAM_MAP(skykid_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_CPU_ADD(HD63701,49152000/8) /* or compatible 6808 with extra instructions */ MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_CPU_IO_MAP(mcu_port_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_INTERLEAVE(100) /* we need heavy synch */ diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c index 2a48c013c30..89248b6ccc3 100644 --- a/src/mame/drivers/skylncr.c +++ b/src/mame/drivers/skylncr.c @@ -429,7 +429,7 @@ static MACHINE_DRIVER_START( skylncr ) MDRV_CPU_ADD(Z80, 12000000/4) MDRV_CPU_PROGRAM_MAP(mem_map_skylncr,0) MDRV_CPU_IO_MAP(io_map_skylncr,0) - MDRV_CPU_VBLANK_INT(skylncr_vblank_interrupt,1) + MDRV_CPU_VBLANK_INT("main", skylncr_vblank_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/skyraid.c b/src/mame/drivers/skyraid.c index a4f35c4839a..a39ea8fe447 100644 --- a/src/mame/drivers/skyraid.c +++ b/src/mame/drivers/skyraid.c @@ -263,7 +263,7 @@ static MACHINE_DRIVER_START( skyraid ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 12096000 / 12) MDRV_CPU_PROGRAM_MAP(skyraid_readmem, skyraid_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c index 1ffdf127345..bec0275e94f 100644 --- a/src/mame/drivers/slapfght.c +++ b/src/mame/drivers/slapfght.c @@ -186,6 +186,7 @@ $8609 - $860f High score characters to display to screen for highest score ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "cpu/m6805/m6805.h" #include "sound/ay8910.h" @@ -842,11 +843,11 @@ static MACHINE_DRIVER_START( perfrman ) MDRV_CPU_ADD(Z80,16000000/4) /* 4MHz ???, 16MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(perfrman_readmem,perfrman_writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,16000000/8) /* 2MHz ???, 16MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(perfrman_sound_readmem,perfrman_sound_writemem) - MDRV_CPU_VBLANK_INT(getstar_interrupt,4) /* music speed, verified */ + MDRV_CPU_VBLANK_INT_HACK(getstar_interrupt,4) /* music speed, verified */ MDRV_INTERLEAVE(10) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ @@ -889,11 +890,11 @@ static MACHINE_DRIVER_START( tigerhb ) MDRV_CPU_ADD(Z80, 6000000) MDRV_CPU_PROGRAM_MAP(tigerh_readmem,writemem) MDRV_CPU_IO_MAP(readport,tigerh_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 6000000) MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,6) /* ??? */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,6) /* ??? */ MDRV_INTERLEAVE(10) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ @@ -935,11 +936,11 @@ static MACHINE_DRIVER_START( tigerh ) MDRV_CPU_ADD(Z80, XTAL_36MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(tigerh_readmem,writemem) MDRV_CPU_IO_MAP(tigerh_readport,tigerh_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, XTAL_36MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,6) /* ??? */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,6) /* ??? */ MDRV_CPU_ADD(M68705,XTAL_36MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(m68705_readmem,m68705_writemem) @@ -984,11 +985,11 @@ static MACHINE_DRIVER_START( slapfigh ) MDRV_CPU_ADD_TAG("main",Z80, XTAL_36MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, XTAL_36MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(getstar_interrupt, 3) + MDRV_CPU_VBLANK_INT_HACK(getstar_interrupt, 3) MDRV_INTERLEAVE(10) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */ diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c index 660c09d302b..76bb09e28a6 100644 --- a/src/mame/drivers/slapshot.c +++ b/src/mame/drivers/slapshot.c @@ -550,7 +550,7 @@ static MACHINE_DRIVER_START( slapshot ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14346000) /* 28.6860 MHz / 2 ??? */ MDRV_CPU_PROGRAM_MAP(slapshot_readmem,slapshot_writemem) - MDRV_CPU_VBLANK_INT(slapshot_interrupt,1) + MDRV_CPU_VBLANK_INT("main", slapshot_interrupt) MDRV_CPU_ADD(Z80,32000000/8) /* audio CPU */ /* 4 MHz */ @@ -592,7 +592,7 @@ static MACHINE_DRIVER_START( opwolf3 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14346000) /* 28.6860 MHz / 2 ??? */ MDRV_CPU_PROGRAM_MAP(opwolf3_readmem,opwolf3_writemem) - MDRV_CPU_VBLANK_INT(slapshot_interrupt,1) + MDRV_CPU_VBLANK_INT("main", slapshot_interrupt) MDRV_CPU_ADD(Z80,32000000/8) /* audio CPU */ /* 4 MHz */ diff --git a/src/mame/drivers/sliver.c b/src/mame/drivers/sliver.c index 26bb1746597..0ca6cf0381e 100644 --- a/src/mame/drivers/sliver.c +++ b/src/mame/drivers/sliver.c @@ -533,7 +533,7 @@ static INTERRUPT_GEN( sliver_int ) static MACHINE_DRIVER_START( sliver ) MDRV_CPU_ADD_TAG("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(sliver_map,0) - MDRV_CPU_VBLANK_INT(sliver_int,3) + MDRV_CPU_VBLANK_INT_HACK(sliver_int,3) MDRV_CPU_ADD(I8051, 8000000) MDRV_CPU_PROGRAM_MAP(soundmem_prg,0) diff --git a/src/mame/drivers/smstrv.c b/src/mame/drivers/smstrv.c index aa50bdec556..c32d20b13b9 100644 --- a/src/mame/drivers/smstrv.c +++ b/src/mame/drivers/smstrv.c @@ -227,7 +227,7 @@ static MACHINE_DRIVER_START( smstrv ) MDRV_CPU_ADD(I8088,24000000/2) MDRV_CPU_PROGRAM_MAP(smstrv_map,0) // MDRV_CPU_IO_MAP(io_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) // MDRV_NVRAM_HANDLER(generic_0fill) MDRV_MACHINE_RESET(smstrv) diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c index 8f7dd9c4a46..4861e0e5704 100644 --- a/src/mame/drivers/snk.c +++ b/src/mame/drivers/snk.c @@ -817,16 +817,16 @@ static MACHINE_DRIVER_START( tnk3 ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, XTAL_13_4MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(tnk3_cpuA_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, XTAL_13_4MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(tnk3_cpuB_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(YM3526_sound_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) MDRV_INTERLEAVE(100) @@ -861,16 +861,16 @@ static MACHINE_DRIVER_START( athena ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(tnk3_cpuA_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(tnk3_cpuB_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(YM3526_YM3526_sound_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_INTERLEAVE(300) @@ -909,16 +909,16 @@ static MACHINE_DRIVER_START( ikari ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, XTAL_13_4MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuA_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, XTAL_13_4MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuB_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(YM3526_YM3526_sound_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(100) @@ -957,16 +957,16 @@ static MACHINE_DRIVER_START( victroad ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, XTAL_13_4MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuA_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, XTAL_13_4MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuB_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(100) @@ -1005,16 +1005,16 @@ static MACHINE_DRIVER_START( gwar ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuA_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuB_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(100) @@ -1051,17 +1051,17 @@ static MACHINE_DRIVER_START( bermudat ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(cpuA_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) // 5MHz gives CPUB higher priority or ROM test will fail if the first NMI is triggered too early by CPUA MDRV_CPU_ADD(Z80, 5000000) MDRV_CPU_PROGRAM_MAP(cpuB_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(100) @@ -1098,16 +1098,16 @@ static MACHINE_DRIVER_START( psychos ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(cpuA_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(cpuB_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_INTERLEAVE(100) @@ -1144,16 +1144,16 @@ static MACHINE_DRIVER_START( chopper1 ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(cpuA_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(cpuB_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(YM3812_Y8950_sound_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(100) @@ -1190,16 +1190,16 @@ static MACHINE_DRIVER_START( tdfever ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(cpuA_map,0) - MDRV_CPU_VBLANK_INT(snk_irq_AB,1) + MDRV_CPU_VBLANK_INT("main", snk_irq_AB) MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(cpuB_map,0) -// MDRV_CPU_VBLANK_INT(irq0_line_hold,1) +// MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(300) @@ -1238,16 +1238,16 @@ static MACHINE_DRIVER_START( tdfever2 ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(cpuA_map,0) - MDRV_CPU_VBLANK_INT(snk_irq_AB,1) + MDRV_CPU_VBLANK_INT("main", snk_irq_AB) MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(cpuB_map,0) -// MDRV_CPU_VBLANK_INT(irq0_line_hold,1) +// MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(300) @@ -1286,16 +1286,16 @@ static MACHINE_DRIVER_START( fsoccer ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuA_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuB_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(Y8950_sound_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c index 54cff3a5293..814c2dcd43b 100644 --- a/src/mame/drivers/snk68.c +++ b/src/mame/drivers/snk68.c @@ -700,7 +700,7 @@ static MACHINE_DRIVER_START( ikari3 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* Accurate */ MDRV_CPU_PROGRAM_MAP(searchar_readmem,searchar_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* Accurate */ @@ -739,7 +739,7 @@ static MACHINE_DRIVER_START( pow ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* Accurate */ MDRV_CPU_PROGRAM_MAP(pow_readmem,pow_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* Accurate */ @@ -778,7 +778,7 @@ static MACHINE_DRIVER_START( searchar ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_18MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(searchar_readmem,searchar_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ /* audio CPU */ @@ -817,7 +817,7 @@ static MACHINE_DRIVER_START( streetsm ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* Accurate */ MDRV_CPU_PROGRAM_MAP(pow_readmem,pow_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* Accurate */ diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c index e3ec149a24b..f02f6108ec6 100644 --- a/src/mame/drivers/snowbros.c +++ b/src/mame/drivers/snowbros.c @@ -1558,7 +1558,7 @@ static MACHINE_DRIVER_START( snowbros ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 Mhz - confirmed */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(snowbros_interrupt,3) + MDRV_CPU_VBLANK_INT_HACK(snowbros_interrupt,3) MDRV_CPU_ADD_TAG("sound", Z80, 6000000) /* 6 MHz - confirmed */ /* audio CPU */ @@ -1656,7 +1656,7 @@ static MACHINE_DRIVER_START( honeydol ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(honeydol_readmem,honeydol_writemem) - MDRV_CPU_VBLANK_INT(snowbros_interrupt,3) + MDRV_CPU_VBLANK_INT_HACK(snowbros_interrupt,3) MDRV_CPU_ADD_TAG("sound", Z80, 4000000) /* audio CPU */ @@ -1696,13 +1696,13 @@ static MACHINE_DRIVER_START( twinadv ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 16000000) // or 12 MDRV_CPU_PROGRAM_MAP(twinadv_readmem,twinadv_writemem) - MDRV_CPU_VBLANK_INT(snowbros_interrupt,3) + MDRV_CPU_VBLANK_INT_HACK(snowbros_interrupt,3) MDRV_CPU_ADD_TAG("sound", Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(twinadv_sound_readmem,twinadv_sound_writemem) MDRV_CPU_IO_MAP(twinadv_sound_readport,twinadv_sound_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -1777,7 +1777,7 @@ static MACHINE_DRIVER_START( snowbro3 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16mhz or 12mhz ? */ MDRV_CPU_PROGRAM_MAP(readmem3,writemem3) - MDRV_CPU_VBLANK_INT(snowbro3_interrupt,3) + MDRV_CPU_VBLANK_INT_HACK(snowbro3_interrupt,3) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/solomon.c b/src/mame/drivers/solomon.c index 8aee2623a43..0dcb36e44f4 100644 --- a/src/mame/drivers/solomon.c +++ b/src/mame/drivers/solomon.c @@ -206,12 +206,12 @@ static MACHINE_DRIVER_START( solomon ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4.0 MHz (?????) */ MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(Z80, 3072000) MDRV_CPU_PROGRAM_MAP(sound_map,0) MDRV_CPU_IO_MAP(sound_portmap,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) /* ??? */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? */ /* NMIs are caused by the main CPU */ /* video hardware */ diff --git a/src/mame/drivers/sonson.c b/src/mame/drivers/sonson.c index 0fcf8838ffa..98a1c0f8183 100644 --- a/src/mame/drivers/sonson.c +++ b/src/mame/drivers/sonson.c @@ -240,12 +240,12 @@ static MACHINE_DRIVER_START( sonson ) /* basic machine hardware */ MDRV_CPU_ADD(M6809,12000000/6) /* 2 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(M6809,12000000/6) /* audio CPU */ /* 2 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) /* FIRQs are triggered by the main CPU */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* FIRQs are triggered by the main CPU */ /* video hardware */ diff --git a/src/mame/drivers/spaceg.c b/src/mame/drivers/spaceg.c index 2c194878241..16f6a3d9d32 100644 --- a/src/mame/drivers/spaceg.c +++ b/src/mame/drivers/spaceg.c @@ -366,7 +366,7 @@ static MACHINE_DRIVER_START( spaceg ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,2500000) /* 2.5 MHz */ MDRV_CPU_PROGRAM_MAP(readwritemem,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) /* 60 Hz NMIs (verified) */ + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* 60 Hz NMIs (verified) */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c index 733dd0bdfa6..c713881c0cd 100644 --- a/src/mame/drivers/spbactn.c +++ b/src/mame/drivers/spbactn.c @@ -356,7 +356,7 @@ static MACHINE_DRIVER_START( spbactn ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(spbactn_readmem,spbactn_writemem) - MDRV_CPU_VBLANK_INT(irq3_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq3_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* 4 MHz ??? */ diff --git a/src/mame/drivers/spcforce.c b/src/mame/drivers/spcforce.c index 496cc031706..aa607700acb 100644 --- a/src/mame/drivers/spcforce.c +++ b/src/mame/drivers/spcforce.c @@ -261,7 +261,7 @@ static MACHINE_DRIVER_START( spcforce ) /* FIXME: The 8085A had a max clock of 6MHz, internally divided by 2! */ MDRV_CPU_ADD(8085A, 8000000 * 2) /* 4.00 MHz??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq3_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq3_line_hold) MDRV_CPU_ADD(I8035,6144000) /* audio CPU */ /* divisor ??? */ diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c index 66b953f0c9d..d8e0ee89e64 100644 --- a/src/mame/drivers/spdodgeb.c +++ b/src/mame/drivers/spdodgeb.c @@ -435,7 +435,7 @@ static MACHINE_DRIVER_START( spdodgeb ) /* basic machine hardware */ MDRV_CPU_ADD(M6502,12000000/6) /* 2MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(spdodgeb_interrupt,33) /* 1 IRQ every 8 visible scanlines, plus NMI for vblank */ + MDRV_CPU_VBLANK_INT_HACK(spdodgeb_interrupt,33) /* 1 IRQ every 8 visible scanlines, plus NMI for vblank */ MDRV_CPU_ADD(M6809,12000000/6) /* audio CPU */ /* 2MHz ? */ diff --git a/src/mame/drivers/speedatk.c b/src/mame/drivers/speedatk.c index 4000f68c924..77c47849506 100644 --- a/src/mame/drivers/speedatk.c +++ b/src/mame/drivers/speedatk.c @@ -270,7 +270,7 @@ static MACHINE_DRIVER_START( speedatk ) MDRV_CPU_ADD(Z80,12000000/2) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/speedbal.c b/src/mame/drivers/speedbal.c index 6404c235e10..1f08702751e 100644 --- a/src/mame/drivers/speedbal.c +++ b/src/mame/drivers/speedbal.c @@ -51,6 +51,7 @@ c1 ?? ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "sound/3812intf.h" @@ -230,12 +231,12 @@ static MACHINE_DRIVER_START( speedbal ) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(main_cpu_map,0) MDRV_CPU_IO_MAP(main_cpu_io_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 2660000) /* 2.66 MHz ??? Maybe yes */ MDRV_CPU_PROGRAM_MAP(sound_cpu_map,0) MDRV_CPU_IO_MAP(sound_cpu_io_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,8) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,8) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/speedspn.c b/src/mame/drivers/speedspn.c index 36e71927fb4..ebcea52dc84 100644 --- a/src/mame/drivers/speedspn.c +++ b/src/mame/drivers/speedspn.c @@ -306,7 +306,7 @@ static MACHINE_DRIVER_START( speedspn ) MDRV_CPU_ADD_TAG("main",Z80,6000000) /* 6 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport, writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,6000000) /* 6 MHz */ /* audio CPU */ diff --git a/src/mame/drivers/speglsht.c b/src/mame/drivers/speglsht.c index 1cae4504c56..4e7901c282d 100644 --- a/src/mame/drivers/speglsht.c +++ b/src/mame/drivers/speglsht.c @@ -271,12 +271,12 @@ static MACHINE_DRIVER_START( speglsht ) MDRV_CPU_PROGRAM_MAP(st0016_mem,0) MDRV_CPU_IO_MAP(st0016_io,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(R3000LE, 25000000) MDRV_CPU_CONFIG(config) MDRV_CPU_PROGRAM_MAP(speglsht_mem,0) - MDRV_CPU_VBLANK_INT(irq4_gen,1) + MDRV_CPU_VBLANK_INT("main", irq4_gen) MDRV_INTERLEAVE(100) MDRV_MACHINE_RESET(speglsht) diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c index de105dd0ebf..9378c48a9c9 100644 --- a/src/mame/drivers/splash.c +++ b/src/mame/drivers/splash.c @@ -435,12 +435,12 @@ static MACHINE_DRIVER_START( splash ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz (24/2) */ MDRV_CPU_PROGRAM_MAP(splash_readmem,splash_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(Z80,30000000/8) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(splash_readmem_sound,splash_writemem_sound) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,64) /* needed for the msm5205 to play the samples */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,64) /* needed for the msm5205 to play the samples */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -482,13 +482,13 @@ static MACHINE_DRIVER_START( roldfrog ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz - verified */ MDRV_CPU_PROGRAM_MAP(roldfrog_readmem,roldfrog_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(Z80,3000000) /* 3 MHz - verified */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(roldf_sound_map,0) MDRV_CPU_IO_MAP(roldf_sound_io_map,0) -// MDRV_CPU_VBLANK_INT(nmi_line_pulse,64) /* needed for the msm5205 to play the samples */ +// MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,64) /* needed for the msm5205 to play the samples */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -521,12 +521,12 @@ static MACHINE_DRIVER_START( funystrp ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz (24/2) */ MDRV_CPU_PROGRAM_MAP(funystrp_readmem,funystrp_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) // MDRV_CPU_ADD(Z80,30000000/8) // /* audio CPU */ // MDRV_CPU_PROGRAM_MAP(splash_readmem_sound,splash_writemem_sound) -// MDRV_CPU_VBLANK_INT(nmi_line_pulse,64) /* needed for the msm5205 to play the samples */ +// MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,64) /* needed for the msm5205 to play the samples */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/sprcros2.c b/src/mame/drivers/sprcros2.c index 674a2938570..9e69a56ad7e 100644 --- a/src/mame/drivers/sprcros2.c +++ b/src/mame/drivers/sprcros2.c @@ -304,12 +304,12 @@ static MACHINE_DRIVER_START( sprcros2 ) MDRV_CPU_ADD(Z80,10000000/2) MDRV_CPU_PROGRAM_MAP(sprcros2_m_readmem,sprcros2_m_writemem) MDRV_CPU_IO_MAP(sprcros2_m_readport,sprcros2_m_writeport) - MDRV_CPU_VBLANK_INT(sprcros2_m_interrupt,2) //1 nmi + 1 irq + MDRV_CPU_VBLANK_INT_HACK(sprcros2_m_interrupt,2) //1 nmi + 1 irq MDRV_CPU_ADD(Z80,10000000/2) MDRV_CPU_PROGRAM_MAP(sprcros2_s_readmem,sprcros2_s_writemem) MDRV_CPU_IO_MAP(0,sprcros2_s_writeport) - MDRV_CPU_VBLANK_INT(sprcros2_s_interrupt,2) //2 nmis + MDRV_CPU_VBLANK_INT_HACK(sprcros2_s_interrupt,2) //2 nmis MDRV_MACHINE_START(sprcros2) diff --git a/src/mame/drivers/sprint2.c b/src/mame/drivers/sprint2.c index 94d9cf40194..03ff6866d4b 100644 --- a/src/mame/drivers/sprint2.c +++ b/src/mame/drivers/sprint2.c @@ -508,7 +508,7 @@ static MACHINE_DRIVER_START( sprint2 ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 12096000 / 16) MDRV_CPU_PROGRAM_MAP(readmem, writemem) - MDRV_CPU_VBLANK_INT(sprint2, 1) + MDRV_CPU_VBLANK_INT("main", sprint2) MDRV_WATCHDOG_VBLANK_INIT(8) /* video hardware */ diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c index ef5180b6b5b..f378f648d5d 100644 --- a/src/mame/drivers/spy.c +++ b/src/mame/drivers/spy.c @@ -538,7 +538,7 @@ static MACHINE_DRIVER_START( spy ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 3000000) /* ? */ MDRV_CPU_PROGRAM_MAP(spy_readmem,spy_writemem) - MDRV_CPU_VBLANK_INT(spy_interrupt,1) + MDRV_CPU_VBLANK_INT("main", spy_interrupt) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c index a153056c8ab..ccac3b40fa9 100644 --- a/src/mame/drivers/srmp2.c +++ b/src/mame/drivers/srmp2.c @@ -1076,7 +1076,7 @@ static MACHINE_DRIVER_START( srmp2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,16000000/2) /* 8.00 MHz */ MDRV_CPU_PROGRAM_MAP(srmp2_readmem,srmp2_writemem) - MDRV_CPU_VBLANK_INT(srmp2_interrupt,16) /* Interrupt times is not understood */ + MDRV_CPU_VBLANK_INT_HACK(srmp2_interrupt,16) /* Interrupt times is not understood */ MDRV_MACHINE_RESET(srmp2) MDRV_NVRAM_HANDLER(generic_0fill) @@ -1116,7 +1116,7 @@ static MACHINE_DRIVER_START( srmp3 ) // 4000000, /* 4.00 MHz ? */ MDRV_CPU_PROGRAM_MAP(srmp3_readmem,srmp3_writemem) MDRV_CPU_IO_MAP(srmp3_readport,srmp3_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_RESET(srmp3) MDRV_NVRAM_HANDLER(generic_0fill) @@ -1153,7 +1153,7 @@ static MACHINE_DRIVER_START( mjyuugi ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,16000000/2) /* 8.00 MHz */ MDRV_CPU_PROGRAM_MAP(mjyuugi_readmem,mjyuugi_writemem) - MDRV_CPU_VBLANK_INT(srmp2_interrupt,16) /* Interrupt times is not understood */ + MDRV_CPU_VBLANK_INT_HACK(srmp2_interrupt,16) /* Interrupt times is not understood */ MDRV_MACHINE_RESET(srmp2) MDRV_NVRAM_HANDLER(generic_0fill) diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c index e2eba5fa272..1bb25331d79 100644 --- a/src/mame/drivers/srmp5.c +++ b/src/mame/drivers/srmp5.c @@ -29,6 +29,7 @@ SX008-14.BIN ; / */ #include "driver.h" +#include "deprecat.h" #include "cpu/mips/r3000.h" #include "sound/st0016.h" #include "st0016.h" @@ -624,11 +625,11 @@ static MACHINE_DRIVER_START( srmp5 ) MDRV_CPU_ADD_TAG("main",Z80,8000000) MDRV_CPU_PROGRAM_MAP(st0016_mem,0) MDRV_CPU_IO_MAP(st0016_io,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) - MDRV_CPU_ADD(R3000LE, 40000000) + MDRV_CPU_ADD(R3000LE, 40000000) MDRV_CPU_CONFIG(config) - MDRV_CPU_VBLANK_INT(irq4_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq4_line_hold,2) MDRV_CPU_PROGRAM_MAP(srmp5_mem,0) diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c index d86a2c7c6be..c2b2f76d5ec 100644 --- a/src/mame/drivers/srmp6.c +++ b/src/mame/drivers/srmp6.c @@ -709,7 +709,7 @@ static INTERRUPT_GEN(srmp6_interrupt) static MACHINE_DRIVER_START( srmp6 ) MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(srmp6,0) - MDRV_CPU_VBLANK_INT(srmp6_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(srmp6_interrupt,2) MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c index d13d26958e2..1f309e4e708 100644 --- a/src/mame/drivers/srumbler.c +++ b/src/mame/drivers/srumbler.c @@ -258,12 +258,12 @@ static MACHINE_DRIVER_START( srumbler ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 1500000) /* 1.5 MHz (?) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(srumbler_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(srumbler_interrupt,2) MDRV_CPU_ADD(Z80, 3000000) /* audio CPU */ /* 3 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) MDRV_MACHINE_RESET(srumbler) diff --git a/src/mame/drivers/ssfindo.c b/src/mame/drivers/ssfindo.c index b747cc8a1e2..7ecf3adacca 100644 --- a/src/mame/drivers/ssfindo.c +++ b/src/mame/drivers/ssfindo.c @@ -613,7 +613,7 @@ static MACHINE_DRIVER_START( ssfindo ) MDRV_CPU_ADD(ARM7, 54000000) // guess... MDRV_CPU_PROGRAM_MAP(ssfindo_map,0) - MDRV_CPU_VBLANK_INT(ssfindo_interrupt,1) + MDRV_CPU_VBLANK_INT("main", ssfindo_interrupt) MDRV_MACHINE_RESET(ssfindo) @@ -636,7 +636,7 @@ static MACHINE_DRIVER_START( ppcar ) MDRV_CPU_ADD(ARM7, 54000000) // guess... MDRV_CPU_PROGRAM_MAP(ppcar_map,0) - MDRV_CPU_VBLANK_INT(ssfindo_interrupt,1) + MDRV_CPU_VBLANK_INT("main", ssfindo_interrupt) MDRV_MACHINE_RESET(ssfindo) diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c index 3bc5d9c7a80..d25b01ea9dd 100644 --- a/src/mame/drivers/sshangha.c +++ b/src/mame/drivers/sshangha.c @@ -342,7 +342,7 @@ static MACHINE_DRIVER_START( sshangha ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 28000000/2) MDRV_CPU_PROGRAM_MAP(sshangha_readmem,sshangha_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(Z80, 16000000/4) /* audio CPU */ diff --git a/src/mame/drivers/ssingles.c b/src/mame/drivers/ssingles.c index f53eaa6b095..b5c1e60960f 100644 --- a/src/mame/drivers/ssingles.c +++ b/src/mame/drivers/ssingles.c @@ -273,7 +273,7 @@ static MACHINE_DRIVER_START( ssingles ) MDRV_CPU_ADD(Z80,4000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(ssingles_map,0) MDRV_CPU_IO_MAP(ssingles_io_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_SCREEN_ADD("main", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) diff --git a/src/mame/drivers/sslam.c b/src/mame/drivers/sslam.c index 3b35f738617..ad1fd1d7709 100644 --- a/src/mame/drivers/sslam.c +++ b/src/mame/drivers/sslam.c @@ -731,7 +731,7 @@ static MACHINE_DRIVER_START( sslam ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(sslam_program_map, 0) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_CPU_ADD(I8051, 12000000) MDRV_CPU_FLAGS(CPU_DISABLE) /* Internal code is not dumped - 2 boards were protected */ @@ -765,7 +765,7 @@ static MACHINE_DRIVER_START( powerbls ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(powerbls_map, 0) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_CPU_ADD(I8051, 12000000) MDRV_CPU_PROGRAM_MAP(sound_map,0) diff --git a/src/mame/drivers/ssozumo.c b/src/mame/drivers/ssozumo.c index e0f7037eb57..fafb595382b 100644 --- a/src/mame/drivers/ssozumo.c +++ b/src/mame/drivers/ssozumo.c @@ -235,12 +235,12 @@ static MACHINE_DRIVER_START( ssozumo ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 1200000) /* 1.2 MHz ???? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(ssozumo_interrupt,1) + MDRV_CPU_VBLANK_INT("main", ssozumo_interrupt) MDRV_CPU_ADD(M6502, 975000) /* audio CPU */ /* 975 kHz ?? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,16) /* IRQs are triggered by the main CPU */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,16) /* IRQs are triggered by the main CPU */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/sspeedr.c b/src/mame/drivers/sspeedr.c index b020c9c13eb..692d3126efa 100644 --- a/src/mame/drivers/sspeedr.c +++ b/src/mame/drivers/sspeedr.c @@ -223,7 +223,7 @@ static MACHINE_DRIVER_START( sspeedr ) MDRV_CPU_ADD(Z80, 19968000 / 8) MDRV_CPU_PROGRAM_MAP(readmem, writemem) MDRV_CPU_IO_MAP(readport, writeport) - MDRV_CPU_VBLANK_INT(irq0_line_assert, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/ssrj.c b/src/mame/drivers/ssrj.c index 9d8d532d03c..0bc5e3cc977 100644 --- a/src/mame/drivers/ssrj.c +++ b/src/mame/drivers/ssrj.c @@ -173,7 +173,7 @@ static MACHINE_DRIVER_START( ssrj ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/sstrangr.c b/src/mame/drivers/sstrangr.c index 838c7fd3f9b..b7a950960d0 100644 --- a/src/mame/drivers/sstrangr.c +++ b/src/mame/drivers/sstrangr.c @@ -6,6 +6,7 @@ #include "driver.h" +#include "deprecat.h" #define NUM_PENS (8) @@ -183,7 +184,7 @@ static MACHINE_DRIVER_START( sstrangr ) MDRV_CPU_ADD_TAG("main",8080,1996800) /* clock is a guess, taken from mw8080bw */ MDRV_CPU_PROGRAM_MAP(sstrangr_map,0) MDRV_CPU_IO_MAP(sstrangr_io_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* video hardware */ MDRV_VIDEO_UPDATE(sstrangr) diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c index 2c205d094e1..2ac1dbbf7e5 100644 --- a/src/mame/drivers/ssv.c +++ b/src/mame/drivers/ssv.c @@ -2790,7 +2790,7 @@ static MACHINE_DRIVER_START( ssv ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", V60, 16000000) /* Based on STA-0001 & STA-0001B System boards */ - MDRV_CPU_VBLANK_INT(ssv_interrupt,2) /* Vblank */ + MDRV_CPU_VBLANK_INT_HACK(ssv_interrupt,2) /* Vblank */ MDRV_MACHINE_RESET(ssv) @@ -2837,7 +2837,7 @@ static MACHINE_DRIVER_START( gdfs ) MDRV_IMPORT_FROM(ssv) MDRV_CPU_MODIFY("main") MDRV_CPU_PROGRAM_MAP(gdfs_readmem, gdfs_writemem) - MDRV_CPU_VBLANK_INT(gdfs_interrupt,1+4) + MDRV_CPU_VBLANK_INT_HACK(gdfs_interrupt,1+4) MDRV_NVRAM_HANDLER(gdfs) diff --git a/src/mame/drivers/st0016.c b/src/mame/drivers/st0016.c index a02cf193816..b5579b00583 100644 --- a/src/mame/drivers/st0016.c +++ b/src/mame/drivers/st0016.c @@ -420,7 +420,7 @@ static MACHINE_DRIVER_START( st0016 ) MDRV_CPU_PROGRAM_MAP(st0016_mem,0) MDRV_CPU_IO_MAP(st0016_io,0) - MDRV_CPU_VBLANK_INT(st0016_int,5) /* 4*nmi + int0 */ + MDRV_CPU_VBLANK_INT_HACK(st0016_int,5) /* 4*nmi + int0 */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/stactics.c b/src/mame/drivers/stactics.c index d0cd83105e2..08806f5827c 100644 --- a/src/mame/drivers/stactics.c +++ b/src/mame/drivers/stactics.c @@ -310,7 +310,7 @@ static MACHINE_DRIVER_START( stactics ) /* basic machine hardware */ MDRV_CPU_ADD(8080, 1933560) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(stactics_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", stactics_interrupt) MDRV_MACHINE_START(stactics) diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c index b46adabb822..a4ce422b41d 100644 --- a/src/mame/drivers/stadhero.c +++ b/src/mame/drivers/stadhero.c @@ -259,7 +259,7 @@ static MACHINE_DRIVER_START( stadhero ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1)/* VBL */ + MDRV_CPU_VBLANK_INT("main", irq5_line_hold)/* VBL */ MDRV_CPU_ADD(M6502, 1500000) /* audio CPU */ diff --git a/src/mame/drivers/starcrus.c b/src/mame/drivers/starcrus.c index 3d2157e8cdb..4e8f24f80fd 100644 --- a/src/mame/drivers/starcrus.c +++ b/src/mame/drivers/starcrus.c @@ -173,7 +173,7 @@ static MACHINE_DRIVER_START( starcrus ) MDRV_CPU_ADD(8080,9750000/9) /* 8224 chip is a divide by 9 */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/starfire.c b/src/mame/drivers/starfire.c index fccec796988..1554effead8 100644 --- a/src/mame/drivers/starfire.c +++ b/src/mame/drivers/starfire.c @@ -265,7 +265,7 @@ static MACHINE_DRIVER_START( starfire ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, STARFIRE_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/starshp1.c b/src/mame/drivers/starshp1.c index 81ff88eeff1..9ac3b87f9d9 100644 --- a/src/mame/drivers/starshp1.c +++ b/src/mame/drivers/starshp1.c @@ -302,7 +302,7 @@ static MACHINE_DRIVER_START( starshp1 ) MDRV_CPU_ADD(M6502, STARSHP1_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(readmem, writemem) - MDRV_CPU_VBLANK_INT(starshp1_interrupt, 1) + MDRV_CPU_VBLANK_INT("main", starshp1_interrupt) /* video hardware */ diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c index fb00e9bb6d7..c345590085b 100644 --- a/src/mame/drivers/statriv2.c +++ b/src/mame/drivers/statriv2.c @@ -607,7 +607,7 @@ static MACHINE_DRIVER_START( statriv2 ) MDRV_CPU_ADD_TAG("main",8085A,12400000*2) /* 12.4MHz / 4? */ MDRV_CPU_PROGRAM_MAP(statriv2_readmem,statriv2_writemem) MDRV_CPU_IO_MAP(statriv2_readport,statriv2_writeport) - MDRV_CPU_VBLANK_INT(statriv2_interrupt,1) + MDRV_CPU_VBLANK_INT("main", statriv2_interrupt) MDRV_NVRAM_HANDLER(statriv2) diff --git a/src/mame/drivers/steaser.c b/src/mame/drivers/steaser.c index 031a469efdc..c262e23440c 100644 --- a/src/mame/drivers/steaser.c +++ b/src/mame/drivers/steaser.c @@ -82,7 +82,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( steaser ) MDRV_CPU_ADD_TAG("main", M68000, 11059200 ) MDRV_CPU_PROGRAM_MAP(steaser_map,0) -// MDRV_CPU_VBLANK_INT(irq1_line_hold,1) +// MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_GFXDECODE(steaser) diff --git a/src/mame/drivers/stepstag.c b/src/mame/drivers/stepstag.c index 2a90436e52a..32a9095afe1 100644 --- a/src/mame/drivers/stepstag.c +++ b/src/mame/drivers/stepstag.c @@ -123,7 +123,7 @@ static MACHINE_DRIVER_START( stepstag ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000 ) //?? MDRV_CPU_PROGRAM_MAP(stepstag_readmem,stepstag_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) // 4 & 6 valid + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) // 4 & 6 valid MDRV_CPU_ADD(M68000, 16000000 ) //?? MDRV_CPU_PROGRAM_MAP(stepstag_sub_readmem,stepstag_sub_writemem) diff --git a/src/mame/drivers/stfight.c b/src/mame/drivers/stfight.c index 9d3960fe130..9aa4bd68817 100644 --- a/src/mame/drivers/stfight.c +++ b/src/mame/drivers/stfight.c @@ -487,7 +487,7 @@ static MACHINE_DRIVER_START( stfight ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 3000000) /* 3 MHz */ MDRV_CPU_PROGRAM_MAP(readmem_cpu1,writemem_cpu1) - MDRV_CPU_VBLANK_INT(stfight_vb_interrupt,1) + MDRV_CPU_VBLANK_INT("main", stfight_vb_interrupt) MDRV_CPU_ADD(Z80, 3000000) /* audio CPU */ /* 3 MHz */ diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c index a0b41adb24d..3039b838f77 100644 --- a/src/mame/drivers/stlforce.c +++ b/src/mame/drivers/stlforce.c @@ -242,7 +242,7 @@ static MACHINE_DRIVER_START( stlforce ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("cpu", M68000, 15000000) MDRV_CPU_PROGRAM_MAP(stlforce_map,0) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_NVRAM_HANDLER(stlforce) diff --git a/src/mame/drivers/strnskil.c b/src/mame/drivers/strnskil.c index b3859e80182..4524211958c 100644 --- a/src/mame/drivers/strnskil.c +++ b/src/mame/drivers/strnskil.c @@ -337,11 +337,11 @@ static MACHINE_DRIVER_START( strnskil ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,8000000/2) /* 4.000MHz */ MDRV_CPU_PROGRAM_MAP(strnskil_readmem1,strnskil_writemem1) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_CPU_ADD(Z80,8000000/2) /* 4.000MHz */ MDRV_CPU_PROGRAM_MAP(strnskil_readmem2,strnskil_writemem2) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c index afc959d6fee..abbe0d41c7a 100644 --- a/src/mame/drivers/stv.c +++ b/src/mame/drivers/stv.c @@ -2736,7 +2736,7 @@ static MACHINE_DRIVER_START( stv ) /* basic machine hardware */ MDRV_CPU_ADD(SH2, MASTER_CLOCK_352/2) // 28.6364 MHz MDRV_CPU_PROGRAM_MAP(stv_mem, 0) - MDRV_CPU_VBLANK_INT(stv_interrupt,264)/*264 lines,224 display lines*/ + MDRV_CPU_VBLANK_INT_HACK(stv_interrupt,264)/*264 lines,224 display lines*/ MDRV_CPU_CONFIG(sh2_conf_master) MDRV_CPU_ADD(SH2, MASTER_CLOCK_352/2) // 28.6364 MHz diff --git a/src/mame/drivers/subs.c b/src/mame/drivers/subs.c index 2145b601f83..415589bc895 100644 --- a/src/mame/drivers/subs.c +++ b/src/mame/drivers/subs.c @@ -18,6 +18,7 @@ ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "subs.h" #include "sound/discrete.h" #include "rendlay.h" @@ -185,7 +186,7 @@ static MACHINE_DRIVER_START( subs ) /* basic machine hardware */ MDRV_CPU_ADD(M6502,12096000/16) /* clock input is the "4H" signal */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(subs_interrupt,4) + MDRV_CPU_VBLANK_INT_HACK(subs_interrupt,4) MDRV_MACHINE_RESET(subs) diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c index 82b79854429..f326488fbf8 100644 --- a/src/mame/drivers/suna16.c +++ b/src/mame/drivers/suna16.c @@ -848,7 +848,7 @@ static MACHINE_DRIVER_START( bssoccer ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* ? */ MDRV_CPU_PROGRAM_MAP(bssoccer_readmem,bssoccer_writemem) - MDRV_CPU_VBLANK_INT(bssoccer_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(bssoccer_interrupt,2) MDRV_CPU_ADD(Z80, 3579545) /* Z80B */ /* audio CPU */ @@ -911,7 +911,7 @@ static MACHINE_DRIVER_START( uballoon ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) MDRV_CPU_PROGRAM_MAP(uballoon_readmem,uballoon_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* ? */ @@ -962,7 +962,7 @@ static MACHINE_DRIVER_START( sunaq ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 24000000/4) MDRV_CPU_PROGRAM_MAP(sunaq_readmem,sunaq_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, 14318000/4) /* audio CPU */ @@ -1035,7 +1035,7 @@ static MACHINE_DRIVER_START( bestbest ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 24000000/4) MDRV_CPU_PROGRAM_MAP(bestbest_map,0) - MDRV_CPU_VBLANK_INT(bssoccer_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(bssoccer_interrupt,2) MDRV_CPU_ADD(Z80, 24000000/4) MDRV_CPU_PROGRAM_MAP(bestbest_sound_map,0) diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c index 48001ffa7d7..0e37755ba1f 100644 --- a/src/mame/drivers/suna8.c +++ b/src/mame/drivers/suna8.c @@ -1553,13 +1553,13 @@ static MACHINE_DRIVER_START( hardhead ) MDRV_CPU_ADD(Z80, 24000000 / 4) /* ? */ MDRV_CPU_PROGRAM_MAP(hardhead_readmem,hardhead_writemem) MDRV_CPU_IO_MAP(hardhead_readport,hardhead_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* No NMI */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* No NMI */ MDRV_CPU_ADD(Z80, 24000000 / 4) /* audio CPU */ /* ? */ MDRV_CPU_PROGRAM_MAP(hardhead_sound_readmem,hardhead_sound_writemem) MDRV_CPU_IO_MAP(hardhead_sound_readport,hardhead_sound_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) /* No NMI */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No NMI */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -1608,13 +1608,13 @@ static MACHINE_DRIVER_START( rranger ) MDRV_CPU_ADD(Z80, 24000000 / 4) /* ? */ MDRV_CPU_PROGRAM_MAP(rranger_readmem,rranger_writemem) MDRV_CPU_IO_MAP(rranger_readport,rranger_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* IRQ & NMI ! */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* IRQ & NMI ! */ MDRV_CPU_ADD(Z80, 24000000 / 4) /* audio CPU */ /* ? */ MDRV_CPU_PROGRAM_MAP(rranger_sound_readmem,rranger_sound_writemem) MDRV_CPU_IO_MAP(rranger_sound_readport,rranger_sound_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) /* NMI = retn */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* NMI = retn */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -1666,8 +1666,8 @@ static MACHINE_DRIVER_START( brickzn ) MDRV_CPU_ADD_TAG("main", Z80, 24000000 / 4) /* SUNA PROTECTION BLOCK */ MDRV_CPU_PROGRAM_MAP(brickzn_readmem,brickzn_writemem) MDRV_CPU_IO_MAP(brickzn_readport,brickzn_writeport) -// MDRV_CPU_VBLANK_INT(brickzn_interrupt, 2) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) // nmi breaks ramtest but is needed! +// MDRV_CPU_VBLANK_INT_HACK(brickzn_interrupt, 2) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) // nmi breaks ramtest but is needed! MDRV_CPU_ADD_TAG("sound", Z80, 24000000 / 4) /* Z0840006PSC */ /* audio CPU */ @@ -1744,7 +1744,7 @@ static MACHINE_DRIVER_START( hardhea2 ) MDRV_IMPORT_FROM( brickzn ) MDRV_CPU_MODIFY("main") /* SUNA T568009 */ MDRV_CPU_PROGRAM_MAP(hardhea2_readmem,hardhea2_writemem) - MDRV_CPU_VBLANK_INT(hardhea2_interrupt,2) /* IRQ & NMI */ + MDRV_CPU_VBLANK_INT_HACK(hardhea2_interrupt,2) /* IRQ & NMI */ MDRV_MACHINE_RESET(hardhea2) MDRV_PALETTE_LENGTH(256) @@ -1769,14 +1769,14 @@ static MACHINE_DRIVER_START( starfigh ) MDRV_CPU_ADD(Z80, 24000000 / 4) /* ? */ MDRV_CPU_PROGRAM_MAP(starfigh_readmem,starfigh_writemem) MDRV_CPU_IO_MAP(starfigh_readport,starfigh_writeport) - MDRV_CPU_VBLANK_INT(brickzn_interrupt,2) /* IRQ & NMI */ + MDRV_CPU_VBLANK_INT_HACK(brickzn_interrupt,2) /* IRQ & NMI */ /* The sound section is identical to that of hardhead */ MDRV_CPU_ADD(Z80, 24000000 / 4) /* audio CPU */ /* ? */ MDRV_CPU_PROGRAM_MAP(hardhead_sound_readmem,hardhead_sound_writemem) MDRV_CPU_IO_MAP(hardhead_sound_readport,hardhead_sound_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) /* No NMI */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No NMI */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -1829,13 +1829,13 @@ static MACHINE_DRIVER_START( sparkman ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 24000000 / 4) /* ? */ MDRV_CPU_PROGRAM_MAP(sparkman_readmem,sparkman_writemem) - MDRV_CPU_VBLANK_INT(sparkman_interrupt,2) /* IRQ & NMI */ + MDRV_CPU_VBLANK_INT_HACK(sparkman_interrupt,2) /* IRQ & NMI */ MDRV_CPU_ADD(Z80, 24000000 / 4) /* audio CPU */ /* ? */ MDRV_CPU_PROGRAM_MAP(hardhead_sound_readmem,hardhead_sound_writemem) MDRV_CPU_IO_MAP(hardhead_sound_readport,hardhead_sound_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) /* No NMI */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* No NMI */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c index 71fc7fe803b..83ea196b941 100644 --- a/src/mame/drivers/supbtime.c +++ b/src/mame/drivers/supbtime.c @@ -376,7 +376,7 @@ static MACHINE_DRIVER_START( supbtime ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14000000) MDRV_CPU_PROGRAM_MAP(supbtime_readmem,supbtime_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(H6280, 32220000/8) /* Custom chip 45, audio section crystal is 32.220 MHz */ /* audio CPU */ @@ -417,7 +417,7 @@ static MACHINE_DRIVER_START( chinatwn ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14000000) MDRV_CPU_PROGRAM_MAP(chinatwn_readmem,chinatwn_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(H6280, 32220000/8) /* Custom chip 45, audio section crystal is 32.220 MHz */ /* audio CPU */ diff --git a/src/mame/drivers/supdrapo.c b/src/mame/drivers/supdrapo.c index 0aba74ee8fe..b6498e08a33 100644 --- a/src/mame/drivers/supdrapo.c +++ b/src/mame/drivers/supdrapo.c @@ -264,7 +264,7 @@ static VIDEO_UPDATE( supdrapo ) static MACHINE_DRIVER_START( supdrapo ) MDRV_CPU_ADD(Z80,8000000/2) /* ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c index ecc9204787d..553624d6272 100644 --- a/src/mame/drivers/superchs.c +++ b/src/mame/drivers/superchs.c @@ -417,14 +417,14 @@ static MACHINE_DRIVER_START( superchs ) /* basic machine hardware */ MDRV_CPU_ADD(M68EC020, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(superchs_readmem,superchs_writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1)/* VBL */ + MDRV_CPU_VBLANK_INT("main", irq2_line_hold)/* VBL */ TAITO_F3_SOUND_SYSTEM_CPU(16000000) MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(superchs_cpub_readmem,superchs_cpub_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1)/* VBL */ + MDRV_CPU_VBLANK_INT("main", irq4_line_hold)/* VBL */ MDRV_INTERLEAVE(8) /* CPU slices - Need to interleave Cpu's 1 & 3 */ diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c index 8573ee896e3..f5c55cbae31 100644 --- a/src/mame/drivers/superdq.c +++ b/src/mame/drivers/superdq.c @@ -338,7 +338,7 @@ static MACHINE_DRIVER_START( superdq ) MDRV_CPU_ADD(Z80, MASTER_CLOCK/8) MDRV_CPU_PROGRAM_MAP(superdq_map,0) MDRV_CPU_IO_MAP(superdq_io,0) - MDRV_CPU_VBLANK_INT(superdq_vblank, 1) + MDRV_CPU_VBLANK_INT("main", superdq_vblank) MDRV_MACHINE_START(superdq) diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c index e3810dcc41a..aa94a47c1a5 100644 --- a/src/mame/drivers/superqix.c +++ b/src/mame/drivers/superqix.c @@ -930,7 +930,7 @@ static MACHINE_DRIVER_START( pbillian ) MDRV_CPU_ADD(Z80,12000000/2) /* 6 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(pbillian_port_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -961,7 +961,7 @@ static MACHINE_DRIVER_START( hotsmash ) MDRV_CPU_ADD(Z80,12000000/2) /* 6 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(hotsmash_port_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(M68705, 4000000) /* ???? */ MDRV_CPU_PROGRAM_MAP(m68705_map,0) @@ -997,7 +997,7 @@ static MACHINE_DRIVER_START( sqix ) MDRV_CPU_ADD(Z80, 12000000/2) /* 6 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(sqix_port_map,0) - MDRV_CPU_VBLANK_INT(sqix_interrupt,6) /* ??? */ + MDRV_CPU_VBLANK_INT_HACK(sqix_interrupt,6) /* ??? */ MDRV_CPU_ADD(I8751, 12000000/3) /* ??? */ MDRV_CPU_PROGRAM_MAP(mcu_map,0) @@ -1038,7 +1038,7 @@ static MACHINE_DRIVER_START( sqixbl ) MDRV_CPU_ADD(Z80, 12000000/2) /* 6 MHz */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(bootleg_port_map,0) - MDRV_CPU_VBLANK_INT(bootleg_interrupt,6) /* ??? */ + MDRV_CPU_VBLANK_INT_HACK(bootleg_interrupt,6) /* ??? */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c index c694cf75574..7d6ab226de6 100644 --- a/src/mame/drivers/supertnk.c +++ b/src/mame/drivers/supertnk.c @@ -413,7 +413,7 @@ static MACHINE_DRIVER_START( supertnk ) MDRV_CPU_ADD(TMS9980, 2598750) /* ? to which frequency is the 20.79 Mhz crystal mapped down? */ MDRV_CPU_PROGRAM_MAP(supertnk_map,0) MDRV_CPU_IO_MAP(supertnk_io_map,0) - MDRV_CPU_VBLANK_INT(supertnk_interrupt,1) + MDRV_CPU_VBLANK_INT("main", supertnk_interrupt) MDRV_MACHINE_RESET(supertnk) diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c index 9f2f7e13704..bc38ba122cc 100644 --- a/src/mame/drivers/suprgolf.c +++ b/src/mame/drivers/suprgolf.c @@ -291,7 +291,7 @@ static MACHINE_DRIVER_START( suprgolf ) MDRV_CPU_ADD(Z80,4000000) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(io_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_VIDEO_START(suprgolf) MDRV_VIDEO_UPDATE(suprgolf) diff --git a/src/mame/drivers/suprloco.c b/src/mame/drivers/suprloco.c index 12a63a2122f..f9f2d31967a 100644 --- a/src/mame/drivers/suprloco.c +++ b/src/mame/drivers/suprloco.c @@ -170,12 +170,12 @@ static MACHINE_DRIVER_START( suprloco ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz (?) */ MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) /* NMIs are caused by the main CPU */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* NMIs are caused by the main CPU */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c index f9ca11a46d1..61ac4d084d1 100644 --- a/src/mame/drivers/suprnova.c +++ b/src/mame/drivers/suprnova.c @@ -951,7 +951,7 @@ static const struct YMZ280Binterface ymz280b_intf = static MACHINE_DRIVER_START(skns) MDRV_CPU_ADD(SH2,28638000) MDRV_CPU_PROGRAM_MAP(skns_readmem,skns_writemem) - MDRV_CPU_VBLANK_INT(skns_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(skns_interrupt,2) MDRV_MACHINE_RESET(skns) MDRV_NVRAM_HANDLER(generic_1fill) diff --git a/src/mame/drivers/suprridr.c b/src/mame/drivers/suprridr.c index a252b094347..2713eea64fe 100644 --- a/src/mame/drivers/suprridr.c +++ b/src/mame/drivers/suprridr.c @@ -355,7 +355,7 @@ static MACHINE_DRIVER_START( suprridr ) MDRV_CPU_ADD(Z80, 10000000/4) /* just a guess */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_portmap,0) - MDRV_CPU_VBLANK_INT(main_nmi_gen,1) + MDRV_CPU_VBLANK_INT("main", main_nmi_gen) MDRV_CPU_ADD(Z80, 10000000/4) /* just a guess */ /* audio CPU */ diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c index 9be6160ee07..f14fc2a4216 100644 --- a/src/mame/drivers/suprslam.c +++ b/src/mame/drivers/suprslam.c @@ -329,7 +329,7 @@ static const struct YM2610interface ym2610_interface = static MACHINE_DRIVER_START( suprslam ) MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(suprslam_readmem,suprslam_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80,8000000/2) /* audio CPU */ /* 4 MHz ??? */ diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c index a176e12ee71..42b063bcf5f 100644 --- a/src/mame/drivers/surpratk.c +++ b/src/mame/drivers/surpratk.c @@ -239,7 +239,7 @@ static MACHINE_DRIVER_START( surpratk ) /* basic machine hardware */ MDRV_CPU_ADD(KONAMI, 3000000) /* 053248 */ MDRV_CPU_PROGRAM_MAP(surpratk_readmem,surpratk_writemem) - MDRV_CPU_VBLANK_INT(surpratk_interrupt,1) + MDRV_CPU_VBLANK_INT("main", surpratk_interrupt) MDRV_MACHINE_RESET(surpratk) diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c index ee1a785ffbe..fb839483586 100644 --- a/src/mame/drivers/system1.c +++ b/src/mame/drivers/system1.c @@ -2486,12 +2486,12 @@ static MACHINE_DRIVER_START( system1 ) MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* My Hero has 2 OSCs 8 & 20 MHz (Cabbe Info) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD_TAG("sound", Z80, 4000000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) /* NMIs are caused by the main CPU */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* NMIs are caused by the main CPU */ MDRV_MACHINE_RESET(system1) diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c index d2c23edf94a..7c7c27a39c5 100644 --- a/src/mame/drivers/system16.c +++ b/src/mame/drivers/system16.c @@ -450,7 +450,7 @@ static MACHINE_DRIVER_START( system16 ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 10000000) - MDRV_CPU_VBLANK_INT(sys16_interrupt,1) + MDRV_CPU_VBLANK_INT("main", sys16_interrupt) MDRV_CPU_ADD_TAG("sound", Z80, 4000000) /* audio CPU */ diff --git a/src/mame/drivers/system18.c b/src/mame/drivers/system18.c index 430523071c2..e5333bf816b 100644 --- a/src/mame/drivers/system18.c +++ b/src/mame/drivers/system18.c @@ -1119,7 +1119,7 @@ static MACHINE_DRIVER_START( system18 ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 10000000) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD_TAG("sound", Z80, 8000000) /* audio CPU */ diff --git a/src/mame/drivers/tagteam.c b/src/mame/drivers/tagteam.c index 705dd292f28..e25459aa886 100644 --- a/src/mame/drivers/tagteam.c +++ b/src/mame/drivers/tagteam.c @@ -272,12 +272,12 @@ static MACHINE_DRIVER_START( tagteam ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 1500000) /* 1.5 MHz ?? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(tagteam_interrupt,1) + MDRV_CPU_VBLANK_INT("main", tagteam_interrupt) MDRV_CPU_ADD(M6502, 975000) /* audio CPU */ /* 975 kHz ?? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,16) /* IRQs are triggered by the main CPU */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,16) /* IRQs are triggered by the main CPU */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c index 73ef981df6a..c29de1c63f9 100644 --- a/src/mame/drivers/tail2nos.c +++ b/src/mame/drivers/tail2nos.c @@ -267,7 +267,7 @@ static MACHINE_DRIVER_START( tail2nos ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,XTAL_20MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(Z80,XTAL_20MHz/4) /* verified on pcb */ /* audio CPU */ diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c index 16f59b1022a..e251e9270ee 100644 --- a/src/mame/drivers/taito_b.c +++ b/src/mame/drivers/taito_b.c @@ -2641,7 +2641,7 @@ static MACHINE_DRIVER_START( rastsag2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(rastsag2_readmem,rastsag2_writemem) - MDRV_CPU_VBLANK_INT(rastansaga2_interrupt,1) + MDRV_CPU_VBLANK_INT("main", rastansaga2_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) @@ -2679,7 +2679,7 @@ static MACHINE_DRIVER_START( ashura ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(rastsag2_readmem,rastsag2_writemem) - MDRV_CPU_VBLANK_INT(rastansaga2_interrupt,1) + MDRV_CPU_VBLANK_INT("main", rastansaga2_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) @@ -2717,7 +2717,7 @@ static MACHINE_DRIVER_START( crimec ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(crimec_readmem,crimec_writemem) - MDRV_CPU_VBLANK_INT(crimec_interrupt,1) + MDRV_CPU_VBLANK_INT("main", crimec_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) @@ -2755,7 +2755,7 @@ static MACHINE_DRIVER_START( tetrist ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ???*/ MDRV_CPU_PROGRAM_MAP(tetrist_readmem,tetrist_writemem) - MDRV_CPU_VBLANK_INT(rastansaga2_interrupt,1) + MDRV_CPU_VBLANK_INT("main", rastansaga2_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) @@ -2792,7 +2792,7 @@ static MACHINE_DRIVER_START( tetrista ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(tetrista_readmem,tetrista_writemem) - MDRV_CPU_VBLANK_INT(masterw_interrupt,1) + MDRV_CPU_VBLANK_INT("main", masterw_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(masterw_sound_readmem,masterw_sound_writemem) @@ -2830,7 +2830,7 @@ static MACHINE_DRIVER_START( hitice ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(hitice_readmem, hitice_writemem) - MDRV_CPU_VBLANK_INT(hitice_interrupt,1) + MDRV_CPU_VBLANK_INT("main", hitice_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(viofight_sound_readmem, viofight_sound_writemem) @@ -2874,7 +2874,7 @@ static MACHINE_DRIVER_START( rambo3 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_24MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(rambo3_readmem,rambo3_writemem) - MDRV_CPU_VBLANK_INT(rambo3_interrupt,1) + MDRV_CPU_VBLANK_INT("main", rambo3_interrupt) MDRV_CPU_ADD(Z80, XTAL_24MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) @@ -2912,7 +2912,7 @@ static MACHINE_DRIVER_START( rambo3a ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_24MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(rambo3_readmem,rambo3_writemem) - MDRV_CPU_VBLANK_INT(rambo3_interrupt,1) + MDRV_CPU_VBLANK_INT("main", rambo3_interrupt) MDRV_CPU_ADD(Z80, XTAL_24MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) @@ -2950,7 +2950,7 @@ static MACHINE_DRIVER_START( pbobble ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(pbobble_readmem,pbobble_writemem) - MDRV_CPU_VBLANK_INT(pbobble_interrupt,1) + MDRV_CPU_VBLANK_INT("main", pbobble_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) @@ -2991,7 +2991,7 @@ static MACHINE_DRIVER_START( spacedx ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(spacedx_readmem,spacedx_writemem) - MDRV_CPU_VBLANK_INT(pbobble_interrupt,1) + MDRV_CPU_VBLANK_INT("main", pbobble_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) @@ -3032,7 +3032,7 @@ static MACHINE_DRIVER_START( spacedxo ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(spacedxo_readmem,spacedxo_writemem) - MDRV_CPU_VBLANK_INT(selfeena_interrupt,1) + MDRV_CPU_VBLANK_INT("main", selfeena_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) @@ -3070,7 +3070,7 @@ static MACHINE_DRIVER_START( qzshowby ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz according to the readme*/ MDRV_CPU_PROGRAM_MAP(qzshowby_readmem,qzshowby_writemem) - MDRV_CPU_VBLANK_INT(pbobble_interrupt,1) + MDRV_CPU_VBLANK_INT("main", pbobble_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) @@ -3111,7 +3111,7 @@ static MACHINE_DRIVER_START( viofight ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(viofight_readmem,viofight_writemem) - MDRV_CPU_VBLANK_INT(viofight_interrupt,1) + MDRV_CPU_VBLANK_INT("main", viofight_interrupt) MDRV_CPU_ADD(Z80, 6000000) /* 6 MHz verified */ MDRV_CPU_PROGRAM_MAP(viofight_sound_readmem, viofight_sound_writemem) @@ -3153,7 +3153,7 @@ static MACHINE_DRIVER_START( masterw ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(masterw_readmem,masterw_writemem) - MDRV_CPU_VBLANK_INT(masterw_interrupt,1) + MDRV_CPU_VBLANK_INT("main", masterw_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(masterw_sound_readmem,masterw_sound_writemem) @@ -3192,7 +3192,7 @@ static MACHINE_DRIVER_START( silentd ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz ??? */ MDRV_CPU_PROGRAM_MAP(silentd_readmem,silentd_writemem) - MDRV_CPU_VBLANK_INT(silentd_interrupt,1) + MDRV_CPU_VBLANK_INT("main", silentd_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) @@ -3230,7 +3230,7 @@ static MACHINE_DRIVER_START( selfeena ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(selfeena_readmem,selfeena_writemem) - MDRV_CPU_VBLANK_INT(selfeena_interrupt,1) + MDRV_CPU_VBLANK_INT("main", selfeena_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) @@ -3277,7 +3277,7 @@ static MACHINE_DRIVER_START( ryujin ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(selfeena_readmem,selfeena_writemem) - MDRV_CPU_VBLANK_INT(selfeena_interrupt,1) + MDRV_CPU_VBLANK_INT("main", selfeena_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) @@ -3322,7 +3322,7 @@ static MACHINE_DRIVER_START( sbm ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(sbm_readmem,sbm_writemem) - MDRV_CPU_VBLANK_INT(sbm_interrupt,1) + MDRV_CPU_VBLANK_INT("main", sbm_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c index c20291d2d4e..a0643d72d6b 100644 --- a/src/mame/drivers/taito_f2.c +++ b/src/mame/drivers/taito_f2.c @@ -3868,7 +3868,7 @@ static MACHINE_DRIVER_START( taito_f2 ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, 24000000/2) /* 12 MHz */ - MDRV_CPU_VBLANK_INT(taitof2_interrupt,1) + MDRV_CPU_VBLANK_INT("main", taitof2_interrupt) MDRV_CPU_ADD(Z80, 24000000/6) /* 4 MHz */ /* audio CPU */ @@ -4322,7 +4322,7 @@ static MACHINE_DRIVER_START( camltrya ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,24000000/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cameltry_readmem,cameltry_writemem) - MDRV_CPU_VBLANK_INT(taitof2_interrupt,1) + MDRV_CPU_VBLANK_INT("main", taitof2_interrupt) MDRV_CPU_ADD(Z80,24000000/4) /* verifed on pcb */ /* audio CPU */ @@ -4364,7 +4364,7 @@ static MACHINE_DRIVER_START( driveout ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(driveout_readmem,driveout_writemem) - MDRV_CPU_VBLANK_INT(taitof2_interrupt,1) + MDRV_CPU_VBLANK_INT("main", taitof2_interrupt) MDRV_CPU_ADD(Z80,24000000/6) /* 4 MHz */ /* audio CPU */ diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c index 69bba7b54c1..1f903748a62 100644 --- a/src/mame/drivers/taito_f3.c +++ b/src/mame/drivers/taito_f3.c @@ -442,7 +442,7 @@ static MACHINE_DRIVER_START( f3 ) /* basic machine hardware */ MDRV_CPU_ADD(M68EC020, 16000000) MDRV_CPU_PROGRAM_MAP(f3_readmem,f3_writemem) - MDRV_CPU_VBLANK_INT(f3_interrupt2,1) + MDRV_CPU_VBLANK_INT("main", f3_interrupt2) TAITO_F3_SOUND_SYSTEM_CPU(16000000) diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c index fb1cdaf212d..81591d82f7a 100644 --- a/src/mame/drivers/taito_h.c +++ b/src/mame/drivers/taito_h.c @@ -578,7 +578,7 @@ static MACHINE_DRIVER_START( syvalion ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,24000000 / 2) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(syvalion_readmem,syvalion_writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_CPU_ADD(Z80,8000000 / 2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) @@ -617,7 +617,7 @@ static MACHINE_DRIVER_START( recordbr ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,24000000 / 2) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(recordbr_readmem,recordbr_writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_CPU_ADD(Z80,8000000 / 2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) @@ -656,7 +656,7 @@ static MACHINE_DRIVER_START( dleague ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,24000000 / 2) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(dleague_readmem,dleague_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80,8000000 / 2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c index 11efd6ef17e..5ad28e727fb 100644 --- a/src/mame/drivers/taito_l.c +++ b/src/mame/drivers/taito_l.c @@ -2285,7 +2285,7 @@ static MACHINE_DRIVER_START( fhawk ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("cpu1", Z80, 13330560/2) /* verified freq on pin122 of TC0090LVC cpu */ MDRV_CPU_PROGRAM_MAP(fhawk_readmem,fhawk_writemem) - MDRV_CPU_VBLANK_INT(vbl_interrupt,3) + MDRV_CPU_VBLANK_INT_HACK(vbl_interrupt,3) MDRV_CPU_ADD_TAG("sound", Z80, 4000000) /* verified on pcb */ /* audio CPU */ @@ -2293,7 +2293,7 @@ static MACHINE_DRIVER_START( fhawk ) MDRV_CPU_ADD_TAG("cpu2", Z80, 12000000/3) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(fhawk_2_readmem,fhawk_2_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,3) /* fixes slow down problems */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,3) /* fixes slow down problems */ MDRV_INTERLEAVE(100) @@ -2385,11 +2385,11 @@ static MACHINE_DRIVER_START( kurikint ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 13330560/2) /* verified freq on pin122 of TC0090LVC cpu */ MDRV_CPU_PROGRAM_MAP(kurikint_readmem,kurikint_writemem) - MDRV_CPU_VBLANK_INT(vbl_interrupt,3) + MDRV_CPU_VBLANK_INT_HACK(vbl_interrupt,3) MDRV_CPU_ADD( Z80, 12000000/3) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(kurikint_2_readmem,kurikint_2_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(100) @@ -2436,7 +2436,7 @@ static MACHINE_DRIVER_START( plotting ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", Z80, 13330560/2) /* verified freq on pin122 of TC0090LVC cpu */ MDRV_CPU_PROGRAM_MAP(plotting_readmem,plotting_writemem) - MDRV_CPU_VBLANK_INT(vbl_interrupt,3) + MDRV_CPU_VBLANK_INT_HACK(vbl_interrupt,3) MDRV_MACHINE_RESET(plotting) @@ -2515,11 +2515,11 @@ static MACHINE_DRIVER_START( evilston ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 13330560/2) /* not verfied */ MDRV_CPU_PROGRAM_MAP(evilston_readmem,evilston_writemem) - MDRV_CPU_VBLANK_INT(vbl_interrupt,3) + MDRV_CPU_VBLANK_INT_HACK(vbl_interrupt,3) MDRV_CPU_ADD(Z80, 12000000/3) /* not verified */ MDRV_CPU_PROGRAM_MAP(evilston_2_readmem,evilston_2_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c index e61f7bba36b..ce8ca24a03a 100644 --- a/src/mame/drivers/taito_x.c +++ b/src/mame/drivers/taito_x.c @@ -1009,7 +1009,7 @@ static MACHINE_DRIVER_START( superman ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_16MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(superman_readmem,superman_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(Z80, XTAL_16MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) @@ -1049,7 +1049,7 @@ static MACHINE_DRIVER_START( daisenpu ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_16MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(daisenpu_readmem,daisenpu_writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_CPU_ADD(Z80, XTAL_16MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(daisenpu_sound_readmem,daisenpu_sound_writemem) @@ -1086,7 +1086,7 @@ static MACHINE_DRIVER_START( gigandes ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz? */ MDRV_CPU_PROGRAM_MAP(gigandes_readmem,gigandes_writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(ballbros_sound_readmem,ballbros_sound_writemem) @@ -1125,7 +1125,7 @@ static MACHINE_DRIVER_START( ballbros ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz? */ MDRV_CPU_PROGRAM_MAP(ballbros_readmem,ballbros_writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(ballbros_sound_readmem,ballbros_sound_writemem) diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c index 7420a963723..a61ca895e86 100644 --- a/src/mame/drivers/taito_z.c +++ b/src/mame/drivers/taito_z.c @@ -2835,7 +2835,7 @@ static MACHINE_DRIVER_START( contcirc ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(contcirc_readmem,contcirc_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(Z80,16000000/4) /* audio CPU */ /* 4 MHz ??? */ @@ -2843,7 +2843,7 @@ static MACHINE_DRIVER_START( contcirc ) MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(contcirc_cpub_readmem,contcirc_cpub_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_MACHINE_START(taitoz) @@ -2880,7 +2880,7 @@ static MACHINE_DRIVER_START( chasehq ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(chasehq_readmem,chasehq_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD(Z80,16000000/4) /* audio CPU */ /* 4 MHz ??? */ @@ -2888,7 +2888,7 @@ static MACHINE_DRIVER_START( chasehq ) MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(chq_cpub_readmem,chq_cpub_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_MACHINE_START(taitoz) @@ -2924,7 +2924,7 @@ static MACHINE_DRIVER_START( enforce ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(enforce_readmem,enforce_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(Z80,16000000/4) /* audio CPU */ /* 4 MHz ??? */ @@ -2932,7 +2932,7 @@ static MACHINE_DRIVER_START( enforce ) MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(enforce_cpub_readmem,enforce_cpub_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_MACHINE_START(taitoz) @@ -2971,11 +2971,11 @@ static MACHINE_DRIVER_START( bshark ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(bshark_readmem,bshark_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(bshark_cpub_readmem,bshark_cpub_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_MACHINE_START(taitoz) @@ -3012,7 +3012,7 @@ static MACHINE_DRIVER_START( sci ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sci_readmem,sci_writemem) - MDRV_CPU_VBLANK_INT(sci_interrupt,1) + MDRV_CPU_VBLANK_INT("main", sci_interrupt) MDRV_CPU_ADD(Z80,16000000/4) /* audio CPU */ /* 4 MHz ??? */ @@ -3020,7 +3020,7 @@ static MACHINE_DRIVER_START( sci ) MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sci_cpub_readmem,sci_cpub_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_MACHINE_START(taitoz) @@ -3057,7 +3057,7 @@ static MACHINE_DRIVER_START( nightstr ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(nightstr_readmem,nightstr_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD(Z80,16000000/4) /* audio CPU */ /* 4 MHz ??? */ @@ -3065,7 +3065,7 @@ static MACHINE_DRIVER_START( nightstr ) MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(nightstr_cpub_readmem,nightstr_cpub_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_MACHINE_START(taitoz) @@ -3103,7 +3103,7 @@ static MACHINE_DRIVER_START( aquajack ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(aquajack_readmem,aquajack_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD(Z80,16000000/4) /* audio CPU */ /* 4 MHz ??? */ @@ -3111,7 +3111,7 @@ static MACHINE_DRIVER_START( aquajack ) MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(aquajack_cpub_readmem,aquajack_cpub_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_MACHINE_START(taitoz) @@ -3148,11 +3148,11 @@ static MACHINE_DRIVER_START( spacegun ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz ??? */ MDRV_CPU_PROGRAM_MAP(spacegun_readmem,spacegun_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz ??? */ MDRV_CPU_PROGRAM_MAP(spacegun_cpub_readmem,spacegun_cpub_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_MACHINE_START(taitoz) @@ -3189,7 +3189,7 @@ static MACHINE_DRIVER_START( dblaxle ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz ??? */ MDRV_CPU_PROGRAM_MAP(dblaxle_readmem,dblaxle_writemem) - MDRV_CPU_VBLANK_INT(dblaxle_interrupt,1) + MDRV_CPU_VBLANK_INT("main", dblaxle_interrupt) MDRV_CPU_ADD(Z80,16000000/4) /* audio CPU */ /* 4 MHz ??? */ @@ -3197,7 +3197,7 @@ static MACHINE_DRIVER_START( dblaxle ) MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz ??? */ MDRV_CPU_PROGRAM_MAP(dblaxle_cpub_readmem,dblaxle_cpub_writemem) - MDRV_CPU_VBLANK_INT(dblaxle_cpub_interrupt,1) + MDRV_CPU_VBLANK_INT("main", dblaxle_cpub_interrupt) MDRV_MACHINE_START(taitoz) @@ -3234,7 +3234,7 @@ static MACHINE_DRIVER_START( racingb ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz ??? */ MDRV_CPU_PROGRAM_MAP(racingb_readmem,racingb_writemem) - MDRV_CPU_VBLANK_INT(dblaxle_interrupt,1) + MDRV_CPU_VBLANK_INT("main", dblaxle_interrupt) MDRV_CPU_ADD(Z80,16000000/4) /* audio CPU */ /* 4 MHz ??? */ @@ -3242,7 +3242,7 @@ static MACHINE_DRIVER_START( racingb ) MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz ??? */ MDRV_CPU_PROGRAM_MAP(racingb_cpub_readmem,racingb_cpub_writemem) - MDRV_CPU_VBLANK_INT(dblaxle_cpub_interrupt,1) + MDRV_CPU_VBLANK_INT("main", dblaxle_cpub_interrupt) MDRV_MACHINE_START(taitoz) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c index 56d2145a805..94197a849b1 100644 --- a/src/mame/drivers/taitoair.c +++ b/src/mame/drivers/taitoair.c @@ -593,7 +593,7 @@ static MACHINE_DRIVER_START( airsys ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,24000000 / 2) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(airsys_map, 0) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq5_line_hold) MDRV_CPU_ADD(Z80,8000000 / 2) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_map, 0) diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c index 070053fdeac..0a7fe687fba 100644 --- a/src/mame/drivers/taitojc.c +++ b/src/mame/drivers/taitojc.c @@ -1271,7 +1271,7 @@ static INTERRUPT_GEN( taitojc_int6 ) static MACHINE_DRIVER_START( taitojc ) MDRV_CPU_ADD(M68040, 25000000) MDRV_CPU_PROGRAM_MAP(taitojc_map, 0) - MDRV_CPU_VBLANK_INT(taitojc_vblank, 1) + MDRV_CPU_VBLANK_INT("main", taitojc_vblank) MDRV_CPU_PERIODIC_INT(taitojc_int6, 1000) TAITO_F3_SOUND_SYSTEM_CPU(16000000) diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c index f087dd60d10..279c76edbc9 100644 --- a/src/mame/drivers/taitosj.c +++ b/src/mame/drivers/taitosj.c @@ -1861,7 +1861,7 @@ static MACHINE_DRIVER_START( nomcu ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main",Z80,8000000/2) /* 4 MHz */ MDRV_CPU_PROGRAM_MAP(taitosj_main_nomcu_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* audio CPU */ /* 3 MHz */ MDRV_CPU_ADD(Z80,6000000/2) diff --git a/src/mame/drivers/talbot.c b/src/mame/drivers/talbot.c index 70a60babdf7..f6dbc0db988 100644 --- a/src/mame/drivers/talbot.c +++ b/src/mame/drivers/talbot.c @@ -237,7 +237,7 @@ static MACHINE_DRIVER_START( talbot ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 18432000/6) /* (?) */ MDRV_CPU_PROGRAM_MAP(cpu_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* MCU */ // MDRV_CPU_ADD(ALPHA8201, 18432000/6/8/2) /* (?) */ diff --git a/src/mame/drivers/tankbatt.c b/src/mame/drivers/tankbatt.c index 05071ab4571..53704eba0e6 100644 --- a/src/mame/drivers/tankbatt.c +++ b/src/mame/drivers/tankbatt.c @@ -281,7 +281,7 @@ static MACHINE_DRIVER_START( tankbatt ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 1000000) /* 1 MHz ???? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(tankbatt_interrupt,1) + MDRV_CPU_VBLANK_INT("main", tankbatt_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c index 779426434d9..4a09e9abc4c 100644 --- a/src/mame/drivers/tankbust.c +++ b/src/mame/drivers/tankbust.c @@ -369,7 +369,7 @@ static MACHINE_DRIVER_START( tankbust ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ? */ MDRV_CPU_PROGRAM_MAP( readmem, writemem ) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* 3.072 MHz ? */ MDRV_CPU_PROGRAM_MAP( readmem2, writemem2 ) diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c index 08309592c10..803bd8c3402 100644 --- a/src/mame/drivers/taotaido.c +++ b/src/mame/drivers/taotaido.c @@ -360,7 +360,7 @@ static const struct YM2610interface ym2610_interface = static MACHINE_DRIVER_START( taotaido ) MDRV_CPU_ADD(M68000, 32000000/2) MDRV_CPU_PROGRAM_MAP(taotaido_readmem,taotaido_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80,20000000/4) // ?? /* audio CPU */ diff --git a/src/mame/drivers/targeth.c b/src/mame/drivers/targeth.c index d9c010afb0f..6a250b4c1e7 100644 --- a/src/mame/drivers/targeth.c +++ b/src/mame/drivers/targeth.c @@ -190,7 +190,7 @@ static MACHINE_DRIVER_START( targeth ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(targeth_readmem,targeth_writemem) - MDRV_CPU_VBLANK_INT(targeth_interrupt,3) + MDRV_CPU_VBLANK_INT_HACK(targeth_interrupt,3) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c index 70cf4c6973a..cadb55444f9 100644 --- a/src/mame/drivers/tatsumi.c +++ b/src/mame/drivers/tatsumi.c @@ -826,7 +826,7 @@ static MACHINE_DRIVER_START( apache3 ) /* basic machine hardware */ MDRV_CPU_ADD(V30,20000000 / 2) /* NEC V30 CPU, 20MHz / 2 */ MDRV_CPU_PROGRAM_MAP(apache3_v30_map,0) - MDRV_CPU_VBLANK_INT(roundup5_interrupt,1) + MDRV_CPU_VBLANK_INT("main", roundup5_interrupt) MDRV_CPU_ADD(M68000,20000000 / 2) /* 68000 CPU, 20MHz / 2 */ MDRV_CPU_PROGRAM_MAP(apache3_68000_map,0) @@ -872,7 +872,7 @@ static MACHINE_DRIVER_START( roundup5 ) /* basic machine hardware */ MDRV_CPU_ADD(V30,20000000 / 2) /* NEC V30 CPU, 20MHz / 2 */ MDRV_CPU_PROGRAM_MAP(roundup5_v30_map,0) - MDRV_CPU_VBLANK_INT(roundup5_interrupt,1) + MDRV_CPU_VBLANK_INT("main", roundup5_interrupt) MDRV_CPU_ADD(M68000,20000000 / 2) /* 68000 CPU, 20MHz / 2 */ MDRV_CPU_PROGRAM_MAP(roundup5_68000_map,0) @@ -915,11 +915,11 @@ static MACHINE_DRIVER_START( cyclwarr ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 50000000 / 4) /* Confirmed */ MDRV_CPU_PROGRAM_MAP(cyclwarr_68000a_map,0) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq5_line_hold) MDRV_CPU_ADD(M68000, 50000000 / 4) /* Confirmed */ MDRV_CPU_PROGRAM_MAP(cyclwarr_68000b_map,0) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq5_line_hold) MDRV_CPU_ADD(Z80, 16000000 / 4) /* Confirmed */ MDRV_CPU_PROGRAM_MAP(cyclwarr_z80_map,0) @@ -959,11 +959,11 @@ static MACHINE_DRIVER_START( bigfight ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 50000000 / 4) /* Confirmed */ MDRV_CPU_PROGRAM_MAP(bigfight_68000a_map,0) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq5_line_hold) MDRV_CPU_ADD(M68000, 50000000 / 4) /* Confirmed */ MDRV_CPU_PROGRAM_MAP(bigfight_68000b_map,0) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq5_line_hold) MDRV_CPU_ADD(Z80, 16000000 / 4) /* Confirmed */ MDRV_CPU_PROGRAM_MAP(cyclwarr_z80_map,0) diff --git a/src/mame/drivers/tattack.c b/src/mame/drivers/tattack.c index 3c15e154225..8a55178348c 100644 --- a/src/mame/drivers/tattack.c +++ b/src/mame/drivers/tattack.c @@ -186,7 +186,7 @@ static MACHINE_DRIVER_START( tattack ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 8000000 / 2) /* 4 MHz ? */ MDRV_CPU_PROGRAM_MAP(mem, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/taxidrvr.c b/src/mame/drivers/taxidrvr.c index 13f0e5d52c9..5c4f703387b 100644 --- a/src/mame/drivers/taxidrvr.c +++ b/src/mame/drivers/taxidrvr.c @@ -362,16 +362,16 @@ static MACHINE_DRIVER_START( taxidrvr ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem1,writemem1) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem2,writemem2) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* ??? */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* ??? */ MDRV_CPU_ADD(Z80,4000000) /* 4 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem3,writemem3) MDRV_CPU_IO_MAP(readport3,writeport3) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* ??? */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* ??? */ MDRV_INTERLEAVE(100) /* 100 CPU slices per frame - an high value to ensure proper */ /* synchronization of the CPUs */ diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c index 8d35c1b4b86..6bca1cd6937 100644 --- a/src/mame/drivers/tbowl.c +++ b/src/mame/drivers/tbowl.c @@ -589,12 +589,12 @@ static MACHINE_DRIVER_START( tbowl ) /* CPU on Board '6206B' */ MDRV_CPU_ADD(Z80, 8000000) /* NEC D70008AC-8 (Z80 Clone) */ MDRV_CPU_PROGRAM_MAP(readmem_6206B,writemem_6206B) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("left", irq0_line_hold) /* CPU on Board '6206C' */ MDRV_CPU_ADD(Z80, 8000000) /* NEC D70008AC-8 (Z80 Clone) */ MDRV_CPU_PROGRAM_MAP(readmem_6206C,writemem_6206C) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("left", irq0_line_hold) /* CPU on Board '6206A' */ MDRV_CPU_ADD(Z80, 4000000) /* Actual Z80 */ diff --git a/src/mame/drivers/tceptor.c b/src/mame/drivers/tceptor.c index b06bfdc3338..bb612cf21bf 100644 --- a/src/mame/drivers/tceptor.c +++ b/src/mame/drivers/tceptor.c @@ -433,7 +433,7 @@ static MACHINE_DRIVER_START( tceptor ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 49152000/32) MDRV_CPU_PROGRAM_MAP(m6809_map,0) - MDRV_CPU_VBLANK_INT(m6809_vb_interrupt,1) + MDRV_CPU_VBLANK_INT("2D", m6809_vb_interrupt) MDRV_CPU_ADD(M65C02, 49152000/24) /* audio CPU */ @@ -445,12 +445,12 @@ static MACHINE_DRIVER_START( tceptor ) MDRV_CPU_ADD(M68000, 49152000/4) MDRV_CPU_PROGRAM_MAP(m68k_map,0) - MDRV_CPU_VBLANK_INT(m68k_vb_interrupt,1) + MDRV_CPU_VBLANK_INT("2D", m68k_vb_interrupt) MDRV_CPU_ADD(HD63701, 49152000/8) /* or compatible 6808 with extra instructions */ MDRV_CPU_PROGRAM_MAP(mcu_map,0) MDRV_CPU_IO_MAP(mcu_io_map,0) - MDRV_CPU_VBLANK_INT(mcu_vb_interrupt,1) + MDRV_CPU_VBLANK_INT("2D", mcu_vb_interrupt) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c index 2abcbb6bbd3..6ed91465efc 100644 --- a/src/mame/drivers/tecmo.c +++ b/src/mame/drivers/tecmo.c @@ -568,7 +568,7 @@ static MACHINE_DRIVER_START( rygar ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", Z80, 4000000) MDRV_CPU_PROGRAM_MAP(readmem,rygar_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD_TAG("sound", Z80, 4000000) /* audio CPU */ diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c index fd677fb70c3..f32b73ca4c9 100644 --- a/src/mame/drivers/tecmo16.c +++ b/src/mame/drivers/tecmo16.c @@ -443,7 +443,7 @@ static MACHINE_DRIVER_START( fstarfrc ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,24000000/2) /* 12MHz */ MDRV_CPU_PROGRAM_MAP(fstarfrc_readmem,fstarfrc_writemem) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq5_line_hold) MDRV_CPU_ADD(Z80,8000000/2) /* audio CPU */ /* 4MHz */ @@ -484,7 +484,7 @@ static MACHINE_DRIVER_START( ginkun ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,24000000/2) /* 12MHz */ MDRV_CPU_PROGRAM_MAP(ginkun_readmem,ginkun_writemem) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq5_line_hold) MDRV_CPU_ADD(Z80,8000000/2) /* audio CPU */ /* 4MHz */ diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c index 55568a4d11b..b59865aad58 100644 --- a/src/mame/drivers/tecmosys.c +++ b/src/mame/drivers/tecmosys.c @@ -537,7 +537,7 @@ static const struct YMZ280Binterface ymz280b_interface = static MACHINE_DRIVER_START( deroon ) MDRV_CPU_ADD(M68000, 16000000/8) /* the /8 divider is here only for OPL3 testing */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, 16000000/2 ) /* 8 MHz ??? */ /* audio CPU */ diff --git a/src/mame/drivers/tehkanwc.c b/src/mame/drivers/tehkanwc.c index a274baeece8..230d5445826 100644 --- a/src/mame/drivers/tehkanwc.c +++ b/src/mame/drivers/tehkanwc.c @@ -661,16 +661,16 @@ static MACHINE_DRIVER_START( tehkanwc ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", Z80, 18432000/4) /* 18.432000 / 4 */ MDRV_CPU_PROGRAM_MAP(main_mem,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 18432000/4) MDRV_CPU_PROGRAM_MAP(sub_mem,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 18432000/4) MDRV_CPU_PROGRAM_MAP(sound_mem,0) MDRV_CPU_IO_MAP(sound_port,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(10) /* 10 CPU slices per frame - seems enough to keep the CPUs in sync */ diff --git a/src/mame/drivers/terracre.c b/src/mame/drivers/terracre.c index 7db715efdc0..bb1d0fa35f5 100644 --- a/src/mame/drivers/terracre.c +++ b/src/mame/drivers/terracre.c @@ -81,6 +81,7 @@ AT-2 */ #include "driver.h" +#include "deprecat.h" #include "cpu/z80/z80.h" #include "sound/dac.h" #include "sound/2203intf.h" @@ -604,13 +605,13 @@ GFXDECODE_END static MACHINE_DRIVER_START( amazon ) MDRV_CPU_ADD(M68000, 8000000 ) MDRV_CPU_PROGRAM_MAP(amazon_readmem,amazon_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* 4 MHz???? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport_3526) - MDRV_CPU_VBLANK_INT(irq0_line_hold,128) /* ??? */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) /* ??? */ MDRV_MACHINE_START(amazon) @@ -644,13 +645,13 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ym3526 ) MDRV_CPU_ADD(M68000, 8000000 ) MDRV_CPU_PROGRAM_MAP(terracre_readmem,terracre_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* 4 MHz???? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport_3526) - MDRV_CPU_VBLANK_INT(irq0_line_hold,128) /* ??? */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) /* ??? */ MDRV_SCREEN_ADD("main", RASTER) @@ -682,13 +683,13 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ym2203 ) MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz?? */ MDRV_CPU_PROGRAM_MAP(terracre_readmem,terracre_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* 4 MHz???? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport_2203) - MDRV_CPU_VBLANK_INT(irq0_line_hold,128) /* ??? */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128) /* ??? */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c index 1ddb4ebc45f..cfbbebf8a78 100644 --- a/src/mame/drivers/tetrisp2.c +++ b/src/mame/drivers/tetrisp2.c @@ -1037,7 +1037,7 @@ static MACHINE_DRIVER_START( tetrisp2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(tetrisp2_readmem,tetrisp2_writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_NVRAM_HANDLER(tetrisp2) @@ -1069,7 +1069,7 @@ static MACHINE_DRIVER_START( rockn ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(rockn1_readmem,rockn1_writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_NVRAM_HANDLER(tetrisp2) @@ -1103,7 +1103,7 @@ static MACHINE_DRIVER_START( rockn2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(rockn2_readmem,rockn2_writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_NVRAM_HANDLER(tetrisp2) @@ -1136,11 +1136,11 @@ static MACHINE_DRIVER_START( rocknms ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(rocknms_main_readmem,rocknms_main_writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("left", irq2_line_hold) MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(rocknms_sub_readmem,rocknms_sub_writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("left", irq2_line_hold) MDRV_NVRAM_HANDLER(tetrisp2) diff --git a/src/mame/drivers/thayers.c b/src/mame/drivers/thayers.c index 264bd3ea5cd..6c551c46e72 100644 --- a/src/mame/drivers/thayers.c +++ b/src/mame/drivers/thayers.c @@ -459,7 +459,7 @@ static MACHINE_DRIVER_START( thayers ) MDRV_CPU_ADD(Z80, SCHEMATIC_CLOCK) MDRV_CPU_PROGRAM_MAP(mainmem,0) MDRV_CPU_IO_MAP(mainio,0) - MDRV_CPU_VBLANK_INT(vblank_callback_thayers, 1) + MDRV_CPU_VBLANK_INT("main", vblank_callback_thayers) MDRV_MACHINE_START(thayers) diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c index fe83b38269d..dc7a9c5d45f 100644 --- a/src/mame/drivers/thedeep.c +++ b/src/mame/drivers/thedeep.c @@ -365,7 +365,7 @@ static MACHINE_DRIVER_START( thedeep ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 6000000) /* 6MHz */ MDRV_CPU_PROGRAM_MAP(thedeep_readmem,thedeep_writemem) - MDRV_CPU_VBLANK_INT(thedeep_interrupt,2) /* IRQ by MCU, NMI by vblank (maskable) */ + MDRV_CPU_VBLANK_INT_HACK(thedeep_interrupt,2) /* IRQ by MCU, NMI by vblank (maskable) */ MDRV_CPU_ADD(M65C02, 2000000) /* 2MHz */ MDRV_CPU_PROGRAM_MAP(thedeep_sound_readmem,thedeep_sound_writemem) diff --git a/src/mame/drivers/thepit.c b/src/mame/drivers/thepit.c index 8759327c21c..287847b93b4 100644 --- a/src/mame/drivers/thepit.c +++ b/src/mame/drivers/thepit.c @@ -644,12 +644,12 @@ static MACHINE_DRIVER_START( thepit ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", Z80, PIXEL_CLOCK/2) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(thepit_main_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(Z80, SOUND_CLOCK/4) /* 2.5 MHz */ MDRV_CPU_PROGRAM_MAP(audio_map,0) MDRV_CPU_IO_MAP(audio_io_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_GFXDECODE(thepit) diff --git a/src/mame/drivers/thief.c b/src/mame/drivers/thief.c index 0ee86940d64..00d56e43ea8 100644 --- a/src/mame/drivers/thief.c +++ b/src/mame/drivers/thief.c @@ -464,7 +464,7 @@ static MACHINE_DRIVER_START( sharkatt ) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz? */ MDRV_CPU_PROGRAM_MAP(sharkatt_readmem,sharkatt_writemem) MDRV_CPU_IO_MAP(io_map,0) - MDRV_CPU_VBLANK_INT(thief_interrupt,1) + MDRV_CPU_VBLANK_INT("main", thief_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -500,7 +500,7 @@ static MACHINE_DRIVER_START( thief ) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz? */ MDRV_CPU_PROGRAM_MAP(thief_readmem,thief_writemem) MDRV_CPU_IO_MAP(io_map,0) - MDRV_CPU_VBLANK_INT(thief_interrupt,1) + MDRV_CPU_VBLANK_INT("main", thief_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -536,7 +536,7 @@ static MACHINE_DRIVER_START( natodef ) MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz? */ MDRV_CPU_PROGRAM_MAP(thief_readmem,thief_writemem) MDRV_CPU_IO_MAP(io_map,0) - MDRV_CPU_VBLANK_INT(thief_interrupt,1) + MDRV_CPU_VBLANK_INT("main", thief_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/thoop2.c b/src/mame/drivers/thoop2.c index 4f06664635d..bc0d9d555b0 100644 --- a/src/mame/drivers/thoop2.c +++ b/src/mame/drivers/thoop2.c @@ -198,7 +198,7 @@ static MACHINE_DRIVER_START( thoop2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(thoop2_readmem,thoop2_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c index ff617a353b5..bd13bb85081 100644 --- a/src/mame/drivers/thunderx.c +++ b/src/mame/drivers/thunderx.c @@ -699,7 +699,7 @@ static MACHINE_DRIVER_START( scontra ) /* basic machine hardware */ MDRV_CPU_ADD(KONAMI, 3000000) /* 052001 */ MDRV_CPU_PROGRAM_MAP(scontra_readmem,scontra_writemem) - MDRV_CPU_VBLANK_INT(scontra_interrupt,1) + MDRV_CPU_VBLANK_INT("main", scontra_interrupt) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* ? */ @@ -741,7 +741,7 @@ static MACHINE_DRIVER_START( thunderx ) /* basic machine hardware */ MDRV_CPU_ADD(KONAMI, 3000000) /* ? */ MDRV_CPU_PROGRAM_MAP(thunderx_readmem,thunderx_writemem) - MDRV_CPU_VBLANK_INT(scontra_interrupt,1) + MDRV_CPU_VBLANK_INT("main", scontra_interrupt) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* ? */ diff --git a/src/mame/drivers/tiamc1.c b/src/mame/drivers/tiamc1.c index a89bed186f3..831c16c6481 100644 --- a/src/mame/drivers/tiamc1.c +++ b/src/mame/drivers/tiamc1.c @@ -279,7 +279,7 @@ static MACHINE_DRIVER_START( tiamc1 ) MDRV_CPU_PROGRAM_MAP(tiamc1_readmem,tiamc1_writemem) MDRV_CPU_IO_MAP(tiamc1_readport,tiamc1_writeport) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_MACHINE_RESET(tiamc1) diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c index 7c4e55d2cdc..d9708f6ec27 100644 --- a/src/mame/drivers/tigeroad.c +++ b/src/mame/drivers/tigeroad.c @@ -549,7 +549,7 @@ static MACHINE_DRIVER_START( tigeroad ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 6000000) /* ? Main clock is 24MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* 4 MHz ??? */ diff --git a/src/mame/drivers/timelimt.c b/src/mame/drivers/timelimt.c index 9abe2905715..e7cd5dc1e35 100644 --- a/src/mame/drivers/timelimt.c +++ b/src/mame/drivers/timelimt.c @@ -262,13 +262,13 @@ static MACHINE_DRIVER_START( timelimt ) MDRV_CPU_ADD(Z80, 5000000) /* 5.000 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,0) - MDRV_CPU_VBLANK_INT(timelimt_irq,1) + MDRV_CPU_VBLANK_INT("main", timelimt_irq) MDRV_CPU_ADD(Z80,18432000/6) /* audio CPU */ /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) MDRV_CPU_IO_MAP(readport_sound,writeport_sound) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* ? */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* ? */ MDRV_INTERLEAVE(50) diff --git a/src/mame/drivers/timeplt.c b/src/mame/drivers/timeplt.c index 6c7efab6c7e..fc4c74c4dce 100644 --- a/src/mame/drivers/timeplt.c +++ b/src/mame/drivers/timeplt.c @@ -323,7 +323,7 @@ static MACHINE_DRIVER_START( timeplt ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, MASTER_CLOCK/3/2) /* not confirmed, but common for Konami games of the era */ MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(timeplt_interrupt,1) + MDRV_CPU_VBLANK_INT("main", timeplt_interrupt) MDRV_MACHINE_START(timeplt) diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c index 1695635fa54..4998e5f9b47 100644 --- a/src/mame/drivers/tmaster.c +++ b/src/mame/drivers/tmaster.c @@ -681,7 +681,7 @@ static INTERRUPT_GEN( tm3k_interrupt ) static MACHINE_DRIVER_START( tm3k ) MDRV_CPU_ADD_TAG("main", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(tmaster_map,0) - MDRV_CPU_VBLANK_INT(tm3k_interrupt,2+5+20) // ?? + MDRV_CPU_VBLANK_INT_HACK(tm3k_interrupt,2+5+20) // ?? MDRV_MACHINE_RESET(tmaster) MDRV_NVRAM_HANDLER(generic_0fill) @@ -721,7 +721,7 @@ static INTERRUPT_GEN( tm_interrupt ) static MACHINE_DRIVER_START( tm ) MDRV_IMPORT_FROM(tm3k) MDRV_CPU_MODIFY("main") - MDRV_CPU_VBLANK_INT(tm_interrupt,3+20) // ?? + MDRV_CPU_VBLANK_INT_HACK(tm_interrupt,3+20) // ?? MDRV_SOUND_REPLACE("OKI",OKIM6295, 1122000) MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified @@ -751,7 +751,7 @@ static MACHINE_RESET( galgames ) static MACHINE_DRIVER_START( galgames ) MDRV_CPU_ADD_TAG("main", M68000, XTAL_24MHz / 2) MDRV_CPU_PROGRAM_MAP(galgames_map,0) - MDRV_CPU_VBLANK_INT(galgames_interrupt, 1+20) // ?? + MDRV_CPU_VBLANK_INT_HACK(galgames_interrupt, 1+20) // ?? MDRV_NVRAM_HANDLER( galgames ) MDRV_MACHINE_RESET( galgames ) diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c index 05d5c050173..1c9386ce9cf 100644 --- a/src/mame/drivers/tmnt.c +++ b/src/mame/drivers/tmnt.c @@ -2329,7 +2329,7 @@ static MACHINE_DRIVER_START( cuebrick ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz */ MDRV_CPU_PROGRAM_MAP(cuebrick_main_map,0) - MDRV_CPU_VBLANK_INT(cuebrick_interrupt,10) + MDRV_CPU_VBLANK_INT_HACK(cuebrick_interrupt,10) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS | VIDEO_UPDATE_AFTER_VBLANK) @@ -2362,7 +2362,7 @@ static MACHINE_DRIVER_START( mia ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_24MHz/3) MDRV_CPU_PROGRAM_MAP(mia_main_map,0) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq5_line_hold) MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) MDRV_CPU_PROGRAM_MAP(mia_audio_map,0) @@ -2408,7 +2408,7 @@ static MACHINE_DRIVER_START( tmnt ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_24MHz/3) MDRV_CPU_PROGRAM_MAP(tmnt_main_map,0) - MDRV_CPU_VBLANK_INT(irq5_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq5_line_hold) MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) MDRV_CPU_PROGRAM_MAP(tmnt_audio_map,0) @@ -2457,7 +2457,7 @@ static MACHINE_DRIVER_START( punkshot ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_24MHz/2) MDRV_CPU_PROGRAM_MAP(punkshot_main_map,0) - MDRV_CPU_VBLANK_INT(punkshot_interrupt,1) + MDRV_CPU_VBLANK_INT("main", punkshot_interrupt) MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) MDRV_CPU_PROGRAM_MAP(punkshot_audio_map,0) @@ -2496,7 +2496,7 @@ static MACHINE_DRIVER_START( lgtnfght ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_24MHz/2) MDRV_CPU_PROGRAM_MAP(lgtnfght_main_map,0) - MDRV_CPU_VBLANK_INT(lgtnfght_interrupt,1) + MDRV_CPU_VBLANK_INT("main", lgtnfght_interrupt) MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) MDRV_CPU_PROGRAM_MAP(lgtnfght_audio_map,0) @@ -2535,7 +2535,7 @@ static MACHINE_DRIVER_START( blswhstl ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(blswhstl_main_map,0) - MDRV_CPU_VBLANK_INT(punkshot_interrupt,1) + MDRV_CPU_VBLANK_INT("main", punkshot_interrupt) MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) MDRV_CPU_PROGRAM_MAP(ssriders_audio_map,0) @@ -2595,7 +2595,7 @@ static MACHINE_DRIVER_START( glfgreat ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* ? */ MDRV_CPU_PROGRAM_MAP(glfgreat_main_map,0) - MDRV_CPU_VBLANK_INT(lgtnfght_interrupt,1) + MDRV_CPU_VBLANK_INT("main", lgtnfght_interrupt) MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) MDRV_CPU_PROGRAM_MAP(glfgreat_audio_map,0) @@ -2644,7 +2644,7 @@ static MACHINE_DRIVER_START( prmrsocr ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* ? */ MDRV_CPU_PROGRAM_MAP(prmrsocr_main_map,0) - MDRV_CPU_VBLANK_INT(lgtnfght_interrupt,1) + MDRV_CPU_VBLANK_INT("main", lgtnfght_interrupt) MDRV_CPU_ADD(Z80, 8000000) /* audio CPU */ /* ? */ @@ -2684,7 +2684,7 @@ static MACHINE_DRIVER_START( tmnt2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_32MHz/2) MDRV_CPU_PROGRAM_MAP(tmnt2_main_map,0) - MDRV_CPU_VBLANK_INT(punkshot_interrupt,1) + MDRV_CPU_VBLANK_INT("main", punkshot_interrupt) MDRV_CPU_ADD(Z80, 8000000) /* audio CPU */ /* 8 MHz; clock is correct, but there's 1 cycle wait for ROM/RAM */ @@ -2731,7 +2731,7 @@ static MACHINE_DRIVER_START( ssriders ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_32MHz/2) MDRV_CPU_PROGRAM_MAP(ssriders_main_map,0) - MDRV_CPU_VBLANK_INT(punkshot_interrupt,1) + MDRV_CPU_VBLANK_INT("main", punkshot_interrupt) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* ????? makes the ROM test sync */ @@ -2774,7 +2774,7 @@ static MACHINE_DRIVER_START( sunsetbl ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(sunsetbl_main_map,0) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_NVRAM_HANDLER(eeprom) @@ -2807,7 +2807,7 @@ static MACHINE_DRIVER_START( thndrx2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(thndrx2_main_map,0) - MDRV_CPU_VBLANK_INT(punkshot_interrupt,1) + MDRV_CPU_VBLANK_INT("main", punkshot_interrupt) MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) MDRV_CPU_PROGRAM_MAP(thndrx2_audio_map,0) diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c index a1b0e0dfaff..b6168fdd8ba 100644 --- a/src/mame/drivers/tnzs.c +++ b/src/mame/drivers/tnzs.c @@ -1292,11 +1292,11 @@ static MACHINE_DRIVER_START( arknoid2 ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(arknoid2_interrupt,1) + MDRV_CPU_VBLANK_INT("main", arknoid2_interrupt) MDRV_CPU_ADD(Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sub_readmem,sub_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(100) @@ -1331,11 +1331,11 @@ static MACHINE_DRIVER_START( drtoppel ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(arknoid2_interrupt,1) + MDRV_CPU_VBLANK_INT("main", arknoid2_interrupt) MDRV_CPU_ADD(Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */ MDRV_CPU_PROGRAM_MAP(sub_readmem,sub_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(100) @@ -1370,11 +1370,11 @@ static MACHINE_DRIVER_START( tnzs ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */ MDRV_CPU_PROGRAM_MAP(sub_readmem,sub_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(I8X41,12000000/2) /* 400KHz ??? - Main board Crystal is 12MHz */ MDRV_CPU_PROGRAM_MAP(i8742_readmem,i8742_writemem) @@ -1412,11 +1412,11 @@ static MACHINE_DRIVER_START( insectx ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sub_readmem,sub_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(100) @@ -1450,11 +1450,11 @@ static MACHINE_DRIVER_START( kageki ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(kageki_sub_readmem,kageki_sub_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_INTERLEAVE(100) @@ -1495,11 +1495,11 @@ static MACHINE_DRIVER_START( tnzsb ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("cpu0", Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpu0_type2,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD_TAG("cpu1", Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(tnzsb_cpu1_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD_TAG("cpu2", Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(tnzsb_cpu2_map,0) diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c index 496f6d6219c..cb5e962dd84 100644 --- a/src/mame/drivers/toaplan1.c +++ b/src/mame/drivers/toaplan1.c @@ -1223,7 +1223,7 @@ static MACHINE_DRIVER_START( rallybik ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(rallybik_main_map, 0) - MDRV_CPU_VBLANK_INT(toaplan1_interrupt,1) + MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt) MDRV_CPU_ADD(Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */ MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map, 0) @@ -1263,7 +1263,7 @@ static MACHINE_DRIVER_START( truxton ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(truxton_main_map, 0) - MDRV_CPU_VBLANK_INT(toaplan1_interrupt,1) + MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt) MDRV_CPU_ADD(Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */ MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map, 0) @@ -1303,7 +1303,7 @@ static MACHINE_DRIVER_START( hellfire ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(hellfire_main_map, 0) - MDRV_CPU_VBLANK_INT(toaplan1_interrupt,1) + MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt) MDRV_CPU_ADD(Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */ MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map, 0) @@ -1343,7 +1343,7 @@ static MACHINE_DRIVER_START( zerowing ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(zerowing_main_map, 0) - MDRV_CPU_VBLANK_INT(toaplan1_interrupt,1) + MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt) MDRV_CPU_ADD(Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */ MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map, 0) @@ -1383,7 +1383,7 @@ static MACHINE_DRIVER_START( demonwld ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(demonwld_main_map, 0) - MDRV_CPU_VBLANK_INT(toaplan1_interrupt,1) + MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt) MDRV_CPU_ADD(Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */ MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map, 0) @@ -1427,7 +1427,7 @@ static MACHINE_DRIVER_START( samesame ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(samesame_main_map, 0) - MDRV_CPU_VBLANK_INT(toaplan1_interrupt,1) + MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt) MDRV_MACHINE_RESET(toaplan1) @@ -1461,7 +1461,7 @@ static MACHINE_DRIVER_START( outzone ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(outzone_main_map, 0) - MDRV_CPU_VBLANK_INT(toaplan1_interrupt,1) + MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt) MDRV_CPU_ADD(Z80,28000000/8) /* 3.5MHz (28MHz Oscillator) */ MDRV_CPU_PROGRAM_MAP(toaplan1_sound_map, 0) @@ -1501,7 +1501,7 @@ static MACHINE_DRIVER_START( vimana ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_10MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(vimana_main_map, 0) - MDRV_CPU_VBLANK_INT(toaplan1_interrupt,1) + MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt) MDRV_MACHINE_RESET(vimana) diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c index 25ab2ce60d5..1161fc5b790 100644 --- a/src/mame/drivers/toaplan2.c +++ b/src/mame/drivers/toaplan2.c @@ -3297,7 +3297,7 @@ static MACHINE_DRIVER_START( tekipaki ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* 10MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(tekipaki_68k_mem, 0) - MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq4,1) + MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) #if HD64x180 MDRV_CPU_ADD(Z180, 10000000) /* HD647180 CPU actually */ @@ -3336,7 +3336,7 @@ static MACHINE_DRIVER_START( ghox ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_10MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(ghox_68k_mem, 0) - MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq4,1) + MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) #if HD64x180 MDRV_CPU_ADD(Z180, XTAL_10MHz) /* HD647180 CPU actually */ @@ -3374,7 +3374,7 @@ static MACHINE_DRIVER_START( dogyuun ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_25MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(dogyuun_68k_mem, 0) - MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq4,1) + MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) #if V25 MDRV_CPU_ADD(Z180, XTAL_25MHz/2) /* NEC V25+ type Toaplan marked CPU ??? */ @@ -3417,7 +3417,7 @@ static MACHINE_DRIVER_START( kbash ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(kbash_68k_mem, 0) - MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq4,1) + MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) #if V25 MDRV_CPU_ADD(Z180, 16000000) /* NEC V25+ type Toaplan marked CPU ??? */ @@ -3459,7 +3459,7 @@ static MACHINE_DRIVER_START( kbash2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(kbash2_68k_mem, 0) - MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq4,1) + MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) MDRV_MACHINE_RESET(toaplan2) @@ -3497,7 +3497,7 @@ static MACHINE_DRIVER_START( truxton2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_16MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(truxton2_68k_mem, 0) - MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq2,1) + MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq2) MDRV_MACHINE_RESET(toaplan2) @@ -3534,7 +3534,7 @@ static MACHINE_DRIVER_START( pipibibs ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_10MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(pipibibs_68k_mem, 0) - MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq4,1) + MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) MDRV_CPU_ADD(Z80,XTAL_27MHz/8) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_z80_mem, 0) @@ -3573,7 +3573,7 @@ static MACHINE_DRIVER_START( whoopee ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* 10MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(tekipaki_68k_mem, 0) - MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq4,1) + MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) MDRV_CPU_ADD(Z80, 27000000/8) /* This should be a HD647180 */ /* Change this to 10MHz when HD647180 gets dumped. 10MHz Oscillator */ @@ -3613,7 +3613,7 @@ static MACHINE_DRIVER_START( pipibibi ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* 10MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(pipibibi_68k_mem, 0) - MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq4,1) + MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) MDRV_CPU_ADD(Z80,27000000/8) /* ??? 3.37MHz */ MDRV_CPU_PROGRAM_MAP(sound_z80_mem, 0) @@ -3652,7 +3652,7 @@ static MACHINE_DRIVER_START( fixeight ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, XTAL_16MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(fixeight_68k_mem, 0) - MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq4,1) + MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) #if V25 MDRV_CPU_ADD(Z180, XTAL_16MHz) /* NEC V25+ type Toaplan marked CPU ??? */ @@ -3695,7 +3695,7 @@ static MACHINE_DRIVER_START( fixeighb ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* 10MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(fixeighb_68k_mem, 0) - MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq2,1) + MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq2) MDRV_MACHINE_RESET(toaplan2) @@ -3729,7 +3729,7 @@ static MACHINE_DRIVER_START( vfive ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* 10MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(vfive_68k_mem, 0) - MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq4,1) + MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) #if V25 MDRV_CPU_ADD(Z180, 10000000) /* NEC V25+ type Toaplan marked CPU ??? */ @@ -3768,7 +3768,7 @@ static MACHINE_DRIVER_START( batsugun ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,32000000/2) /* 16MHz , 32MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(batsugun_68k_mem, 0) - MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq4,1) + MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) #if V25 MDRV_CPU_ADD(Z180, 32000000/2) /* NEC V25+ type Toaplan marked CPU ??? */ @@ -3811,7 +3811,7 @@ static MACHINE_DRIVER_START( snowbro2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(snowbro2_68k_mem, 0) - MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq4,1) + MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) MDRV_MACHINE_RESET(toaplan2) @@ -3848,7 +3848,7 @@ static MACHINE_DRIVER_START( mahoudai ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,32000000/2) /* 16MHz , 32MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(mahoudai_68k_mem, 0) - MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq4,1) + MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) MDRV_CPU_ADD(Z80,32000000/8) /* 4MHz , 32MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(raizing_sound_z80_mem, 0) @@ -3890,7 +3890,7 @@ static MACHINE_DRIVER_START( shippumd ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,32000000/2) /* 16MHz , 32MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(shippumd_68k_mem, 0) - MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq4,1) + MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) MDRV_CPU_ADD(Z80,32000000/8) /* 4MHz , 32MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(raizing_sound_z80_mem, 0) @@ -3932,7 +3932,7 @@ static MACHINE_DRIVER_START( bgaregga ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,32000000/2) /* 16MHz , 32MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(bgaregga_68k_mem, 0) - MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq4,1) + MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4) MDRV_CPU_ADD(Z80,32000000/8) /* 4MHz , 32MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(bgaregga_sound_z80_mem, 0) @@ -3974,7 +3974,7 @@ static MACHINE_DRIVER_START( batrider ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,32000000/2) /* 16MHz , 32MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(batrider_68k_mem, 0) - MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq2,1) + MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq2) MDRV_CPU_ADD(Z80,32000000/8) /* 4MHz , 32MHz Oscillator */ MDRV_CPU_PROGRAM_MAP(batrider_sound_z80_mem, 0) @@ -4019,7 +4019,7 @@ static MACHINE_DRIVER_START( bbakraid ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,32000000/2) MDRV_CPU_PROGRAM_MAP(bbakraid_68k_mem, 0) - MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq1,1) + MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq1) MDRV_CPU_ADD(Z80,32000000/4) MDRV_CPU_PROGRAM_MAP(bbakraid_sound_z80_mem, 0) diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c index 881ea87b563..3eea88bde01 100644 --- a/src/mame/drivers/toki.c +++ b/src/mame/drivers/toki.c @@ -438,7 +438,7 @@ static MACHINE_DRIVER_START( toki ) /* KOYO 20.000MHz near the cpu */ /* basic machine hardware */ MDRV_CPU_ADD(M68000,XTAL_20MHz /2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(toki_map,0) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1)/* VBL */ + MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* VBL */ SEIBU_SOUND_SYSTEM_CPU(XTAL_14_31818MHz/4) /* verifed on pcb */ @@ -470,7 +470,7 @@ static MACHINE_DRIVER_START( tokib ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 10MHz causes bad slowdowns with monkey machine rd1 */ MDRV_CPU_PROGRAM_MAP(tokib_map,0) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1)/* VBL (could be level1, same vector) */ + MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL (could be level1, same vector) */ MDRV_CPU_ADD(Z80, 4000000) /* verified with PCB */ /* audio CPU */ diff --git a/src/mame/drivers/topshoot.c b/src/mame/drivers/topshoot.c index 1056da99de6..889577bc91d 100644 --- a/src/mame/drivers/topshoot.c +++ b/src/mame/drivers/topshoot.c @@ -239,11 +239,11 @@ ADDRESS_MAP_END static MACHINE_DRIVER_START( genesis_base ) /*basic machine hardware */ MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK / 7) - MDRV_CPU_VBLANK_INT(genesis_vblank_interrupt,1) + MDRV_CPU_VBLANK_INT("main", genesis_vblank_interrupt) MDRV_CPU_ADD_TAG("sound", Z80, MASTER_CLOCK / 15) MDRV_CPU_PROGRAM_MAP(genesis_z80_readmem, genesis_z80_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) /* from vdp at scanline 0xe0 */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* from vdp at scanline 0xe0 */ MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c index 3fd7c58f815..2f2f607d8e4 100644 --- a/src/mame/drivers/topspeed.c +++ b/src/mame/drivers/topspeed.c @@ -695,7 +695,7 @@ static MACHINE_DRIVER_START( topspeed ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(topspeed_readmem,topspeed_writemem) - MDRV_CPU_VBLANK_INT(topspeed_interrupt,1) + MDRV_CPU_VBLANK_INT("main", topspeed_interrupt) MDRV_CPU_ADD(Z80,16000000/4) /* audio CPU */ /* 4 MHz ??? */ @@ -703,7 +703,7 @@ static MACHINE_DRIVER_START( topspeed ) MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(topspeed_cpub_readmem,topspeed_cpub_writemem) - MDRV_CPU_VBLANK_INT(topspeed_cpub_interrupt,1) + MDRV_CPU_VBLANK_INT("main", topspeed_cpub_interrupt) MDRV_MACHINE_START(topspeed) diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c index c5afd19d44d..5fd01e85242 100644 --- a/src/mame/drivers/toypop.c +++ b/src/mame/drivers/toypop.c @@ -571,16 +571,16 @@ static MACHINE_DRIVER_START( liblrabl ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M6809, 1536000) /* 1.536 MHz (measured on Libble Rabble board) */ MDRV_CPU_PROGRAM_MAP(readmem_mainCPU_liblrabl,writemem_mainCPU_liblrabl) - MDRV_CPU_VBLANK_INT(toypop_main_interrupt,1) + MDRV_CPU_VBLANK_INT("main", toypop_main_interrupt) MDRV_CPU_ADD(M6809, 1536000) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(readmem_soundCPU,writemem_soundCPU) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) MDRV_CPU_ADD(M68000, 6144000) /* 6.144 MHz (measured on Libble Rabble board) */ MDRV_CPU_PROGRAM_MAP(readmem_68k,writemem_68k) - MDRV_CPU_VBLANK_INT(toypop_m68000_interrupt,1) + MDRV_CPU_VBLANK_INT("main", toypop_m68000_interrupt) MDRV_INTERLEAVE(100) /* 100 CPU slices per frame - an high value to ensure proper */ /* synchronization of the CPUs */ diff --git a/src/mame/drivers/tp84.c b/src/mame/drivers/tp84.c index a736e7c7e46..3a1f77fd780 100644 --- a/src/mame/drivers/tp84.c +++ b/src/mame/drivers/tp84.c @@ -461,11 +461,11 @@ static MACHINE_DRIVER_START( tp84 ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("cpu1",M6809, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(M6809, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem_cpu2,writemem_cpu2) - MDRV_CPU_VBLANK_INT(tp84_6809_interrupt,256) + MDRV_CPU_VBLANK_INT_HACK(tp84_6809_interrupt,256) MDRV_CPU_ADD(Z80,XTAL_14_31818MHz/4) /* verified on pcb */ /* audio CPU */ diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c index ed98e3140d9..75eb5de8e1f 100644 --- a/src/mame/drivers/trackfld.c +++ b/src/mame/drivers/trackfld.c @@ -863,7 +863,7 @@ static MACHINE_DRIVER_START( trackfld ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M6809, 2048000) /* 1.400 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,14318180/4) /* audio CPU */ /* Z80 Clock is derived from a 14.31818 MHz crystal */ @@ -907,7 +907,7 @@ static MACHINE_DRIVER_START( hyprolyb ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 2048000) /* 1.400 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,14318180/4) /* audio CPU */ /* Z80 Clock is derived from a 14.31818 MHz crystal */ @@ -962,7 +962,7 @@ static MACHINE_DRIVER_START( wizzquiz ) // right cpu? MDRV_CPU_REPLACE("main",M6800,2048000) /* 1.400 MHz ??? */ MDRV_CPU_PROGRAM_MAP(wizzquiz_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_NVRAM_HANDLER(generic_0fill) MACHINE_DRIVER_END @@ -974,7 +974,7 @@ static MACHINE_DRIVER_START( reaktor ) MDRV_CPU_REPLACE("main",Z80,18432000/6) MDRV_CPU_PROGRAM_MAP(reaktor_readmem,reaktor_writemem) MDRV_CPU_IO_MAP(reaktor_readport,reaktor_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MACHINE_DRIVER_END diff --git a/src/mame/drivers/travrusa.c b/src/mame/drivers/travrusa.c index 3904c0f6f6c..317829e521b 100644 --- a/src/mame/drivers/travrusa.c +++ b/src/mame/drivers/travrusa.c @@ -328,7 +328,7 @@ static MACHINE_DRIVER_START( travrusa ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz (?) */ MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/triplhnt.c b/src/mame/drivers/triplhnt.c index cddb37611dd..1c7a3bcb9c9 100644 --- a/src/mame/drivers/triplhnt.c +++ b/src/mame/drivers/triplhnt.c @@ -321,7 +321,7 @@ static MACHINE_DRIVER_START( triplhnt ) /* basic machine hardware */ MDRV_CPU_ADD(M6800, 800000) MDRV_CPU_PROGRAM_MAP(triplhnt_readmem, triplhnt_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_NVRAM_HANDLER(generic_0fill) diff --git a/src/mame/drivers/truco.c b/src/mame/drivers/truco.c index 395036edb4e..30f922bc900 100644 --- a/src/mame/drivers/truco.c +++ b/src/mame/drivers/truco.c @@ -151,7 +151,7 @@ static MACHINE_DRIVER_START( truco ) MDRV_CPU_ADD(M6809, 750000) /* ?? guess */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(truco_interrupt,1) + MDRV_CPU_VBLANK_INT("main", truco_interrupt) MDRV_MACHINE_RESET(truco) diff --git a/src/mame/drivers/trucocl.c b/src/mame/drivers/trucocl.c index 835e364d03c..3ef448da562 100644 --- a/src/mame/drivers/trucocl.c +++ b/src/mame/drivers/trucocl.c @@ -145,7 +145,7 @@ static MACHINE_DRIVER_START( trucocl ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 18432000/6) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(trucocl_interrupt,1) + MDRV_CPU_VBLANK_INT("main", trucocl_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c index f26d48d0a42..8bb8fee0ac5 100644 --- a/src/mame/drivers/trvmadns.c +++ b/src/mame/drivers/trvmadns.c @@ -282,7 +282,7 @@ static MACHINE_DRIVER_START( trvmadns ) MDRV_CPU_ADD(Z80,10000000/2) // ? MDRV_CPU_PROGRAM_MAP(cpu_map,0) MDRV_CPU_IO_MAP(io_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/trvquest.c b/src/mame/drivers/trvquest.c index fb135683f54..f8200faed62 100644 --- a/src/mame/drivers/trvquest.c +++ b/src/mame/drivers/trvquest.c @@ -206,7 +206,7 @@ static MACHINE_DRIVER_START( trvquest ) MDRV_CPU_ADD(M6809,6000000) MDRV_CPU_PROGRAM_MAP(cpu_map,0) - MDRV_CPU_VBLANK_INT(trvquest_interrupt,1) + MDRV_CPU_VBLANK_INT("main", trvquest_interrupt) MDRV_NVRAM_HANDLER(generic_1fill) MDRV_MACHINE_START(trvquest) diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c index b1f039c889a..da6104a7e81 100644 --- a/src/mame/drivers/tryout.c +++ b/src/mame/drivers/tryout.c @@ -191,12 +191,12 @@ static MACHINE_DRIVER_START( tryout ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 2000000) /* ? */ MDRV_CPU_PROGRAM_MAP(main_cpu,0) - MDRV_CPU_VBLANK_INT(tryout_interrupt,1) + MDRV_CPU_VBLANK_INT("main", tryout_interrupt) MDRV_CPU_ADD(M6502, 1500000) /* ? */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_cpu,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,16) /* ? */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,16) /* ? */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/tsamurai.c b/src/mame/drivers/tsamurai.c index 991ddc8a58f..bcb9b088081 100644 --- a/src/mame/drivers/tsamurai.c +++ b/src/mame/drivers/tsamurai.c @@ -754,7 +754,7 @@ static MACHINE_DRIVER_START( tsamurai ) MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(z80_readport,z80_writeport) - MDRV_CPU_VBLANK_INT(samurai_interrupt,1) + MDRV_CPU_VBLANK_INT("main", samurai_interrupt) MDRV_CPU_ADD(Z80, 2000000) /* audio CPU */ @@ -799,7 +799,7 @@ static MACHINE_DRIVER_START( m660 ) MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(readmem_m660,writemem_m660) MDRV_CPU_IO_MAP(z80_readport,z80_writeport_m660) - MDRV_CPU_VBLANK_INT(samurai_interrupt,1) + MDRV_CPU_VBLANK_INT("main", samurai_interrupt) MDRV_CPU_ADD(Z80, 2000000) /* audio CPU */ @@ -813,7 +813,7 @@ static MACHINE_DRIVER_START( m660 ) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(readmem_sound3_m660,writemem_sound3_m660) MDRV_CPU_IO_MAP(readport_sound3_m660,writeport_sound3_m660) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -849,12 +849,12 @@ static MACHINE_DRIVER_START( vsgongf ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(readmem_vsgongf,writemem_vsgongf) - MDRV_CPU_VBLANK_INT(samurai_interrupt,1) + MDRV_CPU_VBLANK_INT("main", samurai_interrupt) MDRV_CPU_ADD(Z80, 4000000) MDRV_CPU_PROGRAM_MAP(readmem_sound_vsgongf,writemem_sound_vsgongf) MDRV_CPU_IO_MAP(0,z80_writeport) - MDRV_CPU_VBLANK_INT(vsgongf_sound_interrupt,3) + MDRV_CPU_VBLANK_INT_HACK(vsgongf_sound_interrupt,3) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c index 348b03bea9e..3fa33c3c51b 100644 --- a/src/mame/drivers/ttchamp.c +++ b/src/mame/drivers/ttchamp.c @@ -227,7 +227,7 @@ static MACHINE_DRIVER_START( ttchamp ) MDRV_CPU_ADD(V30, 8000000) MDRV_CPU_PROGRAM_MAP(ttchamp_map, 0) MDRV_CPU_IO_MAP(ttchamp_io,0) - MDRV_CPU_VBLANK_INT(ttchamp_irq,1) + MDRV_CPU_VBLANK_INT("main", ttchamp_irq) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/tubep.c b/src/mame/drivers/tubep.c index ac255a77d5c..17ce26ba101 100644 --- a/src/mame/drivers/tubep.c +++ b/src/mame/drivers/tubep.c @@ -955,7 +955,7 @@ static MACHINE_DRIVER_START( tubepb ) MDRV_CPU_ADD(M6802,6000000) /* ? MHz Xtal */ MDRV_CPU_PROGRAM_MAP(nsc_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MACHINE_DRIVER_END diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c index 7ac67dee6b5..046d018aeb8 100644 --- a/src/mame/drivers/tugboat.c +++ b/src/mame/drivers/tugboat.c @@ -374,7 +374,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( tugboat ) MDRV_CPU_ADD_TAG("main", M6502, 2000000) /* 2 MHz ???? */ MDRV_CPU_PROGRAM_MAP(tugboat_readmem,tugboat_writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_MACHINE_START(tugboat) MDRV_MACHINE_RESET(tugboat) diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c index fe3ff452052..5dd2aebd903 100644 --- a/src/mame/drivers/tumbleb.c +++ b/src/mame/drivers/tumbleb.c @@ -2032,7 +2032,7 @@ static MACHINE_DRIVER_START( tumblepb ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14000000) MDRV_CPU_PROGRAM_MAP(tumblepopb_readmem,tumblepopb_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -2062,7 +2062,7 @@ static MACHINE_DRIVER_START( tumbleb2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14000000) MDRV_CPU_PROGRAM_MAP(tumblepopb_readmem,tumblepopb_writemem) - MDRV_CPU_VBLANK_INT(tumbleb2_interrupt,1) + MDRV_CPU_VBLANK_INT("main", tumbleb2_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -2091,7 +2091,7 @@ static MACHINE_DRIVER_START( jumpkids ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(jumpkids_readmem,jumpkids_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) /* z80? */ MDRV_CPU_ADD( Z80, 8000000/2) @@ -2123,7 +2123,7 @@ static MACHINE_DRIVER_START( fncywld ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) MDRV_CPU_PROGRAM_MAP(fncywld_readmem,fncywld_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -2181,7 +2181,7 @@ static MACHINE_DRIVER_START( htchctch ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 15000000) /* verified */ MDRV_CPU_PROGRAM_MAP(htchctch_readmem,htchctch_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD( Z80, 15000000/4) /* verified on dquizgo */ @@ -2258,7 +2258,7 @@ static MACHINE_DRIVER_START( jumppop ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(jumppop_readmem,jumppop_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(Z80, 3500000) /* verified */ /* audio CPU */ @@ -2297,7 +2297,7 @@ static MACHINE_DRIVER_START( suprtrio ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14000000) /* 14mhz should be correct, but lots of sprite flicker later in game */ MDRV_CPU_PROGRAM_MAP(suprtrio_main_cpu,0) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(Z80, 8000000) /* audio CPU */ @@ -2331,7 +2331,7 @@ static MACHINE_DRIVER_START( pangpang ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14000000) MDRV_CPU_PROGRAM_MAP(pangpang_readmem,pangpang_writemem) - MDRV_CPU_VBLANK_INT(tumbleb2_interrupt,1) + MDRV_CPU_VBLANK_INT("main", tumbleb2_interrupt) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c index e7b452abe41..0ca658ffeab 100644 --- a/src/mame/drivers/tumblep.c +++ b/src/mame/drivers/tumblep.c @@ -321,7 +321,7 @@ static MACHINE_DRIVER_START( tumblep ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 14000000) MDRV_CPU_PROGRAM_MAP(tumblepop_readmem,tumblepop_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(H6280, 32220000/8) /* Custom chip 45; Audio section crystal is 32.220 MHz */ /* audio CPU */ diff --git a/src/mame/drivers/tunhunt.c b/src/mame/drivers/tunhunt.c index ed63fce5306..7885cf14489 100644 --- a/src/mame/drivers/tunhunt.c +++ b/src/mame/drivers/tunhunt.c @@ -49,6 +49,7 @@ ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "sound/pokey.h" @@ -319,7 +320,7 @@ static MACHINE_DRIVER_START( tunhunt ) /* basic machine hardware */ MDRV_CPU_ADD(M6502,2000000) /* ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,2) /* ? probably wrong */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ? probably wrong */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c index 77d29eeb957..6d4be3d64fa 100644 --- a/src/mame/drivers/turbo.c +++ b/src/mame/drivers/turbo.c @@ -1001,7 +1001,7 @@ static MACHINE_DRIVER_START( turbo ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(turbo_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) @@ -1027,7 +1027,7 @@ static MACHINE_DRIVER_START( subroc3d ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(subroc3d_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_GFXDECODE(turbo) @@ -1052,7 +1052,7 @@ static MACHINE_DRIVER_START( buckrog ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(buckrog_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(buckrog_cpu2_map,0) diff --git a/src/mame/drivers/turbosub.c b/src/mame/drivers/turbosub.c index 7b32be875cd..8527fefb4a9 100644 --- a/src/mame/drivers/turbosub.c +++ b/src/mame/drivers/turbosub.c @@ -333,7 +333,7 @@ static MACHINE_DRIVER_START( turbosub ) MDRV_CPU_ADD(M6809E,4000000) MDRV_CPU_PROGRAM_MAP(game_cpu_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) /* Unverified */ + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) /* Unverified */ MDRV_CPU_ADD(M6809E,4000000) MDRV_CPU_PROGRAM_MAP(frame_cpu_map,0) diff --git a/src/mame/drivers/tutankhm.c b/src/mame/drivers/tutankhm.c index 656d3b6de08..8652e25a85b 100644 --- a/src/mame/drivers/tutankhm.c +++ b/src/mame/drivers/tutankhm.c @@ -232,7 +232,7 @@ static MACHINE_DRIVER_START( tutankhm ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 1500000) /* 1.5 MHz ??? */ MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(tutankhm_interrupt,1) + MDRV_CPU_VBLANK_INT("main", tutankhm_interrupt) MDRV_MACHINE_START(tutankhm) diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c index a67b15a6452..f90b1bebe9e 100644 --- a/src/mame/drivers/twin16.c +++ b/src/mame/drivers/twin16.c @@ -960,11 +960,11 @@ static MACHINE_DRIVER_START( twin16 ) MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(readmem_sub,writemem_sub) - MDRV_CPU_VBLANK_INT(CPUB_interrupt,1) + MDRV_CPU_VBLANK_INT("main", CPUB_interrupt) MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(CPUA_interrupt,1) + MDRV_CPU_VBLANK_INT("main", CPUA_interrupt) MDRV_INTERLEAVE(100) @@ -1018,7 +1018,7 @@ static MACHINE_DRIVER_START( fround ) MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(fround_readmem,fround_writemem) - MDRV_CPU_VBLANK_INT(CPUA_interrupt,1) + MDRV_CPU_VBLANK_INT("main", CPUA_interrupt) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c index 37ad8e13ec3..c350a731c5d 100644 --- a/src/mame/drivers/twincobr.c +++ b/src/mame/drivers/twincobr.c @@ -651,7 +651,7 @@ static MACHINE_DRIVER_START( twincobr ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,28000000/4) /* 7.0MHz - Main board Crystal is 28MHz */ MDRV_CPU_PROGRAM_MAP(main_program_map, 0) - MDRV_CPU_VBLANK_INT(twincobr_interrupt,1) + MDRV_CPU_VBLANK_INT("main", twincobr_interrupt) MDRV_CPU_ADD(Z80,28000000/8) /* 3.5MHz */ MDRV_CPU_PROGRAM_MAP(sound_program_map, 0) diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c index d6299552d0c..9e000b82a81 100644 --- a/src/mame/drivers/twins.c +++ b/src/mame/drivers/twins.c @@ -168,7 +168,7 @@ static MACHINE_DRIVER_START( twins ) MDRV_CPU_ADD(V30, 8000000) MDRV_CPU_PROGRAM_MAP(twins_map, 0) MDRV_CPU_IO_MAP(twins_io,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -256,7 +256,7 @@ static MACHINE_DRIVER_START( twinsa ) MDRV_CPU_ADD(V30, XTAL_16MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(twins_map, 0) MDRV_CPU_IO_MAP(twinsa_io,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/uapce.c b/src/mame/drivers/uapce.c index 28ded9c49bc..0946522e247 100644 --- a/src/mame/drivers/uapce.c +++ b/src/mame/drivers/uapce.c @@ -182,7 +182,7 @@ static MACHINE_DRIVER_START( uapce ) MDRV_CPU_ADD(H6280, PCE_MAIN_CLOCK/3) MDRV_CPU_PROGRAM_MAP(pce_mem, 0) MDRV_CPU_IO_MAP(pce_io, 0) - MDRV_CPU_VBLANK_INT(pce_interrupt, VDC_LPF) + MDRV_CPU_VBLANK_INT_HACK(pce_interrupt, VDC_LPF) MDRV_CPU_ADD(Z80, 1400000) MDRV_CPU_PROGRAM_MAP(z80_map, 0) diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c index 12b7061be9e..a1acefdc4e7 100644 --- a/src/mame/drivers/ultraman.c +++ b/src/mame/drivers/ultraman.c @@ -267,7 +267,7 @@ static MACHINE_DRIVER_START( ultraman ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz? */ MDRV_CPU_PROGRAM_MAP(ultraman_readmem,ultraman_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD(Z80,24000000/6) /* audio CPU */ /* 4 MHz? */ diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c index c96f637370c..f6847d9d56b 100644 --- a/src/mame/drivers/ultrsprt.c +++ b/src/mame/drivers/ultrsprt.c @@ -273,7 +273,7 @@ static MACHINE_DRIVER_START( ultrsprt ) MDRV_CPU_ADD(PPC403, 25000000) /* PowerPC 403GA 25MHz */ MDRV_CPU_CONFIG(ultrsprt_ppc_cfg) MDRV_CPU_PROGRAM_MAP(ultrsprt_map, 0) - MDRV_CPU_VBLANK_INT(ultrsprt_vblank, 1) + MDRV_CPU_VBLANK_INT("main", ultrsprt_vblank) MDRV_CPU_ADD(M68000, 8000000) /* Not sure about the frequency */ MDRV_CPU_PROGRAM_MAP(sound_map, 0) diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c index 9d0c826ca17..b9445e4ac6f 100644 --- a/src/mame/drivers/undrfire.c +++ b/src/mame/drivers/undrfire.c @@ -551,7 +551,7 @@ static MACHINE_DRIVER_START( undrfire ) /* basic machine hardware */ MDRV_CPU_ADD(M68EC020, 16000000) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(undrfire_readmem,undrfire_writemem) - MDRV_CPU_VBLANK_INT(undrfire_interrupt,1) + MDRV_CPU_VBLANK_INT("main", undrfire_interrupt) TAITO_F3_SOUND_SYSTEM_CPU(16000000) diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c index 9bd049f1870..fef2ba38bac 100644 --- a/src/mame/drivers/unico.c +++ b/src/mame/drivers/unico.c @@ -677,7 +677,7 @@ static MACHINE_DRIVER_START( burglarx ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(readmem_burglarx,writemem_burglarx) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_MACHINE_RESET(unico) @@ -724,7 +724,7 @@ static MACHINE_DRIVER_START( zeropnt ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(readmem_zeropnt,writemem_zeropnt) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_MACHINE_RESET(zeropt) @@ -766,7 +766,7 @@ static MACHINE_DRIVER_START( zeropnt2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68EC020, 16000000) MDRV_CPU_PROGRAM_MAP(readmem_zeropnt2,writemem_zeropnt2) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_MACHINE_RESET(zeropt) diff --git a/src/mame/drivers/usgames.c b/src/mame/drivers/usgames.c index a2d6ad5b0d4..8187ae784df 100644 --- a/src/mame/drivers/usgames.c +++ b/src/mame/drivers/usgames.c @@ -24,6 +24,7 @@ Sound: AY-3-8912 */ #include "driver.h" +#include "deprecat.h" #include "video/mc6845.h" #include "sound/ay8910.h" @@ -292,7 +293,7 @@ static MACHINE_DRIVER_START( usg32 ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", M6809, 2000000) /* ?? */ MDRV_CPU_PROGRAM_MAP(usgames_readmem,usgames_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,5) /* ?? */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,5) /* ?? */ MDRV_NVRAM_HANDLER(generic_0fill) diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c index afb6632edf6..72e60f4bd12 100644 --- a/src/mame/drivers/vamphalf.c +++ b/src/mame/drivers/vamphalf.c @@ -584,7 +584,7 @@ ADDRESS_MAP_END static MACHINE_DRIVER_START( common ) MDRV_CPU_ADD_TAG("main", E116T, 50000000) /* 50 MHz */ MDRV_CPU_PROGRAM_MAP(common_map,0) - MDRV_CPU_VBLANK_INT(irq1_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_NVRAM_HANDLER(93C46_vamphalf) diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c index de79e3b9bfb..72074691840 100644 --- a/src/mame/drivers/vaportra.c +++ b/src/mame/drivers/vaportra.c @@ -275,7 +275,7 @@ static MACHINE_DRIVER_START( vaportra ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,12000000) /* Custom chip 59 */ MDRV_CPU_PROGRAM_MAP(vaportra_readmem,vaportra_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) MDRV_CPU_ADD(H6280, 32220000/4) /* Custom chip 45; Audio section crystal is 32.220 MHz */ /* audio CPU */ diff --git a/src/mame/drivers/vastar.c b/src/mame/drivers/vastar.c index 35eee4dade9..2879544f9bb 100644 --- a/src/mame/drivers/vastar.c +++ b/src/mame/drivers/vastar.c @@ -327,12 +327,12 @@ static MACHINE_DRIVER_START( vastar ) MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz ???? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(0,writeport) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz ???? */ MDRV_CPU_PROGRAM_MAP(cpu2_readmem,cpu2_writemem) MDRV_CPU_IO_MAP(cpu2_readport,cpu2_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,4) /* ??? */ + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) /* ??? */ MDRV_INTERLEAVE(10) /* 10 CPU slices per frame - seems enough to ensure proper */ /* synchronization of the CPUs */ diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c index 006ca82bd62..04a5842a7f8 100644 --- a/src/mame/drivers/vball.c +++ b/src/mame/drivers/vball.c @@ -402,7 +402,7 @@ static MACHINE_DRIVER_START( vball ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 2000000) /* 2 MHz - measured by guru but it makes the game far far too slow ?! */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(vball_interrupt,32) /* ??1 IRQ every 8 visible scanlines, plus NMI for vblank?? */ + MDRV_CPU_VBLANK_INT_HACK(vball_interrupt,32) /* ??1 IRQ every 8 visible scanlines, plus NMI for vblank?? */ MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* 3.579545 MHz */ @@ -441,7 +441,7 @@ static MACHINE_DRIVER_START( vball2pj ) /* basic machine hardware */ MDRV_CPU_ADD(M6502, 2000000) /* 2.0 MHz */ MDRV_CPU_PROGRAM_MAP(vball2pj_readmem,writemem) - MDRV_CPU_VBLANK_INT(vball_interrupt,32) /* ??1 IRQ every 8 visible scanlines, plus NMI for vblank?? */ + MDRV_CPU_VBLANK_INT_HACK(vball_interrupt,32) /* ??1 IRQ every 8 visible scanlines, plus NMI for vblank?? */ MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ /* 3.579545 MHz */ diff --git a/src/mame/drivers/vegaeo.c b/src/mame/drivers/vegaeo.c index 5faeaed94f4..4b8006d0c19 100644 --- a/src/mame/drivers/vegaeo.c +++ b/src/mame/drivers/vegaeo.c @@ -163,7 +163,7 @@ static VIDEO_UPDATE( vega ) static MACHINE_DRIVER_START( vega ) MDRV_CPU_ADD_TAG("cpu", GMS30C2132, 55000000) /* 55 MHz */ MDRV_CPU_PROGRAM_MAP(vega_map,0) - MDRV_CPU_VBLANK_INT(eolith_speedup,262) + MDRV_CPU_VBLANK_INT_HACK(eolith_speedup,262) /* sound cpu */ diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c index bb8780f3cba..1cc1c1b46a3 100644 --- a/src/mame/drivers/vendetta.c +++ b/src/mame/drivers/vendetta.c @@ -581,7 +581,7 @@ static MACHINE_DRIVER_START( vendetta ) MDRV_CPU_ADD_TAG("main", KONAMI, 6000000) /* this is strange, seems an overclock but */ // MDRV_CPU_ADD_TAG("main", KONAMI, 3000000) /* is needed to have correct music speed */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(vendetta_irq,1) + MDRV_CPU_VBLANK_INT("main", vendetta_irq) MDRV_CPU_ADD(Z80, 3579545) /* verified with PCB */ /* audio CPU */ diff --git a/src/mame/drivers/victory.c b/src/mame/drivers/victory.c index c0a04b26ce8..dec214a797d 100644 --- a/src/mame/drivers/victory.c +++ b/src/mame/drivers/victory.c @@ -212,7 +212,7 @@ static MACHINE_DRIVER_START( victory ) MDRV_CPU_ADD(Z80, VICTORY_MAIN_CPU_CLOCK) MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_IO_MAP(main_io_map,0) - MDRV_CPU_VBLANK_INT(victory_vblank_interrupt,1) + MDRV_CPU_VBLANK_INT("main", victory_vblank_interrupt) MDRV_NVRAM_HANDLER(generic_0fill) diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c index 7cff9e2bac9..f927cee4999 100644 --- a/src/mame/drivers/vigilant.c +++ b/src/mame/drivers/vigilant.c @@ -15,6 +15,7 @@ Buccaneers has a 5.6888 Mhz and a 18.432 Mhz OSC ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "audio/m72.h" #include "sound/dac.h" #include "sound/2203intf.h" @@ -584,13 +585,13 @@ static MACHINE_DRIVER_START( vigilant ) MDRV_CPU_ADD(Z80, 3579645) /* 3.579645 MHz */ MDRV_CPU_PROGRAM_MAP(vigilant_readmem,vigilant_writemem) MDRV_CPU_IO_MAP(vigilant_readport,vigilant_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 3579645) /* audio CPU */ /* 3.579645 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,128) /* clocked by V1 */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1 */ /* IRQs are generated by main Z80 and YM2151 */ MDRV_MACHINE_RESET(m72_sound) @@ -627,13 +628,13 @@ static MACHINE_DRIVER_START( buccanrs ) MDRV_CPU_ADD(Z80, 5688800) /* 5.688800 MHz */ MDRV_CPU_PROGRAM_MAP(vigilant_readmem,vigilant_writemem) MDRV_CPU_IO_MAP(vigilant_readport,vigilant_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 18432000/6) /* audio CPU */ /* 3.072000 MHz */ MDRV_CPU_PROGRAM_MAP(buccanrs_sound_readmem,buccanrs_sound_writemem) MDRV_CPU_IO_MAP(buccanrs_sound_readport,buccanrs_sound_writeport) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,128) /* clocked by V1 */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1 */ /* IRQs are generated by main Z80 and YM2151 */ MDRV_MACHINE_RESET(m72_sound) @@ -686,13 +687,13 @@ static MACHINE_DRIVER_START( kikcubic ) MDRV_CPU_ADD(Z80, 3579645) /* 3.579645 MHz */ MDRV_CPU_PROGRAM_MAP(kikcubic_readmem,kikcubic_writemem) MDRV_CPU_IO_MAP(kikcubic_readport,kikcubic_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 3579645) /* audio CPU */ /* 3.579645 MHz */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,128) /* clocked by V1 */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,128) /* clocked by V1 */ /* IRQs are generated by main Z80 and YM2151 */ MDRV_MACHINE_RESET(m72_sound) diff --git a/src/mame/drivers/viper.c b/src/mame/drivers/viper.c index 2fc6c0fb882..869faac3d17 100644 --- a/src/mame/drivers/viper.c +++ b/src/mame/drivers/viper.c @@ -636,7 +636,7 @@ static MACHINE_DRIVER_START(viper) MDRV_CPU_ADD(MPC8240, 200000000) MDRV_CPU_CONFIG(viper_ppc_cfg) MDRV_CPU_PROGRAM_MAP(viper_map, 0) - MDRV_CPU_VBLANK_INT(viper_vblank, 1) + MDRV_CPU_VBLANK_INT("main", viper_vblank) MDRV_MACHINE_RESET(viper) diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c index da9564eca1c..80803b13c43 100644 --- a/src/mame/drivers/vmetal.c +++ b/src/mame/drivers/vmetal.c @@ -427,7 +427,7 @@ static VIDEO_UPDATE(varia) static MACHINE_DRIVER_START( varia ) MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(varia_program_map, 0) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) // also level 3 + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) // also level 3 MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c index c6df934463f..d1edd238764 100644 --- a/src/mame/drivers/volfied.c +++ b/src/mame/drivers/volfied.c @@ -265,7 +265,7 @@ static MACHINE_DRIVER_START( volfied ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 8000000) /* 8MHz */ MDRV_CPU_PROGRAM_MAP(volfied_readmem,volfied_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* sound CPU, required to run the game */ MDRV_CPU_PROGRAM_MAP(z80_readmem,z80_writemem) diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c index d7d02d93444..4c9ad1c8382 100644 --- a/src/mame/drivers/vroulet.c +++ b/src/mame/drivers/vroulet.c @@ -258,7 +258,7 @@ static MACHINE_DRIVER_START( vroulet ) MDRV_CPU_ADD(Z80, 4000000) //??? MDRV_CPU_PROGRAM_MAP(vroulet_map, 0) MDRV_CPU_IO_MAP(vroulet_io_map, 0) - MDRV_CPU_VBLANK_INT(irq0_line_hold, 1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_MACHINE_RESET(vroulet) diff --git a/src/mame/drivers/vulgus.c b/src/mame/drivers/vulgus.c index 82605b639bf..696c1d036bb 100644 --- a/src/mame/drivers/vulgus.c +++ b/src/mame/drivers/vulgus.c @@ -248,12 +248,12 @@ static MACHINE_DRIVER_START( vulgus ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz (?) */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(vulgus_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(vulgus_interrupt,2) MDRV_CPU_ADD(Z80, 3000000) /* audio CPU */ /* 3 MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,8) + MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,8) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/wallc.c b/src/mame/drivers/wallc.c index cdee14a8f2b..33126dd4998 100644 --- a/src/mame/drivers/wallc.c +++ b/src/mame/drivers/wallc.c @@ -278,7 +278,7 @@ static MACHINE_DRIVER_START( wallc ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 12288000 / 4) /* 3.072 MHz ? */ MDRV_CPU_PROGRAM_MAP(wallc_map,0) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c index 4313936a1aa..bdd4ffe9e10 100644 --- a/src/mame/drivers/wardner.c +++ b/src/mame/drivers/wardner.c @@ -468,7 +468,7 @@ static MACHINE_DRIVER_START( wardner ) MDRV_CPU_ADD(Z80,24000000/4) /* 6MHz ??? - Real board crystal is 24MHz */ MDRV_CPU_PROGRAM_MAP(main_program_map, 0) MDRV_CPU_IO_MAP(main_io_map, 0) - MDRV_CPU_VBLANK_INT(wardner_interrupt,1) + MDRV_CPU_VBLANK_INT("main", wardner_interrupt) MDRV_CPU_ADD(Z80,24000000/7) /* 3.43MHz ??? */ MDRV_CPU_PROGRAM_MAP(sound_program_map, 0) diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c index f8b458c7929..b06054195b4 100644 --- a/src/mame/drivers/warpwarp.c +++ b/src/mame/drivers/warpwarp.c @@ -837,7 +837,7 @@ static MACHINE_DRIVER_START( geebee ) MDRV_CPU_ADD_TAG("main", 8080,XTAL_18_432MHz/9) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem_geebee,writemem_geebee) MDRV_CPU_IO_MAP(readport_geebee,writeport_geebee) - MDRV_CPU_VBLANK_INT(irq0_line_pulse,1) /* one interrupt per frame */ + MDRV_CPU_VBLANK_INT("main", irq0_line_pulse) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -880,7 +880,7 @@ static MACHINE_DRIVER_START( bombbee ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", 8080,18432000/9) /* 18.432 MHz / 9 */ MDRV_CPU_PROGRAM_MAP(readmem_bombbee,writemem_bombbee) - MDRV_CPU_VBLANK_INT(irq0_line_assert,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_assert) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c index f50bb62c9de..4610519373e 100644 --- a/src/mame/drivers/warriorb.c +++ b/src/mame/drivers/warriorb.c @@ -488,7 +488,7 @@ static MACHINE_DRIVER_START( darius2d ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? (Might well be 16!) */ MDRV_CPU_PROGRAM_MAP(darius2d_readmem,darius2d_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("left", irq4_line_hold) MDRV_CPU_ADD(Z80,16000000/4) /* audio CPU */ /* 4 MHz ? */ @@ -547,7 +547,7 @@ static MACHINE_DRIVER_START( warriorb ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz ? */ MDRV_CPU_PROGRAM_MAP(warriorb_readmem,warriorb_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("left", irq4_line_hold) MDRV_CPU_ADD(Z80,16000000/4) /* audio CPU */ /* 4 MHz ? */ diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c index fa61d3decf8..a34b9d542f2 100644 --- a/src/mame/drivers/wc90.c +++ b/src/mame/drivers/wc90.c @@ -348,11 +348,11 @@ static MACHINE_DRIVER_START( wc90 ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 6000000) /* 6.0 MHz ??? */ MDRV_CPU_PROGRAM_MAP(wc90_readmem1,wc90_writemem1) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 6000000) /* 6.0 MHz ??? */ MDRV_CPU_PROGRAM_MAP(wc90_readmem2,wc90_writemem2) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 4000000) /* audio CPU */ /* 4 MHz ???? */ diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c index 5380259bbb3..3c442670234 100644 --- a/src/mame/drivers/wc90b.c +++ b/src/mame/drivers/wc90b.c @@ -393,11 +393,11 @@ static MACHINE_DRIVER_START( wc90b ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 6000000) /* 6.0 MHz ??? */ MDRV_CPU_PROGRAM_MAP(wc90b_readmem1,wc90b_writemem1) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 6000000) /* 6.0 MHz ??? */ MDRV_CPU_PROGRAM_MAP(wc90b_readmem2,wc90b_writemem2) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80, 2510000) // based on goal92 speed measured by guru (although maybe it should be 10mhz / 4 which is close) /* audio CPU */ /* 2.51 MHz */ diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c index 177237d3530..b988ca1c38e 100644 --- a/src/mame/drivers/wecleman.c +++ b/src/mame/drivers/wecleman.c @@ -1115,7 +1115,7 @@ static MACHINE_DRIVER_START( wecleman ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* Schems show 10MHz */ MDRV_CPU_PROGRAM_MAP(wecleman_map,0) - MDRV_CPU_VBLANK_INT(wecleman_interrupt,5 + 1) /* in order to read the inputs once per frame */ + MDRV_CPU_VBLANK_INT_HACK(wecleman_interrupt,5 + 1) /* in order to read the inputs once per frame */ MDRV_CPU_ADD(M68000, 10000000) /* Schems show 10MHz */ MDRV_CPU_PROGRAM_MAP(wecleman_sub_map,0) @@ -1172,7 +1172,7 @@ static MACHINE_DRIVER_START( hotchase ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz - PCB is drawn in one set's readme */ MDRV_CPU_PROGRAM_MAP(hotchase_map,0) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz - PCB is drawn in one set's readme */ MDRV_CPU_PROGRAM_MAP(hotchase_sub_map,0) diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c index 326244dc3ba..1ebcb9efbc7 100644 --- a/src/mame/drivers/welltris.c +++ b/src/mame/drivers/welltris.c @@ -752,7 +752,7 @@ static MACHINE_DRIVER_START( welltris ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz */ MDRV_CPU_PROGRAM_MAP(welltris_readmem,welltris_writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80,8000000/2) /* 4 MHz ??? */ /* audio CPU */ diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c index 78ae451a0d6..bf113a34106 100644 --- a/src/mame/drivers/wgp.c +++ b/src/mame/drivers/wgp.c @@ -982,7 +982,7 @@ static MACHINE_DRIVER_START( wgp ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(wgp_readmem,wgp_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD(Z80, 16000000/4) /* 4 MHz ??? */ /* audio CPU */ @@ -990,7 +990,7 @@ static MACHINE_DRIVER_START( wgp ) MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(wgp_cpub_readmem,wgp_cpub_writemem) - MDRV_CPU_VBLANK_INT(wgp_cpub_interrupt,1) + MDRV_CPU_VBLANK_INT("main", wgp_cpub_interrupt) MDRV_MACHINE_START(wgp) @@ -1027,7 +1027,7 @@ static MACHINE_DRIVER_START( wgp2 ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(wgp_readmem,wgp_writemem) - MDRV_CPU_VBLANK_INT(irq4_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq4_line_hold) MDRV_CPU_ADD(Z80, 16000000/4) /* 4 MHz ??? */ /* audio CPU */ @@ -1035,7 +1035,7 @@ static MACHINE_DRIVER_START( wgp2 ) MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */ MDRV_CPU_PROGRAM_MAP(wgp_cpub_readmem,wgp_cpub_writemem) - MDRV_CPU_VBLANK_INT(wgp_cpub_interrupt,1) + MDRV_CPU_VBLANK_INT("main", wgp_cpub_interrupt) MDRV_MACHINE_START(wgp) diff --git a/src/mame/drivers/wheelfir.c b/src/mame/drivers/wheelfir.c index 91a88e88f44..cde432dee27 100644 --- a/src/mame/drivers/wheelfir.c +++ b/src/mame/drivers/wheelfir.c @@ -631,11 +631,11 @@ static INTERRUPT_GEN( wheelfir_irq ) static MACHINE_DRIVER_START( wheelfir ) MDRV_CPU_ADD_TAG("main", M68000, 32000000) MDRV_CPU_PROGRAM_MAP(wheelfir_main, 0) - MDRV_CPU_VBLANK_INT(wheelfir_irq,256) // 1,3,5 valid + MDRV_CPU_VBLANK_INT_HACK(wheelfir_irq,256) // 1,3,5 valid MDRV_CPU_ADD_TAG("main", M68000, 32000000/2) MDRV_CPU_PROGRAM_MAP(wheelfir_sub, 0) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) // 1 valid + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) // 1 valid MDRV_MACHINE_RESET (wheelfir) diff --git a/src/mame/drivers/wilytowr.c b/src/mame/drivers/wilytowr.c index aa784b4f3cb..3a2f1ad3a9c 100644 --- a/src/mame/drivers/wilytowr.c +++ b/src/mame/drivers/wilytowr.c @@ -515,7 +515,7 @@ static MACHINE_DRIVER_START( wilytowr ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,4000000) /* 4 MHz ???? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(I8039,8000000) /* ????? */ /* audio CPU */ @@ -552,7 +552,7 @@ static MACHINE_DRIVER_START( fghtbskt ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 12000000/4) /* 3 MHz */ MDRV_CPU_PROGRAM_MAP(fghtbskt_map,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(I8039,12000000/4) /* ????? */ /* audio CPU */ diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c index fe466204571..34617da13b1 100644 --- a/src/mame/drivers/wink.c +++ b/src/mame/drivers/wink.c @@ -320,7 +320,7 @@ static MACHINE_DRIVER_START( wink ) MDRV_CPU_ADD(Z80, 12000000 / 4) MDRV_CPU_PROGRAM_MAP(wink_map,0) MDRV_CPU_IO_MAP(wink_io,0) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(Z80, 12000000 / 8) MDRV_CPU_PROGRAM_MAP(wink_sound_map,0) diff --git a/src/mame/drivers/wiping.c b/src/mame/drivers/wiping.c index 186877e02c6..dd522f49d79 100644 --- a/src/mame/drivers/wiping.c +++ b/src/mame/drivers/wiping.c @@ -310,7 +310,7 @@ static MACHINE_DRIVER_START( wiping ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,18432000/6) /* 3.072 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_ADD(Z80,18432000/6) /* audio CPU */ /* 3.072 MHz */ diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c index 1293a7ddb2a..d0bbf8038b1 100644 --- a/src/mame/drivers/witch.c +++ b/src/mame/drivers/witch.c @@ -770,12 +770,12 @@ static MACHINE_DRIVER_START( witch ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,8000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(map_main, 0) - MDRV_CPU_VBLANK_INT(witch_main_interrupt,1) + MDRV_CPU_VBLANK_INT("main", witch_main_interrupt) /* 2nd z80 */ MDRV_CPU_ADD(Z80,8000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(map_sub, 0) - MDRV_CPU_VBLANK_INT(witch_sub_interrupt,1) + MDRV_CPU_VBLANK_INT("main", witch_sub_interrupt) MDRV_NVRAM_HANDLER(generic_0fill) diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c index 4eea9729346..defbc96f21a 100644 --- a/src/mame/drivers/wiz.c +++ b/src/mame/drivers/wiz.c @@ -158,6 +158,7 @@ Stephh's notes (based on the games Z80 code and some tests) : ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "sound/ay8910.h" #include "sound/discrete.h" @@ -706,12 +707,12 @@ static MACHINE_DRIVER_START( wiz ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz ??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(Z80, 14318000/8) /* ? */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,4) /* ??? */ + MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,4) /* ??? */ /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/wrally.c b/src/mame/drivers/wrally.c index f0e0f44b455..14cf08b8971 100644 --- a/src/mame/drivers/wrally.c +++ b/src/mame/drivers/wrally.c @@ -231,7 +231,7 @@ static MACHINE_DRIVER_START( wrally ) /* basic machine hardware */ MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz */ MDRV_CPU_PROGRAM_MAP(wrally_readmem,wrally_writemem) - MDRV_CPU_VBLANK_INT(irq6_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq6_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c index 42e01a1bd2f..61c1aa9f373 100644 --- a/src/mame/drivers/wwfsstar.c +++ b/src/mame/drivers/wwfsstar.c @@ -362,7 +362,7 @@ static MACHINE_DRIVER_START( wwfsstar ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(wwfsstars_interrupt,272) + MDRV_CPU_VBLANK_INT_HACK(wwfsstars_interrupt,272) MDRV_CPU_ADD(Z80, 3579545) MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) diff --git a/src/mame/drivers/wwfwfest.c b/src/mame/drivers/wwfwfest.c index f0395c17e63..b3c7fda06c8 100644 --- a/src/mame/drivers/wwfwfest.c +++ b/src/mame/drivers/wwfwfest.c @@ -405,7 +405,7 @@ static MACHINE_DRIVER_START( wwfwfest ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 24000000/2) /* 24 crystal, 12 rated chip */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(wwfwfest_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(wwfwfest_interrupt,2) MDRV_CPU_ADD(Z80, 3579545) /* audio CPU */ diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c index d82adc68a8d..efc478ac2da 100644 --- a/src/mame/drivers/xain.c +++ b/src/mame/drivers/xain.c @@ -478,7 +478,7 @@ static MACHINE_DRIVER_START( xsleena ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 1500000) /* Confirmed 1.5MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(xain_interrupt,256) + MDRV_CPU_VBLANK_INT_HACK(xain_interrupt,256) MDRV_CPU_ADD(M6809, 1500000) /* Confirmed 1.5MHz */ MDRV_CPU_PROGRAM_MAP(readmemB,writememB) diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c index 76fe95c600e..f9fc19340f6 100644 --- a/src/mame/drivers/xexex.c +++ b/src/mame/drivers/xexex.c @@ -475,7 +475,7 @@ static MACHINE_DRIVER_START( xexex ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) // 16MHz (32MHz xtal) MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(xexex_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(xexex_interrupt,2) // 8MHz (PCB shows one 32MHz/18.432MHz xtal, reference: www.system16.com) // more likely 32MHz since 18.432MHz yields 4.608MHz(too slow) or 9.216MHz(too fast) with integer divisors diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c index 797d1fe199e..c389866cff8 100644 --- a/src/mame/drivers/xmen.c +++ b/src/mame/drivers/xmen.c @@ -524,7 +524,7 @@ static MACHINE_DRIVER_START( xmen ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* ? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(xmen_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(xmen_interrupt,2) MDRV_CPU_ADD(Z80,8000000) /* verified with M1, guessed but accurate */ /* audio CPU */ /* ????? */ @@ -592,7 +592,7 @@ static MACHINE_DRIVER_START( xmen6p ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) /* ? */ MDRV_CPU_PROGRAM_MAP(readmem6p,writemem6p) - MDRV_CPU_VBLANK_INT(xmen6p_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(xmen6p_interrupt,2) MDRV_CPU_ADD(Z80,8000000) /* verified with M1, guessed but accurate */ /* audio CPU */ /* ????? */ diff --git a/src/mame/drivers/xorworld.c b/src/mame/drivers/xorworld.c index e680cf5cf41..2bfed4bcb8c 100644 --- a/src/mame/drivers/xorworld.c +++ b/src/mame/drivers/xorworld.c @@ -208,7 +208,7 @@ static MACHINE_DRIVER_START( xorworld ) // basic machine hardware MDRV_CPU_ADD(M68000, 10000000) // 10 MHz MDRV_CPU_PROGRAM_MAP(xorworld_map, 0) - MDRV_CPU_VBLANK_INT(xorworld_interrupt, 4) // 1 IRQ2 + 1 IRQ4 + 1 IRQ6 + MDRV_CPU_VBLANK_INT_HACK(xorworld_interrupt, 4) // 1 IRQ2 + 1 IRQ4 + 1 IRQ6 MDRV_INTERLEAVE(1) diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c index f6208ea3858..5583e1a1957 100644 --- a/src/mame/drivers/xxmissio.c +++ b/src/mame/drivers/xxmissio.c @@ -292,11 +292,11 @@ static MACHINE_DRIVER_START( xxmissio ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,12000000/4) /* 3.0MHz */ MDRV_CPU_PROGRAM_MAP(map1,0) - MDRV_CPU_VBLANK_INT(xxmissio_interrupt_m,1) + MDRV_CPU_VBLANK_INT("main", xxmissio_interrupt_m) MDRV_CPU_ADD(Z80,12000000/4) /* 3.0MHz */ MDRV_CPU_PROGRAM_MAP(map2,0) - MDRV_CPU_VBLANK_INT(xxmissio_interrupt_s,2) + MDRV_CPU_VBLANK_INT_HACK(xxmissio_interrupt_s,2) MDRV_INTERLEAVE(100) diff --git a/src/mame/drivers/xybots.c b/src/mame/drivers/xybots.c index 56ba32c37e6..a35cbf614b0 100644 --- a/src/mame/drivers/xybots.c +++ b/src/mame/drivers/xybots.c @@ -190,7 +190,7 @@ static MACHINE_DRIVER_START( xybots ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(main_map,0) - MDRV_CPU_VBLANK_INT(atarigen_video_int_gen,1) + MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen) MDRV_MACHINE_RESET(xybots) MDRV_NVRAM_HANDLER(atarigen) diff --git a/src/mame/drivers/xyonix.c b/src/mame/drivers/xyonix.c index 1fb3c484589..90e1b249970 100644 --- a/src/mame/drivers/xyonix.c +++ b/src/mame/drivers/xyonix.c @@ -247,7 +247,7 @@ static MACHINE_DRIVER_START( xyonix ) MDRV_CPU_ADD(Z80,16000000 / 4) /* 4 MHz ? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(port_readmem,port_writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_PERIODIC_INT(irq0_line_assert,4*60) /* ?? controls music tempo */ /* video hardware */ diff --git a/src/mame/drivers/yiear.c b/src/mame/drivers/yiear.c index b1b7054c7d1..e14f6304764 100644 --- a/src/mame/drivers/yiear.c +++ b/src/mame/drivers/yiear.c @@ -261,7 +261,7 @@ static MACHINE_DRIVER_START( yiear ) /* basic machine hardware */ MDRV_CPU_ADD(M6809,18432000/16) /* ???? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* vblank */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_PERIODIC_INT(yiear_nmi_interrupt,500) /* music tempo (correct frequency unknown) */ /* video hardware */ diff --git a/src/mame/drivers/yumefuda.c b/src/mame/drivers/yumefuda.c index 2715aad1cb8..e3d579dd0a9 100644 --- a/src/mame/drivers/yumefuda.c +++ b/src/mame/drivers/yumefuda.c @@ -240,7 +240,7 @@ static MACHINE_DRIVER_START( yumefuda ) MDRV_CPU_ADD(Z80 , 6000000) /*???*/ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_NVRAM_HANDLER(93C46) diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c index b418e98c87d..8f3530ff66b 100644 --- a/src/mame/drivers/yunsun16.c +++ b/src/mame/drivers/yunsun16.c @@ -530,7 +530,7 @@ static MACHINE_DRIVER_START( magicbub ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(yunsun16_readmem,yunsun16_writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) MDRV_CPU_ADD(Z80, 3000000) /* audio CPU */ /* ? */ @@ -575,7 +575,7 @@ static MACHINE_DRIVER_START( shocking ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 16000000) MDRV_CPU_PROGRAM_MAP(yunsun16_readmem,yunsun16_writemem) - MDRV_CPU_VBLANK_INT(irq2_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq2_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c index 1f1553ec489..25c90008918 100644 --- a/src/mame/drivers/yunsung8.c +++ b/src/mame/drivers/yunsung8.c @@ -530,12 +530,12 @@ static MACHINE_DRIVER_START( yunsung8 ) MDRV_CPU_ADD(Z80, 8000000) /* Z80B */ MDRV_CPU_PROGRAM_MAP(yunsung8_readmem,yunsung8_writemem) MDRV_CPU_IO_MAP(yunsung8_readport,yunsung8_writeport) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* No nmi routine */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* No nmi routine */ MDRV_CPU_ADD(Z80, 4000000) /* ? */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(yunsung8_sound_readmem,yunsung8_sound_writemem) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* NMI caused by the MSM5205? */ + MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* NMI caused by the MSM5205? */ MDRV_MACHINE_RESET(yunsung8) diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c index 9adceb867bf..9f297815739 100644 --- a/src/mame/drivers/zaccaria.c +++ b/src/mame/drivers/zaccaria.c @@ -662,7 +662,7 @@ static MACHINE_DRIVER_START( zaccaria ) /* basic machine hardware */ MDRV_CPU_ADD(Z80,XTAL_18_432MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) + MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) MDRV_CPU_ADD(M6802,XTAL_3_579545MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem1,sound_writemem1) diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c index 41193b20445..abb0acd1fd0 100644 --- a/src/mame/drivers/zaxxon.c +++ b/src/mame/drivers/zaxxon.c @@ -935,7 +935,7 @@ static MACHINE_DRIVER_START( root ) /* basic machine hardware */ MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/16) MDRV_CPU_PROGRAM_MAP(zaxxon_map, 0) - MDRV_CPU_VBLANK_INT(vblank_int, 1) + MDRV_CPU_VBLANK_INT("main", vblank_int) MDRV_MACHINE_START(zaxxon) diff --git a/src/mame/drivers/zerozone.c b/src/mame/drivers/zerozone.c index 9b4884ba60c..e4e81cc00ac 100644 --- a/src/mame/drivers/zerozone.c +++ b/src/mame/drivers/zerozone.c @@ -193,7 +193,7 @@ static MACHINE_DRIVER_START( zerozone ) /* basic machine hardware */ MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(irq1_line_hold,1) + MDRV_CPU_VBLANK_INT("main", irq1_line_hold) MDRV_CPU_ADD(Z80, 1000000) /* audio CPU */ /* 1 MHz ??? */ diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c index e4028b08a4a..b17647dd293 100644 --- a/src/mame/drivers/zn.c +++ b/src/mame/drivers/zn.c @@ -426,7 +426,7 @@ static MACHINE_DRIVER_START( zn1_1mb_vram ) /* basic machine hardware */ MDRV_CPU_ADD_TAG( "MAIN", PSXCPU, XTAL_67_7376MHz ) MDRV_CPU_PROGRAM_MAP( zn_map, 0 ) - MDRV_CPU_VBLANK_INT( psx_vblank, 1 ) + MDRV_CPU_VBLANK_INT("main", psx_vblank) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -462,7 +462,7 @@ static MACHINE_DRIVER_START( zn2 ) /* basic machine hardware */ MDRV_CPU_ADD_TAG( "MAIN", PSXCPU, XTAL_100MHz ) MDRV_CPU_PROGRAM_MAP( zn_map, 0 ) - MDRV_CPU_VBLANK_INT( psx_vblank, 1 ) + MDRV_CPU_VBLANK_INT("main", psx_vblank) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) @@ -691,7 +691,7 @@ static MACHINE_DRIVER_START( coh1000c ) /* audio CPU */ /* 8MHz ?? */ MDRV_CPU_PROGRAM_MAP( qsound_readmem, qsound_writemem ) MDRV_CPU_IO_MAP( qsound_readport, 0 ) - MDRV_CPU_VBLANK_INT( qsound_interrupt, 4 ) /* 4 interrupts per frame ?? */ + MDRV_CPU_VBLANK_INT_HACK( qsound_interrupt, 4 ) /* 4 interrupts per frame ?? */ MDRV_MACHINE_RESET( coh1000c ) MDRV_NVRAM_HANDLER( at28c16_0 ) @@ -709,7 +709,7 @@ static MACHINE_DRIVER_START( coh1002c ) /* audio CPU */ /* 8MHz ?? */ MDRV_CPU_PROGRAM_MAP( qsound_readmem, qsound_writemem ) MDRV_CPU_IO_MAP( qsound_readport, 0 ) - MDRV_CPU_VBLANK_INT( qsound_interrupt, 4 ) /* 4 interrupts per frame ?? */ + MDRV_CPU_VBLANK_INT_HACK( qsound_interrupt, 4 ) /* 4 interrupts per frame ?? */ MDRV_MACHINE_RESET( coh1000c ) MDRV_NVRAM_HANDLER( at28c16_0 ) @@ -893,7 +893,7 @@ static MACHINE_DRIVER_START( coh3002c ) MDRV_CPU_ADD( Z80, 8000000 ) MDRV_CPU_PROGRAM_MAP( qsound_readmem, qsound_writemem ) MDRV_CPU_IO_MAP( qsound_readport, 0 ) - MDRV_CPU_VBLANK_INT( qsound_interrupt, 4 ) /* 4 interrupts per frame ?? */ + MDRV_CPU_VBLANK_INT_HACK( qsound_interrupt, 4 ) /* 4 interrupts per frame ?? */ MDRV_MACHINE_RESET( coh3002c ) MDRV_NVRAM_HANDLER( at28c16_0 ) @@ -1306,7 +1306,7 @@ static MACHINE_DRIVER_START( coh1000ta ) MDRV_IMPORT_FROM( zn1_1mb_vram ) MDRV_CPU_MODIFY( "MAIN" ) - MDRV_CPU_VBLANK_INT( coh1000t_vblank, 1 ) + MDRV_CPU_VBLANK_INT("main", coh1000t_vblank) MDRV_CPU_ADD( Z80, 16000000 / 4 ) /* audio CPU */ /* 4 MHz */ @@ -1390,7 +1390,7 @@ static MACHINE_DRIVER_START( coh1000tb ) MDRV_IMPORT_FROM( zn1_2mb_vram ) MDRV_CPU_MODIFY( "MAIN" ) - MDRV_CPU_VBLANK_INT( coh1000t_vblank, 1 ) + MDRV_CPU_VBLANK_INT("main", coh1000t_vblank) MDRV_MACHINE_RESET( coh1000tb ) MDRV_NVRAM_HANDLER( coh1000tb ) @@ -2486,7 +2486,7 @@ static MACHINE_DRIVER_START( coh1002v ) MDRV_IMPORT_FROM( zn1_2mb_vram ) MDRV_CPU_MODIFY( "MAIN" ) - MDRV_CPU_VBLANK_INT( coh1002v_vblank, 1 ) + MDRV_CPU_VBLANK_INT("main", coh1002v_vblank) MDRV_MACHINE_RESET( coh1002v ) MDRV_NVRAM_HANDLER( at28c16_0 ) diff --git a/src/mame/drivers/zodiack.c b/src/mame/drivers/zodiack.c index 3355bd69279..f8e085522c9 100644 --- a/src/mame/drivers/zodiack.c +++ b/src/mame/drivers/zodiack.c @@ -19,6 +19,7 @@ TODO: ***************************************************************************/ #include "driver.h" +#include "deprecat.h" #include "sound/ay8910.h" #include "includes/espial.h" @@ -476,12 +477,12 @@ static MACHINE_DRIVER_START( zodiack ) /* basic machine hardware */ MDRV_CPU_ADD(Z80, 4000000) /* 4.00 MHz??? */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) - MDRV_CPU_VBLANK_INT(zodiac_master_interrupt,2) + MDRV_CPU_VBLANK_INT_HACK(zodiac_master_interrupt,2) MDRV_CPU_ADD(Z80, 14318000/8) /* 1.78975 MHz??? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(0,sound_writeport) - MDRV_CPU_VBLANK_INT(espial_sound_nmi_gen,8) /* IRQs are triggered by the main CPU */ + MDRV_CPU_VBLANK_INT_HACK(espial_sound_nmi_gen,8) /* IRQs are triggered by the main CPU */ MDRV_MACHINE_RESET(zodiack) diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c index 3bbcfec1659..e00d44cffa3 100644 --- a/src/mame/drivers/zr107.c +++ b/src/mame/drivers/zr107.c @@ -573,7 +573,7 @@ static MACHINE_DRIVER_START( zr107 ) MDRV_CPU_ADD(PPC403, 64000000/2) /* PowerPC 403GA 32MHz */ MDRV_CPU_CONFIG(zr107_ppc_cfg) MDRV_CPU_PROGRAM_MAP(zr107_map, 0) - MDRV_CPU_VBLANK_INT(zr107_vblank, 1) + MDRV_CPU_VBLANK_INT("main", zr107_vblank) MDRV_CPU_ADD(M68000, 64000000/8) /* 8MHz */ MDRV_CPU_PROGRAM_MAP(sound_memmap, 0) @@ -618,7 +618,7 @@ static MACHINE_DRIVER_START( jetwave ) MDRV_CPU_ADD(PPC403, 64000000/2) /* PowerPC 403GA 32MHz */ MDRV_CPU_CONFIG(zr107_ppc_cfg) MDRV_CPU_PROGRAM_MAP(jetwave_map, 0) - MDRV_CPU_VBLANK_INT(zr107_vblank, 1) + MDRV_CPU_VBLANK_INT("main", zr107_vblank) MDRV_CPU_ADD(M68000, 64000000/8) /* 8MHz */ MDRV_CPU_PROGRAM_MAP(sound_memmap, 0)