diff options
-rw-r--r-- | src/mame/drivers/5clown.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/carrera.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/flyball.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/fortecar.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/gatron.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/koikoi.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/lbeach.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/magicfly.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/rgum.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/snookr10.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/spaceg.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/thedealr.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/trvmadns.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/tugboat.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/unkhorse.cpp | 11 |
15 files changed, 16 insertions, 23 deletions
diff --git a/src/mame/drivers/5clown.cpp b/src/mame/drivers/5clown.cpp index 7b4faa60e95..3ee6a443932 100644 --- a/src/mame/drivers/5clown.cpp +++ b/src/mame/drivers/5clown.cpp @@ -1024,7 +1024,6 @@ MACHINE_CONFIG_START(_5clown_state::fclown) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8) /* guess, seems ok */ MCFG_CPU_PROGRAM_MAP(fclown_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", _5clown_state, nmi_line_pulse) MCFG_CPU_ADD("audiocpu", M6502, MASTER_CLOCK/8) /* guess, seems ok */ MCFG_CPU_PROGRAM_MAP(fcaudio_map) @@ -1058,6 +1057,7 @@ MACHINE_CONFIG_START(_5clown_state::fclown) MCFG_MC6845_ADD("crtc", MC6845, "screen", MASTER_CLOCK/16) /* guess */ MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) + MCFG_MC6845_OUT_VSYNC_CB(INPUTLINE("maincpu", INPUT_LINE_NMI)) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/carrera.cpp b/src/mame/drivers/carrera.cpp index f1a1c52890e..2737d5e9b1d 100644 --- a/src/mame/drivers/carrera.cpp +++ b/src/mame/drivers/carrera.cpp @@ -318,7 +318,6 @@ MACHINE_CONFIG_START(carrera_state::carrera) MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK / 6) MCFG_CPU_PROGRAM_MAP(carrera_map) MCFG_CPU_IO_MAP(io_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", carrera_state, nmi_line_pulse) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -332,6 +331,7 @@ MACHINE_CONFIG_START(carrera_state::carrera) MCFG_MC6845_ADD("crtc", MC6845, "screen", MASTER_CLOCK / 16) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) + MCFG_MC6845_OUT_VSYNC_CB(INPUTLINE("maincpu", INPUT_LINE_NMI)) MCFG_GFXDECODE_ADD("gfxdecode", "palette", carrera) MCFG_PALETTE_ADD("palette", 32) diff --git a/src/mame/drivers/flyball.cpp b/src/mame/drivers/flyball.cpp index 4982897f2e9..bc57614ec88 100644 --- a/src/mame/drivers/flyball.cpp +++ b/src/mame/drivers/flyball.cpp @@ -460,7 +460,6 @@ MACHINE_CONFIG_START(flyball_state::flyball) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/16) MCFG_CPU_PROGRAM_MAP(flyball_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", flyball_state, nmi_line_pulse) MCFG_DEVICE_ADD("outlatch", F9334, 0) // F7 MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(flyball_state, lamp_w)) // 1 player lamp @@ -477,6 +476,7 @@ MACHINE_CONFIG_START(flyball_state::flyball) MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239) MCFG_SCREEN_UPDATE_DRIVER(flyball_state, screen_update) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) MCFG_GFXDECODE_ADD("gfxdecode", "palette", flyball) MCFG_PALETTE_ADD("palette", 4) diff --git a/src/mame/drivers/fortecar.cpp b/src/mame/drivers/fortecar.cpp index d2e05d5e9e1..c76b5a33070 100644 --- a/src/mame/drivers/fortecar.cpp +++ b/src/mame/drivers/fortecar.cpp @@ -682,7 +682,6 @@ MACHINE_CONFIG_START(fortecar_state::fortecar) MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* 3 MHz, measured */ MCFG_CPU_PROGRAM_MAP(fortecar_map) MCFG_CPU_IO_MAP(fortecar_ports) - MCFG_CPU_VBLANK_INT_DRIVER("screen", fortecar_state, nmi_line_pulse) MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(200)) /* guess */ @@ -718,6 +717,7 @@ MACHINE_CONFIG_START(fortecar_state::fortecar) MCFG_MC6845_ADD("crtc", MC6845, "screen", CRTC_CLOCK) /* 1.5 MHz, measured */ MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) + MCFG_MC6845_OUT_VSYNC_CB(INPUTLINE("maincpu", INPUT_LINE_NMI)) MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/gatron.cpp b/src/mame/drivers/gatron.cpp index 725a66ba642..3bca255213c 100644 --- a/src/mame/drivers/gatron.cpp +++ b/src/mame/drivers/gatron.cpp @@ -571,7 +571,6 @@ MACHINE_CONFIG_START(gatron_state::gat) MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/24) /* 666.66 kHz, guess */ MCFG_CPU_PROGRAM_MAP(gat_map) MCFG_CPU_IO_MAP(gat_portmap) - MCFG_CPU_VBLANK_INT_DRIVER("screen", gatron_state, nmi_line_pulse) MCFG_NVRAM_ADD_0FILL("nvram") @@ -588,6 +587,7 @@ MACHINE_CONFIG_START(gatron_state::gat) MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 16*16-1) MCFG_SCREEN_UPDATE_DRIVER(gatron_state, screen_update_gat) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) MCFG_GFXDECODE_ADD("gfxdecode", "palette", gat) MCFG_PALETTE_ADD("palette", 8) diff --git a/src/mame/drivers/koikoi.cpp b/src/mame/drivers/koikoi.cpp index 24795c48017..2f60e7ad681 100644 --- a/src/mame/drivers/koikoi.cpp +++ b/src/mame/drivers/koikoi.cpp @@ -358,7 +358,6 @@ MACHINE_CONFIG_START(koikoi_state::koikoi) MCFG_CPU_ADD("maincpu", Z80,KOIKOI_CRYSTAL/4) /* ?? */ MCFG_CPU_PROGRAM_MAP(koikoi_map) MCFG_CPU_IO_MAP(koikoi_io_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", koikoi_state, nmi_line_pulse) /* video hardware */ @@ -369,6 +368,7 @@ MACHINE_CONFIG_START(koikoi_state::koikoi) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) MCFG_SCREEN_UPDATE_DRIVER(koikoi_state, screen_update_koikoi) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) MCFG_GFXDECODE_ADD("gfxdecode", "palette", koikoi) MCFG_PALETTE_ADD("palette", 8*32) diff --git a/src/mame/drivers/lbeach.cpp b/src/mame/drivers/lbeach.cpp index 2e047fd2a0c..d047b8743c6 100644 --- a/src/mame/drivers/lbeach.cpp +++ b/src/mame/drivers/lbeach.cpp @@ -332,7 +332,6 @@ MACHINE_CONFIG_START(lbeach_state::lbeach) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6800, XTAL(16'000'000) / 32) // Motorola MC6800P, 500kHz MCFG_CPU_PROGRAM_MAP(lbeach_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", lbeach_state, nmi_line_pulse) MCFG_NVRAM_ADD_0FILL("nvram") @@ -344,6 +343,7 @@ MACHINE_CONFIG_START(lbeach_state::lbeach) MCFG_SCREEN_UPDATE_DRIVER(lbeach_state, screen_update_lbeach) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE) // needed for collision detection MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) MCFG_GFXDECODE_ADD("gfxdecode", "palette", lbeach) MCFG_PALETTE_ADD("palette", 2+8+2) diff --git a/src/mame/drivers/magicfly.cpp b/src/mame/drivers/magicfly.cpp index 44fa36cf997..142efc6b10a 100644 --- a/src/mame/drivers/magicfly.cpp +++ b/src/mame/drivers/magicfly.cpp @@ -942,7 +942,6 @@ MACHINE_CONFIG_START(magicfly_state::magicfly) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16) /* guess */ MCFG_CPU_PROGRAM_MAP(magicfly_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", magicfly_state, nmi_line_pulse) MCFG_NVRAM_ADD_0FILL("nvram") @@ -962,6 +961,7 @@ MACHINE_CONFIG_START(magicfly_state::magicfly) MCFG_MC6845_ADD("crtc", MC6845, "screen", MASTER_CLOCK / 16) /* guess */ MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) + MCFG_MC6845_OUT_VSYNC_CB(INPUTLINE("maincpu", INPUT_LINE_NMI)) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("speaker") diff --git a/src/mame/drivers/rgum.cpp b/src/mame/drivers/rgum.cpp index 48113282c73..9cceb427f7a 100644 --- a/src/mame/drivers/rgum.cpp +++ b/src/mame/drivers/rgum.cpp @@ -245,7 +245,6 @@ MACHINE_CONFIG_START(rgum_state::rgum) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M65C02,24000000/16) /* ? MHz */ MCFG_CPU_PROGRAM_MAP(rgum_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", rgum_state, nmi_line_pulse) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -259,6 +258,7 @@ MACHINE_CONFIG_START(rgum_state::rgum) MCFG_MC6845_ADD("crtc", MC6845, "screen", 24000000/16) /* unknown clock & type, hand tuned to get ~50 fps (?) */ MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) + MCFG_MC6845_OUT_VSYNC_CB(INPUTLINE("maincpu", INPUT_LINE_NMI)) MCFG_DEVICE_ADD("ppi8255", I8255A, 0) MCFG_I8255_IN_PORTA_CB(IOPORT("IN0")) diff --git a/src/mame/drivers/snookr10.cpp b/src/mame/drivers/snookr10.cpp index 040bbad3748..ef251605849 100644 --- a/src/mame/drivers/snookr10.cpp +++ b/src/mame/drivers/snookr10.cpp @@ -1045,7 +1045,6 @@ MACHINE_CONFIG_START(snookr10_state::snookr10) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M65SC02, MASTER_CLOCK/8) /* 2 MHz (1.999 MHz measured) */ MCFG_CPU_PROGRAM_MAP(snookr10_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", snookr10_state, nmi_line_pulse) MCFG_NVRAM_ADD_0FILL("nvram") @@ -1058,6 +1057,7 @@ MACHINE_CONFIG_START(snookr10_state::snookr10) MCFG_SCREEN_VISIBLE_AREA(0*4, 96*4-1, 0*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(snookr10_state, screen_update_snookr10) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) MCFG_GFXDECODE_ADD("gfxdecode", "palette", snookr10) MCFG_PALETTE_ADD("palette", 256) diff --git a/src/mame/drivers/spaceg.cpp b/src/mame/drivers/spaceg.cpp index fe2d5cf6f59..6d170f73c52 100644 --- a/src/mame/drivers/spaceg.cpp +++ b/src/mame/drivers/spaceg.cpp @@ -511,7 +511,6 @@ MACHINE_CONFIG_START(spaceg_state::spaceg) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80,2500000) /* 2.5 MHz */ MCFG_CPU_PROGRAM_MAP(spaceg_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", spaceg_state, nmi_line_pulse) /* 60 Hz NMIs (verified) */ /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -521,6 +520,7 @@ MACHINE_CONFIG_START(spaceg_state::spaceg) MCFG_SCREEN_VISIBLE_AREA(0, 255, 32, 255) MCFG_SCREEN_UPDATE_DRIVER(spaceg_state, screen_update) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) // 60 Hz NMIs (verified) MCFG_PALETTE_ADD("palette", 16+128-16) MCFG_PALETTE_INIT_OWNER(spaceg_state, spaceg) diff --git a/src/mame/drivers/thedealr.cpp b/src/mame/drivers/thedealr.cpp index 28e34a5f84e..813d34fd151 100644 --- a/src/mame/drivers/thedealr.cpp +++ b/src/mame/drivers/thedealr.cpp @@ -538,7 +538,6 @@ MACHINE_CONFIG_START(thedealr_state::thedealr) MCFG_CPU_ADD("subcpu", R65C02, XTAL(16'000'000)/8) // 2 MHz? MCFG_CPU_PROGRAM_MAP(thedealr_sub) - MCFG_CPU_VBLANK_INT_DRIVER("screen", thedealr_state, nmi_line_pulse) MCFG_NVRAM_ADD_0FILL("nvram") @@ -558,6 +557,7 @@ MACHINE_CONFIG_START(thedealr_state::thedealr) MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0+30, 256-1) MCFG_SCREEN_UPDATE_DRIVER(thedealr_state, screen_update) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(thedealr_state, screen_vblank)) + MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("subcpu", INPUT_LINE_NMI)) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", thedealr) diff --git a/src/mame/drivers/trvmadns.cpp b/src/mame/drivers/trvmadns.cpp index 11d3ae6b6dc..1a71d393909 100644 --- a/src/mame/drivers/trvmadns.cpp +++ b/src/mame/drivers/trvmadns.cpp @@ -388,7 +388,6 @@ MACHINE_CONFIG_START(trvmadns_state::trvmadns) MCFG_CPU_ADD("maincpu", Z80, XTAL(10'000'000)/4) // Most likely 2.5MHz (less likely 5MHz (10MHz/2)) MCFG_CPU_PROGRAM_MAP(cpu_map) MCFG_CPU_IO_MAP(io_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", trvmadns_state, nmi_line_pulse) /* video hardware */ @@ -399,6 +398,7 @@ MACHINE_CONFIG_START(trvmadns_state::trvmadns) MCFG_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 0*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(trvmadns_state, screen_update_trvmadns) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) MCFG_GFXDECODE_ADD("gfxdecode", "palette", trvmadns) MCFG_PALETTE_ADD("palette", 16) diff --git a/src/mame/drivers/tugboat.cpp b/src/mame/drivers/tugboat.cpp index d346d2a1234..10cf8557f15 100644 --- a/src/mame/drivers/tugboat.cpp +++ b/src/mame/drivers/tugboat.cpp @@ -364,7 +364,6 @@ GFXDECODE_END MACHINE_CONFIG_START(tugboat_state::tugboat) MCFG_CPU_ADD("maincpu", M6502, 2000000) /* 2 MHz ???? */ MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", tugboat_state, nmi_line_pulse) MCFG_DEVICE_ADD("pia0", PIA6821, 0) MCFG_PIA_READPA_HANDLER(READ8(tugboat_state,input_r)) @@ -379,6 +378,7 @@ MACHINE_CONFIG_START(tugboat_state::tugboat) MCFG_SCREEN_VISIBLE_AREA(1*8,31*8-1,2*8,30*8-1) MCFG_SCREEN_UPDATE_DRIVER(tugboat_state, screen_update) MCFG_SCREEN_PALETTE("palette") + MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) MCFG_GFXDECODE_ADD("gfxdecode", "palette", tugboat) MCFG_PALETTE_ADD("palette", 256) diff --git a/src/mame/drivers/unkhorse.cpp b/src/mame/drivers/unkhorse.cpp index ab6603c6eeb..9e8a446b3e4 100644 --- a/src/mame/drivers/unkhorse.cpp +++ b/src/mame/drivers/unkhorse.cpp @@ -53,7 +53,6 @@ public: virtual void machine_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - INTERRUPT_GEN_MEMBER(interrupt); void horse(machine_config &config); void horse_io_map(address_map &map); void horse_map(address_map &map); @@ -190,21 +189,14 @@ INPUT_PORTS_END ***************************************************************************/ -INTERRUPT_GEN_MEMBER(horse_state::interrupt) -{ - device.execute().set_input_line(I8085_RST75_LINE, ASSERT_LINE); - device.execute().set_input_line(I8085_RST75_LINE, CLEAR_LINE); -} - MACHINE_CONFIG_START(horse_state::horse) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8085A, XTAL(12'000'000) / 2) MCFG_CPU_PROGRAM_MAP(horse_map) MCFG_CPU_IO_MAP(horse_io_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", horse_state, interrupt) - MCFG_DEVICE_ADD("i8155", I8155, XTAL(12'000'000) / 2) // port A input, B output, C output but unused + MCFG_DEVICE_ADD("i8155", I8155, XTAL(12'000'000) / 4) // port A input, B output, C output but unused MCFG_I8155_IN_PORTA_CB(READ8(horse_state, input_r)) MCFG_I8155_OUT_PORTB_CB(WRITE8(horse_state, output_w)) MCFG_I8155_OUT_TIMEROUT_CB(DEVWRITELINE("speaker", speaker_sound_device, level_w)) @@ -216,6 +208,7 @@ MACHINE_CONFIG_START(horse_state::horse) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) MCFG_SCREEN_UPDATE_DRIVER(horse_state, screen_update) + MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", I8085_RST75_LINE)) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD_3BIT_BGR("palette") |