summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2018-09-07 18:26:29 +0200
committer Ivan Vangelista <mesgnet@yahoo.it>2018-09-07 18:26:29 +0200
commit44f3ad511c812dc3242c41c501981e1816747c61 (patch)
tree5b59e8c2fd954ce1dbd9ac7afbdd0f502d7cafc2 /src/mame/drivers
parent6315d07fbf3cd5625ff1b2b6085e76f962c1a84d (diff)
watchdog: removed MCFG macros (nw)
Diffstat (limited to 'src/mame/drivers')
-rw-r--r--src/mame/drivers/1943.cpp2
-rw-r--r--src/mame/drivers/20pacgal.cpp2
-rw-r--r--src/mame/drivers/8080bw.cpp28
-rw-r--r--src/mame/drivers/88games.cpp2
-rw-r--r--src/mame/drivers/acefruit.cpp2
-rw-r--r--src/mame/drivers/airbustr.cpp11
-rw-r--r--src/mame/drivers/ajax.cpp2
-rw-r--r--src/mame/drivers/albazg.cpp3
-rw-r--r--src/mame/drivers/aliens.cpp2
-rw-r--r--src/mame/drivers/ambush.cpp2
-rw-r--r--src/mame/drivers/ampoker2.cpp3
-rw-r--r--src/mame/drivers/arcadecl.cpp2
-rw-r--r--src/mame/drivers/aristmk5.cpp3
-rw-r--r--src/mame/drivers/arkanoid.cpp5
-rw-r--r--src/mame/drivers/asteroid.cpp2
-rw-r--r--src/mame/drivers/astrocde.cpp12
-rw-r--r--src/mame/drivers/asuka.cpp2
-rw-r--r--src/mame/drivers/atari_s1.cpp2
-rw-r--r--src/mame/drivers/atari_s2.cpp2
-rw-r--r--src/mame/drivers/atarifb.cpp2
-rw-r--r--src/mame/drivers/atarig1.cpp2
-rw-r--r--src/mame/drivers/atarig42.cpp2
-rw-r--r--src/mame/drivers/atarisy1.cpp2
-rw-r--r--src/mame/drivers/atarisy2.cpp2
-rw-r--r--src/mame/drivers/avalnche.cpp2
-rw-r--r--src/mame/drivers/aztarac.cpp2
-rw-r--r--src/mame/drivers/badlands.cpp2
-rw-r--r--src/mame/drivers/balsente.cpp2
-rw-r--r--src/mame/drivers/baraduke.cpp2
-rw-r--r--src/mame/drivers/batman.cpp2
-rw-r--r--src/mame/drivers/battlnts.cpp2
-rw-r--r--src/mame/drivers/beathead.cpp2
-rw-r--r--src/mame/drivers/bfm_sc1.cpp3
-rw-r--r--src/mame/drivers/bfm_sc2.cpp9
-rw-r--r--src/mame/drivers/bking.cpp2
-rw-r--r--src/mame/drivers/bladestl.cpp2
-rw-r--r--src/mame/drivers/blktiger.cpp2
-rw-r--r--src/mame/drivers/blockhl.cpp2
-rw-r--r--src/mame/drivers/blstroid.cpp2
-rw-r--r--src/mame/drivers/blueprnt.cpp2
-rw-r--r--src/mame/drivers/bottom9.cpp2
-rw-r--r--src/mame/drivers/boxer.cpp2
-rw-r--r--src/mame/drivers/bublbobl.cpp8
-rw-r--r--src/mame/drivers/buggychl.cpp3
-rw-r--r--src/mame/drivers/bwidow.cpp2
-rw-r--r--src/mame/drivers/bzone.cpp2
-rw-r--r--src/mame/drivers/canyon.cpp3
-rw-r--r--src/mame/drivers/capbowl.cpp4
-rw-r--r--src/mame/drivers/cave.cpp20
-rw-r--r--src/mame/drivers/ccastles.cpp3
-rw-r--r--src/mame/drivers/cchasm.cpp2
-rw-r--r--src/mame/drivers/centiped.cpp4
-rw-r--r--src/mame/drivers/champbas.cpp12
-rw-r--r--src/mame/drivers/changela.cpp2
-rw-r--r--src/mame/drivers/chqflag.cpp2
-rw-r--r--src/mame/drivers/circusc.cpp3
-rw-r--r--src/mame/drivers/cischeat.cpp4
-rw-r--r--src/mame/drivers/clayshoo.cpp2
-rw-r--r--src/mame/drivers/cloak.cpp2
-rw-r--r--src/mame/drivers/cloud9.cpp3
-rw-r--r--src/mame/drivers/combatsc.cpp2
-rw-r--r--src/mame/drivers/crimfght.cpp2
-rw-r--r--src/mame/drivers/cyberbal.cpp2
-rw-r--r--src/mame/drivers/cybstorm.cpp2
-rw-r--r--src/mame/drivers/dambustr.cpp2
-rw-r--r--src/mame/drivers/darius.cpp2
-rw-r--r--src/mame/drivers/dblcrown.cpp3
-rw-r--r--src/mame/drivers/dcheese.cpp2
-rw-r--r--src/mame/drivers/ddribble.cpp2
-rw-r--r--src/mame/drivers/deadang.cpp2
-rw-r--r--src/mame/drivers/decocass.cpp2
-rw-r--r--src/mame/drivers/destroyr.cpp2
-rw-r--r--src/mame/drivers/dkong.cpp4
-rw-r--r--src/mame/drivers/dlair.cpp3
-rw-r--r--src/mame/drivers/docastle.cpp2
-rw-r--r--src/mame/drivers/dragrace.cpp3
-rw-r--r--src/mame/drivers/dribling.cpp2
-rw-r--r--src/mame/drivers/dunhuang.cpp3
-rw-r--r--src/mame/drivers/epos.cpp4
-rw-r--r--src/mame/drivers/eprom.cpp6
-rw-r--r--src/mame/drivers/equites.cpp2
-rw-r--r--src/mame/drivers/espial.cpp2
-rw-r--r--src/mame/drivers/expro02.cpp6
-rw-r--r--src/mame/drivers/exterm.cpp2
-rw-r--r--src/mame/drivers/fastfred.cpp2
-rw-r--r--src/mame/drivers/fastlane.cpp2
-rw-r--r--src/mame/drivers/finalizr.cpp2
-rw-r--r--src/mame/drivers/firefox.cpp3
-rw-r--r--src/mame/drivers/firetrk.cpp3
-rw-r--r--src/mame/drivers/flkatck.cpp2
-rw-r--r--src/mame/drivers/foodf.cpp3
-rw-r--r--src/mame/drivers/fortecar.cpp3
-rw-r--r--src/mame/drivers/funkybee.cpp2
-rw-r--r--src/mame/drivers/gaiden.cpp4
-rw-r--r--src/mame/drivers/galaga.cpp11
-rw-r--r--src/mame/drivers/galaxian.cpp3
-rw-r--r--src/mame/drivers/galaxold.cpp2
-rw-r--r--src/mame/drivers/galgames.cpp2
-rw-r--r--src/mame/drivers/galpani3.cpp2
-rw-r--r--src/mame/drivers/galpanic.cpp5
-rw-r--r--src/mame/drivers/gaplus.cpp2
-rw-r--r--src/mame/drivers/gauntlet.cpp2
-rw-r--r--src/mame/drivers/gberet.cpp2
-rw-r--r--src/mame/drivers/gottlieb.cpp3
-rw-r--r--src/mame/drivers/gotya.cpp2
-rw-r--r--src/mame/drivers/gradius3.cpp2
-rw-r--r--src/mame/drivers/grchamp.cpp3
-rw-r--r--src/mame/drivers/gridlee.cpp2
-rw-r--r--src/mame/drivers/gunsmoke.cpp2
-rw-r--r--src/mame/drivers/harddriv.cpp2
-rw-r--r--src/mame/drivers/hcastle.cpp2
-rw-r--r--src/mame/drivers/hexion.cpp2
-rw-r--r--src/mame/drivers/holeland.cpp4
-rw-r--r--src/mame/drivers/hornet.cpp2
-rw-r--r--src/mame/drivers/hyperspt.cpp2
-rw-r--r--src/mame/drivers/jackal.cpp2
-rw-r--r--src/mame/drivers/jaguar.cpp2
-rw-r--r--src/mame/drivers/jailbrek.cpp2
-rw-r--r--src/mame/drivers/jchan.cpp2
-rw-r--r--src/mame/drivers/jclub2.cpp6
-rw-r--r--src/mame/drivers/jedi.cpp2
-rw-r--r--src/mame/drivers/jrpacman.cpp2
-rw-r--r--src/mame/drivers/junofrst.cpp2
-rw-r--r--src/mame/drivers/klax.cpp2
-rw-r--r--src/mame/drivers/kyugo.cpp2
-rw-r--r--src/mame/drivers/labyrunr.cpp2
-rw-r--r--src/mame/drivers/liberatr.cpp2
-rw-r--r--src/mame/drivers/lockon.cpp3
-rw-r--r--src/mame/drivers/looping.cpp2
-rw-r--r--src/mame/drivers/lwings.cpp4
-rw-r--r--src/mame/drivers/mappy.cpp18
-rw-r--r--src/mame/drivers/mcatadv.cpp3
-rw-r--r--src/mame/drivers/mcr.cpp3
-rw-r--r--src/mame/drivers/mcr3.cpp3
-rw-r--r--src/mame/drivers/mcr68.cpp24
-rw-r--r--src/mame/drivers/megazone.cpp2
-rw-r--r--src/mame/drivers/meritm.cpp3
-rw-r--r--src/mame/drivers/metro.cpp8
-rw-r--r--src/mame/drivers/mhavoc.cpp2
-rw-r--r--src/mame/drivers/midtunit.cpp2
-rw-r--r--src/mame/drivers/midvunit.cpp2
-rw-r--r--src/mame/drivers/mikie.cpp2
-rw-r--r--src/mame/drivers/missb2.cpp3
-rw-r--r--src/mame/drivers/missile.cpp3
-rw-r--r--src/mame/drivers/momoko.cpp2
-rw-r--r--src/mame/drivers/multfish.cpp2
-rw-r--r--src/mame/drivers/mw18w.cpp2
-rw-r--r--src/mame/drivers/mw8080bw.cpp54
-rw-r--r--src/mame/drivers/mwsub.cpp2
-rw-r--r--src/mame/drivers/namcos86.cpp2
-rw-r--r--src/mame/drivers/nemesis.cpp18
-rw-r--r--src/mame/drivers/neogeo.cpp3
-rw-r--r--src/mame/drivers/nitedrvr.cpp3
-rw-r--r--src/mame/drivers/nova2001.cpp2
-rw-r--r--src/mame/drivers/offtwall.cpp2
-rw-r--r--src/mame/drivers/ohmygod.cpp3
-rw-r--r--src/mame/drivers/omegrace.cpp2
-rw-r--r--src/mame/drivers/onetwo.cpp2
-rw-r--r--src/mame/drivers/orbit.cpp2
-rw-r--r--src/mame/drivers/pacland.cpp2
-rw-r--r--src/mame/drivers/pandoras.cpp2
-rw-r--r--src/mame/drivers/parodius.cpp2
-rw-r--r--src/mame/drivers/pengo.cpp2
-rw-r--r--src/mame/drivers/pingpong.cpp2
-rw-r--r--src/mame/drivers/pitnrun.cpp2
-rw-r--r--src/mame/drivers/plygonet.cpp2
-rw-r--r--src/mame/drivers/polepos.cpp6
-rw-r--r--src/mame/drivers/poolshrk.cpp2
-rw-r--r--src/mame/drivers/pooyan.cpp2
-rw-r--r--src/mame/drivers/psikyosh.cpp2
-rw-r--r--src/mame/drivers/quantum.cpp2
-rw-r--r--src/mame/drivers/rallyx.cpp4
-rw-r--r--src/mame/drivers/rampart.cpp3
-rw-r--r--src/mame/drivers/rastan.cpp2
-rw-r--r--src/mame/drivers/relief.cpp2
-rw-r--r--src/mame/drivers/retofinv.cpp2
-rw-r--r--src/mame/drivers/rockrage.cpp2
-rw-r--r--src/mame/drivers/rocnrope.cpp2
-rw-r--r--src/mame/drivers/rollerg.cpp2
-rw-r--r--src/mame/drivers/sandscrp.cpp3
-rw-r--r--src/mame/drivers/sauro.cpp2
-rw-r--r--src/mame/drivers/sbasketb.cpp2
-rw-r--r--src/mame/drivers/sbowling.cpp2
-rw-r--r--src/mame/drivers/sbrkout.cpp3
-rw-r--r--src/mame/drivers/scobra.cpp4
-rw-r--r--src/mame/drivers/scotrsht.cpp2
-rw-r--r--src/mame/drivers/scramble.cpp4
-rw-r--r--src/mame/drivers/segaorun.cpp2
-rw-r--r--src/mame/drivers/segas16a.cpp2
-rw-r--r--src/mame/drivers/seicross.cpp2
-rw-r--r--src/mame/drivers/seta.cpp29
-rw-r--r--src/mame/drivers/seta2.cpp4
-rw-r--r--src/mame/drivers/shadfrce.cpp2
-rw-r--r--src/mame/drivers/shaolins.cpp2
-rw-r--r--src/mame/drivers/shougi.cpp3
-rw-r--r--src/mame/drivers/shuuz.cpp2
-rw-r--r--src/mame/drivers/sidearms.cpp6
-rw-r--r--src/mame/drivers/sigmab98.cpp2
-rw-r--r--src/mame/drivers/simpsons.cpp2
-rw-r--r--src/mame/drivers/skullxbo.cpp2
-rw-r--r--src/mame/drivers/skydiver.cpp3
-rw-r--r--src/mame/drivers/skykid.cpp2
-rw-r--r--src/mame/drivers/skyraid.cpp3
-rw-r--r--src/mame/drivers/snowbros.cpp8
-rw-r--r--src/mame/drivers/speedatk.cpp3
-rw-r--r--src/mame/drivers/sprint2.cpp3
-rw-r--r--src/mame/drivers/sprint4.cpp3
-rw-r--r--src/mame/drivers/spy.cpp2
-rw-r--r--src/mame/drivers/sspeedr.cpp2
-rw-r--r--src/mame/drivers/ssv.cpp30
-rw-r--r--src/mame/drivers/stargame.cpp2
-rw-r--r--src/mame/drivers/starwars.cpp3
-rw-r--r--src/mame/drivers/stuntair.cpp2
-rw-r--r--src/mame/drivers/sub.cpp2
-rw-r--r--src/mame/drivers/suna8.cpp2
-rw-r--r--src/mame/drivers/supdrapo.cpp2
-rw-r--r--src/mame/drivers/supertnk.cpp2
-rw-r--r--src/mame/drivers/suprridr.cpp2
-rw-r--r--src/mame/drivers/surpratk.cpp2
-rw-r--r--src/mame/drivers/taito_f2.cpp2
-rw-r--r--src/mame/drivers/taito_o.cpp2
-rw-r--r--src/mame/drivers/taitosj.cpp3
-rw-r--r--src/mame/drivers/tecmo.cpp2
-rw-r--r--src/mame/drivers/tecmosys.cpp3
-rw-r--r--src/mame/drivers/tehkanwc.cpp2
-rw-r--r--src/mame/drivers/tempest.cpp3
-rw-r--r--src/mame/drivers/tetrisp2.cpp15
-rw-r--r--src/mame/drivers/thedealr.cpp2
-rw-r--r--src/mame/drivers/thepit.cpp2
-rw-r--r--src/mame/drivers/thoop2.cpp2
-rw-r--r--src/mame/drivers/thunderj.cpp2
-rw-r--r--src/mame/drivers/thunderx.cpp2
-rw-r--r--src/mame/drivers/tickee.cpp2
-rw-r--r--src/mame/drivers/timelimt.cpp2
-rw-r--r--src/mame/drivers/timeplt.cpp2
-rw-r--r--src/mame/drivers/tmnt.cpp20
-rw-r--r--src/mame/drivers/toki.cpp2
-rw-r--r--src/mame/drivers/tomcat.cpp2
-rw-r--r--src/mame/drivers/toobin.cpp3
-rw-r--r--src/mame/drivers/tourtabl.cpp2
-rw-r--r--src/mame/drivers/tp84.cpp2
-rw-r--r--src/mame/drivers/trackfld.cpp4
-rw-r--r--src/mame/drivers/triplhnt.cpp2
-rw-r--r--src/mame/drivers/truco.cpp3
-rw-r--r--src/mame/drivers/trucocl.cpp2
-rw-r--r--src/mame/drivers/tutankhm.cpp2
-rw-r--r--src/mame/drivers/twin16.cpp4
-rw-r--r--src/mame/drivers/twinkle.cpp3
-rw-r--r--src/mame/drivers/tx1.cpp6
-rw-r--r--src/mame/drivers/ultraman.cpp2
-rw-r--r--src/mame/drivers/ultratnk.cpp3
-rw-r--r--src/mame/drivers/vendetta.cpp2
-rw-r--r--src/mame/drivers/videopin.cpp2
-rw-r--r--src/mame/drivers/vlc.cpp3
-rw-r--r--src/mame/drivers/warpwarp.cpp2
-rw-r--r--src/mame/drivers/wc90.cpp2
-rw-r--r--src/mame/drivers/williams.cpp4
-rw-r--r--src/mame/drivers/wiping.cpp2
-rw-r--r--src/mame/drivers/wiz.cpp2
-rw-r--r--src/mame/drivers/wmg.cpp2
-rw-r--r--src/mame/drivers/wolfpack.cpp2
-rw-r--r--src/mame/drivers/xmen.cpp4
-rw-r--r--src/mame/drivers/xtheball.cpp2
-rw-r--r--src/mame/drivers/yiear.cpp2
-rw-r--r--src/mame/drivers/zaccaria.cpp2
-rw-r--r--src/mame/drivers/zr107.cpp4
-rw-r--r--src/mame/drivers/zwackery.cpp2
267 files changed, 417 insertions, 528 deletions
diff --git a/src/mame/drivers/1943.cpp b/src/mame/drivers/1943.cpp
index eab57f8b6c5..cd9da57c2c0 100644
--- a/src/mame/drivers/1943.cpp
+++ b/src/mame/drivers/1943.cpp
@@ -322,7 +322,7 @@ MACHINE_CONFIG_START(_1943_state::_1943)
MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_DEVICE_PERIODIC_INT_DRIVER(_1943_state, irq0_line_hold, 4*60)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/20pacgal.cpp b/src/mame/drivers/20pacgal.cpp
index c4768b8b300..ef5f729c28c 100644
--- a/src/mame/drivers/20pacgal.cpp
+++ b/src/mame/drivers/20pacgal.cpp
@@ -406,7 +406,7 @@ MACHINE_CONFIG_START(_20pacgal_state::_20pacgal)
EEPROM_93C46_8BIT(config, "eeprom");
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
_20pacgal_video(config);
diff --git a/src/mame/drivers/8080bw.cpp b/src/mame/drivers/8080bw.cpp
index 1327878733c..e0314984553 100644
--- a/src/mame/drivers/8080bw.cpp
+++ b/src/mame/drivers/8080bw.cpp
@@ -416,8 +416,7 @@ MACHINE_CONFIG_START(_8080bw_state::invadpt2)
/* 60 Hz signal clocks two LS161. Ripple carry will */
/* reset circuit, if LS161 not cleared before. */
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 255)
+ WATCHDOG_TIMER(config, m_watchdog).set_vblank_count("screen", 255);
/* add shifter */
MCFG_MB14241_ADD("mb14241")
@@ -543,8 +542,7 @@ MACHINE_CONFIG_START(_8080bw_state::spcewarla)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_IO_MAP(spcewarla_io_map)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 255)
+ WATCHDOG_TIMER(config, m_watchdog).set_vblank_count("screen", 255);
MCFG_PALETTE_ADD_3BIT_RBG("palette")
MCFG_SCREEN_MODIFY("screen")
@@ -667,7 +665,7 @@ MACHINE_CONFIG_START(_8080bw_state::cosmo)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_PROGRAM_MAP(cosmo_map)
MCFG_DEVICE_IO_MAP(cosmo_io_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
/* video hardware */
@@ -941,7 +939,7 @@ MACHINE_CONFIG_START(_8080bw_state::invrvnge)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_IO_MAP(invrvnge_io_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
MCFG_DEVICE_ADD("audiocpu", M6808, XTAL(4'000'000)/2) // MC6808P
MCFG_DEVICE_PROGRAM_MAP(invrvnge_sound_map)
@@ -1255,8 +1253,7 @@ MACHINE_CONFIG_START(_8080bw_state::cosmicmo)
MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 255)
+ WATCHDOG_TIMER(config, m_watchdog).set_vblank_count("screen", 255);
/* add shifter */
MCFG_MB14241_ADD("mb14241")
@@ -1549,8 +1546,7 @@ MACHINE_CONFIG_START(_8080bw_state::schaser)
MCFG_DEVICE_PROGRAM_MAP(schaser_map)
MCFG_DEVICE_IO_MAP(schaser_io_map)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 255)
+ WATCHDOG_TIMER(config, m_watchdog).set_vblank_count("screen", 255);
MCFG_MACHINE_START_OVERRIDE(_8080bw_state,schaser)
MCFG_MACHINE_RESET_OVERRIDE(_8080bw_state,schaser)
@@ -1887,7 +1883,7 @@ MACHINE_CONFIG_START(_8080bw_state::lupin3)
/* basic machine hardware */
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_IO_MAP(lupin3_io_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
/* add shifter */
@@ -2056,8 +2052,7 @@ MACHINE_CONFIG_START(_8080bw_state::polaris)
MCFG_DEVICE_IO_MAP(polaris_io_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", _8080bw_state, polaris_interrupt)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 255)
+ WATCHDOG_TIMER(config, m_watchdog).set_vblank_count("screen", 255);
MCFG_MACHINE_START_OVERRIDE(_8080bw_state,polaris)
@@ -2434,7 +2429,7 @@ MACHINE_CONFIG_START(_8080bw_state::indianbt)
/* basic machine hardware */
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_IO_MAP(indianbt_io_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
/* add shifter */
@@ -2460,7 +2455,7 @@ MACHINE_CONFIG_START(_8080bw_state::indianbtbr)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_PROGRAM_MAP(schaser_map)
MCFG_DEVICE_IO_MAP(indianbtbr_io_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
/* add shifter */
@@ -2959,8 +2954,7 @@ MACHINE_CONFIG_START(_8080bw_state::vortex)
MCFG_DEVICE_IO_MAP(vortex_io_map)
MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_usec(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+ WATCHDOG_TIMER(config, m_watchdog).set_time(attotime::from_usec(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)));
/* video hardware */
// TODO: replace with modified invaders color renderer code allowing midscanline color writes
diff --git a/src/mame/drivers/88games.cpp b/src/mame/drivers/88games.cpp
index c5e3139aa7f..49ca9d2580a 100644
--- a/src/mame/drivers/88games.cpp
+++ b/src/mame/drivers/88games.cpp
@@ -314,7 +314,7 @@ MACHINE_CONFIG_START(_88games_state::_88games)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/acefruit.cpp b/src/mame/drivers/acefruit.cpp
index 0ccd187950a..d412c7c76a2 100644
--- a/src/mame/drivers/acefruit.cpp
+++ b/src/mame/drivers/acefruit.cpp
@@ -633,7 +633,7 @@ MACHINE_CONFIG_START(acefruit_state::acefruit)
MCFG_DEVICE_IO_MAP(acefruit_io)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", acefruit_state, acefruit_vblank)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_acefruit)
diff --git a/src/mame/drivers/airbustr.cpp b/src/mame/drivers/airbustr.cpp
index ed5851891fc..232eed66775 100644
--- a/src/mame/drivers/airbustr.cpp
+++ b/src/mame/drivers/airbustr.cpp
@@ -583,8 +583,7 @@ MACHINE_CONFIG_START(airbustr_state::airbustr)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) // Palette RAM is filled by sub cpu with data supplied by main cpu
// Maybe a high value is safer in order to avoid glitches
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */
+ WATCHDOG_TIMER(config, m_watchdog).set_time(attotime::from_seconds(3)); /* a guess, and certainly wrong */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -624,11 +623,11 @@ MACHINE_CONFIG_START(airbustr_state::airbustr)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
-MACHINE_CONFIG_START(airbustr_state::airbustrb)
+void airbustr_state::airbustrb(machine_config &config)
+{
airbustr(config);
- MCFG_WATCHDOG_MODIFY("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(0)) // no protection device or watchdog
-MACHINE_CONFIG_END
+ m_watchdog->set_time(attotime::from_seconds(0)); // no protection device or watchdog
+}
/* ROMs */
diff --git a/src/mame/drivers/ajax.cpp b/src/mame/drivers/ajax.cpp
index 2933d1c2b84..ba700056cf7 100644
--- a/src/mame/drivers/ajax.cpp
+++ b/src/mame/drivers/ajax.cpp
@@ -184,7 +184,7 @@ MACHINE_CONFIG_START(ajax_state::ajax)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/albazg.cpp b/src/mame/drivers/albazg.cpp
index 09f007269b4..c3aed14f95a 100644
--- a/src/mame/drivers/albazg.cpp
+++ b/src/mame/drivers/albazg.cpp
@@ -369,8 +369,7 @@ MACHINE_CONFIG_START(albazg_state::yumefuda)
EEPROM_93C46_16BIT(config, "eeprom");
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8) // timing is unknown
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 8); // timing is unknown
i8255_device &ppi(I8255A(config, "ppi8255_0"));
ppi.out_pa_callback().set(FUNC(albazg_state::mux_w));
diff --git a/src/mame/drivers/aliens.cpp b/src/mame/drivers/aliens.cpp
index 2e29899ad9b..881c032b002 100644
--- a/src/mame/drivers/aliens.cpp
+++ b/src/mame/drivers/aliens.cpp
@@ -207,7 +207,7 @@ MACHINE_CONFIG_START(aliens_state::aliens)
ADDRESS_MAP_BANK(config, "bank0000").set_map(&aliens_state::bank0000_map).set_options(ENDIANNESS_BIG, 8, 11, 0x400);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/ambush.cpp b/src/mame/drivers/ambush.cpp
index 1ef64c55042..19fb50f3056 100644
--- a/src/mame/drivers/ambush.cpp
+++ b/src/mame/drivers/ambush.cpp
@@ -730,7 +730,7 @@ MACHINE_CONFIG_START(ambush_state::ambush_base)
MCFG_DEVICE_IO_MAP(main_portmap)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ambush_state, irq0_line_hold)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_MACHINE_START_OVERRIDE(ambush_state, ambush)
diff --git a/src/mame/drivers/ampoker2.cpp b/src/mame/drivers/ampoker2.cpp
index 93de5af13e7..54310efb5f9 100644
--- a/src/mame/drivers/ampoker2.cpp
+++ b/src/mame/drivers/ampoker2.cpp
@@ -1154,8 +1154,7 @@ MACHINE_CONFIG_START(ampoker2_state::ampoker2)
MCFG_DEVICE_IO_MAP(ampoker2_io_map)
MCFG_DEVICE_PERIODIC_INT_DRIVER(ampoker2_state, nmi_line_pulse, 1536)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(200)) /* 200 ms, measured */
+ WATCHDOG_TIMER(config, m_watchdog).set_time(attotime::from_msec(200)); /* 200 ms, measured */
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
diff --git a/src/mame/drivers/arcadecl.cpp b/src/mame/drivers/arcadecl.cpp
index 6a444c6711b..9602ded6763 100644
--- a/src/mame/drivers/arcadecl.cpp
+++ b/src/mame/drivers/arcadecl.cpp
@@ -327,7 +327,7 @@ MACHINE_CONFIG_START(sparkz_state::sparkz)
EEPROM_2804(config, "eeprom").lock_after_write(true);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_arcadecl)
diff --git a/src/mame/drivers/aristmk5.cpp b/src/mame/drivers/aristmk5.cpp
index c0f2bd4695c..213dbc4e19f 100644
--- a/src/mame/drivers/aristmk5.cpp
+++ b/src/mame/drivers/aristmk5.cpp
@@ -2039,8 +2039,7 @@ MACHINE_CONFIG_START(aristmk5_state::aristmk5)
MCFG_DEVICE_ADD("maincpu", ARM, MASTER_CLOCK/6) // 12000000
MCFG_DEVICE_PROGRAM_MAP(aristmk5_drame_map)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(2)) /* 1.6 - 2 seconds */
+ WATCHDOG_TIMER(config, "watchdog").set_time(attotime::from_seconds(2)); /* 1.6 - 2 seconds */
/* TODO: this isn't supposed to access a keyboard ... */
MCFG_DEVICE_ADD("kart", AAKART, 12000000/128) // TODO: frequency
diff --git a/src/mame/drivers/arkanoid.cpp b/src/mame/drivers/arkanoid.cpp
index 7976ae71e27..873aa65aa15 100644
--- a/src/mame/drivers/arkanoid.cpp
+++ b/src/mame/drivers/arkanoid.cpp
@@ -1351,8 +1351,7 @@ MACHINE_CONFIG_START(arkanoid_state::arkanoid)
MCFG_DEVICE_PROGRAM_MAP(arkanoid_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", arkanoid_state, irq0_line_hold)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 128); // 74LS393 at ic21, counts 128 vblanks before firing watchdog; z80 /RESET ls08 ic19 pin 9 input comes from ls04 ic20 pin 8, ls04 ic20 pin 9 input comes from ic21 ls393 pin 8, and ls393 is set to chain both 4 bit counters together
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 128); // 74LS393 at ic21, counts 128 vblanks before firing watchdog; z80 /RESET ls08 ic19 pin 9 input comes from ls04 ic20 pin 8, ls04 ic20 pin 9 input comes from ic21 ls393 pin 8, and ls393 is set to chain both 4 bit counters together
ARKANOID_68705P5(config, m_mcuintf, 12_MHz_XTAL / 4); // verified on PCB
m_mcuintf->portb_r_cb().set_ioport("MUX");
@@ -1429,7 +1428,7 @@ MACHINE_CONFIG_START(arkanoid_state::hexa)
MCFG_DEVICE_PROGRAM_MAP(hexa_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", arkanoid_state, irq0_line_hold)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/asteroid.cpp b/src/mame/drivers/asteroid.cpp
index ab4a93993f8..73d435ec944 100644
--- a/src/mame/drivers/asteroid.cpp
+++ b/src/mame/drivers/asteroid.cpp
@@ -738,7 +738,7 @@ MACHINE_CONFIG_START(asteroid_state::asteroid_base)
MCFG_DEVICE_PROGRAM_MAP(asteroid_map)
MCFG_DEVICE_PERIODIC_INT_DRIVER(asteroid_state, asteroid_interrupt, CLOCK_3KHZ/12)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
TTL153(config, m_dsw_sel);
diff --git a/src/mame/drivers/astrocde.cpp b/src/mame/drivers/astrocde.cpp
index ecae79593b5..798d67e35b1 100644
--- a/src/mame/drivers/astrocde.cpp
+++ b/src/mame/drivers/astrocde.cpp
@@ -1240,8 +1240,7 @@ MACHINE_CONFIG_START(astrocde_state::astrocade_stereo_sound)
MCFG_DEVICE_ADD("astrocade2", ASTROCADE_IO, ASTROCADE_CLOCK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_WATCHDOG_ADD("watchdog") // MC14024B on CPU board at U18
- MCFG_WATCHDOG_VBLANK_INIT("screen", 128) // CLK = VERTDR, Q7 used for RESET
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 128); // MC14024B on CPU board at U18, CLK = VERTDR, Q7 used for RESET
MACHINE_CONFIG_END
@@ -1310,8 +1309,7 @@ MACHINE_CONFIG_START(ebases_state::ebases)
MCFG_DEVICE_MODIFY("astrocade1")
MCFG_ASTROCADE_IO_SO1_STROBE_CB(WRITE8("watchdog", watchdog_timer_device, reset_w))
- MCFG_WATCHDOG_ADD("watchdog") // MC14024 on CPU board at U18
- MCFG_WATCHDOG_VBLANK_INIT("screen", 128) // CLK = VERTDR, Q7 used for RESET
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 128); // MC14024 on CPU board at U18, CLK = VERTDR, Q7 used for RESET
MACHINE_CONFIG_END
@@ -1332,8 +1330,7 @@ MACHINE_CONFIG_START(astrocde_state::spacezap)
MCFG_OUTPUT_LATCH_BIT0_HANDLER(WRITELINE(*this, astrocde_state, coin_counter_w<0>))
MCFG_OUTPUT_LATCH_BIT1_HANDLER(WRITELINE(*this, astrocde_state, coin_counter_w<1>))
- MCFG_WATCHDOG_ADD("watchdog") // MC14024 on CPU board at U18
- MCFG_WATCHDOG_VBLANK_INIT("screen", 128) // CLK = VERTDR, Q7 used for RESET
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 128); // MC14024 on CPU board at U18, CLK = VERTDR, Q7 used for RESET
MACHINE_CONFIG_END
MACHINE_CONFIG_START(astrocde_state::wow)
@@ -1399,8 +1396,7 @@ MACHINE_CONFIG_START(astrocde_state::gorf)
lamplatch.q_out_cb<6>().set_nop(); // n/c
lamplatch.q_out_cb<7>().set_output("lamp7");
- MCFG_WATCHDOG_ADD("watchdog") // MC14024 on CPU board at U18
- MCFG_WATCHDOG_VBLANK_INIT("screen", 128) // CLK = VERTDR, Q7 used for RESET
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 128); // MC14024 on CPU board at U18, CLK = VERTDR, Q7 used for RESET
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/asuka.cpp b/src/mame/drivers/asuka.cpp
index 5bcc7e3f095..323ff465456 100644
--- a/src/mame/drivers/asuka.cpp
+++ b/src/mame/drivers/asuka.cpp
@@ -858,7 +858,7 @@ MACHINE_CONFIG_START(asuka_state::bonzeadv)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/atari_s1.cpp b/src/mame/drivers/atari_s1.cpp
index 24bee5c3c49..f8d785178b0 100644
--- a/src/mame/drivers/atari_s1.cpp
+++ b/src/mame/drivers/atari_s1.cpp
@@ -455,7 +455,7 @@ MACHINE_CONFIG_START(atari_s1_state::atari_s1)
MCFG_DEVICE_ADD("maincpu", M6800, MASTER_CLK)
MCFG_DEVICE_PROGRAM_MAP(atari_s1_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* Sound */
genpin_audio(config);
diff --git a/src/mame/drivers/atari_s2.cpp b/src/mame/drivers/atari_s2.cpp
index 0b5eccf4db1..ff198642ed3 100644
--- a/src/mame/drivers/atari_s2.cpp
+++ b/src/mame/drivers/atari_s2.cpp
@@ -484,7 +484,7 @@ MACHINE_CONFIG_START(atari_s2_state::atari_s2)
MCFG_DEVICE_ADD("maincpu", M6800, XTAL(4'000'000) / 4)
MCFG_DEVICE_PROGRAM_MAP(atari_s2_map)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* Sound */
genpin_audio(config);
diff --git a/src/mame/drivers/atarifb.cpp b/src/mame/drivers/atarifb.cpp
index c96eda96ed4..633d3f2322a 100644
--- a/src/mame/drivers/atarifb.cpp
+++ b/src/mame/drivers/atarifb.cpp
@@ -563,7 +563,7 @@ MACHINE_CONFIG_START(atarifb_state::atarifb)
MCFG_DEVICE_PROGRAM_MAP(atarifb_map)
MCFG_DEVICE_PERIODIC_INT_DRIVER(atarifb_state, irq0_line_hold, 4*60)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/atarig1.cpp b/src/mame/drivers/atarig1.cpp
index 57893e61545..7e01387b401 100644
--- a/src/mame/drivers/atarig1.cpp
+++ b/src/mame/drivers/atarig1.cpp
@@ -406,7 +406,7 @@ MACHINE_CONFIG_START(atarig1_state::atarig1)
EEPROM_2816(config, "eeprom").lock_after_write(true);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_atarig1)
diff --git a/src/mame/drivers/atarig42.cpp b/src/mame/drivers/atarig42.cpp
index 740bf904e30..766021b7f13 100644
--- a/src/mame/drivers/atarig42.cpp
+++ b/src/mame/drivers/atarig42.cpp
@@ -521,7 +521,7 @@ MACHINE_CONFIG_START(atarig42_state::atarig42)
EEPROM_2816(config, "eeprom").lock_after_write(true);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_atarig42)
diff --git a/src/mame/drivers/atarisy1.cpp b/src/mame/drivers/atarisy1.cpp
index 11d68ff2fcd..57f73f7fcce 100644
--- a/src/mame/drivers/atarisy1.cpp
+++ b/src/mame/drivers/atarisy1.cpp
@@ -745,7 +745,7 @@ MACHINE_CONFIG_START(atarisy1_state::atarisy1)
m_outlatch->q_out_cb<6>().set(FUNC(atarisy1_state::coin_counter_right_w));
m_outlatch->q_out_cb<7>().set(FUNC(atarisy1_state::coin_counter_left_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_TIMER_DRIVER_ADD("scan_timer", atarisy1_state, atarisy1_int3_callback)
MCFG_TIMER_DRIVER_ADD("int3off_timer", atarisy1_state, atarisy1_int3off_callback)
diff --git a/src/mame/drivers/atarisy2.cpp b/src/mame/drivers/atarisy2.cpp
index 61d06c0e105..ccb86bc6e60 100644
--- a/src/mame/drivers/atarisy2.cpp
+++ b/src/mame/drivers/atarisy2.cpp
@@ -1208,7 +1208,7 @@ MACHINE_CONFIG_START(atarisy2_state::atarisy2)
EEPROM_2804(config, "eeprom");
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_atarisy2)
diff --git a/src/mame/drivers/avalnche.cpp b/src/mame/drivers/avalnche.cpp
index c1b0f87d5dc..2789147e5b1 100644
--- a/src/mame/drivers/avalnche.cpp
+++ b/src/mame/drivers/avalnche.cpp
@@ -229,7 +229,7 @@ MACHINE_CONFIG_START(avalnche_state::avalnche_base)
m_latch->q_out_cb<7>().set_output("led2"); // START LAMP
// Q1, Q4, Q5, Q6 are configured in audio/avalnche.cpp
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/aztarac.cpp b/src/mame/drivers/aztarac.cpp
index 3c6e288487a..c4bdc4cbae3 100644
--- a/src/mame/drivers/aztarac.cpp
+++ b/src/mame/drivers/aztarac.cpp
@@ -163,7 +163,7 @@ MACHINE_CONFIG_START(aztarac_state::aztarac)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_VECTOR_ADD("vector")
diff --git a/src/mame/drivers/badlands.cpp b/src/mame/drivers/badlands.cpp
index 2b3a80fd2cb..4228d334fa2 100644
--- a/src/mame/drivers/badlands.cpp
+++ b/src/mame/drivers/badlands.cpp
@@ -456,7 +456,7 @@ MACHINE_CONFIG_START(badlands_state::badlands)
EEPROM_2816(config, "eeprom").lock_after_write(true);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_badlands)
diff --git a/src/mame/drivers/balsente.cpp b/src/mame/drivers/balsente.cpp
index c48967b4989..b21aad77268 100644
--- a/src/mame/drivers/balsente.cpp
+++ b/src/mame/drivers/balsente.cpp
@@ -1333,7 +1333,7 @@ MACHINE_CONFIG_START(balsente_state::balsente)
X2212(config, "nov0").set_auto_save(true); // system NOVRAM
X2212(config, "nov1").set_auto_save(true); // cart NOVRAM
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_TIMER_DRIVER_ADD("scan_timer", balsente_state, interrupt_timer)
MCFG_TIMER_DRIVER_ADD("8253_0_timer", balsente_state, clock_counter_0_ff)
diff --git a/src/mame/drivers/baraduke.cpp b/src/mame/drivers/baraduke.cpp
index b066a7d95ff..12abda841b0 100644
--- a/src/mame/drivers/baraduke.cpp
+++ b/src/mame/drivers/baraduke.cpp
@@ -390,7 +390,7 @@ MACHINE_CONFIG_START(baraduke_state::baraduke)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* we need heavy synch */
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/batman.cpp b/src/mame/drivers/batman.cpp
index 784462e4b4f..82cdc98ac19 100644
--- a/src/mame/drivers/batman.cpp
+++ b/src/mame/drivers/batman.cpp
@@ -191,7 +191,7 @@ MACHINE_CONFIG_START(batman_state::batman)
EEPROM_2816(config, "eeprom").lock_after_write(true);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_batman)
diff --git a/src/mame/drivers/battlnts.cpp b/src/mame/drivers/battlnts.cpp
index 2feac7bec2d..41938ad3e68 100644
--- a/src/mame/drivers/battlnts.cpp
+++ b/src/mame/drivers/battlnts.cpp
@@ -240,7 +240,7 @@ MACHINE_CONFIG_START(battlnts_state::battlnts)
MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000) / 6 /* 3579545? */)
MCFG_DEVICE_PROGRAM_MAP(battlnts_sound_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/beathead.cpp b/src/mame/drivers/beathead.cpp
index 7b8b8b86db0..ae8374eafbb 100644
--- a/src/mame/drivers/beathead.cpp
+++ b/src/mame/drivers/beathead.cpp
@@ -344,7 +344,7 @@ MACHINE_CONFIG_START(beathead_state::beathead)
EEPROM_2804(config, "eeprom").lock_after_write(true);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_TIMER_DRIVER_ADD(m_scan_timer, beathead_state, scanline_callback)
diff --git a/src/mame/drivers/bfm_sc1.cpp b/src/mame/drivers/bfm_sc1.cpp
index 968b7c55627..59a8df53daa 100644
--- a/src/mame/drivers/bfm_sc1.cpp
+++ b/src/mame/drivers/bfm_sc1.cpp
@@ -1078,8 +1078,7 @@ MACHINE_CONFIG_START(bfm_sc1_state::scorpion1)
MCFG_DEVICE_PROGRAM_MAP(sc1_base) // setup read and write memorymap
MCFG_DEVICE_PERIODIC_INT_DRIVER(bfm_sc1_state, timer_irq, 1000) // generate 1000 IRQ's per second
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_MONOSTABLE(120000,100e-9))
+ WATCHDOG_TIMER(config, "watchdog").set_time(PERIOD_OF_555_MONOSTABLE(120000,100e-9));
MCFG_BFMBD1_ADD("vfd0",0)
diff --git a/src/mame/drivers/bfm_sc2.cpp b/src/mame/drivers/bfm_sc2.cpp
index 9f34389a0f2..804698c183b 100644
--- a/src/mame/drivers/bfm_sc2.cpp
+++ b/src/mame/drivers/bfm_sc2.cpp
@@ -2284,8 +2284,7 @@ MACHINE_CONFIG_START(bfm_sc2_vid_state::scorpion2_vid)
MCFG_DEVICE_PERIODIC_INT_DRIVER(bfm_sc2_vid_state, timer_irq, 1000) // generate 1000 IRQ's per second
MCFG_QUANTUM_TIME(attotime::from_hz(960)) // needed for serial communication !!
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_MONOSTABLE(120000,100e-9))
+ WATCHDOG_TIMER(config, "watchdog").set_time(PERIOD_OF_555_MONOSTABLE(120000,100e-9));
MCFG_BFMBD1_ADD("vfd0",0)
MCFG_BFMBD1_ADD("vfd1",1)
@@ -3754,8 +3753,7 @@ MACHINE_CONFIG_START(bfm_sc2_awp_state::scorpion2)
MCFG_DEVICE_PROGRAM_MAP(memmap_no_vid)
MCFG_DEVICE_PERIODIC_INT_DRIVER(bfm_sc2_awp_state, timer_irq, 1000)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_MONOSTABLE(120000,100e-9))
+ WATCHDOG_TIMER(config, "watchdog").set_time(PERIOD_OF_555_MONOSTABLE(120000,100e-9));
MCFG_BFMBD1_ADD("vfd0",0)
MCFG_BFMBD1_ADD("vfd1",1)
@@ -3814,8 +3812,7 @@ MACHINE_CONFIG_START(bfm_sc2_dmd_state::scorpion2_dm01)
MCFG_DEVICE_PROGRAM_MAP(memmap_no_vid)
MCFG_DEVICE_PERIODIC_INT_DRIVER(bfm_sc2_dmd_state, timer_irq, 1000)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_MONOSTABLE(120000,100e-9))
+ WATCHDOG_TIMER(config, "watchdog").set_time(PERIOD_OF_555_MONOSTABLE(120000,100e-9));
SPEAKER(config, "mono").front_center();
MCFG_DEVICE_ADD("ymsnd",YM2413, XTAL(3'579'545))
diff --git a/src/mame/drivers/bking.cpp b/src/mame/drivers/bking.cpp
index 62eadae7e3c..bf5105b9e51 100644
--- a/src/mame/drivers/bking.cpp
+++ b/src/mame/drivers/bking.cpp
@@ -405,7 +405,7 @@ MACHINE_CONFIG_START(bking_state::bking)
/* - periodic IRQ, with frequency 6000000/(4*16*16*10*16) = 36.621 Hz, */
MCFG_DEVICE_PERIODIC_INT_DRIVER(bking_state, irq0_line_hold, (double)6000000/(4*16*16*10*16))
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/bladestl.cpp b/src/mame/drivers/bladestl.cpp
index e110ca5bc45..2b8fd9e3f2b 100644
--- a/src/mame/drivers/bladestl.cpp
+++ b/src/mame/drivers/bladestl.cpp
@@ -315,7 +315,7 @@ MACHINE_CONFIG_START(bladestl_state::bladestl)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/blktiger.cpp b/src/mame/drivers/blktiger.cpp
index a59cf5edd13..bab2301d104 100644
--- a/src/mame/drivers/blktiger.cpp
+++ b/src/mame/drivers/blktiger.cpp
@@ -307,7 +307,7 @@ MACHINE_CONFIG_START(blktiger_state::blktiger)
// other ports unknown
//MCFG_DEVICE_VBLANK_INT_DRIVER("screen", blktiger_state, irq0_line_hold)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/blockhl.cpp b/src/mame/drivers/blockhl.cpp
index d0387d25bda..520d2296d27 100644
--- a/src/mame/drivers/blockhl.cpp
+++ b/src/mame/drivers/blockhl.cpp
@@ -289,7 +289,7 @@ MACHINE_CONFIG_START(blockhl_state::blockhl)
MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545))
MCFG_DEVICE_PROGRAM_MAP(audio_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/blstroid.cpp b/src/mame/drivers/blstroid.cpp
index 3871338fe03..b67ddbf7e53 100644
--- a/src/mame/drivers/blstroid.cpp
+++ b/src/mame/drivers/blstroid.cpp
@@ -182,7 +182,7 @@ MACHINE_CONFIG_START(blstroid_state::blstroid)
EEPROM_2804(config, "eeprom").lock_after_write(true);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_blstroid)
diff --git a/src/mame/drivers/blueprnt.cpp b/src/mame/drivers/blueprnt.cpp
index 8a478fa7f37..cdd7514cbf9 100644
--- a/src/mame/drivers/blueprnt.cpp
+++ b/src/mame/drivers/blueprnt.cpp
@@ -361,7 +361,7 @@ MACHINE_CONFIG_START(blueprnt_state::blueprnt)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/bottom9.cpp b/src/mame/drivers/bottom9.cpp
index c7207e743b7..67c584734e7 100644
--- a/src/mame/drivers/bottom9.cpp
+++ b/src/mame/drivers/bottom9.cpp
@@ -310,7 +310,7 @@ MACHINE_CONFIG_START(bottom9_state::bottom9)
MCFG_DEVICE_PROGRAM_MAP(audio_map)
MCFG_DEVICE_PERIODIC_INT_DRIVER(bottom9_state, bottom9_sound_interrupt, 8*60) /* irq is triggered by the main CPU */
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/boxer.cpp b/src/mame/drivers/boxer.cpp
index eb3d71d70d1..210abfdd6e3 100644
--- a/src/mame/drivers/boxer.cpp
+++ b/src/mame/drivers/boxer.cpp
@@ -497,7 +497,7 @@ MACHINE_CONFIG_START(boxer_state::boxer)
MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK / 16)
MCFG_DEVICE_PROGRAM_MAP(boxer_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/bublbobl.cpp b/src/mame/drivers/bublbobl.cpp
index 912182aa9c9..20afcc12f84 100644
--- a/src/mame/drivers/bublbobl.cpp
+++ b/src/mame/drivers/bublbobl.cpp
@@ -865,8 +865,7 @@ MACHINE_CONFIG_START(bublbobl_state::tokio)
MCFG_QUANTUM_PERFECT_CPU("maincpu") // is this necessary?
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 128); // 74LS393, counts 128 vblanks before firing watchdog; same circuit as taitosj uses
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 128); // 74LS393, counts 128 vblanks before firing watchdog; same circuit as taitosj uses
MCFG_MACHINE_START_OVERRIDE(bublbobl_state, tokio)
MCFG_MACHINE_RESET_OVERRIDE(bublbobl_state, tokio)
@@ -909,7 +908,7 @@ MACHINE_CONFIG_START(bublbobl_state::bublboblp)
// hooked up wrong in MAME for tokio in general, or is disabled with a wire
// jumper under the epoxy
MCFG_DEVICE_REMOVE("watchdog")
- MCFG_WATCHDOG_ADD("watchdog") // this adds back a watchdog, but due to the way MAME handles watchdogs, it will never fire unless it first gets at least one pulse, which it never will.
+ WATCHDOG_TIMER(config, "watchdog"); // this adds back a watchdog, but due to the way MAME handles watchdogs, it will never fire unless it first gets at least one pulse, which it never will.
MCFG_DEVICE_REPLACE("maincpu", Z80, MAIN_XTAL/4) // 6 MHz
MCFG_DEVICE_PROGRAM_MAP(tokio_map) // no mcu or resistors at all
@@ -978,8 +977,7 @@ MACHINE_CONFIG_START(bublbobl_state::bublbobl_nomcu)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 128); // 74LS393, counts 128 vblanks before firing watchdog; same circuit as taitosj uses
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 128); // 74LS393, counts 128 vblanks before firing watchdog; same circuit as taitosj uses
MCFG_MACHINE_START_OVERRIDE(bublbobl_state, bublbobl)
MCFG_MACHINE_RESET_OVERRIDE(bublbobl_state, bublbobl)
diff --git a/src/mame/drivers/buggychl.cpp b/src/mame/drivers/buggychl.cpp
index ab4809c8a88..3d589eb5c13 100644
--- a/src/mame/drivers/buggychl.cpp
+++ b/src/mame/drivers/buggychl.cpp
@@ -533,8 +533,7 @@ MACHINE_CONFIG_START(buggychl_state::buggychl)
MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, 48_MHz_XTAL/8/2) /* CPUspeed/2 MHz according to schematics, so 3MHz if cpu is jumpered for 6MHz */
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 128); // typical Taito 74ls392
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 128); // typical Taito 74ls392
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/bwidow.cpp b/src/mame/drivers/bwidow.cpp
index c71167bfae6..3d3c6eeac0f 100644
--- a/src/mame/drivers/bwidow.cpp
+++ b/src/mame/drivers/bwidow.cpp
@@ -793,7 +793,7 @@ MACHINE_CONFIG_START(bwidow_state::bwidowp)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_PROGRAM_MAP(bwidowp_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MACHINE_CONFIG_END
MACHINE_CONFIG_START(bwidow_state::gravitar)
diff --git a/src/mame/drivers/bzone.cpp b/src/mame/drivers/bzone.cpp
index 84e8bb1d58c..f35d0a23888 100644
--- a/src/mame/drivers/bzone.cpp
+++ b/src/mame/drivers/bzone.cpp
@@ -576,7 +576,7 @@ MACHINE_CONFIG_START(bzone_state::bzone_base)
MCFG_DEVICE_PROGRAM_MAP(bzone_map)
MCFG_DEVICE_PERIODIC_INT_DRIVER(bzone_state, bzone_interrupt, BZONE_CLOCK_3KHZ / 12)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_VECTOR_ADD("vector")
diff --git a/src/mame/drivers/canyon.cpp b/src/mame/drivers/canyon.cpp
index b1de3875d12..f6e17338242 100644
--- a/src/mame/drivers/canyon.cpp
+++ b/src/mame/drivers/canyon.cpp
@@ -252,8 +252,7 @@ MACHINE_CONFIG_START(canyon_state::canyon)
m_outlatch->q_out_cb<4>().set("discrete", FUNC(discrete_device::write_line<CANYON_ATTRACT1_EN>));
m_outlatch->q_out_cb<5>().set("discrete", FUNC(discrete_device::write_line<CANYON_ATTRACT2_EN>));
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
+ WATCHDOG_TIMER(config, m_watchdog).set_vblank_count("screen", 8);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/capbowl.cpp b/src/mame/drivers/capbowl.cpp
index b831a8df3ea..fec21ecd991 100644
--- a/src/mame/drivers/capbowl.cpp
+++ b/src/mame/drivers/capbowl.cpp
@@ -323,12 +323,10 @@ MACHINE_CONFIG_START(capbowl_state::capbowl)
MCFG_DEVICE_PROGRAM_MAP(capbowl_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", capbowl_state, interrupt)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_ASTABLE(100000.0, 100000.0, 0.1e-6) * 15.5) // ~0.3s
+ WATCHDOG_TIMER(config, m_watchdog).set_time(PERIOD_OF_555_ASTABLE(100000.0, 100000.0, 0.1e-6) * 15.5); // ~0.3s
MCFG_DEVICE_ADD("audiocpu", MC6809E, MASTER_CLOCK / 4) // MC68B09EP
MCFG_DEVICE_PROGRAM_MAP(sound_map)
-// MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_ASTABLE(100000.0, 100000.0, 0.1e-6) * 15.5) // TODO
NVRAM(config, "nvram", nvram_device::DEFAULT_RANDOM);
diff --git a/src/mame/drivers/cave.cpp b/src/mame/drivers/cave.cpp
index 6483c0ebc4c..01567df1cf5 100644
--- a/src/mame/drivers/cave.cpp
+++ b/src/mame/drivers/cave.cpp
@@ -2270,7 +2270,7 @@ MACHINE_CONFIG_START(cave_state::gaia)
MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2446,8 +2446,7 @@ MACHINE_CONFIG_START(cave_state::mazinger)
MCFG_DEVICE_PROGRAM_MAP(mazinger_sound_map)
MCFG_DEVICE_IO_MAP(mazinger_sound_portmap)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */
+ WATCHDOG_TIMER(config, "watchdog").set_time(attotime::from_seconds(3)); /* a guess, and certainly wrong */
MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
EEPROM_93C46_16BIT(config, "eeprom");
@@ -2502,8 +2501,7 @@ MACHINE_CONFIG_START(cave_state::metmqstr)
MCFG_DEVICE_PROGRAM_MAP(metmqstr_sound_map)
MCFG_DEVICE_IO_MAP(metmqstr_sound_portmap)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */
+ WATCHDOG_TIMER(config, "watchdog").set_time(attotime::from_seconds(3)); /* a guess, and certainly wrong */
MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave) /* start with the watchdog armed */
EEPROM_93C46_16BIT(config, "eeprom");
@@ -2557,8 +2555,7 @@ MACHINE_CONFIG_START(cave_state::pacslot)
MCFG_DEVICE_PROGRAM_MAP(pacslot_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */
+ WATCHDOG_TIMER(config, "watchdog").set_time(attotime::from_seconds(3)); /* a guess, and certainly wrong */
MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
@@ -2615,8 +2612,7 @@ MACHINE_CONFIG_START(cave_state::ppsatan)
MCFG_DEVICE_PROGRAM_MAP(ppsatan_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt_ppsatan)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(1)) /* a guess, and certainly wrong */
+ WATCHDOG_TIMER(config, "watchdog").set_time(attotime::from_seconds(1)); /* a guess, and certainly wrong */
MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
EEPROM_93C46_16BIT(config, "eeprom");
@@ -2811,8 +2807,7 @@ MACHINE_CONFIG_START(cave_state::tekkencw)
MCFG_DEVICE_PROGRAM_MAP(tekkencw_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */
+ WATCHDOG_TIMER(config, "watchdog").set_time(attotime::from_seconds(3)); /* a guess, and certainly wrong */
MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
@@ -2865,8 +2860,7 @@ MACHINE_CONFIG_START(cave_state::tjumpman)
MCFG_DEVICE_PROGRAM_MAP(tjumpman_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */
+ WATCHDOG_TIMER(config, "watchdog").set_time(attotime::from_seconds(3)); /* a guess, and certainly wrong */
MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
diff --git a/src/mame/drivers/ccastles.cpp b/src/mame/drivers/ccastles.cpp
index a2cc1c37fed..99390bc6390 100644
--- a/src/mame/drivers/ccastles.cpp
+++ b/src/mame/drivers/ccastles.cpp
@@ -448,8 +448,7 @@ MACHINE_CONFIG_START(ccastles_state::ccastles)
LS259(config, m_outlatch[1]); // 6P
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 8);
X2212(config, "nvram_4b").set_auto_save(true);
X2212(config, "nvram_4a").set_auto_save(true);
diff --git a/src/mame/drivers/cchasm.cpp b/src/mame/drivers/cchasm.cpp
index 332f943e7a1..7f3de547f0e 100644
--- a/src/mame/drivers/cchasm.cpp
+++ b/src/mame/drivers/cchasm.cpp
@@ -162,7 +162,7 @@ MACHINE_CONFIG_START(cchasm_state::cchasm)
m_ctc->zc_callback<1>().set(FUNC(cchasm_state::ctc_timer_1_w));
m_ctc->zc_callback<2>().set(FUNC(cchasm_state::ctc_timer_2_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_VECTOR_ADD("vector")
diff --git a/src/mame/drivers/centiped.cpp b/src/mame/drivers/centiped.cpp
index 161d67fa83f..51c9ffc5196 100644
--- a/src/mame/drivers/centiped.cpp
+++ b/src/mame/drivers/centiped.cpp
@@ -1755,7 +1755,7 @@ MACHINE_CONFIG_START(centiped_state::centiped_base)
m_outlatch->q_out_cb<3>().set_output("led0").invert(); // LED 1
m_outlatch->q_out_cb<4>().set_output("led1").invert(); // LED 2
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* timer */
MCFG_TIMER_DRIVER_ADD_SCANLINE("32v", centiped_state, generate_interrupt, "screen", 0, 16)
@@ -1968,7 +1968,7 @@ MACHINE_CONFIG_START(centiped_state::bullsdrt)
m_outlatch->q_out_cb<4>().set_output("led1").invert();
m_outlatch->q_out_cb<7>().set(FUNC(centiped_state::flip_screen_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/champbas.cpp b/src/mame/drivers/champbas.cpp
index 6c532d607a4..09bbfed8995 100644
--- a/src/mame/drivers/champbas.cpp
+++ b/src/mame/drivers/champbas.cpp
@@ -546,8 +546,7 @@ MACHINE_CONFIG_START(champbas_state::talbot)
MCFG_DEVICE_ADD("alpha_8201", ALPHA_8201, XTAL(18'432'000)/6/8)
MCFG_QUANTUM_PERFECT_CPU("alpha_8201:mcu")
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 0x10)
+ WATCHDOG_TIMER(config, m_watchdog).set_vblank_count("screen", 0x10);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -592,8 +591,7 @@ MACHINE_CONFIG_START(champbas_state::champbas)
MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(18'432'000)/6)
MCFG_DEVICE_PROGRAM_MAP(champbas_sound_map)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 0x10)
+ WATCHDOG_TIMER(config, m_watchdog).set_vblank_count("screen", 0x10);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -705,8 +703,7 @@ MACHINE_CONFIG_START(exctsccr_state::exctsccr)
MCFG_DEVICE_ADD("alpha_8201", ALPHA_8201, XTAL(18'432'000)/6/8) // note: 8302 rom, or 8303 on exctscc2 (same device!)
MCFG_QUANTUM_PERFECT_CPU("alpha_8201:mcu")
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 0x10)
+ WATCHDOG_TIMER(config, m_watchdog).set_vblank_count("screen", 0x10);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -770,8 +767,7 @@ MACHINE_CONFIG_START(exctsccr_state::exctsccrb)
MCFG_DEVICE_ADD("alpha_8201", ALPHA_8201, XTAL(18'432'000)/6/8) // champbasj 8201 on pcb, though unused
MCFG_QUANTUM_PERFECT_CPU("alpha_8201:mcu")
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 0x10)
+ WATCHDOG_TIMER(config, m_watchdog).set_vblank_count("screen", 0x10);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/changela.cpp b/src/mame/drivers/changela.cpp
index f17f16e01ad..ad26de9d95d 100644
--- a/src/mame/drivers/changela.cpp
+++ b/src/mame/drivers/changela.cpp
@@ -435,7 +435,7 @@ MACHINE_CONFIG_START(changela_state::changela)
outlatch.q_out_cb<4>().set(FUNC(changela_state::mcu_pc_0_w));
outlatch.q_out_cb<5>().set(FUNC(changela_state::collision_reset_1_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/chqflag.cpp b/src/mame/drivers/chqflag.cpp
index aeac869b725..419f391818a 100644
--- a/src/mame/drivers/chqflag.cpp
+++ b/src/mame/drivers/chqflag.cpp
@@ -329,7 +329,7 @@ MACHINE_CONFIG_START(chqflag_state::chqflag)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/circusc.cpp b/src/mame/drivers/circusc.cpp
index 1c993de2ddc..beeb0637448 100644
--- a/src/mame/drivers/circusc.cpp
+++ b/src/mame/drivers/circusc.cpp
@@ -358,8 +358,7 @@ MACHINE_CONFIG_START(circusc_state::circusc)
mainlatch.q_out_cb<4>().set(FUNC(circusc_state::coin_counter_2_w)); // COIN2
mainlatch.q_out_cb<5>().set(FUNC(circusc_state::spritebank_w)); // OBJ CHENG
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 8);
MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(14'318'181)/4)
MCFG_DEVICE_PROGRAM_MAP(sound_map)
diff --git a/src/mame/drivers/cischeat.cpp b/src/mame/drivers/cischeat.cpp
index 4e3595d3e32..6586557d435 100644
--- a/src/mame/drivers/cischeat.cpp
+++ b/src/mame/drivers/cischeat.cpp
@@ -2142,7 +2142,7 @@ MACHINE_CONFIG_START(cischeat_state::scudhamm)
MCFG_DEVICE_PROGRAM_MAP(scudhamm_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", cischeat_state, scudhamm_scanline, "screen", 0, 1)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2233,7 +2233,7 @@ MACHINE_CONFIG_START(cischeat_state::captflag)
MCFG_TICKET_DISPENSER_ADD("hopper", attotime::from_msec(2000), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH )
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
/* video hardware */
diff --git a/src/mame/drivers/clayshoo.cpp b/src/mame/drivers/clayshoo.cpp
index 2aa90a41087..bddff8b1082 100644
--- a/src/mame/drivers/clayshoo.cpp
+++ b/src/mame/drivers/clayshoo.cpp
@@ -330,7 +330,7 @@ MACHINE_CONFIG_START(clayshoo_state::clayshoo)
MCFG_DEVICE_IO_MAP(main_io_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", clayshoo_state, irq0_line_hold)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/cloak.cpp b/src/mame/drivers/cloak.cpp
index 08a58d805a7..0bee1fb795c 100644
--- a/src/mame/drivers/cloak.cpp
+++ b/src/mame/drivers/cloak.cpp
@@ -336,7 +336,7 @@ MACHINE_CONFIG_START(cloak_state::cloak)
outlatch.q_out_cb<6>().set_output("led1").invert(); // START LED 2
outlatch.q_out_cb<7>().set_output("led0").invert(); // START LED 1
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/cloud9.cpp b/src/mame/drivers/cloud9.cpp
index 7192503b8a9..b6f3e80085c 100644
--- a/src/mame/drivers/cloud9.cpp
+++ b/src/mame/drivers/cloud9.cpp
@@ -404,8 +404,7 @@ MACHINE_CONFIG_START(cloud9_state::cloud9)
outlatch.q_out_cb<2>().set_output("led0").invert();
outlatch.q_out_cb<3>().set_output("led1").invert();
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 8);
X2212(config, "nvram").set_auto_save(true);
diff --git a/src/mame/drivers/combatsc.cpp b/src/mame/drivers/combatsc.cpp
index a2eda5e116a..4a32f1b3f69 100644
--- a/src/mame/drivers/combatsc.cpp
+++ b/src/mame/drivers/combatsc.cpp
@@ -710,7 +710,7 @@ MACHINE_CONFIG_START(combatsc_state::combatsc)
MCFG_MACHINE_START_OVERRIDE(combatsc_state,combatsc)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/crimfght.cpp b/src/mame/drivers/crimfght.cpp
index fceb9c2186f..19491d387a6 100644
--- a/src/mame/drivers/crimfght.cpp
+++ b/src/mame/drivers/crimfght.cpp
@@ -313,7 +313,7 @@ MACHINE_CONFIG_START(crimfght_state::crimfght)
ADDRESS_MAP_BANK(config, "bank0000").set_map(&crimfght_state::bank0000_map).set_options(ENDIANNESS_BIG, 8, 11, 0x400);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/cyberbal.cpp b/src/mame/drivers/cyberbal.cpp
index 6944d51d177..50668f0de90 100644
--- a/src/mame/drivers/cyberbal.cpp
+++ b/src/mame/drivers/cyberbal.cpp
@@ -497,7 +497,7 @@ MACHINE_CONFIG_START(cyberbal2p_state::cyberbal2p)
EEPROM_2816(config, "eeprom").lock_after_write(true);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cyberbal)
diff --git a/src/mame/drivers/cybstorm.cpp b/src/mame/drivers/cybstorm.cpp
index 9e3b7b2b903..4734db056e6 100644
--- a/src/mame/drivers/cybstorm.cpp
+++ b/src/mame/drivers/cybstorm.cpp
@@ -229,7 +229,7 @@ MACHINE_CONFIG_START(cybstorm_state::round2)
EEPROM_2816(config, "eeprom").lock_after_write(true);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_ATARI_VAD_ADD("vad", "screen", INPUTLINE("maincpu", M68K_IRQ_4))
diff --git a/src/mame/drivers/dambustr.cpp b/src/mame/drivers/dambustr.cpp
index 1fca6c0d20b..72a5bdf3566 100644
--- a/src/mame/drivers/dambustr.cpp
+++ b/src/mame/drivers/dambustr.cpp
@@ -272,7 +272,7 @@ MACHINE_CONFIG_START(dambustr_state::dambustr)
MCFG_TIMER_DRIVER_ADD("int_timer", dambustr_state, galaxold_interrupt_timer)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/darius.cpp b/src/mame/drivers/darius.cpp
index f45f1ad48b9..8991bb41ee3 100644
--- a/src/mame/drivers/darius.cpp
+++ b/src/mame/drivers/darius.cpp
@@ -724,7 +724,7 @@ MACHINE_CONFIG_START(darius_state::darius)
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame ? */
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_darius)
diff --git a/src/mame/drivers/dblcrown.cpp b/src/mame/drivers/dblcrown.cpp
index b931af1c121..0344ddcc062 100644
--- a/src/mame/drivers/dblcrown.cpp
+++ b/src/mame/drivers/dblcrown.cpp
@@ -607,8 +607,7 @@ MACHINE_CONFIG_START(dblcrown_state::dblcrown)
MCFG_DEVICE_IO_MAP(dblcrown_io)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", dblcrown_state, dblcrown_irq_scanline, "screen", 0, 1)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(1000)) /* 1000 ms. (minimal of MAX693A watchdog long timeout period with internal oscillator) */
+ WATCHDOG_TIMER(config, m_watchdog).set_time(attotime::from_msec(1000)); /* 1000 ms. (minimal of MAX693A watchdog long timeout period with internal oscillator) */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/dcheese.cpp b/src/mame/drivers/dcheese.cpp
index b9a2487b3f7..66e8a334037 100644
--- a/src/mame/drivers/dcheese.cpp
+++ b/src/mame/drivers/dcheese.cpp
@@ -388,7 +388,7 @@ MACHINE_CONFIG_START(dcheese_state::dcheese)
MCFG_TICKET_DISPENSER_ADD("ticket", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/ddribble.cpp b/src/mame/drivers/ddribble.cpp
index 40c70327afa..fff43be4849 100644
--- a/src/mame/drivers/ddribble.cpp
+++ b/src/mame/drivers/ddribble.cpp
@@ -271,7 +271,7 @@ MACHINE_CONFIG_START(ddribble_state::ddribble)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* we need heavy synch */
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/deadang.cpp b/src/mame/drivers/deadang.cpp
index c102d158302..8c3b1905332 100644
--- a/src/mame/drivers/deadang.cpp
+++ b/src/mame/drivers/deadang.cpp
@@ -365,7 +365,7 @@ MACHINE_CONFIG_START(deadang_state::deadang)
MCFG_QUANTUM_TIME(attotime::from_hz(60)) // the game stops working with higher interleave rates..
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/decocass.cpp b/src/mame/drivers/decocass.cpp
index 01e5868e5ad..bf2a5560492 100644
--- a/src/mame/drivers/decocass.cpp
+++ b/src/mame/drivers/decocass.cpp
@@ -970,7 +970,7 @@ MACHINE_CONFIG_START(decocass_state::decocass)
MCFG_QUANTUM_TIME(attotime::from_hz(4200)) /* interleave CPUs */
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
MCFG_DECOCASS_TAPE_ADD("cassette")
diff --git a/src/mame/drivers/destroyr.cpp b/src/mame/drivers/destroyr.cpp
index da185a09194..d9268fc9436 100644
--- a/src/mame/drivers/destroyr.cpp
+++ b/src/mame/drivers/destroyr.cpp
@@ -482,7 +482,7 @@ MACHINE_CONFIG_START(destroyr_state::destroyr)
// Q6 => high explosion
// Q7 => low explosion
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/dkong.cpp b/src/mame/drivers/dkong.cpp
index 4d06a7e8074..2bf8190d7d3 100644
--- a/src/mame/drivers/dkong.cpp
+++ b/src/mame/drivers/dkong.cpp
@@ -1761,7 +1761,7 @@ MACHINE_CONFIG_START(dkong_state::dkong2b)
/* sound hardware */
dkong2b_audio(config);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
MACHINE_CONFIG_END
void dkong_state::dk_braze(machine_config &config)
@@ -1834,7 +1834,7 @@ MACHINE_CONFIG_START(dkong_state::dkongjr)
/* sound hardware */
dkongjr_audio(config);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(dkong_state::pestplce)
diff --git a/src/mame/drivers/dlair.cpp b/src/mame/drivers/dlair.cpp
index d65fc7e71b0..c9d94ee9cd6 100644
--- a/src/mame/drivers/dlair.cpp
+++ b/src/mame/drivers/dlair.cpp
@@ -781,8 +781,7 @@ MACHINE_CONFIG_START(dlair_state::dleuro)
sio.out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
// TODO: hook up tx and rx callbacks
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_hz(MASTER_CLOCK_EURO/(16*16*16*16*16*8)))
+ WATCHDOG_TIMER(config, "watchdog").set_time(attotime::from_hz(MASTER_CLOCK_EURO/(16*16*16*16*16*8)));
MCFG_LASERDISC_22VP932_ADD("ld_22vp932")
MCFG_LASERDISC_OVERLAY_DRIVER(256, 256, dlair_state, screen_update_dleuro)
diff --git a/src/mame/drivers/docastle.cpp b/src/mame/drivers/docastle.cpp
index 25075d579bd..47d3c705703 100644
--- a/src/mame/drivers/docastle.cpp
+++ b/src/mame/drivers/docastle.cpp
@@ -623,7 +623,7 @@ MACHINE_CONFIG_START(docastle_state::docastle)
m_inp[1]->read_port5_callback().set_ioport("BUTTONS").rshift(4);
m_inp[1]->read_port7_callback().set_ioport("SYSTEM").rshift(4);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(9'828'000) / 16)
diff --git a/src/mame/drivers/dragrace.cpp b/src/mame/drivers/dragrace.cpp
index add002df6fc..4ee8a707460 100644
--- a/src/mame/drivers/dragrace.cpp
+++ b/src/mame/drivers/dragrace.cpp
@@ -278,8 +278,7 @@ MACHINE_CONFIG_START(dragrace_state::dragrace)
MCFG_DEVICE_PROGRAM_MAP(dragrace_map)
MCFG_DEVICE_PERIODIC_INT_DRIVER(dragrace_state, irq0_line_hold, 4*60)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
+ WATCHDOG_TIMER(config, m_watchdog).set_vblank_count("screen", 8);
MCFG_TIMER_DRIVER_ADD_PERIODIC("frame_timer", dragrace_state, dragrace_frame_callback, attotime::from_hz(60))
diff --git a/src/mame/drivers/dribling.cpp b/src/mame/drivers/dribling.cpp
index dfe6aab3ace..01351167c26 100644
--- a/src/mame/drivers/dribling.cpp
+++ b/src/mame/drivers/dribling.cpp
@@ -287,7 +287,7 @@ MACHINE_CONFIG_START(dribling_state::dribling)
m_ppi8255_1->in_pc_callback().set_ioport("IN0");
m_ppi8255_1->out_pc_callback().set(FUNC(dribling_state::shr_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/dunhuang.cpp b/src/mame/drivers/dunhuang.cpp
index d576dfe2f78..85d0608546a 100644
--- a/src/mame/drivers/dunhuang.cpp
+++ b/src/mame/drivers/dunhuang.cpp
@@ -812,8 +812,7 @@ MACHINE_CONFIG_START(dunhuang_state::dunhuang)
MCFG_DEVICE_IO_MAP(dunhuang_io_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dunhuang_state, irq0_line_hold)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(5))
+ WATCHDOG_TIMER(config, "watchdog").set_time(attotime::from_seconds(5));
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/epos.cpp b/src/mame/drivers/epos.cpp
index c480cd19feb..4b60990ed01 100644
--- a/src/mame/drivers/epos.cpp
+++ b/src/mame/drivers/epos.cpp
@@ -465,7 +465,7 @@ MACHINE_CONFIG_START(epos_state::epos) /* EPOS TRISTAR 8000 PCB */
MCFG_DEVICE_IO_MAP(epos_io_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", epos_state, irq0_line_hold)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -505,7 +505,7 @@ MACHINE_CONFIG_START(epos_state::dealer) /* EPOS TRISTAR 9000 PCB */
MCFG_PALETTE_ADD_INIT_BLACK("palette", 32)
// MCFG_PALETTE_INIT_OWNER(epos_state, epos)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/eprom.cpp b/src/mame/drivers/eprom.cpp
index 969d14c8f2e..f8d8ea48bc9 100644
--- a/src/mame/drivers/eprom.cpp
+++ b/src/mame/drivers/eprom.cpp
@@ -399,7 +399,7 @@ MACHINE_CONFIG_START(eprom_state::eprom)
EEPROM_2804(config, "eeprom").lock_after_write(true);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_eprom)
@@ -441,7 +441,7 @@ MACHINE_CONFIG_START(eprom_state::klaxp)
EEPROM_2804(config, "eeprom").lock_after_write(true);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_eprom)
@@ -488,7 +488,7 @@ MACHINE_CONFIG_START(eprom_state::guts)
EEPROM_2804(config, "eeprom").lock_after_write(true);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_guts)
diff --git a/src/mame/drivers/equites.cpp b/src/mame/drivers/equites.cpp
index 748a57bd5e7..5b675dfdcd2 100644
--- a/src/mame/drivers/equites.cpp
+++ b/src/mame/drivers/equites.cpp
@@ -1170,7 +1170,7 @@ MACHINE_CONFIG_START(equites_state::equites)
MCFG_DEVICE_ADD("alpha_8201", ALPHA_8201, 4000000/8) // 8303 or 8304 (same device!)
MCFG_QUANTUM_PERFECT_CPU("alpha_8201:mcu")
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/espial.cpp b/src/mame/drivers/espial.cpp
index 76fa8493f45..70c3c9e79a4 100644
--- a/src/mame/drivers/espial.cpp
+++ b/src/mame/drivers/espial.cpp
@@ -331,7 +331,7 @@ MACHINE_CONFIG_START(espial_state::espial)
MCFG_DEVICE_IO_MAP(espial_sound_io_map)
MCFG_DEVICE_PERIODIC_INT_DRIVER(espial_state, espial_sound_nmi_gen, 4*60)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/expro02.cpp b/src/mame/drivers/expro02.cpp
index 8248bba7e71..de18d1ef64d 100644
--- a/src/mame/drivers/expro02.cpp
+++ b/src/mame/drivers/expro02.cpp
@@ -950,8 +950,7 @@ MACHINE_CONFIG_START(expro02_state::expro02)
/* arm watchdog */
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */
+ WATCHDOG_TIMER(config, "watchdog").set_time(attotime::from_seconds(3)); /* a guess, and certainly wrong */
/* sound hardware */
SPEAKER(config, "mono").front_center();
@@ -976,8 +975,7 @@ MACHINE_CONFIG_START(expro02_state::comad)
MCFG_KANEKO_TMAP_INVERT_FLIP(1)
MCFG_KANEKO_TMAP_OFFSET(-256, -216, 256, 224)
- MCFG_WATCHDOG_MODIFY("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(0)) /* a guess, and certainly wrong */
+ subdevice<watchdog_timer_device>("watchdog")->set_time(attotime::from_seconds(0)); /* a guess, and certainly wrong */
MACHINE_CONFIG_END
MACHINE_CONFIG_START(expro02_state::comad_noview2)
diff --git a/src/mame/drivers/exterm.cpp b/src/mame/drivers/exterm.cpp
index ec9d2b3a3cb..68e16e60229 100644
--- a/src/mame/drivers/exterm.cpp
+++ b/src/mame/drivers/exterm.cpp
@@ -403,7 +403,7 @@ MACHINE_CONFIG_START(exterm_state::exterm)
MCFG_TIMER_DRIVER_ADD(m_nmi_timer, exterm_state, master_sound_nmi_callback)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_PALETTE_ADD("palette", 2048+32768)
diff --git a/src/mame/drivers/fastfred.cpp b/src/mame/drivers/fastfred.cpp
index d7b21c9a7f9..c6a6024d647 100644
--- a/src/mame/drivers/fastfred.cpp
+++ b/src/mame/drivers/fastfred.cpp
@@ -651,7 +651,7 @@ MACHINE_CONFIG_START(fastfred_state::fastfred)
m_outlatch->q_out_cb<6>().set(FUNC(fastfred_state::flip_screen_x_w));
m_outlatch->q_out_cb<7>().set(FUNC(fastfred_state::flip_screen_y_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/fastlane.cpp b/src/mame/drivers/fastlane.cpp
index 0773eb0d4c6..ef623cc877c 100644
--- a/src/mame/drivers/fastlane.cpp
+++ b/src/mame/drivers/fastlane.cpp
@@ -206,7 +206,7 @@ MACHINE_CONFIG_START(fastlane_state::fastlane)
MCFG_DEVICE_PROGRAM_MAP(fastlane_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", fastlane_state, fastlane_scanline, "screen", 0, 1)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/finalizr.cpp b/src/mame/drivers/finalizr.cpp
index bc509bfa3d3..d19c5210829 100644
--- a/src/mame/drivers/finalizr.cpp
+++ b/src/mame/drivers/finalizr.cpp
@@ -278,7 +278,7 @@ MACHINE_CONFIG_START(finalizr_state::finalizr)
//MCFG_MCS48_PORT_T0_CLK_CUSTOM(finalizr_state, i8039_T0_w)
MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, finalizr_state, i8039_T1_r))
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/firefox.cpp b/src/mame/drivers/firefox.cpp
index ba14b41892b..54d91479561 100644
--- a/src/mame/drivers/firefox.cpp
+++ b/src/mame/drivers/firefox.cpp
@@ -684,8 +684,7 @@ MACHINE_CONFIG_START(firefox_state::firefox)
latch1.q_out_cb<6>().set_output("led2").invert();
latch1.q_out_cb<7>().set_output("led3").invert();
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_hz(MASTER_XTAL/8/16/16/16/16))
+ WATCHDOG_TIMER(config, "watchdog").set_time(attotime::from_hz(MASTER_XTAL/8/16/16/16/16));
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_firefox)
diff --git a/src/mame/drivers/firetrk.cpp b/src/mame/drivers/firetrk.cpp
index 9aafa181af9..3c735dd3446 100644
--- a/src/mame/drivers/firetrk.cpp
+++ b/src/mame/drivers/firetrk.cpp
@@ -860,8 +860,7 @@ MACHINE_CONFIG_START(firetrk_state::firetrk)
MCFG_DEVICE_PROGRAM_MAP(firetrk_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", firetrk_state, firetrk_scanline, "screen", 0, 1)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 5)
+ WATCHDOG_TIMER(config, m_watchdog).set_vblank_count("screen", 5);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/flkatck.cpp b/src/mame/drivers/flkatck.cpp
index 6c6a9629756..c967926f624 100644
--- a/src/mame/drivers/flkatck.cpp
+++ b/src/mame/drivers/flkatck.cpp
@@ -222,7 +222,7 @@ MACHINE_CONFIG_START(flkatck_state::flkatck)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/foodf.cpp b/src/mame/drivers/foodf.cpp
index d0a1e3f4dae..f271fca9ad2 100644
--- a/src/mame/drivers/foodf.cpp
+++ b/src/mame/drivers/foodf.cpp
@@ -330,8 +330,7 @@ MACHINE_CONFIG_START(foodf_state::foodf)
X2212(config, "nvram").set_auto_save(true);
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 8);
MCFG_TIMER_DRIVER_ADD(m_scan_timer, foodf_state, scanline_update_timer)
diff --git a/src/mame/drivers/fortecar.cpp b/src/mame/drivers/fortecar.cpp
index 8f34f86ffa2..64e21f8c950 100644
--- a/src/mame/drivers/fortecar.cpp
+++ b/src/mame/drivers/fortecar.cpp
@@ -687,8 +687,7 @@ MACHINE_CONFIG_START(fortecar_state::fortecar)
MCFG_DEVICE_PROGRAM_MAP(fortecar_map)
MCFG_DEVICE_IO_MAP(fortecar_ports)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(200)) /* guess */
+ WATCHDOG_TIMER(config, m_watchdog).set_time(attotime::from_msec(200)); /* guess */
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
diff --git a/src/mame/drivers/funkybee.cpp b/src/mame/drivers/funkybee.cpp
index 085ca67dc09..c10a49a58b1 100644
--- a/src/mame/drivers/funkybee.cpp
+++ b/src/mame/drivers/funkybee.cpp
@@ -299,7 +299,7 @@ MACHINE_CONFIG_START(funkybee_state::funkybee)
mainlatch.q_out_cb<3>().set(FUNC(funkybee_state::coin_counter_2_w));
mainlatch.q_out_cb<5>().set(FUNC(funkybee_state::gfx_bank_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/gaiden.cpp b/src/mame/drivers/gaiden.cpp
index ca384d9c6ab..4b2e81c13e8 100644
--- a/src/mame/drivers/gaiden.cpp
+++ b/src/mame/drivers/gaiden.cpp
@@ -770,7 +770,7 @@ MACHINE_CONFIG_START(gaiden_state::shadoww)
MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* IRQs are triggered by the YM2203 */
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1009,7 +1009,7 @@ MACHINE_CONFIG_START(gaiden_state::mastninj)
MCFG_MACHINE_START_OVERRIDE(gaiden_state,mastninj)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/galaga.cpp b/src/mame/drivers/galaga.cpp
index 1498c1b385f..8b6c0f814da 100644
--- a/src/mame/drivers/galaga.cpp
+++ b/src/mame/drivers/galaga.cpp
@@ -1650,8 +1650,7 @@ MACHINE_CONFIG_START(bosco_state::bosco)
//m_videolatch->q_out_cb<7>().set("50xx_2", FUNC(namco_50xx_device::reset_w));
//m_videolatch->q_out_cb<7>().append("52xx", FUNC(namco_52xx_device, reset_w));
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 8);
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
@@ -1723,8 +1722,7 @@ MACHINE_CONFIG_START(galaga_state::galaga)
// Q0-Q5 to 05XX for starfield control
m_videolatch->q_out_cb<7>().set(FUNC(galaga_state::flip_screen_w));
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 8);
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
@@ -1827,8 +1825,7 @@ MACHINE_CONFIG_START(xevious_state::xevious)
MCFG_NAMCO_06XX_WRITE_2_CB(WRITE8("50xx", namco_50xx_device, write))
MCFG_NAMCO_06XX_WRITE_3_CB(WRITE8("54xx", namco_54xx_device, write))
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 8);
MCFG_QUANTUM_TIME(attotime::from_hz(60000)) /* 1000 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
@@ -1944,7 +1941,7 @@ MACHINE_CONFIG_START(digdug_state::digdug)
MCFG_DEVICE_ADD("earom", ER2055)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD(m_screen, RASTER)
diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp
index ae94d827a53..51e2a6ce98e 100644
--- a/src/mame/drivers/galaxian.cpp
+++ b/src/mame/drivers/galaxian.cpp
@@ -5935,8 +5935,7 @@ MACHINE_CONFIG_START(galaxian_state::galaxian_base)
MCFG_DEVICE_ADD("maincpu", Z80, GALAXIAN_PIXEL_CLOCK/3/2)
MCFG_DEVICE_PROGRAM_MAP(galaxian_map)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 8);
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_galaxian)
diff --git a/src/mame/drivers/galaxold.cpp b/src/mame/drivers/galaxold.cpp
index 4d161777268..78834a5444e 100644
--- a/src/mame/drivers/galaxold.cpp
+++ b/src/mame/drivers/galaxold.cpp
@@ -2269,7 +2269,7 @@ MACHINE_CONFIG_START(galaxold_state::galaxold_base)
MCFG_TIMER_DRIVER_ADD("int_timer", galaxold_state, galaxold_interrupt_timer)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_galaxian)
diff --git a/src/mame/drivers/galgames.cpp b/src/mame/drivers/galgames.cpp
index a831ffb081c..1bbb2afb549 100644
--- a/src/mame/drivers/galgames.cpp
+++ b/src/mame/drivers/galgames.cpp
@@ -983,7 +983,7 @@ MACHINE_CONFIG_START(galgames_state::galgames_base)
MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000) / 2)
MCFG_DEVICE_PROGRAM_MAP(galgames_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", galgames_state, scanline_interrupt, "screen", 0, 1)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_GALGAMES_SLOT_ADD("slot")
MCFG_GALGAMES_BIOS_CART_ADD( "cart0", 0)
diff --git a/src/mame/drivers/galpani3.cpp b/src/mame/drivers/galpani3.cpp
index d37c32598af..e3ca63100a7 100644
--- a/src/mame/drivers/galpani3.cpp
+++ b/src/mame/drivers/galpani3.cpp
@@ -465,7 +465,7 @@ MACHINE_CONFIG_START(galpani3_state::galpani3)
EEPROM_93C46_16BIT(config, "eeprom");
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_DEVICE_ADD("toybox", KANEKO_TOYBOX, "eeprom", "DSW1", "mcuram", "mcudata")
diff --git a/src/mame/drivers/galpanic.cpp b/src/mame/drivers/galpanic.cpp
index 8267d41d8fa..7cbd9cbfac9 100644
--- a/src/mame/drivers/galpanic.cpp
+++ b/src/mame/drivers/galpanic.cpp
@@ -239,7 +239,7 @@ MACHINE_CONFIG_START(galpanic_state::galpanic)
MCFG_DEVICE_PROGRAM_MAP(galpanic_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", galpanic_state, scanline, "screen", 0, 1)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -279,8 +279,7 @@ MACHINE_CONFIG_START(galpanic_state::galpanica)
MCFG_KANEKO_HIT_TYPE(0)
/* arm watchdog */
- MCFG_WATCHDOG_MODIFY("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */
+ subdevice<watchdog_timer_device>("watchdog")->set_time(attotime::from_seconds(3)); /* a guess, and certainly wrong */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gaplus.cpp b/src/mame/drivers/gaplus.cpp
index af559f86c70..db9c7435619 100644
--- a/src/mame/drivers/gaplus.cpp
+++ b/src/mame/drivers/gaplus.cpp
@@ -527,7 +527,7 @@ MACHINE_CONFIG_START(gaplus_base_state::gaplus_base)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* a high value to ensure proper synchronization of the CPUs */
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_NAMCO_62XX_ADD("62xx", 24576000 / 6 / 2) /* totally made up - TODO: fix */
//MCFG_NAMCO_62XX_INPUT_0_CB(IOPORT("IN0L"))
diff --git a/src/mame/drivers/gauntlet.cpp b/src/mame/drivers/gauntlet.cpp
index 5b07a3cb922..70b6e528c96 100644
--- a/src/mame/drivers/gauntlet.cpp
+++ b/src/mame/drivers/gauntlet.cpp
@@ -498,7 +498,7 @@ MACHINE_CONFIG_START(gauntlet_state::gauntlet_base)
EEPROM_2804(config, "eeprom").lock_after_write(true);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_gauntlet)
diff --git a/src/mame/drivers/gberet.cpp b/src/mame/drivers/gberet.cpp
index 0518e4b64e5..b0e931cac93 100644
--- a/src/mame/drivers/gberet.cpp
+++ b/src/mame/drivers/gberet.cpp
@@ -414,7 +414,7 @@ MACHINE_CONFIG_START(gberet_state::gberet)
MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'432'000)/6) // X1S (generated by a custom IC)
MCFG_DEVICE_PROGRAM_MAP(gberet_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", gberet_state, gberet_interrupt_tick, "screen", 0, 16)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_MACHINE_START_OVERRIDE(gberet_state,gberet)
MCFG_MACHINE_RESET_OVERRIDE(gberet_state,gberet)
diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp
index 49c1e0c2219..71ed01d774f 100644
--- a/src/mame/drivers/gottlieb.cpp
+++ b/src/mame/drivers/gottlieb.cpp
@@ -1776,8 +1776,7 @@ MACHINE_CONFIG_START(gottlieb_state::gottlieb_core)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 16)
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 16);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/gotya.cpp b/src/mame/drivers/gotya.cpp
index e2780b5863b..63e3c256c8a 100644
--- a/src/mame/drivers/gotya.cpp
+++ b/src/mame/drivers/gotya.cpp
@@ -216,7 +216,7 @@ MACHINE_CONFIG_START(gotya_state::gotya)
MCFG_DEVICE_PROGRAM_MAP(gotya_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gotya_state, irq0_line_hold)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/gradius3.cpp b/src/mame/drivers/gradius3.cpp
index a1f1a52c43e..1cea45f628e 100644
--- a/src/mame/drivers/gradius3.cpp
+++ b/src/mame/drivers/gradius3.cpp
@@ -296,7 +296,7 @@ MACHINE_CONFIG_START(gradius3_state::gradius3)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/grchamp.cpp b/src/mame/drivers/grchamp.cpp
index c550d7b5c2a..a4571ab7738 100644
--- a/src/mame/drivers/grchamp.cpp
+++ b/src/mame/drivers/grchamp.cpp
@@ -755,8 +755,7 @@ MACHINE_CONFIG_START(grchamp_state::grchamp)
MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_DEVICE_PERIODIC_INT_DRIVER(grchamp_state, irq0_line_hold, (double)SOUND_CLOCK/4/16/16/10/16)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
+ WATCHDOG_TIMER(config, m_watchdog).set_vblank_count("screen", 8);
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
/* video hardware */
diff --git a/src/mame/drivers/gridlee.cpp b/src/mame/drivers/gridlee.cpp
index 67459d57a22..a796146039f 100644
--- a/src/mame/drivers/gridlee.cpp
+++ b/src/mame/drivers/gridlee.cpp
@@ -404,7 +404,7 @@ MACHINE_CONFIG_START(gridlee_state::gridlee)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
LS259(config, m_latch); // type can only be guessed
m_latch->q_out_cb<0>().set_output("led0");
diff --git a/src/mame/drivers/gunsmoke.cpp b/src/mame/drivers/gunsmoke.cpp
index d9611c70493..68156d4f9c9 100644
--- a/src/mame/drivers/gunsmoke.cpp
+++ b/src/mame/drivers/gunsmoke.cpp
@@ -312,7 +312,7 @@ MACHINE_CONFIG_START(gunsmoke_state::gunsmoke)
MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_DEVICE_PERIODIC_INT_DRIVER(gunsmoke_state, irq0_line_hold, 4*60)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/harddriv.cpp b/src/mame/drivers/harddriv.cpp
index 024a6c59118..86e98898c75 100644
--- a/src/mame/drivers/harddriv.cpp
+++ b/src/mame/drivers/harddriv.cpp
@@ -1463,7 +1463,7 @@ MACHINE_CONFIG_START(harddriv_state::driver_nomsp)
MCFG_DEVICE_ADD("slapstic", SLAPSTIC, 117, true)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
ADC0809(config, m_adc8, 1000000); // unknown clock
m_adc8->in_callback<0>().set_ioport("8BADC.0");
diff --git a/src/mame/drivers/hcastle.cpp b/src/mame/drivers/hcastle.cpp
index ec4c8b0004d..34672ff0a32 100644
--- a/src/mame/drivers/hcastle.cpp
+++ b/src/mame/drivers/hcastle.cpp
@@ -196,7 +196,7 @@ MACHINE_CONFIG_START(hcastle_state::hcastle)
MCFG_DEVICE_ADD("audiocpu", Z80, 3579545)
MCFG_DEVICE_PROGRAM_MAP(sound_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8)
diff --git a/src/mame/drivers/hexion.cpp b/src/mame/drivers/hexion.cpp
index 468e13b7c6e..872262039bf 100644
--- a/src/mame/drivers/hexion.cpp
+++ b/src/mame/drivers/hexion.cpp
@@ -259,7 +259,7 @@ MACHINE_CONFIG_START(hexion_state::hexion)
MCFG_DEVICE_ADD("maincpu", Z80, XTAL(24'000'000)/4) /* Z80B 6 MHz @ 17F, xtal verified, divider not verified */
MCFG_DEVICE_PROGRAM_MAP(hexion_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", hexion_state, scanline, "screen", 0, 1)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
K053252(config, m_k053252, XTAL(24'000'000)/2); /* K053252, X0-010(?) @8D, xtal verified, divider not verified */
m_k053252->int1_ack().set(FUNC(hexion_state::irq_ack_w));
diff --git a/src/mame/drivers/holeland.cpp b/src/mame/drivers/holeland.cpp
index f071f8c37b0..a627865c8c2 100644
--- a/src/mame/drivers/holeland.cpp
+++ b/src/mame/drivers/holeland.cpp
@@ -288,7 +288,7 @@ MACHINE_CONFIG_START(holeland_state::holeland)
m_latch->q_out_cb<6>().set(FUNC(holeland_state::flipscreen_x_w));
m_latch->q_out_cb<7>().set(FUNC(holeland_state::flipscreen_y_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -369,7 +369,7 @@ MACHINE_CONFIG_START(holeland_state::crzrally)
m_latch->parallel_out_cb().set(FUNC(holeland_state::pal_offs_w)).mask(0x03);
m_latch->q_out_cb<5>().set(FUNC(holeland_state::coin_counter_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/hornet.cpp b/src/mame/drivers/hornet.cpp
index 1821febea98..1c48d2258d0 100644
--- a/src/mame/drivers/hornet.cpp
+++ b/src/mame/drivers/hornet.cpp
@@ -1079,7 +1079,7 @@ MACHINE_CONFIG_START(hornet_state::hornet)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
// PCB description at top doesn't mention any EEPROM on the base board...
// EEPROM_93C46_16BIT(config, "eeprom");
diff --git a/src/mame/drivers/hyperspt.cpp b/src/mame/drivers/hyperspt.cpp
index 7a571b2025d..2d2b5aa13a2 100644
--- a/src/mame/drivers/hyperspt.cpp
+++ b/src/mame/drivers/hyperspt.cpp
@@ -312,7 +312,7 @@ MACHINE_CONFIG_START(hyperspt_state::hyperspt)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD(m_screen, RASTER)
diff --git a/src/mame/drivers/jackal.cpp b/src/mame/drivers/jackal.cpp
index 0154c98fa45..f1d37d55095 100644
--- a/src/mame/drivers/jackal.cpp
+++ b/src/mame/drivers/jackal.cpp
@@ -368,7 +368,7 @@ MACHINE_CONFIG_START(jackal_state::jackal)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/jaguar.cpp b/src/mame/drivers/jaguar.cpp
index 62e62fa6dda..4613b2ce55d 100644
--- a/src/mame/drivers/jaguar.cpp
+++ b/src/mame/drivers/jaguar.cpp
@@ -1855,7 +1855,7 @@ MACHINE_CONFIG_START(jaguar_state::cojagr3k)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
VT83C461(config, m_ide).options(cojag_devices, "hdd", nullptr, true);
m_ide->irq_handler().set(FUNC(jaguar_state::external_int));
diff --git a/src/mame/drivers/jailbrek.cpp b/src/mame/drivers/jailbrek.cpp
index 98073e12096..38d93ac6bce 100644
--- a/src/mame/drivers/jailbrek.cpp
+++ b/src/mame/drivers/jailbrek.cpp
@@ -268,7 +268,7 @@ MACHINE_CONFIG_START(jailbrek_state::jailbrek)
MCFG_DEVICE_PROGRAM_MAP(jailbrek_map)
MCFG_DEVICE_PERIODIC_INT_DRIVER(jailbrek_state, interrupt_nmi, 500) /* ? */
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jailbrek)
diff --git a/src/mame/drivers/jchan.cpp b/src/mame/drivers/jchan.cpp
index dc089330f62..f595198d3b1 100644
--- a/src/mame/drivers/jchan.cpp
+++ b/src/mame/drivers/jchan.cpp
@@ -612,7 +612,7 @@ MACHINE_CONFIG_START(jchan_state::jchan)
MCFG_DEVICE_ADD("sub", M68000, 16000000)
MCFG_DEVICE_PROGRAM_MAP(jchan_sub)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_jchan)
diff --git a/src/mame/drivers/jclub2.cpp b/src/mame/drivers/jclub2.cpp
index 730b515ab69..a37893cb845 100644
--- a/src/mame/drivers/jclub2.cpp
+++ b/src/mame/drivers/jclub2.cpp
@@ -1143,7 +1143,7 @@ MACHINE_CONFIG_START(jclub2o_state::jclub2o)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
EEPROM_S29290_16BIT(config, "eeprom");
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_TICKET_DISPENSER_ADD("hopper1", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH)
MCFG_TICKET_DISPENSER_ADD("hopper2", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH)
@@ -1177,7 +1177,7 @@ MACHINE_CONFIG_START(jclub2_state::jclub2)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
EEPROM_93C46_8BIT(config, "eeprom");
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_TICKET_DISPENSER_ADD("hopper1", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH)
MCFG_TICKET_DISPENSER_ADD("hopper2", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH)
@@ -1212,7 +1212,7 @@ MACHINE_CONFIG_START(darkhors_state::darkhors)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
EEPROM_93C46_8BIT(config, "eeprom");
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_TICKET_DISPENSER_ADD("hopper1", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH)
MCFG_TICKET_DISPENSER_ADD("hopper2", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH)
diff --git a/src/mame/drivers/jedi.cpp b/src/mame/drivers/jedi.cpp
index 839afa84440..1d3d4875afe 100644
--- a/src/mame/drivers/jedi.cpp
+++ b/src/mame/drivers/jedi.cpp
@@ -354,7 +354,7 @@ MACHINE_CONFIG_START(jedi_state::jedi)
outlatch.q_out_cb<6>().set(FUNC(jedi_state::audio_reset_w));
outlatch.q_out_cb<7>().set(FUNC(jedi_state::video_off_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
jedi_video(config);
diff --git a/src/mame/drivers/jrpacman.cpp b/src/mame/drivers/jrpacman.cpp
index 0407b0b9ff2..fcd54cef2ef 100644
--- a/src/mame/drivers/jrpacman.cpp
+++ b/src/mame/drivers/jrpacman.cpp
@@ -299,7 +299,7 @@ MACHINE_CONFIG_START(jrpacman_state::jrpacman)
latch2.q_out_cb<4>().set(FUNC(jrpacman_state::jrpacman_charbank_w));
latch2.q_out_cb<5>().set(FUNC(jrpacman_state::jrpacman_spritebank_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/junofrst.cpp b/src/mame/drivers/junofrst.cpp
index 790f08138a4..66e2bcabe65 100644
--- a/src/mame/drivers/junofrst.cpp
+++ b/src/mame/drivers/junofrst.cpp
@@ -426,7 +426,7 @@ MACHINE_CONFIG_START(junofrst_state::junofrst)
mainlatch.q_out_cb<4>().set(FUNC(junofrst_state::flip_screen_x_w)); // HFF
mainlatch.q_out_cb<5>().set(FUNC(junofrst_state::flip_screen_y_w)); // VFLIP
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_PALETTE_ADD("palette", 16)
MCFG_PALETTE_FORMAT(BBGGGRRR)
diff --git a/src/mame/drivers/klax.cpp b/src/mame/drivers/klax.cpp
index fa504b03876..4e085feb436 100644
--- a/src/mame/drivers/klax.cpp
+++ b/src/mame/drivers/klax.cpp
@@ -201,7 +201,7 @@ MACHINE_CONFIG_START(klax_state::klax)
EEPROM_2816(config, "eeprom").lock_after_write(true);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_klax)
diff --git a/src/mame/drivers/kyugo.cpp b/src/mame/drivers/kyugo.cpp
index 49f42ac102e..bbb47a078fc 100644
--- a/src/mame/drivers/kyugo.cpp
+++ b/src/mame/drivers/kyugo.cpp
@@ -566,7 +566,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(kyugo_state::gyrodine)
kyugo_base(config);
/* add watchdog */
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_PROGRAM_MAP(gyrodine_main_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/labyrunr.cpp b/src/mame/drivers/labyrunr.cpp
index f9ce1c52720..350aba889fe 100644
--- a/src/mame/drivers/labyrunr.cpp
+++ b/src/mame/drivers/labyrunr.cpp
@@ -171,7 +171,7 @@ MACHINE_CONFIG_START(labyrunr_state::labyrunr)
MCFG_DEVICE_PROGRAM_MAP(labyrunr_map)
MCFG_DEVICE_PERIODIC_INT_DRIVER(labyrunr_state, labyrunr_timer_interrupt, 4*60)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/liberatr.cpp b/src/mame/drivers/liberatr.cpp
index 9ed5915adc9..f021a5a9fdb 100644
--- a/src/mame/drivers/liberatr.cpp
+++ b/src/mame/drivers/liberatr.cpp
@@ -439,7 +439,7 @@ MACHINE_CONFIG_START(liberatr_state::liberatr)
m_outlatch->q_out_cb<6>().set(FUNC(liberatr_state::coin_counter_left_w));
m_outlatch->q_out_cb<7>().set([this] (int state) { m_planet_select = state; });
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/lockon.cpp b/src/mame/drivers/lockon.cpp
index 4472cc36aea..ec7b9e45b32 100644
--- a/src/mame/drivers/lockon.cpp
+++ b/src/mame/drivers/lockon.cpp
@@ -485,8 +485,7 @@ MACHINE_CONFIG_START(lockon_state::lockon)
MCFG_DEVICE_PROGRAM_MAP(sound_prg)
MCFG_DEVICE_IO_MAP(sound_io)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_ASTABLE(10000, 4700, 10000e-12) * 4096)
+ WATCHDOG_TIMER(config, m_watchdog).set_time(PERIOD_OF_555_ASTABLE(10000, 4700, 10000e-12) * 4096);
MCFG_QUANTUM_TIME(attotime::from_hz(600))
m58990_device &adc(M58990(config, "adc", 16_MHz_XTAL / 16));
diff --git a/src/mame/drivers/looping.cpp b/src/mame/drivers/looping.cpp
index e6492b5fca8..ac1db512b37 100644
--- a/src/mame/drivers/looping.cpp
+++ b/src/mame/drivers/looping.cpp
@@ -652,7 +652,7 @@ MACHINE_CONFIG_START(looping_state::looping)
mainlatch.q_out_cb<6>().set(FUNC(looping_state::main_irq_ack_w));
mainlatch.q_out_cb<7>().set(FUNC(looping_state::watchdog_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/lwings.cpp b/src/mame/drivers/lwings.cpp
index 9bed8a568b0..82ae08e5430 100644
--- a/src/mame/drivers/lwings.cpp
+++ b/src/mame/drivers/lwings.cpp
@@ -942,7 +942,7 @@ MACHINE_CONFIG_START(lwings_state::lwings)
MCFG_DEVICE_PROGRAM_MAP(lwings_sound_map)
MCFG_DEVICE_PERIODIC_INT_DRIVER(lwings_state, irq0_line_hold, 222) // approximation from pcb music recording - where is the frequency actually derived from??
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8)
@@ -992,7 +992,7 @@ MACHINE_CONFIG_START(lwings_state::fball)
MCFG_DEVICE_PROGRAM_MAP(fball_sound_map)
// MCFG_DEVICE_PERIODIC_INT_DRIVER(lwings_state, irq0_line_hold, 222)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8)
diff --git a/src/mame/drivers/mappy.cpp b/src/mame/drivers/mappy.cpp
index 45f47e9ca20..0c08524c23e 100644
--- a/src/mame/drivers/mappy.cpp
+++ b/src/mame/drivers/mappy.cpp
@@ -1332,8 +1332,7 @@ MACHINE_CONFIG_START(mappy_state::superpac_common)
mainlatch.q_out_cb<4>().append(m_namcoio[1], FUNC(namcoio_device::set_reset_line)).invert();
mainlatch.q_out_cb<5>().set_inputline(m_subcpu, INPUT_LINE_RESET).invert();
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 8);
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) // 100 CPU slices per frame - an high value to ensure proper synchronization of the CPUs
ls157_device &dipmux(LS157(config, "dipmux"));
@@ -1447,8 +1446,7 @@ MACHINE_CONFIG_START(mappy_state::phozon)
mainlatch.q_out_cb<5>().set_inputline(m_subcpu, INPUT_LINE_RESET).invert();
mainlatch.q_out_cb<6>().set_inputline(m_subcpu2, INPUT_LINE_RESET).invert();
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 8);
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) // 100 CPU slices per frame - an high value to ensure proper synchronization of the CPUs
NAMCO_58XX(config, m_namcoio[0], 0);
@@ -1509,8 +1507,7 @@ MACHINE_CONFIG_START(mappy_state::mappy_common)
mainlatch.q_out_cb<4>().append(m_namcoio[1], FUNC(namcoio_device::set_reset_line)).invert();
mainlatch.q_out_cb<5>().set_inputline(m_subcpu, INPUT_LINE_RESET).invert();
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 8);
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) // 100 CPU slices per frame - an high value to ensure proper synchronization of the CPUs
ls157_device &dipmux(LS157(config, "dipmux"));
@@ -1557,12 +1554,11 @@ void mappy_state::mappy(machine_config &config)
m_namcoio[1]->out_callback<0>().set("dipmux", FUNC(ls157_device::select_w)).bit(0);
}
-MACHINE_CONFIG_START(mappy_state::digdug2)
-
+void mappy_state::digdug2(machine_config &config)
+{
mappy_common(config);
- MCFG_WATCHDOG_MODIFY("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 0)
+ subdevice<watchdog_timer_device>("watchdog")->set_vblank_count("screen", 0);
NAMCO_58XX(config, m_namcoio[0], 0);
m_namcoio[0]->in_callback<0>().set_ioport("COINS");
@@ -1576,7 +1572,7 @@ MACHINE_CONFIG_START(mappy_state::digdug2)
m_namcoio[1]->in_callback<2>().set_ioport("DSW1").rshift(4);
m_namcoio[1]->in_callback<3>().set_ioport("DSW0");
m_namcoio[1]->out_callback<0>().set("dipmux", FUNC(ls157_device::select_w)).bit(0);
-MACHINE_CONFIG_END
+}
MACHINE_CONFIG_START(mappy_state::todruaga)
digdug2(config);
diff --git a/src/mame/drivers/mcatadv.cpp b/src/mame/drivers/mcatadv.cpp
index 91cf0fece12..44c1f30e5e2 100644
--- a/src/mame/drivers/mcatadv.cpp
+++ b/src/mame/drivers/mcatadv.cpp
@@ -460,8 +460,7 @@ MACHINE_CONFIG_START(mcatadv_state::mcatadv)
MCFG_PALETTE_ADD("palette", 0x2000/2)
MCFG_PALETTE_FORMAT(xGGGGGRRRRRBBBBB)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */
+ WATCHDOG_TIMER(config, m_watchdog).set_time(attotime::from_seconds(3)); /* a guess, and certainly wrong */
/* sound hardware */
diff --git a/src/mame/drivers/mcr.cpp b/src/mame/drivers/mcr.cpp
index 614c211a93f..d2631c3c10f 100644
--- a/src/mame/drivers/mcr.cpp
+++ b/src/mame/drivers/mcr.cpp
@@ -1763,8 +1763,7 @@ MACHINE_CONFIG_START(mcr_state::mcr_90009)
m_ctc->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
m_ctc->zc_callback<0>().set(m_ctc, FUNC(z80ctc_device::trg1));
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 16)
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 16);
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
diff --git a/src/mame/drivers/mcr3.cpp b/src/mame/drivers/mcr3.cpp
index d6a2862828e..ece9d7e0ebb 100644
--- a/src/mame/drivers/mcr3.cpp
+++ b/src/mame/drivers/mcr3.cpp
@@ -1092,8 +1092,7 @@ MACHINE_CONFIG_START(mcr3_state::mcrmono)
m_ctc->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
m_ctc->zc_callback<0>().set(m_ctc, FUNC(z80ctc_device::trg1));
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 16)
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 16);
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
diff --git a/src/mame/drivers/mcr68.cpp b/src/mame/drivers/mcr68.cpp
index f38b6a6ded4..b8c4a83b335 100644
--- a/src/mame/drivers/mcr68.cpp
+++ b/src/mame/drivers/mcr68.cpp
@@ -902,8 +902,7 @@ MACHINE_CONFIG_START(mcr68_state::mcr68)
MCFG_DEVICE_ADD("maincpu", M68000, 7723800)
MCFG_DEVICE_PROGRAM_MAP(mcr68_map)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 8);
MCFG_MACHINE_START_OVERRIDE(mcr68_state,mcr68)
MCFG_MACHINE_RESET_OVERRIDE(mcr68_state,mcr68)
@@ -932,31 +931,30 @@ MACHINE_CONFIG_START(mcr68_state::mcr68)
MACHINE_CONFIG_END
-MACHINE_CONFIG_START(mcr68_state::xenophob)
+void mcr68_state::xenophob(machine_config &config)
+{
mcr68(config);
/* basic machine hardware */
- MCFG_DEVICE_ADD("sg", MIDWAY_SOUNDS_GOOD)
- MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
-MACHINE_CONFIG_END
+ MIDWAY_SOUNDS_GOOD(config, m_sounds_good).add_route(ALL_OUTPUTS, "speaker", 1.0);
+}
-MACHINE_CONFIG_START(mcr68_state::intlaser)
+void mcr68_state::intlaser(machine_config &config)
+{
mcr68(config);
/* basic machine hardware */
- MCFG_DEVICE_ADD("sg", MIDWAY_SOUNDS_GOOD)
- MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
+ MIDWAY_SOUNDS_GOOD(config, m_sounds_good).add_route(ALL_OUTPUTS, "speaker", 1.0);
- MCFG_WATCHDOG_MODIFY("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 800)
-MACHINE_CONFIG_END
+ subdevice<watchdog_timer_device>("watchdog")->set_vblank_count("screen", 800);
+}
MACHINE_CONFIG_START(mcr68_state::spyhunt2)
mcr68(config);
/* basic machine hardware */
- MCFG_DEVICE_ADD("sg", MIDWAY_SOUNDS_GOOD)
+ MCFG_DEVICE_ADD(m_sounds_good, MIDWAY_SOUNDS_GOOD)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_DEVICE_ADD("tcs", MIDWAY_TURBO_CHEAP_SQUEAK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
diff --git a/src/mame/drivers/megazone.cpp b/src/mame/drivers/megazone.cpp
index d08b46c7549..5536e6be4a0 100644
--- a/src/mame/drivers/megazone.cpp
+++ b/src/mame/drivers/megazone.cpp
@@ -318,7 +318,7 @@ MACHINE_CONFIG_START(megazone_state::megazone)
mainlatch.q_out_cb<5>().set(FUNC(megazone_state::flipscreen_w));
mainlatch.q_out_cb<7>().set(FUNC(megazone_state::irq_mask_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/meritm.cpp b/src/mame/drivers/meritm.cpp
index e0698e81570..36d9d259c9b 100644
--- a/src/mame/drivers/meritm.cpp
+++ b/src/mame/drivers/meritm.cpp
@@ -1180,8 +1180,7 @@ MACHINE_CONFIG_START(meritm_state::crt260)
m_ppi->out_pb_callback().set_nop();
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(1200)) // DS1232, TD connected to VCC
+ WATCHDOG_TIMER(config, "watchdog").set_time(attotime::from_msec(1200)); // DS1232, TD connected to VCC
MCFG_MACHINE_START_OVERRIDE(meritm_state, crt260)
NS16550(config, m_uart, UART_CLK);
diff --git a/src/mame/drivers/metro.cpp b/src/mame/drivers/metro.cpp
index db553296ae9..0ae0ebbea43 100644
--- a/src/mame/drivers/metro.cpp
+++ b/src/mame/drivers/metro.cpp
@@ -3448,7 +3448,7 @@ MACHINE_CONFIG_START(metro_state::dokyusp)
EEPROM_93C46_16BIT(config, "eeprom");
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
i4300_config_384x224(config);
@@ -3476,7 +3476,7 @@ MACHINE_CONFIG_START(metro_state::gakusai)
EEPROM_93C46_16BIT(config, "eeprom");
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
i4300_config_320x240(config);
@@ -3505,7 +3505,7 @@ MACHINE_CONFIG_START(metro_state::gakusai2)
EEPROM_93C46_16BIT(config, "eeprom");
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
i4300_config_320x240(config);
@@ -3671,7 +3671,7 @@ MACHINE_CONFIG_START(metro_state::mouja)
MCFG_DEVICE_PROGRAM_MAP(mouja_map)
MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(metro_state,metro_irq_callback)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
i4300_config(config);
diff --git a/src/mame/drivers/mhavoc.cpp b/src/mame/drivers/mhavoc.cpp
index 185735f2260..3d74e3f4f44 100644
--- a/src/mame/drivers/mhavoc.cpp
+++ b/src/mame/drivers/mhavoc.cpp
@@ -529,7 +529,7 @@ MACHINE_CONFIG_START(mhavoc_state::mhavoc)
MCFG_TIMER_DRIVER_ADD_PERIODIC("5k_timer", mhavoc_state, mhavoc_cpu_irq_clock, attotime::from_hz(MHAVOC_CLOCK_5K))
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_VECTOR_ADD("vector")
diff --git a/src/mame/drivers/midtunit.cpp b/src/mame/drivers/midtunit.cpp
index 0605d4a1861..0dd4230e667 100644
--- a/src/mame/drivers/midtunit.cpp
+++ b/src/mame/drivers/midtunit.cpp
@@ -606,7 +606,7 @@ MACHINE_CONFIG_START(midtunit_state::tunit_core)
MCFG_MACHINE_RESET_OVERRIDE(midtunit_state,midtunit)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_PALETTE_ADD("palette", 32768)
diff --git a/src/mame/drivers/midvunit.cpp b/src/mame/drivers/midvunit.cpp
index e3e7252cad7..a528b21680f 100644
--- a/src/mame/drivers/midvunit.cpp
+++ b/src/mame/drivers/midvunit.cpp
@@ -1074,7 +1074,7 @@ MACHINE_CONFIG_START(midvunit_state::midvcommon)
MCFG_TIMER_ADD_NONE("timer0")
MCFG_TIMER_ADD_NONE("timer1")
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
/* video hardware */
MCFG_PALETTE_ADD("palette", 32768)
diff --git a/src/mame/drivers/mikie.cpp b/src/mame/drivers/mikie.cpp
index e92f653f235..86612a0e223 100644
--- a/src/mame/drivers/mikie.cpp
+++ b/src/mame/drivers/mikie.cpp
@@ -275,7 +275,7 @@ MACHINE_CONFIG_START(mikie_state::mikie)
mainlatch.q_out_cb<6>().set(FUNC(mikie_state::flipscreen_w)); // FLIP
mainlatch.q_out_cb<7>().set(FUNC(mikie_state::irq_mask_w)); // INT
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/missb2.cpp b/src/mame/drivers/missb2.cpp
index 029d2ca1be9..94f7686f133 100644
--- a/src/mame/drivers/missb2.cpp
+++ b/src/mame/drivers/missb2.cpp
@@ -482,8 +482,7 @@ MACHINE_CONFIG_START(missb2_state::missb2)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 128);
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 128);
MCFG_MACHINE_START_OVERRIDE(missb2_state,missb2)
MCFG_MACHINE_RESET_OVERRIDE(missb2_state,missb2)
diff --git a/src/mame/drivers/missile.cpp b/src/mame/drivers/missile.cpp
index ceb7416cab1..6eacbe30c95 100644
--- a/src/mame/drivers/missile.cpp
+++ b/src/mame/drivers/missile.cpp
@@ -1157,8 +1157,7 @@ MACHINE_CONFIG_START(missile_state::missile)
MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK/8)
MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
+ WATCHDOG_TIMER(config, m_watchdog).set_vblank_count("screen", 8);
/* video hardware */
MCFG_PALETTE_ADD("palette", 8)
diff --git a/src/mame/drivers/momoko.cpp b/src/mame/drivers/momoko.cpp
index 075dbc517a4..8a7d744c88b 100644
--- a/src/mame/drivers/momoko.cpp
+++ b/src/mame/drivers/momoko.cpp
@@ -265,7 +265,7 @@ MACHINE_CONFIG_START(momoko_state::momoko)
MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(10'000'000)/4) /* 2.5MHz */
MCFG_DEVICE_PROGRAM_MAP(momoko_sound_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/multfish.cpp b/src/mame/drivers/multfish.cpp
index f9f91b212a1..8f9c29b7dfb 100644
--- a/src/mame/drivers/multfish.cpp
+++ b/src/mame/drivers/multfish.cpp
@@ -1032,7 +1032,7 @@ MACHINE_CONFIG_START(igrosoft_gamble_state::igrosoft_gamble)
MCFG_DEVICE_IO_MAP(igrosoft_gamble_portmap)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", igrosoft_gamble_state, irq0_line_hold)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/mw18w.cpp b/src/mame/drivers/mw18w.cpp
index f56106b479e..b502c17ef1d 100644
--- a/src/mame/drivers/mw18w.cpp
+++ b/src/mame/drivers/mw18w.cpp
@@ -287,7 +287,7 @@ MACHINE_CONFIG_START(mw18w_state::mw18w)
MCFG_DEVICE_PROGRAM_MAP(mw18w_map)
MCFG_DEVICE_IO_MAP(mw18w_portmap)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* no video! */
diff --git a/src/mame/drivers/mw8080bw.cpp b/src/mame/drivers/mw8080bw.cpp
index d49f3643ff8..ea0ca1f9c62 100644
--- a/src/mame/drivers/mw8080bw.cpp
+++ b/src/mame/drivers/mw8080bw.cpp
@@ -855,8 +855,7 @@ MACHINE_CONFIG_START(mw8080bw_state::zzzap)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_IO_MAP(zzzap_io_map)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_MONOSTABLE(RES_M(1), CAP_U(1))) /* 1.1s */
+ WATCHDOG_TIMER(config, m_watchdog).set_time(PERIOD_OF_555_MONOSTABLE(RES_M(1), CAP_U(1))); /* 1.1s */
/* add shifter */
MCFG_MB14241_ADD("mb14241")
@@ -970,8 +969,7 @@ MACHINE_CONFIG_START(mw8080bw_state::maze)
MCFG_DEVICE_IO_MAP(maze_io_map)
MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,maze)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_MONOSTABLE(RES_K(270), CAP_U(10))) /* 2.97s */
+ WATCHDOG_TIMER(config, m_watchdog).set_time(PERIOD_OF_555_MONOSTABLE(RES_K(270), CAP_U(10))); /* 2.97s */
/* audio hardware */
maze_audio(config);
@@ -1064,8 +1062,7 @@ MACHINE_CONFIG_START(mw8080bw_state::boothill)
MCFG_DEVICE_IO_MAP(boothill_io_map)
MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,boothill)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_MONOSTABLE(RES_K(270), CAP_U(10))) /* 2.97s */
+ WATCHDOG_TIMER(config, m_watchdog).set_time(PERIOD_OF_555_MONOSTABLE(RES_K(270), CAP_U(10))); /* 2.97s */
/* add shifter */
MCFG_MB14241_ADD("mb14241")
@@ -1172,8 +1169,7 @@ MACHINE_CONFIG_START(mw8080bw_state::checkmat)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_IO_MAP(checkmat_io_map)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_MONOSTABLE(RES_K(270), CAP_U(10))) /* 2.97s */
+ WATCHDOG_TIMER(config, m_watchdog).set_time(PERIOD_OF_555_MONOSTABLE(RES_K(270), CAP_U(10))); /* 2.97s */
/* audio hardware */
checkmat_audio(config);
@@ -1302,8 +1298,7 @@ MACHINE_CONFIG_START(mw8080bw_state::desertgu)
MCFG_DEVICE_IO_MAP(desertgu_io_map)
MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,desertgu)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ))
+ WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ));
/* add shifter */
MCFG_MB14241_ADD("mb14241")
@@ -1505,8 +1500,7 @@ MACHINE_CONFIG_START(mw8080bw_state::dplay)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_IO_MAP(dplay_io_map)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ))
+ WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ));
/* add shifter */
MCFG_MB14241_ADD("mb14241")
@@ -1603,8 +1597,7 @@ MACHINE_CONFIG_START(mw8080bw_state::gmissile)
MCFG_DEVICE_IO_MAP(gmissile_io_map)
MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,gmissile)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ))
+ WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ));
/* add shifter */
MCFG_MB14241_ADD("mb14241")
@@ -1699,8 +1692,7 @@ MACHINE_CONFIG_START(mw8080bw_state::m4)
MCFG_DEVICE_IO_MAP(m4_io_map)
MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,m4)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ))
+ WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ));
/* add shifter */
MCFG_MB14241_ADD("mb14241")
@@ -1870,8 +1862,7 @@ MACHINE_CONFIG_START(mw8080bw_state::clowns)
MCFG_DEVICE_IO_MAP(clowns_io_map)
MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,clowns)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ))
+ WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ));
/* add shifter */
MCFG_MB14241_ADD("mb14241")
@@ -1968,8 +1959,7 @@ MACHINE_CONFIG_START(mw8080bw_state::spacwalk)
MCFG_DEVICE_IO_MAP(spacwalk_io_map)
MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,clowns)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ))
+ WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ));
/* add shifter */
MCFG_MB14241_ADD("mb14241")
@@ -2052,8 +2042,7 @@ MACHINE_CONFIG_START(mw8080bw_state::shuffle)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_IO_MAP(shuffle_io_map)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ))
+ WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ));
/* add shifter */
MCFG_MB14241_ADD("mb14241")
@@ -2141,8 +2130,7 @@ MACHINE_CONFIG_START(mw8080bw_state::dogpatch)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_IO_MAP(dogpatch_io_map)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ))
+ WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ));
/* add shifter */
MCFG_MB14241_ADD("mb14241")
@@ -2294,8 +2282,7 @@ MACHINE_CONFIG_START(mw8080bw_state::spcenctr)
MCFG_DEVICE_IO_MAP(spcenctr_io_map)
MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,spcenctr)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ))
+ WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ));
/* timers */
MCFG_TIMER_DRIVER_ADD_PERIODIC("strobeon", mw8080bw_state, spcenctr_strobe_timer_callback, attotime::from_hz(SPCENCTR_STROBE_FREQ))
@@ -2392,8 +2379,7 @@ MACHINE_CONFIG_START(mw8080bw_state::phantom2)
MCFG_DEVICE_IO_MAP(phantom2_io_map)
MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,phantom2)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ))
+ WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ));
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2534,8 +2520,7 @@ MACHINE_CONFIG_START(mw8080bw_state::bowler)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_IO_MAP(bowler_io_map)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ))
+ WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ));
/* add shifter */
MCFG_MB14241_ADD("mb14241")
@@ -2748,8 +2733,7 @@ MACHINE_CONFIG_START(mw8080bw_state::invaders)
MCFG_DEVICE_IO_MAP(invaders_io_map)
MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,invaders)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ))
+ WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ));
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2834,8 +2818,7 @@ MACHINE_CONFIG_START(mw8080bw_state::blueshrk)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_IO_MAP(blueshrk_io_map)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ))
+ WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ));
/* add shifter */
MCFG_MB14241_ADD("mb14241")
@@ -2938,8 +2921,7 @@ MACHINE_CONFIG_START(mw8080bw_state::invad2ct)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_IO_MAP(invad2ct_io_map)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ))
+ WATCHDOG_TIMER(config, m_watchdog).set_time(255 * attotime::from_hz(MW8080BW_60HZ));
/* add shifter */
MCFG_MB14241_ADD("mb14241")
diff --git a/src/mame/drivers/mwsub.cpp b/src/mame/drivers/mwsub.cpp
index e41b666e84a..9e204f5c64d 100644
--- a/src/mame/drivers/mwsub.cpp
+++ b/src/mame/drivers/mwsub.cpp
@@ -230,7 +230,7 @@ MACHINE_CONFIG_START(submar_state::submar)
MCFG_DEVICE_PROGRAM_MAP(submar_map)
MCFG_DEVICE_IO_MAP(submar_portmap)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* no video! */
diff --git a/src/mame/drivers/namcos86.cpp b/src/mame/drivers/namcos86.cpp
index 9c86075904b..e3ea2b0d6f9 100644
--- a/src/mame/drivers/namcos86.cpp
+++ b/src/mame/drivers/namcos86.cpp
@@ -1079,7 +1079,7 @@ MACHINE_CONFIG_START(namcos86_state::hopmappy)
MCFG_QUANTUM_TIME(attotime::from_hz(48000)) /* heavy interleaving needed to avoid hangs in rthunder */
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/nemesis.cpp b/src/mame/drivers/nemesis.cpp
index 7f44a89101f..cde3018c4ea 100644
--- a/src/mame/drivers/nemesis.cpp
+++ b/src/mame/drivers/nemesis.cpp
@@ -1547,7 +1547,7 @@ MACHINE_CONFIG_START(nemesis_state::gx400)
intlatch.q_out_cb<2>().set(FUNC(nemesis_state::gfx_flipx_w));
intlatch.q_out_cb<3>().set(FUNC(nemesis_state::gfx_flipy_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1619,7 +1619,7 @@ MACHINE_CONFIG_START(nemesis_state::konamigt)
intlatch.q_out_cb<2>().set(FUNC(nemesis_state::gfx_flipx_w));
intlatch.q_out_cb<3>().set(FUNC(nemesis_state::gfx_flipy_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1687,7 +1687,7 @@ MACHINE_CONFIG_START(nemesis_state::rf2_gx400)
intlatch.q_out_cb<2>().set(FUNC(nemesis_state::gfx_flipx_w));
intlatch.q_out_cb<3>().set(FUNC(nemesis_state::gfx_flipy_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1747,7 +1747,7 @@ MACHINE_CONFIG_START(nemesis_state::salamand)
MCFG_DEVICE_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
MCFG_DEVICE_PROGRAM_MAP(sal_sound_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1799,7 +1799,7 @@ MACHINE_CONFIG_START(nemesis_state::blkpnthr)
MCFG_DEVICE_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
MCFG_DEVICE_PROGRAM_MAP(blkpnthr_sound_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1846,7 +1846,7 @@ MACHINE_CONFIG_START(nemesis_state::citybomb)
MCFG_DEVICE_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
MCFG_DEVICE_PROGRAM_MAP(city_sound_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1897,7 +1897,7 @@ MACHINE_CONFIG_START(nemesis_state::nyanpani)
MCFG_DEVICE_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
MCFG_DEVICE_PROGRAM_MAP(city_sound_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1954,7 +1954,7 @@ MACHINE_CONFIG_START(nemesis_state::hcrash)
intlatch.q_out_cb<1>().set(FUNC(nemesis_state::irq2_enable_w)); // or at 0x0c2804 ?
intlatch.q_out_cb<2>().set_nop(); // ?
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2716,7 +2716,7 @@ MACHINE_CONFIG_START(nemesis_state::bubsys)
intlatch.q_out_cb<2>().set(FUNC(nemesis_state::gfx_flipx_w));
intlatch.q_out_cb<3>().set(FUNC(nemesis_state::gfx_flipy_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/neogeo.cpp b/src/mame/drivers/neogeo.cpp
index 3d3c9a9ca89..bec0233cf24 100644
--- a/src/mame/drivers/neogeo.cpp
+++ b/src/mame/drivers/neogeo.cpp
@@ -1997,8 +1997,7 @@ MACHINE_CONFIG_START(ngarcade_base_state::neogeo_arcade)
m_systemlatch->q_out_cb<5>().set(FUNC(ngarcade_base_state::set_use_cart_audio));
m_systemlatch->q_out_cb<6>().set(FUNC(ngarcade_base_state::set_save_ram_unlock));
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_ticks(3244030, NEOGEO_MASTER_CLOCK))
+ WATCHDOG_TIMER(config, "watchdog").set_time(attotime::from_ticks(3244030, NEOGEO_MASTER_CLOCK));
MCFG_UPD4990A_ADD("upd4990a", XTAL(32'768), NOOP, NOOP)
diff --git a/src/mame/drivers/nitedrvr.cpp b/src/mame/drivers/nitedrvr.cpp
index 62485722bf4..a65d3ac2cbc 100644
--- a/src/mame/drivers/nitedrvr.cpp
+++ b/src/mame/drivers/nitedrvr.cpp
@@ -147,8 +147,7 @@ MACHINE_CONFIG_START(nitedrvr_state::nitedrvr)
MCFG_DEVICE_PROGRAM_MAP(nitedrvr_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nitedrvr_state, irq0_line_hold)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 3)
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 3);
MCFG_TIMER_DRIVER_ADD_PERIODIC("crash_timer", nitedrvr_state, nitedrvr_crash_toggle_callback, PERIOD_OF_555_ASTABLE(RES_K(180), 330, CAP_U(1)))
diff --git a/src/mame/drivers/nova2001.cpp b/src/mame/drivers/nova2001.cpp
index 3f7e6b269df..94205102e99 100644
--- a/src/mame/drivers/nova2001.cpp
+++ b/src/mame/drivers/nova2001.cpp
@@ -653,7 +653,7 @@ MACHINE_CONFIG_START(nova2001_state::nova2001)
MCFG_DEVICE_PROGRAM_MAP(nova2001_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nova2001_state, irq0_line_hold)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/offtwall.cpp b/src/mame/drivers/offtwall.cpp
index 42dc51800a2..3e368aa11fc 100644
--- a/src/mame/drivers/offtwall.cpp
+++ b/src/mame/drivers/offtwall.cpp
@@ -343,7 +343,7 @@ MACHINE_CONFIG_START(offtwall_state::offtwall)
EEPROM_2816(config, "eeprom").lock_after_write(true);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_offtwall)
diff --git a/src/mame/drivers/ohmygod.cpp b/src/mame/drivers/ohmygod.cpp
index f04509dd9d5..30bc747b09b 100644
--- a/src/mame/drivers/ohmygod.cpp
+++ b/src/mame/drivers/ohmygod.cpp
@@ -327,8 +327,7 @@ MACHINE_CONFIG_START(ohmygod_state::ohmygod)
MCFG_DEVICE_PROGRAM_MAP(ohmygod_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ohmygod_state, irq1_line_hold)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */
+ WATCHDOG_TIMER(config, "watchdog").set_time(attotime::from_seconds(3)); /* a guess, and certainly wrong */
/* video hardware */
diff --git a/src/mame/drivers/omegrace.cpp b/src/mame/drivers/omegrace.cpp
index d10bcd799b8..52df225c8fc 100644
--- a/src/mame/drivers/omegrace.cpp
+++ b/src/mame/drivers/omegrace.cpp
@@ -536,7 +536,7 @@ MACHINE_CONFIG_START(omegrace_state::omegrace)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_VECTOR_ADD("vector")
diff --git a/src/mame/drivers/onetwo.cpp b/src/mame/drivers/onetwo.cpp
index b6042a73c5a..79395415e2f 100644
--- a/src/mame/drivers/onetwo.cpp
+++ b/src/mame/drivers/onetwo.cpp
@@ -372,7 +372,7 @@ MACHINE_CONFIG_START(onetwo_state::onetwo)
MCFG_DEVICE_PROGRAM_MAP(sound_cpu)
MCFG_DEVICE_IO_MAP(sound_cpu_io)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/orbit.cpp b/src/mame/drivers/orbit.cpp
index 50ec7133996..5ea517896e1 100644
--- a/src/mame/drivers/orbit.cpp
+++ b/src/mame/drivers/orbit.cpp
@@ -288,7 +288,7 @@ MACHINE_CONFIG_START(orbit_state::orbit)
m_latch->q_out_cb<6>().set_output("led1");
m_latch->q_out_cb<7>().set(m_discrete, FUNC(discrete_device::write_line<ORBIT_WARNING_EN>));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD(m_screen, RASTER)
diff --git a/src/mame/drivers/pacland.cpp b/src/mame/drivers/pacland.cpp
index 4f372e05388..dae2cf7b411 100644
--- a/src/mame/drivers/pacland.cpp
+++ b/src/mame/drivers/pacland.cpp
@@ -439,7 +439,7 @@ MACHINE_CONFIG_START(pacland_state::pacland)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* we need heavy synching between the MCU and the CPU */
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/pandoras.cpp b/src/mame/drivers/pandoras.cpp
index dff8388cdc9..b9e96478f2b 100644
--- a/src/mame/drivers/pandoras.cpp
+++ b/src/mame/drivers/pandoras.cpp
@@ -335,7 +335,7 @@ MACHINE_CONFIG_START(pandoras_state::pandoras)
mainlatch.q_out_cb<6>().set(FUNC(pandoras_state::cpub_irq_enable_w)); // ENB
mainlatch.q_out_cb<7>().set_inputline(m_subcpu, INPUT_LINE_RESET).invert(); // RESETB
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/parodius.cpp b/src/mame/drivers/parodius.cpp
index b84573c42b1..70273a3d104 100644
--- a/src/mame/drivers/parodius.cpp
+++ b/src/mame/drivers/parodius.cpp
@@ -243,7 +243,7 @@ MACHINE_CONFIG_START(parodius_state::parodius)
ADDRESS_MAP_BANK(config, "bank0000").set_map(&parodius_state::bank0000_map).set_options(ENDIANNESS_BIG, 8, 13, 0x800);
ADDRESS_MAP_BANK(config, "bank2000").set_map(&parodius_state::bank2000_map).set_options(ENDIANNESS_BIG, 8, 12, 0x800);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/pengo.cpp b/src/mame/drivers/pengo.cpp
index a86a08ffc6b..7ef72f6978c 100644
--- a/src/mame/drivers/pengo.cpp
+++ b/src/mame/drivers/pengo.cpp
@@ -401,7 +401,7 @@ MACHINE_CONFIG_START(pengo_state::pengo)
m_latch->q_out_cb<6>().set(FUNC(pengo_state::pengo_colortablebank_w));
m_latch->q_out_cb<7>().set(FUNC(pengo_state::pengo_gfxbank_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pengo)
diff --git a/src/mame/drivers/pingpong.cpp b/src/mame/drivers/pingpong.cpp
index e8c85a9e61b..edb55a309ca 100644
--- a/src/mame/drivers/pingpong.cpp
+++ b/src/mame/drivers/pingpong.cpp
@@ -454,7 +454,7 @@ MACHINE_CONFIG_START(pingpong_state::pingpong)
MCFG_DEVICE_ADD("maincpu",Z80,18432000/6) /* 3.072 MHz (probably) */
MCFG_DEVICE_PROGRAM_MAP(pingpong_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", pingpong_state, pingpong_interrupt, "screen", 0, 1)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/pitnrun.cpp b/src/mame/drivers/pitnrun.cpp
index 14444025bb9..4635cff525e 100644
--- a/src/mame/drivers/pitnrun.cpp
+++ b/src/mame/drivers/pitnrun.cpp
@@ -296,7 +296,7 @@ MACHINE_CONFIG_START(pitnrun_state::pitnrun)
MCFG_DEVICE_IO_MAP(pitnrun_sound_io_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pitnrun_state, irq0_line_hold)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
diff --git a/src/mame/drivers/plygonet.cpp b/src/mame/drivers/plygonet.cpp
index 61b18389a5b..75c7a6dd25f 100644
--- a/src/mame/drivers/plygonet.cpp
+++ b/src/mame/drivers/plygonet.cpp
@@ -569,7 +569,7 @@ MACHINE_CONFIG_START(polygonet_state::plygonet)
EEPROM_ER5911_8BIT(config, "eeprom");
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_plygonet)
diff --git a/src/mame/drivers/polepos.cpp b/src/mame/drivers/polepos.cpp
index 0d339ed6c81..99b0b98623e 100644
--- a/src/mame/drivers/polepos.cpp
+++ b/src/mame/drivers/polepos.cpp
@@ -897,8 +897,7 @@ MACHINE_CONFIG_START(polepos_state::polepos)
MCFG_NAMCO_06XX_WRITE_2_CB(WRITE8("52xx", namco_52xx_device, write))
MCFG_NAMCO_06XX_WRITE_3_CB(WRITE8("54xx", namco_54xx_device, write))
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 16) // 128V clocks the same as VBLANK
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 16); // 128V clocks the same as VBLANK
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* some interleaving */
@@ -1007,8 +1006,7 @@ MACHINE_CONFIG_START(polepos_state::topracern)
MCFG_NAMCO_06XX_READ_0_CB(READ8("51xx", namco_51xx_device, read))
MCFG_NAMCO_06XX_WRITE_0_CB(WRITE8("51xx", namco_51xx_device, write))
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 16) // 128V clocks the same as VBLANK
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 16); // 128V clocks the same as VBLANK
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* some interleaving */
diff --git a/src/mame/drivers/poolshrk.cpp b/src/mame/drivers/poolshrk.cpp
index fbfe8af431a..2f74274948c 100644
--- a/src/mame/drivers/poolshrk.cpp
+++ b/src/mame/drivers/poolshrk.cpp
@@ -223,7 +223,7 @@ MACHINE_CONFIG_START(poolshrk_state::poolshrk)
MCFG_DEVICE_PROGRAM_MAP(poolshrk_cpu_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", poolshrk_state, irq0_line_assert)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/pooyan.cpp b/src/mame/drivers/pooyan.cpp
index 628e849647a..a3d1809e391 100644
--- a/src/mame/drivers/pooyan.cpp
+++ b/src/mame/drivers/pooyan.cpp
@@ -208,7 +208,7 @@ MACHINE_CONFIG_START(pooyan_state::pooyan)
mainlatch.q_out_cb<5>().set_nop(); // PAY OUT - not used
mainlatch.q_out_cb<7>().set(FUNC(pooyan_state::flipscreen_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/psikyosh.cpp b/src/mame/drivers/psikyosh.cpp
index b358c0ae0a1..bb26dbe5b5c 100644
--- a/src/mame/drivers/psikyosh.cpp
+++ b/src/mame/drivers/psikyosh.cpp
@@ -784,7 +784,7 @@ MACHINE_CONFIG_START(psikyosh_state::psikyo3v1)
MCFG_DEVICE_PROGRAM_MAP(ps3v1_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", psikyosh_state, psikyosh_interrupt)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
EEPROM_93C56_8BIT(config, "eeprom").default_value(0);
diff --git a/src/mame/drivers/quantum.cpp b/src/mame/drivers/quantum.cpp
index 89e99db432d..0ea10275b60 100644
--- a/src/mame/drivers/quantum.cpp
+++ b/src/mame/drivers/quantum.cpp
@@ -294,7 +294,7 @@ MACHINE_CONFIG_START(quantum_state::quantum)
X2212(config, "nvram"); // "137288-001" in parts list and schematic diagram
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_VECTOR_ADD("vector")
diff --git a/src/mame/drivers/rallyx.cpp b/src/mame/drivers/rallyx.cpp
index 8a40bc601b1..69bf07efec6 100644
--- a/src/mame/drivers/rallyx.cpp
+++ b/src/mame/drivers/rallyx.cpp
@@ -831,7 +831,7 @@ MACHINE_CONFIG_START(rallyx_state::rallyx)
mainlatch.q_out_cb<6>().set(FUNC(rallyx_state::coin_lockout_w));
mainlatch.q_out_cb<7>().set(FUNC(rallyx_state::coin_counter_1_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_MACHINE_START_OVERRIDE(rallyx_state,rallyx)
@@ -883,7 +883,7 @@ MACHINE_CONFIG_START(rallyx_state::jungler)
mainlatch.q_out_cb<6>().set(FUNC(rallyx_state::coin_counter_2_w)); // OUT3
mainlatch.q_out_cb<7>().set(FUNC(rallyx_state::stars_enable_w)); // STARSON
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_MACHINE_START_OVERRIDE(rallyx_state,rallyx)
diff --git a/src/mame/drivers/rampart.cpp b/src/mame/drivers/rampart.cpp
index 396afcc951f..f5351f2c4d9 100644
--- a/src/mame/drivers/rampart.cpp
+++ b/src/mame/drivers/rampart.cpp
@@ -347,8 +347,7 @@ MACHINE_CONFIG_START(rampart_state::rampart)
EEPROM_2816(config, "eeprom").lock_after_write(true);
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 8);
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rampart)
diff --git a/src/mame/drivers/rastan.cpp b/src/mame/drivers/rastan.cpp
index 67857457cfa..46bb1fc138a 100644
--- a/src/mame/drivers/rastan.cpp
+++ b/src/mame/drivers/rastan.cpp
@@ -377,7 +377,7 @@ MACHINE_CONFIG_START(rastan_state::rastan)
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/relief.cpp b/src/mame/drivers/relief.cpp
index d671d581be0..06c19a40ccc 100644
--- a/src/mame/drivers/relief.cpp
+++ b/src/mame/drivers/relief.cpp
@@ -277,7 +277,7 @@ MACHINE_CONFIG_START(relief_state::relief)
EEPROM_2816(config, "eeprom").lock_after_write(true);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_relief)
diff --git a/src/mame/drivers/retofinv.cpp b/src/mame/drivers/retofinv.cpp
index 49d87797cb6..ffaad1659bc 100644
--- a/src/mame/drivers/retofinv.cpp
+++ b/src/mame/drivers/retofinv.cpp
@@ -439,7 +439,7 @@ MACHINE_CONFIG_START(retofinv_state::retofinv)
m_mainlatch->q_out_cb<4>().set(FUNC(retofinv_state::irq1_ack_w));
m_mainlatch->q_out_cb<5>().set_inputline(m_subcpu, INPUT_LINE_RESET).invert();
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/rockrage.cpp b/src/mame/drivers/rockrage.cpp
index 366bf17e94a..742e95c5934 100644
--- a/src/mame/drivers/rockrage.cpp
+++ b/src/mame/drivers/rockrage.cpp
@@ -257,7 +257,7 @@ MACHINE_CONFIG_START(rockrage_state::rockrage)
MCFG_DEVICE_ADD("audiocpu", MC6809E, XTAL(24'000'000) / 16)
MCFG_DEVICE_PROGRAM_MAP(rockrage_sound_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/rocnrope.cpp b/src/mame/drivers/rocnrope.cpp
index 43374fcf357..6a86ff017a5 100644
--- a/src/mame/drivers/rocnrope.cpp
+++ b/src/mame/drivers/rocnrope.cpp
@@ -220,7 +220,7 @@ MACHINE_CONFIG_START(rocnrope_state::rocnrope)
mainlatch.q_out_cb<4>().set(FUNC(rocnrope_state::coin_counter_2_w));
mainlatch.q_out_cb<7>().set(FUNC(rocnrope_state::irq_mask_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/rollerg.cpp b/src/mame/drivers/rollerg.cpp
index 3acb0a132b6..494c5462dd8 100644
--- a/src/mame/drivers/rollerg.cpp
+++ b/src/mame/drivers/rollerg.cpp
@@ -256,7 +256,7 @@ MACHINE_CONFIG_START(rollerg_state::rollerg)
MCFG_DEVICE_ADD("audiocpu", Z80, 3579545)
MCFG_DEVICE_PROGRAM_MAP(rollerg_sound_map) /* NMIs are generated by the 053260 */
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/sandscrp.cpp b/src/mame/drivers/sandscrp.cpp
index fc5aa8c6633..6b950213719 100644
--- a/src/mame/drivers/sandscrp.cpp
+++ b/src/mame/drivers/sandscrp.cpp
@@ -478,8 +478,7 @@ MACHINE_CONFIG_START(sandscrp_state::sandscrp)
MCFG_DEVICE_PROGRAM_MAP(sandscrp_soundmem)
MCFG_DEVICE_IO_MAP(sandscrp_soundport)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */
+ WATCHDOG_TIMER(config, "watchdog").set_time(attotime::from_seconds(3)); /* a guess, and certainly wrong */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/sauro.cpp b/src/mame/drivers/sauro.cpp
index 524098826c9..1e6c0934694 100644
--- a/src/mame/drivers/sauro.cpp
+++ b/src/mame/drivers/sauro.cpp
@@ -456,7 +456,7 @@ MACHINE_CONFIG_START(sauro_state::tecfri)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/sbasketb.cpp b/src/mame/drivers/sbasketb.cpp
index 580f37e47ee..0ea1be8e625 100644
--- a/src/mame/drivers/sbasketb.cpp
+++ b/src/mame/drivers/sbasketb.cpp
@@ -210,7 +210,7 @@ MACHINE_CONFIG_START(sbasketb_state::sbasketb)
mainlatch.q_out_cb<5>().set(FUNC(sbasketb_state::spriteram_select_w)); // OBJ CHE
mainlatch.q_out_cb<6>().set_nop(); // END - not used
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD(m_screen, RASTER)
diff --git a/src/mame/drivers/sbowling.cpp b/src/mame/drivers/sbowling.cpp
index f489da0d004..1ce7e61a90d 100644
--- a/src/mame/drivers/sbowling.cpp
+++ b/src/mame/drivers/sbowling.cpp
@@ -417,7 +417,7 @@ MACHINE_CONFIG_START(sbowling_state::sbowling)
MCFG_DEVICE_IO_MAP(port_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", sbowling_state, interrupt, "screen", 0, 1)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/sbrkout.cpp b/src/mame/drivers/sbrkout.cpp
index 3ad241a169a..d6602f26e8b 100644
--- a/src/mame/drivers/sbrkout.cpp
+++ b/src/mame/drivers/sbrkout.cpp
@@ -573,8 +573,7 @@ MACHINE_CONFIG_START(sbrkout_state::sbrkout)
// coin counter activity as stated in Atari bulletin B-0054 (which recommends tying it to the
// CPU reset line instead).
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 8);
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sbrkout)
diff --git a/src/mame/drivers/scobra.cpp b/src/mame/drivers/scobra.cpp
index c575cd684a9..7091f8bb6d2 100644
--- a/src/mame/drivers/scobra.cpp
+++ b/src/mame/drivers/scobra.cpp
@@ -898,7 +898,7 @@ MACHINE_CONFIG_START(scobra_state::type1)
MCFG_TIMER_DRIVER_ADD("int_timer", scobra_state, galaxold_interrupt_timer)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1067,7 +1067,7 @@ MACHINE_CONFIG_START(scobra_state::hustler)
MCFG_TIMER_DRIVER_ADD("int_timer", scobra_state, galaxold_interrupt_timer)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
I8255A(config, m_ppi8255_0);
m_ppi8255_0->in_pa_callback().set_ioport("IN0");
diff --git a/src/mame/drivers/scotrsht.cpp b/src/mame/drivers/scotrsht.cpp
index 9db1b13ec30..c8e19beaee3 100644
--- a/src/mame/drivers/scotrsht.cpp
+++ b/src/mame/drivers/scotrsht.cpp
@@ -197,7 +197,7 @@ MACHINE_CONFIG_START(scotrsht_state::scotrsht)
MCFG_DEVICE_PROGRAM_MAP(scotrsht_sound_map)
MCFG_DEVICE_IO_MAP(scotrsht_sound_port)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/scramble.cpp b/src/mame/drivers/scramble.cpp
index e049413ca68..b71a4a7de38 100644
--- a/src/mame/drivers/scramble.cpp
+++ b/src/mame/drivers/scramble.cpp
@@ -1324,7 +1324,7 @@ MACHINE_CONFIG_START(scramble_state::scramble)
MCFG_TIMER_DRIVER_ADD("int_timer", scramble_state, galaxold_interrupt_timer)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_MACHINE_RESET_OVERRIDE(scramble_state,scramble)
@@ -1595,7 +1595,7 @@ MACHINE_CONFIG_START(scramble_state::ad2083)
MCFG_TIMER_DRIVER_ADD("int_timer", scramble_state, galaxold_interrupt_timer)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_MACHINE_RESET_OVERRIDE(scramble_state,galaxold)
diff --git a/src/mame/drivers/segaorun.cpp b/src/mame/drivers/segaorun.cpp
index f447a3be27d..11e30d91cfd 100644
--- a/src/mame/drivers/segaorun.cpp
+++ b/src/mame/drivers/segaorun.cpp
@@ -1159,7 +1159,7 @@ MACHINE_CONFIG_START(segaorun_state::outrun_base)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
I8255(config, m_i8255);
m_i8255->in_pa_callback().set(FUNC(segaorun_state::bankmotor_limit_r));
diff --git a/src/mame/drivers/segas16a.cpp b/src/mame/drivers/segas16a.cpp
index 42e8b3daf86..1f64ffd81e9 100644
--- a/src/mame/drivers/segas16a.cpp
+++ b/src/mame/drivers/segas16a.cpp
@@ -1987,7 +1987,7 @@ MACHINE_CONFIG_START(segas16a_state::system16a)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
I8255(config, m_i8255);
m_i8255->out_pa_callback().set("soundlatch", FUNC(generic_latch_8_device::write));
diff --git a/src/mame/drivers/seicross.cpp b/src/mame/drivers/seicross.cpp
index 58d52bd2085..c6a57466f5f 100644
--- a/src/mame/drivers/seicross.cpp
+++ b/src/mame/drivers/seicross.cpp
@@ -409,7 +409,7 @@ MACHINE_CONFIG_START(seicross_state::no_nvram)
MCFG_QUANTUM_TIME(attotime::from_hz(1200)) /* 20 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp
index 2ac44271546..aa9467e87c1 100644
--- a/src/mame/drivers/seta.cpp
+++ b/src/mame/drivers/seta.cpp
@@ -8034,7 +8034,7 @@ MACHINE_CONFIG_START(seta_state::usclssic)
MCFG_DEVICE_PROGRAM_MAP(usclssic_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, calibr50_interrupt, "screen", 0, 1)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_DEVICE_ADD("sub", M65C02, 16000000/8) /* 2 MHz */
MCFG_DEVICE_PROGRAM_MAP(calibr50_sub_map)
@@ -8101,7 +8101,7 @@ MACHINE_CONFIG_START(seta_state::calibr50)
MCFG_DEVICE_PROGRAM_MAP(calibr50_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, calibr50_interrupt, "screen", 0, 1)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
@@ -8568,7 +8568,7 @@ MACHINE_CONFIG_START(setaroul_state::setaroul)
MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* 8 MHz */
MCFG_DEVICE_PROGRAM_MAP(setaroul_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", setaroul_state, interrupt, "screen", 0, 1)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_MACHINE_START_OVERRIDE(setaroul_state, setaroul)
MCFG_MACHINE_RESET_OVERRIDE(setaroul_state, setaroul)
@@ -8623,7 +8623,7 @@ MACHINE_CONFIG_START(seta_state::eightfrc)
MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
MCFG_DEVICE_PROGRAM_MAP(wrofaero_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
@@ -8667,7 +8667,7 @@ MACHINE_CONFIG_START(seta_state::extdwnhl)
MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
MCFG_DEVICE_PROGRAM_MAP(extdwnhl_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
@@ -8731,7 +8731,7 @@ MACHINE_CONFIG_START(seta_state::gundhara)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_2_and_4, "screen", 0, 1)
#endif // __uPD71054_TIMER
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
#if __uPD71054_TIMER
MCFG_MACHINE_START_OVERRIDE(seta_state, wrofaero )
@@ -8803,7 +8803,7 @@ MACHINE_CONFIG_START(seta_state::jjsquawk)
MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
MCFG_DEVICE_PROGRAM_MAP(wrofaero_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
@@ -8879,7 +8879,7 @@ MACHINE_CONFIG_START(seta_state::kamenrid)
MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
MCFG_DEVICE_PROGRAM_MAP(kamenrid_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta_state, irq2_line_assert)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_DEVICE_ADD("pit", PIT8254, 0) // uPD71054C
MCFG_PIT8253_CLK0(16000000/2/8)
@@ -9063,7 +9063,7 @@ MACHINE_CONFIG_START(seta_state::madshark)
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -9103,7 +9103,7 @@ MACHINE_CONFIG_START(seta_state::magspeed)
MCFG_DEVICE_PROGRAM_MAP(magspeed_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta_state, irq2_line_assert)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_MACHINE_START_OVERRIDE(seta_state, magspeed)
@@ -9318,7 +9318,7 @@ MACHINE_CONFIG_START(seta_state::rezon)
MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
MCFG_DEVICE_PROGRAM_MAP(wrofaero_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
@@ -9607,7 +9607,7 @@ MACHINE_CONFIG_START(seta_state::wrofaero)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_2_and_4, "screen", 0, 1)
#endif // __uPD71054_TIMER
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
#if __uPD71054_TIMER
MCFG_MACHINE_START_OVERRIDE(seta_state, wrofaero )
@@ -9661,7 +9661,7 @@ MACHINE_CONFIG_START(seta_state::zingzip)
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
MCFG_SETA001_SPRITE_GFXBANK_CB(seta_state, setac_gfxbank_callback)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -9831,8 +9831,7 @@ MACHINE_CONFIG_START(jockeyc_state::jockeyc)
MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) // TMP68000N-8
MCFG_DEVICE_PROGRAM_MAP(jockeyc_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", jockeyc_state, interrupt, "screen", 0, 1)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(2.0)) // jockeyc: watchdog test error if over 2.5s
+ WATCHDOG_TIMER(config, "watchdog").set_time(attotime::from_seconds(2.0)); // jockeyc: watchdog test error if over 2.5s
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
diff --git a/src/mame/drivers/seta2.cpp b/src/mame/drivers/seta2.cpp
index 85a79c951e9..464c01a6c37 100644
--- a/src/mame/drivers/seta2.cpp
+++ b/src/mame/drivers/seta2.cpp
@@ -2583,7 +2583,7 @@ MACHINE_CONFIG_START(seta2_state::seta2)
MCFG_DEVICE_ADD("tmp68301", TMP68301, 0)
MCFG_TMP68301_CPU("maincpu")
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2810,7 +2810,7 @@ MACHINE_CONFIG_START(funcube_state::funcube)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/shadfrce.cpp b/src/mame/drivers/shadfrce.cpp
index 14ca2204ceb..5c937c16bd2 100644
--- a/src/mame/drivers/shadfrce.cpp
+++ b/src/mame/drivers/shadfrce.cpp
@@ -544,7 +544,7 @@ MACHINE_CONFIG_START(shadfrce_state::shadfrce)
MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
MCFG_DEVICE_PROGRAM_MAP(shadfrce_sound_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 448, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */
diff --git a/src/mame/drivers/shaolins.cpp b/src/mame/drivers/shaolins.cpp
index 401e02a0e9d..a7852f669cb 100644
--- a/src/mame/drivers/shaolins.cpp
+++ b/src/mame/drivers/shaolins.cpp
@@ -199,7 +199,7 @@ MACHINE_CONFIG_START(shaolins_state::shaolins)
MCFG_DEVICE_ADD("maincpu", MC6809E, MASTER_CLOCK/12) /* verified on pcb */
MCFG_DEVICE_PROGRAM_MAP(shaolins_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", shaolins_state, interrupt, "screen", 0, 1)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/shougi.cpp b/src/mame/drivers/shougi.cpp
index ae4f0db2e5e..1b91a739420 100644
--- a/src/mame/drivers/shougi.cpp
+++ b/src/mame/drivers/shougi.cpp
@@ -393,8 +393,7 @@ MACHINE_CONFIG_START(shougi_state::shougi)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 0x10) // assuming it's the same as champbas
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 0x10); // assuming it's the same as champbas
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/shuuz.cpp b/src/mame/drivers/shuuz.cpp
index 19c1e1a9acf..f54ee95b2c8 100644
--- a/src/mame/drivers/shuuz.cpp
+++ b/src/mame/drivers/shuuz.cpp
@@ -240,7 +240,7 @@ MACHINE_CONFIG_START(shuuz_state::shuuz)
EEPROM_2816(config, "eeprom").lock_after_write(true);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_shuuz)
diff --git a/src/mame/drivers/sidearms.cpp b/src/mame/drivers/sidearms.cpp
index f7c3726ae66..acb3a5dc0a0 100644
--- a/src/mame/drivers/sidearms.cpp
+++ b/src/mame/drivers/sidearms.cpp
@@ -609,7 +609,7 @@ MACHINE_CONFIG_START(sidearms_state::sidearms)
MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* 4 MHz (?) */
MCFG_DEVICE_PROGRAM_MAP(sidearms_sound_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8)
@@ -658,7 +658,7 @@ MACHINE_CONFIG_START(sidearms_state::turtship)
MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* 4 MHz (?) */
MCFG_DEVICE_PROGRAM_MAP(sidearms_sound_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8)
@@ -710,7 +710,7 @@ MACHINE_CONFIG_START(sidearms_state::whizz)
MCFG_QUANTUM_TIME(attotime::from_hz(60000))
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8)
diff --git a/src/mame/drivers/sigmab98.cpp b/src/mame/drivers/sigmab98.cpp
index a9c436325e5..c0239ce68f9 100644
--- a/src/mame/drivers/sigmab98.cpp
+++ b/src/mame/drivers/sigmab98.cpp
@@ -3009,7 +3009,7 @@ MACHINE_CONFIG_START(sigmab98_state::sammymdl)
MCFG_TICKET_DISPENSER_ADD("hopper", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_LOW )
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/simpsons.cpp b/src/mame/drivers/simpsons.cpp
index f89eb556255..68ac2aba230 100644
--- a/src/mame/drivers/simpsons.cpp
+++ b/src/mame/drivers/simpsons.cpp
@@ -338,7 +338,7 @@ MACHINE_CONFIG_START(simpsons_state::simpsons)
EEPROM_ER5911_8BIT(config, "eeprom");
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/skullxbo.cpp b/src/mame/drivers/skullxbo.cpp
index 37bcb7aa9b4..cbe3436ccad 100644
--- a/src/mame/drivers/skullxbo.cpp
+++ b/src/mame/drivers/skullxbo.cpp
@@ -235,7 +235,7 @@ MACHINE_CONFIG_START(skullxbo_state::skullxbo)
EEPROM_2816(config, "eeprom").lock_after_write(true);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_skullxbo)
diff --git a/src/mame/drivers/skydiver.cpp b/src/mame/drivers/skydiver.cpp
index 9fe01be50cd..e4ee45b584a 100644
--- a/src/mame/drivers/skydiver.cpp
+++ b/src/mame/drivers/skydiver.cpp
@@ -352,8 +352,7 @@ MACHINE_CONFIG_START(skydiver_state::skydiver)
MCFG_DEVICE_PROGRAM_MAP(skydiver_map)
MCFG_DEVICE_PERIODIC_INT_DRIVER(skydiver_state, interrupt, 5*60)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8) // 128V clocks the same as VBLANK
+ WATCHDOG_TIMER(config, m_watchdog).set_vblank_count("screen", 8); // 128V clocks the same as VBLANK
f9334_device &latch1(F9334(config, "latch1")); // F12
latch1.q_out_cb<0>().set(FUNC(skydiver_state::lamp_s_w));
diff --git a/src/mame/drivers/skykid.cpp b/src/mame/drivers/skykid.cpp
index 4eeede35f26..67e12ff741d 100644
--- a/src/mame/drivers/skykid.cpp
+++ b/src/mame/drivers/skykid.cpp
@@ -447,7 +447,7 @@ MACHINE_CONFIG_START(skykid_state::skykid)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* we need heavy synch */
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/skyraid.cpp b/src/mame/drivers/skyraid.cpp
index 64137991f2b..4d9fccefcaf 100644
--- a/src/mame/drivers/skyraid.cpp
+++ b/src/mame/drivers/skyraid.cpp
@@ -229,8 +229,7 @@ MACHINE_CONFIG_START(skyraid_state::skyraid)
MCFG_DEVICE_PROGRAM_MAP(skyraid_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", skyraid_state, irq0_line_hold)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 4)
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 4);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/snowbros.cpp b/src/mame/drivers/snowbros.cpp
index 04adc464a03..65657beac03 100644
--- a/src/mame/drivers/snowbros.cpp
+++ b/src/mame/drivers/snowbros.cpp
@@ -1730,7 +1730,7 @@ MACHINE_CONFIG_START(snowbros_state::snowbros)
MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* 8 Mhz - confirmed */
MCFG_DEVICE_PROGRAM_MAP(snowbros_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", snowbros_state, snowbros_irq, "screen", 0, 1)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(12'000'000)/2) /* 6 MHz - confirmed */
MCFG_DEVICE_PROGRAM_MAP(sound_map)
@@ -1879,7 +1879,7 @@ MACHINE_CONFIG_START(snowbros_state::twinadv)
MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000)) /* 12MHz like Honey Dolls ? */
MCFG_DEVICE_PROGRAM_MAP(twinadv_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", snowbros_state, snowbros_irq, "screen", 0, 1)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(16'000'000)/4) /* 4Mhz (16MHz/4) like SemiCom or 6MHz (12MHz/2) like snowbros??? */
MCFG_DEVICE_PROGRAM_MAP(sound_map)
@@ -1966,7 +1966,7 @@ MACHINE_CONFIG_START(snowbros_state::snowbro3) /* PCB has 16MHz & 12MHz OSCs */
MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000)) /* MC68000P10 CPU @ 12mhz or 8MHz (16MHz/2) ? */
MCFG_DEVICE_PROGRAM_MAP(snowbros3_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", snowbros_state, snowbros3_irq, "screen", 0, 1)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1997,7 +1997,7 @@ MACHINE_CONFIG_START(snowbros_state::yutnori)
MCFG_DEVICE_PROGRAM_MAP(yutnori_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", snowbros_state, snowbros_irq, "screen", 0, 1)
-// MCFG_WATCHDOG_ADD("watchdog") // maybe
+// WATCHDOG_TIMER(config, "watchdog"); // maybe
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/speedatk.cpp b/src/mame/drivers/speedatk.cpp
index 5dda53b5564..eeaf8ceed4b 100644
--- a/src/mame/drivers/speedatk.cpp
+++ b/src/mame/drivers/speedatk.cpp
@@ -313,8 +313,7 @@ MACHINE_CONFIG_START(speedatk_state::speedatk)
MCFG_DEVICE_IO_MAP(speedatk_io)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", speedatk_state, irq0_line_hold)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8) // timing is unknown
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 8); // timing is unknown
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/sprint2.cpp b/src/mame/drivers/sprint2.cpp
index cec24af87c2..8142f76e509 100644
--- a/src/mame/drivers/sprint2.cpp
+++ b/src/mame/drivers/sprint2.cpp
@@ -497,8 +497,7 @@ MACHINE_CONFIG_START(sprint2_state::sprint2)
MCFG_DEVICE_PROGRAM_MAP(sprint2_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sprint2_state, sprint2)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
+ WATCHDOG_TIMER(config, m_watchdog).set_vblank_count("screen", 8);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/sprint4.cpp b/src/mame/drivers/sprint4.cpp
index 5efaa9cfd26..41e6ed78b80 100644
--- a/src/mame/drivers/sprint4.cpp
+++ b/src/mame/drivers/sprint4.cpp
@@ -385,8 +385,7 @@ MACHINE_CONFIG_START(sprint4_state::sprint4)
MCFG_DEVICE_ADD("maincpu", M6502, PIXEL_CLOCK / 8)
MCFG_DEVICE_PROGRAM_MAP(sprint4_cpu_map)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
+ WATCHDOG_TIMER(config, m_watchdog).set_vblank_count("screen", 8);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/spy.cpp b/src/mame/drivers/spy.cpp
index c7a6aa51e75..32e69d9eb5e 100644
--- a/src/mame/drivers/spy.cpp
+++ b/src/mame/drivers/spy.cpp
@@ -504,7 +504,7 @@ MACHINE_CONFIG_START(spy_state::spy)
MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545))
MCFG_DEVICE_PROGRAM_MAP(spy_sound_map) /* nmi by the sound chip */
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/sspeedr.cpp b/src/mame/drivers/sspeedr.cpp
index cd9f2366b8a..77519edc5d4 100644
--- a/src/mame/drivers/sspeedr.cpp
+++ b/src/mame/drivers/sspeedr.cpp
@@ -198,7 +198,7 @@ MACHINE_CONFIG_START(sspeedr_state::sspeedr)
MCFG_DEVICE_IO_MAP(sspeedr_io_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sspeedr_state, irq0_line_assert)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/ssv.cpp b/src/mame/drivers/ssv.cpp
index ff1bd10e7a1..4e9d328931b 100644
--- a/src/mame/drivers/ssv.cpp
+++ b/src/mame/drivers/ssv.cpp
@@ -2635,7 +2635,7 @@ MACHINE_CONFIG_START(ssv_state::hypreact)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_PROGRAM_MAP(hypreact_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2650,7 +2650,7 @@ MACHINE_CONFIG_START(ssv_state::hypreac2)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_PROGRAM_MAP(hypreac2_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2693,7 +2693,7 @@ MACHINE_CONFIG_START(ssv_state::meosism)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2721,7 +2721,7 @@ MACHINE_CONFIG_START(ssv_state::ryorioh)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_PROGRAM_MAP(ryorioh_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2735,7 +2735,7 @@ MACHINE_CONFIG_START(ssv_state::vasara)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_PROGRAM_MAP(ryorioh_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2749,7 +2749,7 @@ MACHINE_CONFIG_START(ssv_state::srmp4)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_PROGRAM_MAP(srmp4_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2764,7 +2764,7 @@ MACHINE_CONFIG_START(ssv_state::srmp7)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_PROGRAM_MAP(srmp7_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2800,7 +2800,7 @@ MACHINE_CONFIG_START(ssv_state::survarts)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_PROGRAM_MAP(survarts_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2831,7 +2831,7 @@ MACHINE_CONFIG_START(ssv_state::eaglshot)
MCFG_UPD4701_PORTX("TRACKX")
MCFG_UPD4701_PORTY("TRACKY")
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2852,7 +2852,7 @@ MACHINE_CONFIG_START(ssv_state::sxyreact)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2868,7 +2868,7 @@ MACHINE_CONFIG_START(ssv_state::sxyreac2)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2884,7 +2884,7 @@ MACHINE_CONFIG_START(ssv_state::cairblad)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2904,7 +2904,7 @@ MACHINE_CONFIG_START(ssv_state::twineag2)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2919,7 +2919,7 @@ MACHINE_CONFIG_START(ssv_state::ultrax)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_PROGRAM_MAP(ultrax_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2936,7 +2936,7 @@ MACHINE_CONFIG_START(ssv_state::jsk)
MCFG_DEVICE_ADD("sub", V810,25000000)
MCFG_DEVICE_PROGRAM_MAP(jsk_v810_mem)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/stargame.cpp b/src/mame/drivers/stargame.cpp
index 3556438e508..813470bf2a7 100644
--- a/src/mame/drivers/stargame.cpp
+++ b/src/mame/drivers/stargame.cpp
@@ -144,7 +144,7 @@ MACHINE_CONFIG_START(stargame_state::stargame)
GENERIC_LATCH_8(config, "soundlatch").data_pending_callback().set_inputline(m_audiocpu, INPUT_LINE_NMI);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MACHINE_CONFIG_END
ROM_START(spcship)
diff --git a/src/mame/drivers/starwars.cpp b/src/mame/drivers/starwars.cpp
index c720c9eb115..cb0f381a092 100644
--- a/src/mame/drivers/starwars.cpp
+++ b/src/mame/drivers/starwars.cpp
@@ -305,8 +305,7 @@ MACHINE_CONFIG_START(starwars_state::starwars)
MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_DEVICE_PERIODIC_INT_DRIVER(starwars_state, irq0_line_assert, CLOCK_3KHZ / 12)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_hz(CLOCK_3KHZ / 128))
+ WATCHDOG_TIMER(config, "watchdog").set_time(attotime::from_hz(CLOCK_3KHZ / 128));
MCFG_DEVICE_ADD("audiocpu", MC6809E, MASTER_CLOCK / 8)
MCFG_DEVICE_PROGRAM_MAP(sound_map)
diff --git a/src/mame/drivers/stuntair.cpp b/src/mame/drivers/stuntair.cpp
index 136ef6972f0..e054617b546 100644
--- a/src/mame/drivers/stuntair.cpp
+++ b/src/mame/drivers/stuntair.cpp
@@ -539,7 +539,7 @@ MACHINE_CONFIG_START(stuntair_state::stuntair)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/sub.cpp b/src/mame/drivers/sub.cpp
index 5c8ccc2ce26..1fd35c94682 100644
--- a/src/mame/drivers/sub.cpp
+++ b/src/mame/drivers/sub.cpp
@@ -322,7 +322,7 @@ MACHINE_CONFIG_START(sub_state::sub)
mainlatch.q_out_cb<3>().set_nop(); // same as Q0?
mainlatch.q_out_cb<5>().set_nop();
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/suna8.cpp b/src/mame/drivers/suna8.cpp
index 4418c8a76db..8c1408e6500 100644
--- a/src/mame/drivers/suna8.cpp
+++ b/src/mame/drivers/suna8.cpp
@@ -1947,7 +1947,7 @@ MACHINE_CONFIG_START(suna8_state::rranger)
MCFG_DEVICE_PROGRAM_MAP(rranger_sound_map)
MCFG_DEVICE_PERIODIC_INT_DRIVER(suna8_state, irq0_line_hold, 4*60) /* NMI = retn */
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/supdrapo.cpp b/src/mame/drivers/supdrapo.cpp
index b30755755f2..37002314b77 100644
--- a/src/mame/drivers/supdrapo.cpp
+++ b/src/mame/drivers/supdrapo.cpp
@@ -461,7 +461,7 @@ MACHINE_CONFIG_START(supdrapo_state::supdrapo)
MCFG_DEVICE_PROGRAM_MAP(sdpoker_mem)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", supdrapo_state, irq0_line_hold)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
diff --git a/src/mame/drivers/supertnk.cpp b/src/mame/drivers/supertnk.cpp
index e2c7a3603d2..bf4d63f2767 100644
--- a/src/mame/drivers/supertnk.cpp
+++ b/src/mame/drivers/supertnk.cpp
@@ -441,7 +441,7 @@ MACHINE_CONFIG_START(supertnk_state::supertnk)
m_maincpu->set_addrmap(AS_IO, &supertnk_state::supertnk_io_map);
m_maincpu->set_vblank_int("screen", FUNC(supertnk_state::supertnk_interrupt));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
diff --git a/src/mame/drivers/suprridr.cpp b/src/mame/drivers/suprridr.cpp
index dea41e8bc42..df711feca94 100644
--- a/src/mame/drivers/suprridr.cpp
+++ b/src/mame/drivers/suprridr.cpp
@@ -333,7 +333,7 @@ MACHINE_CONFIG_START(suprridr_state::suprridr)
MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_DEVICE_IO_MAP(sound_portmap)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/surpratk.cpp b/src/mame/drivers/surpratk.cpp
index 26f251c8f0f..dfb920ea624 100644
--- a/src/mame/drivers/surpratk.cpp
+++ b/src/mame/drivers/surpratk.cpp
@@ -178,7 +178,7 @@ MACHINE_CONFIG_START(surpratk_state::surpratk)
ADDRESS_MAP_BANK(config, "bank0000").set_map(&surpratk_state::bank0000_map).set_options(ENDIANNESS_BIG, 8, 13, 0x800);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/taito_f2.cpp b/src/mame/drivers/taito_f2.cpp
index f9a18c99929..151fee9c879 100644
--- a/src/mame/drivers/taito_f2.cpp
+++ b/src/mame/drivers/taito_f2.cpp
@@ -2860,7 +2860,7 @@ MACHINE_CONFIG_START(taitof2_state::taito_f2)
MCFG_MACHINE_START_OVERRIDE(taitof2_state,f2)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/taito_o.cpp b/src/mame/drivers/taito_o.cpp
index d09da0d7018..c581e2f79cb 100644
--- a/src/mame/drivers/taito_o.cpp
+++ b/src/mame/drivers/taito_o.cpp
@@ -239,7 +239,7 @@ MACHINE_CONFIG_START(taitoo_state::parentj)
MCFG_DEVICE_PROGRAM_MAP(parentj_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", taitoo_state, parentj_interrupt, "screen", 0, 1)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/taitosj.cpp b/src/mame/drivers/taitosj.cpp
index 9fcdf538b22..69370b98ab5 100644
--- a/src/mame/drivers/taitosj.cpp
+++ b/src/mame/drivers/taitosj.cpp
@@ -1835,8 +1835,7 @@ MACHINE_CONFIG_START(taitosj_state::nomcu)
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, taitosj_state, taitosj_sndnmi_msk_w)) /* port Bwrite */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 128); // 74LS393 on CPU board, counts 128 vblanks before firing watchdog
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 128); // 74LS393 on CPU board, counts 128 vblanks before firing watchdog
MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15) // 30k r-2r network
MCFG_DEVICE_ADD("dacvol", DISCRETE, taitosj_dacvol_discrete)
diff --git a/src/mame/drivers/tecmo.cpp b/src/mame/drivers/tecmo.cpp
index 40a22c6e7bd..cb1de631c97 100644
--- a/src/mame/drivers/tecmo.cpp
+++ b/src/mame/drivers/tecmo.cpp
@@ -724,7 +724,7 @@ MACHINE_CONFIG_START(tecmo_state::rygar)
MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(4'000'000)) /* verified on pcb */
MCFG_DEVICE_PROGRAM_MAP(rygar_sound_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/tecmosys.cpp b/src/mame/drivers/tecmosys.cpp
index 3d18f17a53d..9c3530511e3 100644
--- a/src/mame/drivers/tecmosys.cpp
+++ b/src/mame/drivers/tecmosys.cpp
@@ -459,8 +459,7 @@ MACHINE_CONFIG_START(tecmosys_state::tecmosys)
MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tecmosys_state, irq1_line_hold)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 400) // guess
+ WATCHDOG_TIMER(config, m_watchdog).set_vblank_count("screen", 400); // guess
MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/2 )
MCFG_DEVICE_PROGRAM_MAP(sound_map)
diff --git a/src/mame/drivers/tehkanwc.cpp b/src/mame/drivers/tehkanwc.cpp
index a4d05511913..16406ecc97a 100644
--- a/src/mame/drivers/tehkanwc.cpp
+++ b/src/mame/drivers/tehkanwc.cpp
@@ -683,7 +683,7 @@ MACHINE_CONFIG_START(tehkanwc_state::tehkanwc)
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - seems enough to keep the CPUs in sync */
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/tempest.cpp b/src/mame/drivers/tempest.cpp
index ae8c8593ba6..7657f1027e2 100644
--- a/src/mame/drivers/tempest.cpp
+++ b/src/mame/drivers/tempest.cpp
@@ -638,8 +638,7 @@ MACHINE_CONFIG_START(tempest_state::tempest)
MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_DEVICE_PERIODIC_INT_DRIVER(tempest_state, irq0_line_assert, CLOCK_3KHZ / 12)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_hz(CLOCK_3KHZ / 256))
+ WATCHDOG_TIMER(config, m_watchdog).set_time(attotime::from_hz(CLOCK_3KHZ / 256));
MCFG_DEVICE_ADD("earom", ER2055)
diff --git a/src/mame/drivers/tetrisp2.cpp b/src/mame/drivers/tetrisp2.cpp
index 9e0d9831997..6acd4ecccac 100644
--- a/src/mame/drivers/tetrisp2.cpp
+++ b/src/mame/drivers/tetrisp2.cpp
@@ -1701,8 +1701,7 @@ MACHINE_CONFIG_START(tetrisp2_state::tetrisp2)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8) /* guess */
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 8); /* guess */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1737,7 +1736,7 @@ MACHINE_CONFIG_START(tetrisp2_state::nndmseal)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1770,7 +1769,7 @@ MACHINE_CONFIG_START(tetrisp2_state::rockn)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1805,7 +1804,7 @@ MACHINE_CONFIG_START(tetrisp2_state::rockn2)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1844,7 +1843,7 @@ MACHINE_CONFIG_START(tetrisp2_state::rocknms)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
@@ -1895,7 +1894,7 @@ MACHINE_CONFIG_START(stepstag_state::stepstag)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
// video hardware
screen_device &lscreen(SCREEN(config, "lscreen", SCREEN_TYPE_RASTER));
@@ -1963,7 +1962,7 @@ MACHINE_CONFIG_START(stepstag_state::vjdash) // 4 Screens
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/thedealr.cpp b/src/mame/drivers/thedealr.cpp
index 9a9e82dc927..12a7f3c5d35 100644
--- a/src/mame/drivers/thedealr.cpp
+++ b/src/mame/drivers/thedealr.cpp
@@ -552,7 +552,7 @@ MACHINE_CONFIG_START(thedealr_state::thedealr)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
diff --git a/src/mame/drivers/thepit.cpp b/src/mame/drivers/thepit.cpp
index 8e3f6091b47..7db344a3e9d 100644
--- a/src/mame/drivers/thepit.cpp
+++ b/src/mame/drivers/thepit.cpp
@@ -734,7 +734,7 @@ MACHINE_CONFIG_START(thepit_state::thepit)
m_mainlatch->q_out_cb<6>().set(FUNC(thepit_state::flip_screen_x_w));
m_mainlatch->q_out_cb<7>().set(FUNC(thepit_state::flip_screen_y_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_thepit)
diff --git a/src/mame/drivers/thoop2.cpp b/src/mame/drivers/thoop2.cpp
index 8835d482c21..7f636b7eb70 100644
--- a/src/mame/drivers/thoop2.cpp
+++ b/src/mame/drivers/thoop2.cpp
@@ -283,7 +283,7 @@ MACHINE_CONFIG_START(thoop2_state::thoop2)
m_outlatch->q_out_cb<4>().set_nop(); // unknown. Sound related?
m_outlatch->q_out_cb<5>().set_nop(); // unknown
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/thunderj.cpp b/src/mame/drivers/thunderj.cpp
index b328ae34754..454eadf302f 100644
--- a/src/mame/drivers/thunderj.cpp
+++ b/src/mame/drivers/thunderj.cpp
@@ -251,7 +251,7 @@ MACHINE_CONFIG_START(thunderj_state::thunderj)
EEPROM_2816(config, "eeprom").lock_after_write(true);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* perfect synchronization due to shared RAM */
MCFG_QUANTUM_PERFECT_CPU("maincpu")
diff --git a/src/mame/drivers/thunderx.cpp b/src/mame/drivers/thunderx.cpp
index c2dfd9fac65..816b5315fcb 100644
--- a/src/mame/drivers/thunderx.cpp
+++ b/src/mame/drivers/thunderx.cpp
@@ -650,7 +650,7 @@ MACHINE_CONFIG_START(thunderx_state::scontra)
ADDRESS_MAP_BANK(config, m_bank5800).set_map(&thunderx_state::scontra_bank5800_map).set_options(ENDIANNESS_BIG, 8, 12, 0x800);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/tickee.cpp b/src/mame/drivers/tickee.cpp
index 05a28b601fc..0e21be1246c 100644
--- a/src/mame/drivers/tickee.cpp
+++ b/src/mame/drivers/tickee.cpp
@@ -822,7 +822,7 @@ MACHINE_CONFIG_START(tickee_state::rapidfir)
MCFG_MACHINE_RESET_OVERRIDE(tickee_state,rapidfir)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
diff --git a/src/mame/drivers/timelimt.cpp b/src/mame/drivers/timelimt.cpp
index 946a92b52c7..125ca2454ef 100644
--- a/src/mame/drivers/timelimt.cpp
+++ b/src/mame/drivers/timelimt.cpp
@@ -244,7 +244,7 @@ MACHINE_CONFIG_START(timelimt_state::timelimt)
mainlatch.q_out_cb<6>().set_nop(); // probably flip screen
mainlatch.q_out_cb<7>().set_nop(); // probably flip screen
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/timeplt.cpp b/src/mame/drivers/timeplt.cpp
index 62e53dbcdd5..2859c91e521 100644
--- a/src/mame/drivers/timeplt.cpp
+++ b/src/mame/drivers/timeplt.cpp
@@ -441,7 +441,7 @@ MACHINE_CONFIG_START(timeplt_state::timeplt)
m_mainlatch->q_out_cb<6>().set(FUNC(timeplt_state::coin_counter_2_w));
m_mainlatch->q_out_cb<7>().set_nop(); // PAY OUT - not used
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/tmnt.cpp b/src/mame/drivers/tmnt.cpp
index a30eeb97b8b..13631ad3113 100644
--- a/src/mame/drivers/tmnt.cpp
+++ b/src/mame/drivers/tmnt.cpp
@@ -1925,7 +1925,7 @@ MACHINE_CONFIG_START(tmnt_state::cuebrick)
MCFG_MACHINE_START_OVERRIDE(tmnt_state,common)
MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1980,7 +1980,7 @@ MACHINE_CONFIG_START(tmnt_state::mia)
MCFG_MACHINE_START_OVERRIDE(tmnt_state,common)
MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2045,7 +2045,7 @@ MACHINE_CONFIG_START(tmnt_state::tmnt)
MCFG_MACHINE_START_OVERRIDE(tmnt_state,common)
MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,tmnt)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2113,7 +2113,7 @@ MACHINE_CONFIG_START(tmnt_state::punkshot)
MCFG_MACHINE_START_OVERRIDE(tmnt_state,common)
MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2166,7 +2166,7 @@ MACHINE_CONFIG_START(tmnt_state::lgtnfght)
MCFG_MACHINE_START_OVERRIDE(tmnt_state,common)
MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2226,7 +2226,7 @@ MACHINE_CONFIG_START(tmnt_state::blswhstl)
EEPROM_ER5911_8BIT(config, "eeprom");
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2303,7 +2303,7 @@ MACHINE_CONFIG_START(tmnt_state::glfgreat)
MCFG_MACHINE_START_OVERRIDE(tmnt_state,common)
MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2372,7 +2372,7 @@ MACHINE_CONFIG_START(tmnt_state::prmrsocr)
EEPROM_ER5911_8BIT(config, "eeprom");
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2442,7 +2442,7 @@ MACHINE_CONFIG_START(tmnt_state::tmnt2)
EEPROM_ER5911_8BIT(config, "eeprom");
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2502,7 +2502,7 @@ MACHINE_CONFIG_START(tmnt_state::ssriders)
EEPROM_ER5911_8BIT(config, "eeprom");
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/toki.cpp b/src/mame/drivers/toki.cpp
index b14a82db097..e3d0124d770 100644
--- a/src/mame/drivers/toki.cpp
+++ b/src/mame/drivers/toki.cpp
@@ -558,7 +558,7 @@ MACHINE_CONFIG_START(toki_state::tokib)
MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* verified with PCB */
MCFG_DEVICE_PROGRAM_MAP(tokib_audio_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16)
diff --git a/src/mame/drivers/tomcat.cpp b/src/mame/drivers/tomcat.cpp
index 4b63c4b5484..f59e5b1f04b 100644
--- a/src/mame/drivers/tomcat.cpp
+++ b/src/mame/drivers/tomcat.cpp
@@ -356,7 +356,7 @@ MACHINE_CONFIG_START(tomcat_state::tomcat)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
MCFG_DEVICE_ADD("m48t02", M48T02, 0)
diff --git a/src/mame/drivers/toobin.cpp b/src/mame/drivers/toobin.cpp
index a14f7e4a0d1..d9d0148dd28 100644
--- a/src/mame/drivers/toobin.cpp
+++ b/src/mame/drivers/toobin.cpp
@@ -211,8 +211,7 @@ MACHINE_CONFIG_START(toobin_state::toobin)
EEPROM_2804(config, "eeprom").lock_after_write(true);
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
+ WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 8);
/* video hardware */
MCFG_TILEMAP_ADD_STANDARD("playfield", "gfxdecode", 4, toobin_state, get_playfield_tile_info, 8,8, SCAN_ROWS, 128,64)
diff --git a/src/mame/drivers/tourtabl.cpp b/src/mame/drivers/tourtabl.cpp
index 340c8fbfc60..ba9914a0fd4 100644
--- a/src/mame/drivers/tourtabl.cpp
+++ b/src/mame/drivers/tourtabl.cpp
@@ -170,7 +170,7 @@ MACHINE_CONFIG_START(tourtabl_state::tourtabl)
riot2.in_pb_callback().set_ioport("RIOT1_SWB");
riot2.out_pb_callback().set(FUNC(tourtabl_state::tourtabl_led_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("tia_video", TIA_NTSC_VIDEO, 0, "tia")
diff --git a/src/mame/drivers/tp84.cpp b/src/mame/drivers/tp84.cpp
index 76f43e8f3e6..2735f5b9b29 100644
--- a/src/mame/drivers/tp84.cpp
+++ b/src/mame/drivers/tp84.cpp
@@ -351,7 +351,7 @@ MACHINE_CONFIG_START(tp84_state::tp84)
mainlatch.q_out_cb<4>().set(FUNC(tp84_state::flip_screen_x_w));
mainlatch.q_out_cb<5>().set(FUNC(tp84_state::flip_screen_y_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/trackfld.cpp b/src/mame/drivers/trackfld.cpp
index 89046f80517..fc01c834e12 100644
--- a/src/mame/drivers/trackfld.cpp
+++ b/src/mame/drivers/trackfld.cpp
@@ -919,7 +919,7 @@ MACHINE_CONFIG_START(trackfld_state::trackfld)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD(m_screen, RASTER)
@@ -995,7 +995,7 @@ MACHINE_CONFIG_START(trackfld_state::yieartf)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD(m_screen, RASTER)
diff --git a/src/mame/drivers/triplhnt.cpp b/src/mame/drivers/triplhnt.cpp
index 58fa459194b..988b4d24fb4 100644
--- a/src/mame/drivers/triplhnt.cpp
+++ b/src/mame/drivers/triplhnt.cpp
@@ -292,7 +292,7 @@ MACHINE_CONFIG_START(triplhnt_state::triplhnt)
m_latch->q_out_cb<7>().set([this] (int state) { m_sprite_bank = state; });
m_latch->q_out_cb<7>().append(m_discrete, FUNC(discrete_device::write_line<TRIPLHNT_BEAR_EN>)); // bear
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/truco.cpp b/src/mame/drivers/truco.cpp
index 2f563a15f2f..e975a1f50b8 100644
--- a/src/mame/drivers/truco.cpp
+++ b/src/mame/drivers/truco.cpp
@@ -424,8 +424,7 @@ MACHINE_CONFIG_START(truco_state::truco)
MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", truco_state, interrupt)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(1.6)) /* 1.6 seconds */
+ WATCHDOG_TIMER(config, m_watchdog).set_time(attotime::from_seconds(1.6)); /* 1.6 seconds */
pia6821_device &pia(PIA6821(config, "pia0", 0));
pia.readpa_handler().set_ioport("P1");
diff --git a/src/mame/drivers/trucocl.cpp b/src/mame/drivers/trucocl.cpp
index c88e681638b..61ff21d60df 100644
--- a/src/mame/drivers/trucocl.cpp
+++ b/src/mame/drivers/trucocl.cpp
@@ -187,7 +187,7 @@ MACHINE_CONFIG_START(trucocl_state::trucocl)
MCFG_DEVICE_IO_MAP(main_io)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", trucocl_state, trucocl_interrupt)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/tutankhm.cpp b/src/mame/drivers/tutankhm.cpp
index 375b3106409..3bb852c263b 100644
--- a/src/mame/drivers/tutankhm.cpp
+++ b/src/mame/drivers/tutankhm.cpp
@@ -242,7 +242,7 @@ MACHINE_CONFIG_START(tutankhm_state::tutankhm)
mainlatch.q_out_cb<6>().set(FUNC(tutankhm_state::flip_screen_x_w));
mainlatch.q_out_cb<7>().set(FUNC(tutankhm_state::flip_screen_y_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/twin16.cpp b/src/mame/drivers/twin16.cpp
index 7af28422157..058b3d08511 100644
--- a/src/mame/drivers/twin16.cpp
+++ b/src/mame/drivers/twin16.cpp
@@ -662,7 +662,7 @@ MACHINE_CONFIG_START(twin16_state::twin16)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
// video hardware
MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16)
@@ -717,7 +717,7 @@ MACHINE_CONFIG_START(fround_state::fround)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16)
diff --git a/src/mame/drivers/twinkle.cpp b/src/mame/drivers/twinkle.cpp
index a77a5bde9be..cea9840352d 100644
--- a/src/mame/drivers/twinkle.cpp
+++ b/src/mame/drivers/twinkle.cpp
@@ -1087,8 +1087,7 @@ MACHINE_CONFIG_START(twinkle_state::twinkle)
MCFG_DEVICE_PERIODIC_INT_DRIVER(twinkle_state, irq1_line_assert, 60)
MCFG_DEVICE_PERIODIC_INT_DRIVER(twinkle_state, irq2_line_assert, 60)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(1200)) /* check TD pin on LTC1232 */
+ WATCHDOG_TIMER(config, "watchdog").set_time(attotime::from_msec(1200)); /* check TD pin on LTC1232 */
MCFG_DEVICE_ADD("scsi", SCSI_PORT, 0)
MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE1, "cdrom", SCSICD, SCSI_ID_4)
diff --git a/src/mame/drivers/tx1.cpp b/src/mame/drivers/tx1.cpp
index 1d5c7936bb8..4eb0c97dfce 100644
--- a/src/mame/drivers/tx1.cpp
+++ b/src/mame/drivers/tx1.cpp
@@ -171,7 +171,7 @@ MACHINE_CONFIG_START(tx1_state::tx1)
MCFG_DEVICE_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3)
MCFG_DEVICE_PROGRAM_MAP(tx1_main)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
// MCFG_WATCHDOG_TIME_INIT(5)
MCFG_DEVICE_ADD("math_cpu", I8086, CPU_MASTER_CLOCK / 3)
@@ -218,7 +218,7 @@ MACHINE_CONFIG_START(tx1_state::buggyboy)
MCFG_DEVICE_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3)
MCFG_DEVICE_PROGRAM_MAP(buggyboy_main)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
// MCFG_WATCHDOG_TIME_INIT(5)
MCFG_DEVICE_ADD("math_cpu", I8086, CPU_MASTER_CLOCK / 3)
@@ -257,7 +257,7 @@ MACHINE_CONFIG_START(tx1_state::buggybjr)
MCFG_DEVICE_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3)
MCFG_DEVICE_PROGRAM_MAP(buggybjr_main)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
// MCFG_WATCHDOG_TIME_INIT(5)
MCFG_DEVICE_ADD("math_cpu", I8086, CPU_MASTER_CLOCK / 3)
diff --git a/src/mame/drivers/ultraman.cpp b/src/mame/drivers/ultraman.cpp
index 4fcec36d959..5ceab9446df 100644
--- a/src/mame/drivers/ultraman.cpp
+++ b/src/mame/drivers/ultraman.cpp
@@ -189,7 +189,7 @@ MACHINE_CONFIG_START(ultraman_state::ultraman)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/ultratnk.cpp b/src/mame/drivers/ultratnk.cpp
index aff11fd30f2..45b879ee884 100644
--- a/src/mame/drivers/ultratnk.cpp
+++ b/src/mame/drivers/ultratnk.cpp
@@ -302,8 +302,7 @@ MACHINE_CONFIG_START(ultratnk_state::ultratnk)
latch.q_out_cb<6>().set("discrete", FUNC(discrete_device::write_line<ULTRATNK_FIRE_EN_2>));
latch.q_out_cb<7>().set("discrete", FUNC(discrete_device::write_line<ULTRATNK_FIRE_EN_1>));
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
+ WATCHDOG_TIMER(config, m_watchdog).set_vblank_count("screen", 8);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/vendetta.cpp b/src/mame/drivers/vendetta.cpp
index b4c96d7bb4a..8a70c90d8e2 100644
--- a/src/mame/drivers/vendetta.cpp
+++ b/src/mame/drivers/vendetta.cpp
@@ -444,7 +444,7 @@ MACHINE_CONFIG_START(vendetta_state::vendetta)
EEPROM_ER5911_8BIT(config, "eeprom");
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/videopin.cpp b/src/mame/drivers/videopin.cpp
index 28a3c619cae..e783361f81f 100644
--- a/src/mame/drivers/videopin.cpp
+++ b/src/mame/drivers/videopin.cpp
@@ -366,7 +366,7 @@ MACHINE_CONFIG_START(videopin_state::videopin)
MCFG_DEVICE_ADD("maincpu", M6502, 12096000 / 16)
MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/vlc.cpp b/src/mame/drivers/vlc.cpp
index a718f92037b..f00c70b8ad6 100644
--- a/src/mame/drivers/vlc.cpp
+++ b/src/mame/drivers/vlc.cpp
@@ -590,8 +590,7 @@ MACHINE_CONFIG_START(nevada_state::nevada)
MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CPU)
MCFG_DEVICE_PROGRAM_MAP(nevada_map)
- MCFG_WATCHDOG_ADD("watchdog")
- MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(150)) /* 150ms Ds1232 TD to Ground */
+ WATCHDOG_TIMER(config, "watchdog").set_time(attotime::from_msec(150)); /* 150ms Ds1232 TD to Ground */
MCFG_MACHINE_START_OVERRIDE(nevada_state, nevada)
diff --git a/src/mame/drivers/warpwarp.cpp b/src/mame/drivers/warpwarp.cpp
index 984ce8adcdc..ad20f333f1c 100644
--- a/src/mame/drivers/warpwarp.cpp
+++ b/src/mame/drivers/warpwarp.cpp
@@ -795,7 +795,7 @@ MACHINE_CONFIG_START(warpwarp_state::bombbee)
m_latch->q_out_cb<6>().set(FUNC(warpwarp_state::ball_on_w));
m_latch->q_out_cb<7>().set(FUNC(warpwarp_state::inv_w));
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/wc90.cpp b/src/mame/drivers/wc90.cpp
index d325744cc90..10f675cd997 100644
--- a/src/mame/drivers/wc90.cpp
+++ b/src/mame/drivers/wc90.cpp
@@ -359,7 +359,7 @@ MACHINE_CONFIG_START(wc90_state::wc90)
MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* NMIs are triggered by the main CPU */
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/williams.cpp b/src/mame/drivers/williams.cpp
index 9eee6d54914..73e3e4fe971 100644
--- a/src/mame/drivers/williams.cpp
+++ b/src/mame/drivers/williams.cpp
@@ -1500,7 +1500,7 @@ MACHINE_CONFIG_START(williams_state::williams)
// also set a timer to go off on scanline 240
MCFG_TIMER_DRIVER_ADD_SCANLINE("240_timer", williams_state, williams_count240_callback, "screen", 0, 240)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1758,7 +1758,7 @@ MACHINE_CONFIG_START(williams2_state::williams2)
// also set a timer to go off on scanline 254
MCFG_TIMER_DRIVER_ADD_SCANLINE("254_timer", williams2_state, williams2_endscreen_callback, "screen", 8, 246)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
/* video hardware */
MCFG_PALETTE_ADD("palette", 1024)
diff --git a/src/mame/drivers/wiping.cpp b/src/mame/drivers/wiping.cpp
index 7dcdbdf8554..4ee0b399094 100644
--- a/src/mame/drivers/wiping.cpp
+++ b/src/mame/drivers/wiping.cpp
@@ -302,7 +302,7 @@ MACHINE_CONFIG_START(wiping_state::wiping)
mainlatch.q_out_cb<2>().set(FUNC(wiping_state::flipscreen_w)); // INV
mainlatch.q_out_cb<3>().set_inputline(m_audiocpu, INPUT_LINE_RESET).invert(); // CP2RE
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/wiz.cpp b/src/mame/drivers/wiz.cpp
index dbcb1e54a59..abd9fd4e172 100644
--- a/src/mame/drivers/wiz.cpp
+++ b/src/mame/drivers/wiz.cpp
@@ -855,7 +855,7 @@ MACHINE_CONFIG_START(wiz_state::stinger)
MCFG_DEVICE_MODIFY("audiocpu")
MCFG_DEVICE_PROGRAM_MAP(stinger_sound_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/wmg.cpp b/src/mame/drivers/wmg.cpp
index 68bf473037c..f33cd649002 100644
--- a/src/mame/drivers/wmg.cpp
+++ b/src/mame/drivers/wmg.cpp
@@ -534,7 +534,7 @@ MACHINE_CONFIG_START(wmg_state::wmg)
// also set a timer to go off on scanline 240
MCFG_TIMER_DRIVER_ADD_SCANLINE("240_timer", williams_state, williams_count240_callback, "screen", 0, 240)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/wolfpack.cpp b/src/mame/drivers/wolfpack.cpp
index fc12eb1f081..865412a8b05 100644
--- a/src/mame/drivers/wolfpack.cpp
+++ b/src/mame/drivers/wolfpack.cpp
@@ -312,7 +312,7 @@ MACHINE_CONFIG_START(wolfpack_state::wolfpack)
MCFG_DEVICE_ADD("maincpu", M6502, 12096000 / 16)
MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/xmen.cpp b/src/mame/drivers/xmen.cpp
index 25e3b5a4ab0..c5e5a806b95 100644
--- a/src/mame/drivers/xmen.cpp
+++ b/src/mame/drivers/xmen.cpp
@@ -310,7 +310,7 @@ MACHINE_CONFIG_START(xmen_state::xmen)
EEPROM_ER5911_8BIT(config, "eeprom");
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -363,7 +363,7 @@ MACHINE_CONFIG_START(xmen_state::xmen6p)
EEPROM_ER5911_8BIT(config, "eeprom");
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_PALETTE_ADD("palette", 2048)
diff --git a/src/mame/drivers/xtheball.cpp b/src/mame/drivers/xtheball.cpp
index 79073671194..821a1fca3dd 100644
--- a/src/mame/drivers/xtheball.cpp
+++ b/src/mame/drivers/xtheball.cpp
@@ -320,7 +320,7 @@ MACHINE_CONFIG_START(xtheball_state::xtheball)
MCFG_TICKET_DISPENSER_ADD("ticket", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
/* video hardware */
MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
diff --git a/src/mame/drivers/yiear.cpp b/src/mame/drivers/yiear.cpp
index 08cd29734d2..b5b2c3a90c5 100644
--- a/src/mame/drivers/yiear.cpp
+++ b/src/mame/drivers/yiear.cpp
@@ -285,7 +285,7 @@ MACHINE_CONFIG_START(yiear_state::yiear)
MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_DEVICE_PERIODIC_INT_DRIVER(yiear_state, yiear_nmi_interrupt, 480) /* music tempo (correct frequency unknown) */
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
/* video hardware */
MCFG_SCREEN_ADD(m_screen, RASTER)
diff --git a/src/mame/drivers/zaccaria.cpp b/src/mame/drivers/zaccaria.cpp
index 26a0d3c03d8..d469db0c6fe 100644
--- a/src/mame/drivers/zaccaria.cpp
+++ b/src/mame/drivers/zaccaria.cpp
@@ -339,7 +339,7 @@ MACHINE_CONFIG_START(zaccaria_state::zaccaria)
// MCFG_QUANTUM_TIME(attotime::from_hz(1000000))
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, "watchdog");
ls259_device &mainlatch(LS259(config, "mainlatch")); // 3G on 1B1141 I/O (Z80) board
mainlatch.q_out_cb<0>().set(FUNC(zaccaria_state::flip_screen_x_w)); // VCMA
diff --git a/src/mame/drivers/zr107.cpp b/src/mame/drivers/zr107.cpp
index ca5202ec3ad..7038f398ceb 100644
--- a/src/mame/drivers/zr107.cpp
+++ b/src/mame/drivers/zr107.cpp
@@ -788,7 +788,7 @@ MACHINE_CONFIG_START(zr107_state::zr107)
K056230(config, "k056230", "maincpu");
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -858,7 +858,7 @@ MACHINE_CONFIG_START(zr107_state::jetwave)
K056230(config, "k056230", "maincpu");
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/zwackery.cpp b/src/mame/drivers/zwackery.cpp
index 206233043ae..17a368531e0 100644
--- a/src/mame/drivers/zwackery.cpp
+++ b/src/mame/drivers/zwackery.cpp
@@ -499,7 +499,7 @@ MACHINE_CONFIG_START(zwackery_state::zwackery)
MCFG_DEVICE_ADD("maincpu", M68000, 7652400) // based on counter usage, should be XTAL(16'000'000)/2
MCFG_DEVICE_PROGRAM_MAP(zwackery_map)
- MCFG_WATCHDOG_ADD("watchdog")
+ WATCHDOG_TIMER(config, m_watchdog);
PTM6840(config, m_ptm, 7652400 / 10);
m_ptm->irq_callback().set_inputline("maincpu", 6);