From b4a653b6900a8aa3a22f514849645a1d46de3050 Mon Sep 17 00:00:00 2001 From: AJR Date: Wed, 28 Mar 2018 11:52:38 -0400 Subject: MCFG_DEVICE_VBLANK_INT to MCFG_SCREEN_VBLANK_CALLBACK conversion, part 1 --- src/devices/bus/isa/pgc.cpp | 13 +++++++++---- src/devices/bus/isa/pgc.h | 2 +- src/mame/drivers/arcadecl.cpp | 2 +- src/mame/drivers/atarig1.cpp | 2 +- src/mame/drivers/atarig42.cpp | 2 +- src/mame/drivers/atarigt.cpp | 2 +- src/mame/drivers/atarigx2.cpp | 2 +- src/mame/drivers/atarisy1.cpp | 2 +- src/mame/drivers/atarisy2.cpp | 2 +- src/mame/drivers/badlands.cpp | 2 +- src/mame/drivers/blstroid.cpp | 2 +- src/mame/drivers/cyberbal.cpp | 4 ++-- src/mame/drivers/cybstorm.cpp | 2 +- src/mame/drivers/eprom.cpp | 6 +++--- src/mame/drivers/foodf.cpp | 2 +- src/mame/drivers/gauntlet.cpp | 2 +- src/mame/drivers/harddriv.cpp | 11 +++++++---- src/mame/drivers/klax.cpp | 2 +- src/mame/drivers/rampart.cpp | 2 +- src/mame/drivers/skullxbo.cpp | 2 +- src/mame/drivers/xybots.cpp | 2 +- src/mame/includes/harddriv.h | 2 +- src/mame/machine/atarigen.cpp | 13 ++++++++----- src/mame/machine/atarigen.h | 2 +- 24 files changed, 48 insertions(+), 37 deletions(-) diff --git a/src/devices/bus/isa/pgc.cpp b/src/devices/bus/isa/pgc.cpp index b37beba811f..d042731555e 100644 --- a/src/devices/bus/isa/pgc.cpp +++ b/src/devices/bus/isa/pgc.cpp @@ -155,7 +155,6 @@ MACHINE_CONFIG_START(isa8_pgc_device::device_add_mconfig) MCFG_CPU_ADD("maincpu", I8088, XTAL(24'000'000)/3) MCFG_CPU_PROGRAM_MAP(pgc_map) #if 0 - MCFG_CPU_VBLANK_INT_DRIVER(PGC_SCREEN_NAME, isa8_pgc_device, vblank_irq) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(isa8_pgc_device, irq_callback) #endif @@ -169,6 +168,9 @@ MACHINE_CONFIG_START(isa8_pgc_device::device_add_mconfig) PGC_TOTAL_VERT, PGC_VERT_START, PGC_VERT_START+PGC_DISP_VERT) MCFG_SCREEN_UPDATE_DRIVER(isa8_pgc_device, screen_update) MCFG_SCREEN_PALETTE("palette") +#if 0 + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(isa8_pgc_device, vblank_irq)) +#endif MCFG_GFXDECODE_ADD("gfxdecode", "palette", pgc) MCFG_PALETTE_ADD( "palette", 256 ) @@ -262,10 +264,13 @@ void isa8_pgc_device::device_reset() // -INTERRUPT_GEN_MEMBER(isa8_pgc_device::vblank_irq) +WRITE_LINE_MEMBER(isa8_pgc_device::vblank_irq) { - LOGCMD("vblank_irq\n"); - m_cpu->set_input_line(0, ASSERT_LINE); + if (state) + { + LOGCMD("vblank_irq\n"); + m_cpu->set_input_line(0, ASSERT_LINE); + } } IRQ_CALLBACK_MEMBER(isa8_pgc_device::irq_callback) diff --git a/src/devices/bus/isa/pgc.h b/src/devices/bus/isa/pgc.h index 2982cb81c4f..f3099cf7bd9 100644 --- a/src/devices/bus/isa/pgc.h +++ b/src/devices/bus/isa/pgc.h @@ -42,7 +42,7 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(scanline_callback); - INTERRUPT_GEN_MEMBER(vblank_irq); + DECLARE_WRITE_LINE_MEMBER(vblank_irq); IRQ_CALLBACK_MEMBER(irq_callback); DECLARE_WRITE8_MEMBER(vram_w); diff --git a/src/mame/drivers/arcadecl.cpp b/src/mame/drivers/arcadecl.cpp index 51455a40a96..4a0fba7d04d 100644 --- a/src/mame/drivers/arcadecl.cpp +++ b/src/mame/drivers/arcadecl.cpp @@ -324,7 +324,6 @@ MACHINE_CONFIG_START(sparkz_state::sparkz) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK) MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sparkz_state, video_int_gen) MCFG_EEPROM_2804_ADD("eeprom") MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true) @@ -344,6 +343,7 @@ MACHINE_CONFIG_START(sparkz_state::sparkz) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 456, 0+12, 336+12, 262, 0, 240) MCFG_SCREEN_UPDATE_DRIVER(sparkz_state, screen_update) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(sparkz_state, video_int_write_line)) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/atarig1.cpp b/src/mame/drivers/atarig1.cpp index a6a8159570c..da2a03b3868 100644 --- a/src/mame/drivers/atarig1.cpp +++ b/src/mame/drivers/atarig1.cpp @@ -430,7 +430,6 @@ MACHINE_CONFIG_START(atarig1_state::atarig1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz) MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", atarig1_state, video_int_gen) MCFG_MACHINE_START_OVERRIDE(atarig1_state,atarig1) MCFG_MACHINE_RESET_OVERRIDE(atarig1_state,atarig1) @@ -455,6 +454,7 @@ MACHINE_CONFIG_START(atarig1_state::atarig1) MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) MCFG_SCREEN_UPDATE_DRIVER(atarig1_state, screen_update_atarig1) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(atarig1_state, video_int_write_line)) MCFG_VIDEO_START_OVERRIDE(atarig1_state,atarig1) diff --git a/src/mame/drivers/atarig42.cpp b/src/mame/drivers/atarig42.cpp index f03b4db376f..a48173a38a5 100644 --- a/src/mame/drivers/atarig42.cpp +++ b/src/mame/drivers/atarig42.cpp @@ -528,7 +528,6 @@ MACHINE_CONFIG_START(atarig42_state::atarig42) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz) MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", atarig42_state, video_int_gen) MCFG_EEPROM_2816_ADD("eeprom") MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true) @@ -550,6 +549,7 @@ MACHINE_CONFIG_START(atarig42_state::atarig42) MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) MCFG_SCREEN_UPDATE_DRIVER(atarig42_state, screen_update_atarig42) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(atarig42_state, video_int_write_line)) MCFG_VIDEO_START_OVERRIDE(atarig42_state,atarig42) diff --git a/src/mame/drivers/atarigt.cpp b/src/mame/drivers/atarigt.cpp index fc8a438bfbe..0b15dc8f647 100644 --- a/src/mame/drivers/atarigt.cpp +++ b/src/mame/drivers/atarigt.cpp @@ -806,7 +806,6 @@ MACHINE_CONFIG_START(atarigt_state::atarigt) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, ATARI_CLOCK_50MHz/2) MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", atarigt_state, video_int_gen) MCFG_CPU_PERIODIC_INT_DRIVER(atarigt_state, scanline_int_gen, 250) MCFG_MACHINE_RESET_OVERRIDE(atarigt_state,atarigt) @@ -827,6 +826,7 @@ MACHINE_CONFIG_START(atarigt_state::atarigt) /* the board uses a pair of GALs to determine H and V parameters */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) MCFG_SCREEN_UPDATE_DRIVER(atarigt_state, screen_update_atarigt) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(atarigt_state, video_int_write_line)) MCFG_VIDEO_START_OVERRIDE(atarigt_state,atarigt) diff --git a/src/mame/drivers/atarigx2.cpp b/src/mame/drivers/atarigx2.cpp index 019cc84bfce..7d8ea060fce 100644 --- a/src/mame/drivers/atarigx2.cpp +++ b/src/mame/drivers/atarigx2.cpp @@ -1500,7 +1500,6 @@ MACHINE_CONFIG_START(atarigx2_state::atarigx2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, ATARI_CLOCK_14MHz) MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", atarigx2_state, video_int_gen) MCFG_EEPROM_2816_ADD("eeprom") MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true) @@ -1520,6 +1519,7 @@ MACHINE_CONFIG_START(atarigx2_state::atarigx2) MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) MCFG_SCREEN_UPDATE_DRIVER(atarigx2_state, screen_update_atarigx2) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(atarigx2_state, video_int_write_line)) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/atarisy1.cpp b/src/mame/drivers/atarisy1.cpp index a13b0859020..cfa9d97a90d 100644 --- a/src/mame/drivers/atarisy1.cpp +++ b/src/mame/drivers/atarisy1.cpp @@ -732,7 +732,6 @@ MACHINE_CONFIG_START(atarisy1_state::atarisy1) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2) MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", atarisy1_state, video_int_gen) MCFG_CPU_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8) MCFG_CPU_PROGRAM_MAP(sound_map) @@ -776,6 +775,7 @@ MACHINE_CONFIG_START(atarisy1_state::atarisy1) MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) MCFG_SCREEN_UPDATE_DRIVER(atarisy1_state, screen_update_atarisy1) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(atarisy1_state, video_int_write_line)) MCFG_VIDEO_START_OVERRIDE(atarisy1_state,atarisy1) diff --git a/src/mame/drivers/atarisy2.cpp b/src/mame/drivers/atarisy2.cpp index 565e5f38ace..5d4358be8e8 100644 --- a/src/mame/drivers/atarisy2.cpp +++ b/src/mame/drivers/atarisy2.cpp @@ -233,7 +233,7 @@ INTERRUPT_GEN_MEMBER(atarisy2_state::vblank_int) { /* clock the VBLANK through */ if (m_interrupt_enable & 8) - video_int_gen(device); + video_int_write_line(1); } diff --git a/src/mame/drivers/badlands.cpp b/src/mame/drivers/badlands.cpp index 4afb1d13c9d..4bf7520b872 100644 --- a/src/mame/drivers/badlands.cpp +++ b/src/mame/drivers/badlands.cpp @@ -236,7 +236,7 @@ INTERRUPT_GEN_MEMBER(badlands_state::vblank_int) m_pedal_value[i]++; } - video_int_gen(device); + video_int_write_line(1); } diff --git a/src/mame/drivers/blstroid.cpp b/src/mame/drivers/blstroid.cpp index 5450bd56cc0..1463f07d3ba 100644 --- a/src/mame/drivers/blstroid.cpp +++ b/src/mame/drivers/blstroid.cpp @@ -180,7 +180,6 @@ MACHINE_CONFIG_START(blstroid_state::blstroid) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2) MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", blstroid_state, video_int_gen) MCFG_EEPROM_2804_ADD("eeprom") MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true) @@ -204,6 +203,7 @@ MACHINE_CONFIG_START(blstroid_state::blstroid) MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 320*2, 262, 0, 240) MCFG_SCREEN_UPDATE_DRIVER(blstroid_state, screen_update_blstroid) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(blstroid_state, video_int_write_line)) MCFG_VIDEO_START_OVERRIDE(blstroid_state,blstroid) diff --git a/src/mame/drivers/cyberbal.cpp b/src/mame/drivers/cyberbal.cpp index 61e3296afba..c62d8c27113 100644 --- a/src/mame/drivers/cyberbal.cpp +++ b/src/mame/drivers/cyberbal.cpp @@ -406,7 +406,6 @@ MACHINE_CONFIG_START(cyberbal_state::cyberbal) MCFG_CPU_ADD("extra", M68000, ATARI_CLOCK_14MHz/2) MCFG_CPU_PROGRAM_MAP(extra_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", cyberbal_state, video_int_gen) /* or is it "right?" */ MCFG_CPU_ADD("dac", M68000, ATARI_CLOCK_14MHz/2) MCFG_CPU_PROGRAM_MAP(sound_68k_map) @@ -444,6 +443,7 @@ MACHINE_CONFIG_START(cyberbal_state::cyberbal) MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 336*2, 262, 0, 240) MCFG_SCREEN_UPDATE_DRIVER(cyberbal_state, screen_update_cyberbal_left) MCFG_SCREEN_PALETTE("lpalette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cyberbal_state, video_int_write_line)) /* or is it "right?" */ MCFG_SCREEN_ADD("rscreen", RASTER) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) @@ -485,7 +485,6 @@ MACHINE_CONFIG_START(cyberbal2p_state::cyberbal2p) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2) MCFG_CPU_PROGRAM_MAP(cyberbal2p_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cyberbal2p_state, video_int_gen) MCFG_EEPROM_2816_ADD("eeprom") MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true) @@ -509,6 +508,7 @@ MACHINE_CONFIG_START(cyberbal2p_state::cyberbal2p) MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 336*2, 262, 0, 240) MCFG_SCREEN_UPDATE_DRIVER(cyberbal2p_state, screen_update_cyberbal2p) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cyberbal2p_state, video_int_write_line)) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/cybstorm.cpp b/src/mame/drivers/cybstorm.cpp index 256fc0d4b71..2386b050a61 100644 --- a/src/mame/drivers/cybstorm.cpp +++ b/src/mame/drivers/cybstorm.cpp @@ -234,7 +234,6 @@ MACHINE_CONFIG_START(cybstorm_state::round2) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68EC020, ATARI_CLOCK_14MHz) MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cybstorm_state, video_int_gen) MCFG_EEPROM_2816_ADD("eeprom") MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true) @@ -264,6 +263,7 @@ MACHINE_CONFIG_START(cybstorm_state::round2) /* note: these parameters are from published specs, not derived */ /* the board uses an SOS-2 chip to generate video signals */ MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cybstorm_state, video_int_write_line)) MCFG_SCREEN_UPDATE_DRIVER(cybstorm_state, screen_update_cybstorm) MACHINE_CONFIG_END diff --git a/src/mame/drivers/eprom.cpp b/src/mame/drivers/eprom.cpp index 17297286809..42649a3b55f 100644 --- a/src/mame/drivers/eprom.cpp +++ b/src/mame/drivers/eprom.cpp @@ -393,7 +393,6 @@ MACHINE_CONFIG_START(eprom_state::eprom) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2) MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", eprom_state, video_int_gen) MCFG_CPU_ADD("extra", M68000, ATARI_CLOCK_14MHz/2) MCFG_CPU_PROGRAM_MAP(extra_map) @@ -421,6 +420,7 @@ MACHINE_CONFIG_START(eprom_state::eprom) MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) MCFG_SCREEN_UPDATE_DRIVER(eprom_state, screen_update_eprom) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(eprom_state, video_int_write_line)) MCFG_VIDEO_START_OVERRIDE(eprom_state,eprom) @@ -439,7 +439,6 @@ MACHINE_CONFIG_START(eprom_state::klaxp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2) MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", eprom_state, video_int_gen) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -464,6 +463,7 @@ MACHINE_CONFIG_START(eprom_state::klaxp) MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) MCFG_SCREEN_UPDATE_DRIVER(eprom_state, screen_update_eprom) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(eprom_state, video_int_write_line)) MCFG_VIDEO_START_OVERRIDE(eprom_state,eprom) @@ -481,7 +481,6 @@ MACHINE_CONFIG_START(eprom_state::guts) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2) MCFG_CPU_PROGRAM_MAP(guts_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", eprom_state, video_int_gen) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -506,6 +505,7 @@ MACHINE_CONFIG_START(eprom_state::guts) MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) MCFG_SCREEN_UPDATE_DRIVER(eprom_state, screen_update_guts) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(eprom_state, video_int_write_line)) MCFG_VIDEO_START_OVERRIDE(eprom_state,guts) diff --git a/src/mame/drivers/foodf.cpp b/src/mame/drivers/foodf.cpp index 1d5753d4915..c6e6de22a46 100644 --- a/src/mame/drivers/foodf.cpp +++ b/src/mame/drivers/foodf.cpp @@ -342,7 +342,6 @@ MACHINE_CONFIG_START(foodf_state::foodf) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2) MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", foodf_state, video_int_gen) MCFG_X2212_ADD_AUTOSAVE("nvram") @@ -361,6 +360,7 @@ MACHINE_CONFIG_START(foodf_state::foodf) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 384, 0, 256, 259, 0, 224) MCFG_SCREEN_UPDATE_DRIVER(foodf_state, screen_update_foodf) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(foodf_state, video_int_write_line)) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/gauntlet.cpp b/src/mame/drivers/gauntlet.cpp index 970a27bcb42..54622518cd0 100644 --- a/src/mame/drivers/gauntlet.cpp +++ b/src/mame/drivers/gauntlet.cpp @@ -493,7 +493,6 @@ MACHINE_CONFIG_START(gauntlet_state::gauntlet_base) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2) MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gauntlet_state, video_int_gen) MCFG_CPU_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8) MCFG_CPU_PROGRAM_MAP(sound_map) @@ -521,6 +520,7 @@ MACHINE_CONFIG_START(gauntlet_state::gauntlet_base) MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) MCFG_SCREEN_UPDATE_DRIVER(gauntlet_state, screen_update_gauntlet) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(gauntlet_state, video_int_write_line)) /* sound hardware */ MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "audiocpu", WRITELINE(gauntlet_state, sound_int_write_line)) diff --git a/src/mame/drivers/harddriv.cpp b/src/mame/drivers/harddriv.cpp index f5137f03232..d2ffdb2a6ba 100644 --- a/src/mame/drivers/harddriv.cpp +++ b/src/mame/drivers/harddriv.cpp @@ -1440,10 +1440,13 @@ INPUT_PORTS_END * *************************************/ -INTERRUPT_GEN_MEMBER(harddriv_state::video_int_gen) +WRITE_LINE_MEMBER(harddriv_state::video_int_write_line) { - m_video_int_state = 1; - update_interrupts(); + if (state) + { + m_video_int_state = 1; + update_interrupts(); + } } @@ -1453,7 +1456,6 @@ MACHINE_CONFIG_START(harddriv_state::driver_nomsp) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68010, HARDDRIV_MASTER_CLOCK/4) MCFG_CPU_PROGRAM_MAP(driver_68k_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", harddriv_state, video_int_gen) MCFG_CPU_PERIODIC_INT_DRIVER(harddriv_state, hd68k_irq_gen, HARDDRIV_MASTER_CLOCK/16/16/16/16/2) MCFG_SLAPSTIC_ADD("slapstic", 117) @@ -1492,6 +1494,7 @@ MACHINE_CONFIG_START(harddriv_state::driver_nomsp) MCFG_SCREEN_UPDATE_DEVICE("gsp", tms34010_device, tms340x0_ind16) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(harddriv_state, video_int_write_line)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/klax.cpp b/src/mame/drivers/klax.cpp index ff805f32276..c5fda239200 100644 --- a/src/mame/drivers/klax.cpp +++ b/src/mame/drivers/klax.cpp @@ -198,7 +198,6 @@ MACHINE_CONFIG_START(klax_state::klax) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2) MCFG_CPU_PROGRAM_MAP(klax_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", klax_state, video_int_gen) MCFG_EEPROM_2816_ADD("eeprom") MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true) @@ -222,6 +221,7 @@ MACHINE_CONFIG_START(klax_state::klax) MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) MCFG_SCREEN_UPDATE_DRIVER(klax_state, screen_update_klax) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(klax_state, video_int_write_line)) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/rampart.cpp b/src/mame/drivers/rampart.cpp index bce638b62d0..8fab57a1d91 100644 --- a/src/mame/drivers/rampart.cpp +++ b/src/mame/drivers/rampart.cpp @@ -342,7 +342,6 @@ MACHINE_CONFIG_START(rampart_state::rampart) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2) MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rampart_state, video_int_gen) MCFG_SLAPSTIC_ADD("slapstic", 118) @@ -368,6 +367,7 @@ MACHINE_CONFIG_START(rampart_state::rampart) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 456, 0+12, 336+12, 262, 0, 240) MCFG_SCREEN_UPDATE_DRIVER(rampart_state, screen_update_rampart) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(rampart_state, video_int_write_line)) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/skullxbo.cpp b/src/mame/drivers/skullxbo.cpp index 61ae035186b..7019e9555b1 100644 --- a/src/mame/drivers/skullxbo.cpp +++ b/src/mame/drivers/skullxbo.cpp @@ -231,7 +231,6 @@ MACHINE_CONFIG_START(skullxbo_state::skullxbo) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2) MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", skullxbo_state, video_int_gen) MCFG_TIMER_DRIVER_ADD("scan_timer", skullxbo_state, scanline_timer) @@ -257,6 +256,7 @@ MACHINE_CONFIG_START(skullxbo_state::skullxbo) MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 336*2, 262, 0, 240) MCFG_SCREEN_UPDATE_DRIVER(skullxbo_state, screen_update_skullxbo) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(skullxbo_state, video_int_write_line)) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/xybots.cpp b/src/mame/drivers/xybots.cpp index 15c25df660f..97fd18a8713 100644 --- a/src/mame/drivers/xybots.cpp +++ b/src/mame/drivers/xybots.cpp @@ -180,7 +180,6 @@ MACHINE_CONFIG_START(xybots_state::xybots) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2) MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", xybots_state, video_int_gen) MCFG_SLAPSTIC_ADD("slapstic", 107) @@ -207,6 +206,7 @@ MACHINE_CONFIG_START(xybots_state::xybots) MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240) MCFG_SCREEN_UPDATE_DRIVER(xybots_state, screen_update_xybots) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(xybots_state, video_int_write_line)) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/includes/harddriv.h b/src/mame/includes/harddriv.h index d6fc80e9e00..c6a58bd6a3a 100644 --- a/src/mame/includes/harddriv.h +++ b/src/mame/includes/harddriv.h @@ -202,7 +202,7 @@ public: TMS340X0_TO_SHIFTREG_CB_MEMBER(hdgsp_write_to_shiftreg); TMS340X0_FROM_SHIFTREG_CB_MEMBER(hdgsp_read_from_shiftreg); - INTERRUPT_GEN_MEMBER(video_int_gen); + DECLARE_WRITE_LINE_MEMBER(video_int_write_line); DECLARE_WRITE_LINE_MEMBER(sound_int_write_line); diff --git a/src/mame/machine/atarigen.cpp b/src/mame/machine/atarigen.cpp index 5ca6abf5f0f..777969ea5cb 100644 --- a/src/mame/machine/atarigen.cpp +++ b/src/mame/machine/atarigen.cpp @@ -991,14 +991,17 @@ WRITE16_MEMBER(atarigen_state::sound_int_ack_w) //------------------------------------------------- -// video_int_gen: Standard interrupt routine which -// sets the video interrupt state. +// video_int_write_line: Standard write line +// callback for the video interrupt. //------------------------------------------------- -INTERRUPT_GEN_MEMBER(atarigen_state::video_int_gen) +WRITE_LINE_MEMBER(atarigen_state::video_int_write_line) { - m_video_int_state = 1; - update_interrupts(); + if (state) + { + m_video_int_state = 1; + update_interrupts(); + } } diff --git a/src/mame/machine/atarigen.h b/src/mame/machine/atarigen.h index 92a24646b55..05f0ee7d60e 100644 --- a/src/mame/machine/atarigen.h +++ b/src/mame/machine/atarigen.h @@ -283,7 +283,7 @@ protected: INTERRUPT_GEN_MEMBER(sound_int_gen); DECLARE_WRITE16_MEMBER(sound_int_ack_w); - INTERRUPT_GEN_MEMBER(video_int_gen); + DECLARE_WRITE_LINE_MEMBER(video_int_write_line); DECLARE_WRITE16_MEMBER(video_int_ack_w); // slapstic helpers -- cgit v1.2.3