summaryrefslogtreecommitdiffstats
path: root/src/mame
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame')
-rw-r--r--src/mame/audio/atarijsa.cpp8
-rw-r--r--src/mame/audio/carnival.cpp4
-rw-r--r--src/mame/audio/crbaloon.cpp2
-rw-r--r--src/mame/audio/csd.cpp2
-rw-r--r--src/mame/audio/dcs.cpp10
-rw-r--r--src/mame/audio/decobsmt.cpp4
-rw-r--r--src/mame/audio/dkong.cpp6
-rw-r--r--src/mame/audio/exidy.cpp14
-rw-r--r--src/mame/audio/exidy440.cpp2
-rw-r--r--src/mame/audio/galaxian.cpp4
-rw-r--r--src/mame/audio/gottlieb.cpp6
-rw-r--r--src/mame/audio/harddriv.cpp4
-rw-r--r--src/mame/audio/irem.cpp28
-rw-r--r--src/mame/audio/midway.cpp8
-rw-r--r--src/mame/audio/rax.cpp2
-rw-r--r--src/mame/audio/redalert.cpp8
-rw-r--r--src/mame/audio/s11c_bg.cpp4
-rw-r--r--src/mame/audio/scramble.cpp2
-rw-r--r--src/mame/audio/t5182.cpp2
-rw-r--r--src/mame/audio/taito_en.cpp8
-rw-r--r--src/mame/audio/taito_zm.cpp4
-rw-r--r--src/mame/audio/timeplt.cpp2
-rw-r--r--src/mame/audio/tx1.cpp12
-rw-r--r--src/mame/audio/williams.cpp12
-rw-r--r--src/mame/audio/wpcsnd.cpp2
-rw-r--r--src/mame/audio/zaccaria.cpp10
-rw-r--r--src/mame/drivers/1942.cpp4
-rw-r--r--src/mame/drivers/1943.cpp8
-rw-r--r--src/mame/drivers/1945kiii.cpp2
-rw-r--r--src/mame/drivers/20pacgal.cpp2
-rw-r--r--src/mame/drivers/30test.cpp2
-rw-r--r--src/mame/drivers/3do.cpp6
-rw-r--r--src/mame/drivers/3x3puzzl.cpp4
-rw-r--r--src/mame/drivers/4004clk.cpp2
-rw-r--r--src/mame/drivers/4enlinea.cpp6
-rw-r--r--src/mame/drivers/4enraya.cpp2
-rw-r--r--src/mame/drivers/4roses.cpp2
-rw-r--r--src/mame/drivers/5clown.cpp2
-rw-r--r--src/mame/drivers/8080bw.cpp10
-rw-r--r--src/mame/drivers/a5105.cpp8
-rw-r--r--src/mame/drivers/a51xx.cpp2
-rw-r--r--src/mame/drivers/a6809.cpp6
-rw-r--r--src/mame/drivers/a7150.cpp14
-rw-r--r--src/mame/drivers/a7800.cpp2
-rw-r--r--src/mame/drivers/aa310.cpp12
-rw-r--r--src/mame/drivers/abc1600.cpp18
-rw-r--r--src/mame/drivers/abc80.cpp4
-rw-r--r--src/mame/drivers/ac1.cpp4
-rw-r--r--src/mame/drivers/accomm.cpp6
-rw-r--r--src/mame/drivers/ace.cpp2
-rw-r--r--src/mame/drivers/actfancr.cpp10
-rw-r--r--src/mame/drivers/acvirus.cpp2
-rw-r--r--src/mame/drivers/adam.cpp14
-rw-r--r--src/mame/drivers/adp.cpp4
-rw-r--r--src/mame/drivers/advision.cpp2
-rw-r--r--src/mame/drivers/aeroboto.cpp8
-rw-r--r--src/mame/drivers/aerofgt.cpp44
-rw-r--r--src/mame/drivers/agat.cpp2
-rw-r--r--src/mame/drivers/aim65_40.cpp2
-rw-r--r--src/mame/drivers/airbustr.cpp10
-rw-r--r--src/mame/drivers/airraid.cpp6
-rw-r--r--src/mame/drivers/ajax.cpp6
-rw-r--r--src/mame/drivers/akaiax80.cpp2
-rw-r--r--src/mame/drivers/albazg.cpp2
-rw-r--r--src/mame/drivers/alesis.cpp4
-rw-r--r--src/mame/drivers/alesis_qs.cpp2
-rw-r--r--src/mame/drivers/alien.cpp2
-rw-r--r--src/mame/drivers/aliens.cpp12
-rw-r--r--src/mame/drivers/alpha68k.cpp12
-rw-r--r--src/mame/drivers/alphasma.cpp2
-rw-r--r--src/mame/drivers/alphatpx.cpp24
-rw-r--r--src/mame/drivers/alphatro.cpp4
-rw-r--r--src/mame/drivers/altair.cpp2
-rw-r--r--src/mame/drivers/alto2.cpp4
-rw-r--r--src/mame/drivers/altos2.cpp10
-rw-r--r--src/mame/drivers/altos486.cpp18
-rw-r--r--src/mame/drivers/altos5.cpp18
-rw-r--r--src/mame/drivers/altos8600.cpp6
-rw-r--r--src/mame/drivers/amaticmg.cpp2
-rw-r--r--src/mame/drivers/ambush.cpp12
-rw-r--r--src/mame/drivers/amerihok.cpp2
-rw-r--r--src/mame/drivers/amiga.cpp22
-rw-r--r--src/mame/drivers/ampex.cpp6
-rw-r--r--src/mame/drivers/ampoker2.cpp2
-rw-r--r--src/mame/drivers/ampro.cpp10
-rw-r--r--src/mame/drivers/amstr_pc.cpp2
-rw-r--r--src/mame/drivers/amstrad.cpp28
-rw-r--r--src/mame/drivers/amusco.cpp6
-rw-r--r--src/mame/drivers/amust.cpp4
-rw-r--r--src/mame/drivers/anes.cpp4
-rw-r--r--src/mame/drivers/angelkds.cpp10
-rw-r--r--src/mame/drivers/apc.cpp4
-rw-r--r--src/mame/drivers/apf.cpp4
-rw-r--r--src/mame/drivers/apogee.cpp12
-rw-r--r--src/mame/drivers/apple1.cpp2
-rw-r--r--src/mame/drivers/apple2.cpp2
-rw-r--r--src/mame/drivers/apple2e.cpp8
-rw-r--r--src/mame/drivers/apple2gs.cpp8
-rw-r--r--src/mame/drivers/apple3.cpp4
-rw-r--r--src/mame/drivers/applix.cpp10
-rw-r--r--src/mame/drivers/apricot.cpp22
-rw-r--r--src/mame/drivers/apricotf.cpp4
-rw-r--r--src/mame/drivers/apricotp.cpp2
-rw-r--r--src/mame/drivers/aquarium.cpp8
-rw-r--r--src/mame/drivers/aquarius.cpp8
-rw-r--r--src/mame/drivers/arabian.cpp2
-rw-r--r--src/mame/drivers/arachnid.cpp6
-rw-r--r--src/mame/drivers/arcadecl.cpp2
-rw-r--r--src/mame/drivers/argox.cpp2
-rw-r--r--src/mame/drivers/aristmk4.cpp4
-rw-r--r--src/mame/drivers/aristmk5.cpp10
-rw-r--r--src/mame/drivers/aristmk6.cpp6
-rw-r--r--src/mame/drivers/arkanoid.cpp26
-rw-r--r--src/mame/drivers/armedf.cpp58
-rw-r--r--src/mame/drivers/artmagic.cpp4
-rw-r--r--src/mame/drivers/asterix.cpp8
-rw-r--r--src/mame/drivers/asteroid.cpp6
-rw-r--r--src/mame/drivers/astinvad.cpp4
-rw-r--r--src/mame/drivers/astrcorp.cpp10
-rw-r--r--src/mame/drivers/astrof.cpp2
-rw-r--r--src/mame/drivers/asuka.cpp16
-rw-r--r--src/mame/drivers/at.cpp18
-rw-r--r--src/mame/drivers/atari_s1.cpp2
-rw-r--r--src/mame/drivers/atari_s2.cpp4
-rw-r--r--src/mame/drivers/atarist.cpp4
-rw-r--r--src/mame/drivers/atarisy2.cpp8
-rw-r--r--src/mame/drivers/atetris.cpp4
-rw-r--r--src/mame/drivers/atlantis.cpp4
-rw-r--r--src/mame/drivers/atom.cpp4
-rw-r--r--src/mame/drivers/att4425.cpp4
-rw-r--r--src/mame/drivers/att630.cpp8
-rw-r--r--src/mame/drivers/attache.cpp38
-rw-r--r--src/mame/drivers/attckufo.cpp4
-rw-r--r--src/mame/drivers/atvtrack.cpp2
-rw-r--r--src/mame/drivers/aussiebyte.cpp22
-rw-r--r--src/mame/drivers/avalnche.cpp2
-rw-r--r--src/mame/drivers/avigo.cpp4
-rw-r--r--src/mame/drivers/avt.cpp2
-rw-r--r--src/mame/drivers/ax20.cpp2
-rw-r--r--src/mame/drivers/b16.cpp6
-rw-r--r--src/mame/drivers/b2m.cpp2
-rw-r--r--src/mame/drivers/badlands.cpp6
-rw-r--r--src/mame/drivers/balsente.cpp4
-rw-r--r--src/mame/drivers/banctec.cpp4
-rw-r--r--src/mame/drivers/bankp.cpp2
-rw-r--r--src/mame/drivers/baraduke.cpp8
-rw-r--r--src/mame/drivers/barata.cpp2
-rw-r--r--src/mame/drivers/barni.cpp4
-rw-r--r--src/mame/drivers/basic52.cpp4
-rw-r--r--src/mame/drivers/battlex.cpp6
-rw-r--r--src/mame/drivers/battlnts.cpp8
-rw-r--r--src/mame/drivers/bbc.cpp38
-rw-r--r--src/mame/drivers/bbcbc.cpp4
-rw-r--r--src/mame/drivers/bcs3.cpp8
-rw-r--r--src/mame/drivers/bebox.cpp8
-rw-r--r--src/mame/drivers/beehive.cpp2
-rw-r--r--src/mame/drivers/beezer.cpp12
-rw-r--r--src/mame/drivers/berzerk.cpp2
-rw-r--r--src/mame/drivers/beta.cpp4
-rw-r--r--src/mame/drivers/bfm_sc1.cpp2
-rw-r--r--src/mame/drivers/bfm_sc2.cpp8
-rw-r--r--src/mame/drivers/bfm_sc4.cpp2
-rw-r--r--src/mame/drivers/bfmsys85.cpp2
-rw-r--r--src/mame/drivers/big10.cpp2
-rw-r--r--src/mame/drivers/bigbord2.cpp8
-rw-r--r--src/mame/drivers/binbug.cpp8
-rw-r--r--src/mame/drivers/bingoman.cpp2
-rw-r--r--src/mame/drivers/bingor.cpp8
-rw-r--r--src/mame/drivers/bingowav.cpp2
-rw-r--r--src/mame/drivers/bionicc.cpp8
-rw-r--r--src/mame/drivers/bitgraph.cpp12
-rw-r--r--src/mame/drivers/bking.cpp10
-rw-r--r--src/mame/drivers/bladestl.cpp8
-rw-r--r--src/mame/drivers/blitz68k.cpp30
-rw-r--r--src/mame/drivers/blktiger.cpp10
-rw-r--r--src/mame/drivers/blmbycar.cpp4
-rw-r--r--src/mame/drivers/blockade.cpp4
-rw-r--r--src/mame/drivers/blockhl.cpp10
-rw-r--r--src/mame/drivers/blockout.cpp6
-rw-r--r--src/mame/drivers/bloodbro.cpp14
-rw-r--r--src/mame/drivers/bmcbowl.cpp6
-rw-r--r--src/mame/drivers/bmcpokr.cpp6
-rw-r--r--src/mame/drivers/bmjr.cpp2
-rw-r--r--src/mame/drivers/bob85.cpp2
-rw-r--r--src/mame/drivers/bogeyman.cpp2
-rw-r--r--src/mame/drivers/bombjack.cpp10
-rw-r--r--src/mame/drivers/bottom9.cpp8
-rw-r--r--src/mame/drivers/boxer.cpp2
-rw-r--r--src/mame/drivers/bpmmicro.cpp2
-rw-r--r--src/mame/drivers/br8641.cpp10
-rw-r--r--src/mame/drivers/brkthru.cpp2
-rw-r--r--src/mame/drivers/btime.cpp2
-rw-r--r--src/mame/drivers/btoads.cpp6
-rw-r--r--src/mame/drivers/bublbobl.cpp6
-rw-r--r--src/mame/drivers/buggychl.cpp14
-rw-r--r--src/mame/drivers/bullet.cpp34
-rw-r--r--src/mame/drivers/buster.cpp4
-rw-r--r--src/mame/drivers/bw12.cpp12
-rw-r--r--src/mame/drivers/bw2.cpp10
-rw-r--r--src/mame/drivers/bwing.cpp4
-rw-r--r--src/mame/drivers/by6803.cpp2
-rw-r--r--src/mame/drivers/byvid.cpp14
-rw-r--r--src/mame/drivers/c10.cpp2
-rw-r--r--src/mame/drivers/c128.cpp36
-rw-r--r--src/mame/drivers/c64.cpp40
-rw-r--r--src/mame/drivers/c65.cpp2
-rw-r--r--src/mame/drivers/c900.cpp2
-rw-r--r--src/mame/drivers/cabal.cpp20
-rw-r--r--src/mame/drivers/cabaret.cpp4
-rw-r--r--src/mame/drivers/calcune.cpp2
-rw-r--r--src/mame/drivers/calomega.cpp2
-rw-r--r--src/mame/drivers/camplynx.cpp10
-rw-r--r--src/mame/drivers/candela.cpp10
-rw-r--r--src/mame/drivers/canyon.cpp2
-rw-r--r--src/mame/drivers/capbowl.cpp2
-rw-r--r--src/mame/drivers/cardline.cpp2
-rw-r--r--src/mame/drivers/carjmbre.cpp8
-rw-r--r--src/mame/drivers/carpolo.cpp2
-rw-r--r--src/mame/drivers/carrera.cpp2
-rw-r--r--src/mame/drivers/cat.cpp6
-rw-r--r--src/mame/drivers/cave.cpp94
-rw-r--r--src/mame/drivers/cball.cpp2
-rw-r--r--src/mame/drivers/cbm2.cpp44
-rw-r--r--src/mame/drivers/cbuster.cpp12
-rw-r--r--src/mame/drivers/cc40.cpp2
-rw-r--r--src/mame/drivers/cchasm.cpp4
-rw-r--r--src/mame/drivers/cclimber.cpp10
-rw-r--r--src/mame/drivers/ccs2810.cpp10
-rw-r--r--src/mame/drivers/ccs300.cpp8
-rw-r--r--src/mame/drivers/cd2650.cpp4
-rw-r--r--src/mame/drivers/cdi.cpp4
-rw-r--r--src/mame/drivers/cgc7900.cpp10
-rw-r--r--src/mame/drivers/cgenie.cpp8
-rw-r--r--src/mame/drivers/chaknpop.cpp8
-rw-r--r--src/mame/drivers/champbas.cpp36
-rw-r--r--src/mame/drivers/champbwl.cpp4
-rw-r--r--src/mame/drivers/chanbara.cpp4
-rw-r--r--src/mame/drivers/chance32.cpp2
-rw-r--r--src/mame/drivers/chaos.cpp2
-rw-r--r--src/mame/drivers/chessmst.cpp18
-rw-r--r--src/mame/drivers/chexx.cpp2
-rw-r--r--src/mame/drivers/chinagat.cpp8
-rw-r--r--src/mame/drivers/chinsan.cpp8
-rw-r--r--src/mame/drivers/chqflag.cpp14
-rw-r--r--src/mame/drivers/chsuper.cpp2
-rw-r--r--src/mame/drivers/cinemat.cpp2
-rw-r--r--src/mame/drivers/circus.cpp8
-rw-r--r--src/mame/drivers/circusc.cpp6
-rw-r--r--src/mame/drivers/cischeat.cpp2
-rw-r--r--src/mame/drivers/citycon.cpp8
-rw-r--r--src/mame/drivers/ckz80.cpp2
-rw-r--r--src/mame/drivers/clcd.cpp4
-rw-r--r--src/mame/drivers/cliffhgr.cpp2
-rw-r--r--src/mame/drivers/cloak.cpp4
-rw-r--r--src/mame/drivers/clpoker.cpp4
-rw-r--r--src/mame/drivers/clshroad.cpp2
-rw-r--r--src/mame/drivers/cm1800.cpp2
-rw-r--r--src/mame/drivers/cmi.cpp46
-rw-r--r--src/mame/drivers/cmmb.cpp2
-rw-r--r--src/mame/drivers/cninja.cpp68
-rw-r--r--src/mame/drivers/cobra.cpp6
-rw-r--r--src/mame/drivers/coco12.cpp8
-rw-r--r--src/mame/drivers/coco3.cpp8
-rw-r--r--src/mame/drivers/cocoloco.cpp2
-rw-r--r--src/mame/drivers/codata.cpp6
-rw-r--r--src/mame/drivers/coinmstr.cpp2
-rw-r--r--src/mame/drivers/coinmvga.cpp8
-rw-r--r--src/mame/drivers/coleco.cpp10
-rw-r--r--src/mame/drivers/combatsc.cpp2
-rw-r--r--src/mame/drivers/compc.cpp6
-rw-r--r--src/mame/drivers/compis.cpp16
-rw-r--r--src/mame/drivers/compucolor.cpp8
-rw-r--r--src/mame/drivers/concept.cpp6
-rw-r--r--src/mame/drivers/contra.cpp6
-rw-r--r--src/mame/drivers/controlid.cpp2
-rw-r--r--src/mame/drivers/coolpool.cpp16
-rw-r--r--src/mame/drivers/coolridr.cpp2
-rw-r--r--src/mame/drivers/cop01.cpp6
-rw-r--r--src/mame/drivers/cops.cpp12
-rw-r--r--src/mame/drivers/corona.cpp8
-rw-r--r--src/mame/drivers/cortex.cpp8
-rw-r--r--src/mame/drivers/cosmicos.cpp6
-rw-r--r--src/mame/drivers/cp1.cpp2
-rw-r--r--src/mame/drivers/cps1.cpp14
-rw-r--r--src/mame/drivers/cps2.cpp6
-rw-r--r--src/mame/drivers/cps3.cpp2
-rw-r--r--src/mame/drivers/crimfght.cpp12
-rw-r--r--src/mame/drivers/crvision.cpp14
-rw-r--r--src/mame/drivers/crystal.cpp2
-rw-r--r--src/mame/drivers/csplayh5.cpp6
-rw-r--r--src/mame/drivers/cswat.cpp2
-rw-r--r--src/mame/drivers/ct486.cpp6
-rw-r--r--src/mame/drivers/cubeqst.cpp8
-rw-r--r--src/mame/drivers/cv1k.cpp10
-rw-r--r--src/mame/drivers/cvicny.cpp2
-rw-r--r--src/mame/drivers/cvs.cpp8
-rw-r--r--src/mame/drivers/cxgz80.cpp2
-rw-r--r--src/mame/drivers/cxhumax.cpp4
-rw-r--r--src/mame/drivers/cyberbal.cpp2
-rw-r--r--src/mame/drivers/cybertnk.cpp10
-rw-r--r--src/mame/drivers/cybiko.cpp6
-rw-r--r--src/mame/drivers/cyclemb.cpp6
-rw-r--r--src/mame/drivers/czk80.cpp8
-rw-r--r--src/mame/drivers/d400.cpp6
-rw-r--r--src/mame/drivers/d6800.cpp2
-rw-r--r--src/mame/drivers/d6809.cpp6
-rw-r--r--src/mame/drivers/d9final.cpp4
-rw-r--r--src/mame/drivers/dacholer.cpp12
-rw-r--r--src/mame/drivers/dai3wksi.cpp2
-rw-r--r--src/mame/drivers/darius.cpp14
-rw-r--r--src/mame/drivers/darkseal.cpp12
-rw-r--r--src/mame/drivers/dassault.cpp14
-rw-r--r--src/mame/drivers/datum.cpp2
-rw-r--r--src/mame/drivers/dblcrown.cpp2
-rw-r--r--src/mame/drivers/dblewing.cpp8
-rw-r--r--src/mame/drivers/dbox.cpp2
-rw-r--r--src/mame/drivers/dccons.cpp4
-rw-r--r--src/mame/drivers/dcon.cpp8
-rw-r--r--src/mame/drivers/ddealer.cpp4
-rw-r--r--src/mame/drivers/ddenlovr.cpp104
-rw-r--r--src/mame/drivers/ddragon.cpp6
-rw-r--r--src/mame/drivers/ddragon3.cpp18
-rw-r--r--src/mame/drivers/ddribble.cpp10
-rw-r--r--src/mame/drivers/de_2.cpp16
-rw-r--r--src/mame/drivers/de_3.cpp4
-rw-r--r--src/mame/drivers/de_3b.cpp4
-rw-r--r--src/mame/drivers/deadang.cpp10
-rw-r--r--src/mame/drivers/dec0.cpp40
-rw-r--r--src/mame/drivers/dec8.cpp30
-rw-r--r--src/mame/drivers/deco32.cpp34
-rw-r--r--src/mame/drivers/decocass.cpp2
-rw-r--r--src/mame/drivers/dectalk.cpp6
-rw-r--r--src/mame/drivers/decwritr.cpp4
-rw-r--r--src/mame/drivers/deniam.cpp14
-rw-r--r--src/mame/drivers/deshoros.cpp2
-rw-r--r--src/mame/drivers/destroyr.cpp2
-rw-r--r--src/mame/drivers/dfruit.cpp2
-rw-r--r--src/mame/drivers/dgn_beta.cpp4
-rw-r--r--src/mame/drivers/didact.cpp2
-rw-r--r--src/mame/drivers/dietgo.cpp8
-rw-r--r--src/mame/drivers/digel804.cpp4
-rw-r--r--src/mame/drivers/digijet.cpp2
-rw-r--r--src/mame/drivers/dim68k.cpp10
-rw-r--r--src/mame/drivers/discoboy.cpp8
-rw-r--r--src/mame/drivers/djmain.cpp4
-rw-r--r--src/mame/drivers/dkong.cpp2
-rw-r--r--src/mame/drivers/dlair2.cpp2
-rw-r--r--src/mame/drivers/dmax8000.cpp16
-rw-r--r--src/mame/drivers/dms5000.cpp2
-rw-r--r--src/mame/drivers/dms86.cpp10
-rw-r--r--src/mame/drivers/dmv.cpp10
-rw-r--r--src/mame/drivers/docastle.cpp20
-rw-r--r--src/mame/drivers/dolphunk.cpp2
-rw-r--r--src/mame/drivers/dominob.cpp4
-rw-r--r--src/mame/drivers/dooyong.cpp36
-rw-r--r--src/mame/drivers/dotrikun.cpp2
-rw-r--r--src/mame/drivers/dps1.cpp2
-rw-r--r--src/mame/drivers/dragon.cpp16
-rw-r--r--src/mame/drivers/dragrace.cpp2
-rw-r--r--src/mame/drivers/dreamwld.cpp6
-rw-r--r--src/mame/drivers/drw80pkr.cpp2
-rw-r--r--src/mame/drivers/dsb46.cpp8
-rw-r--r--src/mame/drivers/dual68.cpp4
-rw-r--r--src/mame/drivers/dvk_kcgd.cpp6
-rw-r--r--src/mame/drivers/dvk_ksm.cpp4
-rw-r--r--src/mame/drivers/dynax.cpp34
-rw-r--r--src/mame/drivers/e100.cpp4
-rw-r--r--src/mame/drivers/eacc.cpp2
-rw-r--r--src/mame/drivers/ec65.cpp14
-rw-r--r--src/mame/drivers/einstein.cpp6
-rw-r--r--src/mame/drivers/electron.cpp2
-rw-r--r--src/mame/drivers/elekscmp.cpp2
-rw-r--r--src/mame/drivers/elektronmono.cpp2
-rw-r--r--src/mame/drivers/elf.cpp6
-rw-r--r--src/mame/drivers/eolith.cpp4
-rw-r--r--src/mame/drivers/ep64.cpp6
-rw-r--r--src/mame/drivers/epos.cpp8
-rw-r--r--src/mame/drivers/equites.cpp8
-rw-r--r--src/mame/drivers/ertictac.cpp6
-rw-r--r--src/mame/drivers/esd16.cpp14
-rw-r--r--src/mame/drivers/esq1.cpp8
-rw-r--r--src/mame/drivers/esq5505.cpp16
-rw-r--r--src/mame/drivers/esqasr.cpp12
-rw-r--r--src/mame/drivers/esqkt.cpp8
-rw-r--r--src/mame/drivers/esqmr.cpp6
-rw-r--r--src/mame/drivers/esripsys.cpp10
-rw-r--r--src/mame/drivers/et3400.cpp2
-rw-r--r--src/mame/drivers/eti660.cpp6
-rw-r--r--src/mame/drivers/eurocom2.cpp6
-rw-r--r--src/mame/drivers/eva.cpp12
-rw-r--r--src/mame/drivers/evmbug.cpp4
-rw-r--r--src/mame/drivers/excali64.cpp14
-rw-r--r--src/mame/drivers/exelv.cpp8
-rw-r--r--src/mame/drivers/exp85.cpp6
-rw-r--r--src/mame/drivers/exprraid.cpp10
-rw-r--r--src/mame/drivers/f-32.cpp12
-rw-r--r--src/mame/drivers/f1gp.cpp10
-rw-r--r--src/mame/drivers/fantland.cpp6
-rw-r--r--src/mame/drivers/fanucs15.cpp8
-rw-r--r--src/mame/drivers/fanucspmg.cpp26
-rw-r--r--src/mame/drivers/fastfred.cpp8
-rw-r--r--src/mame/drivers/fastlane.cpp6
-rw-r--r--src/mame/drivers/fb01.cpp8
-rw-r--r--src/mame/drivers/fc100.cpp8
-rw-r--r--src/mame/drivers/fccpu30.cpp20
-rw-r--r--src/mame/drivers/fcrash.cpp20
-rw-r--r--src/mame/drivers/feversoc.cpp4
-rw-r--r--src/mame/drivers/fidel6502.cpp38
-rw-r--r--src/mame/drivers/fidel68k.cpp24
-rw-r--r--src/mame/drivers/fidelmcs48.cpp2
-rw-r--r--src/mame/drivers/fidelz80.cpp18
-rw-r--r--src/mame/drivers/finalizr.cpp6
-rw-r--r--src/mame/drivers/fireball.cpp4
-rw-r--r--src/mame/drivers/firebeat.cpp22
-rw-r--r--src/mame/drivers/firefox.cpp4
-rw-r--r--src/mame/drivers/firetrap.cpp4
-rw-r--r--src/mame/drivers/firetrk.cpp2
-rw-r--r--src/mame/drivers/fk1.cpp2
-rw-r--r--src/mame/drivers/flicker.cpp2
-rw-r--r--src/mame/drivers/flipjack.cpp4
-rw-r--r--src/mame/drivers/flower.cpp2
-rw-r--r--src/mame/drivers/flstory.cpp48
-rw-r--r--src/mame/drivers/flyball.cpp2
-rw-r--r--src/mame/drivers/fm7.cpp32
-rw-r--r--src/mame/drivers/fmtowns.cpp2
-rw-r--r--src/mame/drivers/fontwriter.cpp2
-rw-r--r--src/mame/drivers/force68k.cpp18
-rw-r--r--src/mame/drivers/forte2.cpp6
-rw-r--r--src/mame/drivers/fortecar.cpp2
-rw-r--r--src/mame/drivers/fp200.cpp2
-rw-r--r--src/mame/drivers/freekick.cpp28
-rw-r--r--src/mame/drivers/fromanc2.cpp4
-rw-r--r--src/mame/drivers/fromance.cpp14
-rw-r--r--src/mame/drivers/ft68m.cpp4
-rw-r--r--src/mame/drivers/funkyjet.cpp8
-rw-r--r--src/mame/drivers/funworld.cpp2
-rw-r--r--src/mame/drivers/fuukifg2.cpp10
-rw-r--r--src/mame/drivers/gaelco.cpp12
-rw-r--r--src/mame/drivers/gaelco2.cpp24
-rw-r--r--src/mame/drivers/galaga.cpp2
-rw-r--r--src/mame/drivers/galaxi.cpp4
-rw-r--r--src/mame/drivers/galaxia.cpp4
-rw-r--r--src/mame/drivers/galaxian.cpp8
-rw-r--r--src/mame/drivers/galaxold.cpp2
-rw-r--r--src/mame/drivers/galgames.cpp10
-rw-r--r--src/mame/drivers/galivan.cpp16
-rw-r--r--src/mame/drivers/galpani2.cpp8
-rw-r--r--src/mame/drivers/galpani3.cpp4
-rw-r--r--src/mame/drivers/galpanic.cpp4
-rw-r--r--src/mame/drivers/galspnbl.cpp8
-rw-r--r--src/mame/drivers/gambl186.cpp4
-rw-r--r--src/mame/drivers/gamecom.cpp2
-rw-r--r--src/mame/drivers/gamepock.cpp2
-rw-r--r--src/mame/drivers/gamtor.cpp2
-rw-r--r--src/mame/drivers/gaplus.cpp8
-rw-r--r--src/mame/drivers/gatron.cpp2
-rw-r--r--src/mame/drivers/gb.cpp12
-rw-r--r--src/mame/drivers/gba.cpp10
-rw-r--r--src/mame/drivers/gberet.cpp10
-rw-r--r--src/mame/drivers/gcpinbal.cpp6
-rw-r--r--src/mame/drivers/geneve.cpp4
-rw-r--r--src/mame/drivers/geniusiq.cpp4
-rw-r--r--src/mame/drivers/ggconnie.cpp2
-rw-r--r--src/mame/drivers/ghosteo.cpp2
-rw-r--r--src/mame/drivers/giclassic.cpp8
-rw-r--r--src/mame/drivers/gijoe.cpp6
-rw-r--r--src/mame/drivers/gimix.cpp28
-rw-r--r--src/mame/drivers/ginganin.cpp4
-rw-r--r--src/mame/drivers/gkigt.cpp6
-rw-r--r--src/mame/drivers/gladiatr.cpp32
-rw-r--r--src/mame/drivers/glass.cpp6
-rw-r--r--src/mame/drivers/gluck2.cpp4
-rw-r--r--src/mame/drivers/gmaster.cpp2
-rw-r--r--src/mame/drivers/gng.cpp8
-rw-r--r--src/mame/drivers/goindol.cpp6
-rw-r--r--src/mame/drivers/gokidetor.cpp2
-rw-r--r--src/mame/drivers/goldngam.cpp4
-rw-r--r--src/mame/drivers/goldnpkr.cpp2
-rw-r--r--src/mame/drivers/goldstar.cpp6
-rw-r--r--src/mame/drivers/gomoku.cpp2
-rw-r--r--src/mame/drivers/gottlieb.cpp6
-rw-r--r--src/mame/drivers/goupil.cpp8
-rw-r--r--src/mame/drivers/gradius3.cpp4
-rw-r--r--src/mame/drivers/gridcomp.cpp14
-rw-r--r--src/mame/drivers/groundfx.cpp2
-rw-r--r--src/mame/drivers/gstriker.cpp2
-rw-r--r--src/mame/drivers/gsword.cpp10
-rw-r--r--src/mame/drivers/gticlub.cpp22
-rw-r--r--src/mame/drivers/gts1.cpp4
-rw-r--r--src/mame/drivers/gts3.cpp6
-rw-r--r--src/mame/drivers/gts3a.cpp10
-rw-r--r--src/mame/drivers/gts80.cpp8
-rw-r--r--src/mame/drivers/gts80a.cpp8
-rw-r--r--src/mame/drivers/gts80b.cpp8
-rw-r--r--src/mame/drivers/gumbo.cpp4
-rw-r--r--src/mame/drivers/gunbustr.cpp2
-rw-r--r--src/mame/drivers/gundealr.cpp4
-rw-r--r--src/mame/drivers/gunpey.cpp4
-rw-r--r--src/mame/drivers/gyruss.cpp6
-rw-r--r--src/mame/drivers/h19.cpp6
-rw-r--r--src/mame/drivers/h8.cpp2
-rw-r--r--src/mame/drivers/h89.cpp4
-rw-r--r--src/mame/drivers/halleys.cpp14
-rw-r--r--src/mame/drivers/harddriv.cpp20
-rw-r--r--src/mame/drivers/harriet.cpp2
-rw-r--r--src/mame/drivers/hazeltin.cpp14
-rw-r--r--src/mame/drivers/headonb.cpp2
-rw-r--r--src/mame/drivers/hec2hrp.cpp20
-rw-r--r--src/mame/drivers/hexion.cpp6
-rw-r--r--src/mame/drivers/hh_melps4.cpp4
-rw-r--r--src/mame/drivers/hh_sm510.cpp94
-rw-r--r--src/mame/drivers/hh_tms1k.cpp2
-rw-r--r--src/mame/drivers/hh_ucom4.cpp22
-rw-r--r--src/mame/drivers/higemaru.cpp6
-rw-r--r--src/mame/drivers/highvdeo.cpp10
-rw-r--r--src/mame/drivers/himesiki.cpp4
-rw-r--r--src/mame/drivers/hitme.cpp2
-rw-r--r--src/mame/drivers/hitpoker.cpp2
-rw-r--r--src/mame/drivers/hk68v10.cpp4
-rw-r--r--src/mame/drivers/hng64.cpp2
-rw-r--r--src/mame/drivers/homelab.cpp6
-rw-r--r--src/mame/drivers/homerun.cpp6
-rw-r--r--src/mame/drivers/homez80.cpp2
-rw-r--r--src/mame/drivers/horizon.cpp8
-rw-r--r--src/mame/drivers/hornet.cpp14
-rw-r--r--src/mame/drivers/hotstuff.cpp2
-rw-r--r--src/mame/drivers/hp16500.cpp2
-rw-r--r--src/mame/drivers/hp2620.cpp8
-rw-r--r--src/mame/drivers/hp2640.cpp6
-rw-r--r--src/mame/drivers/hp64k.cpp4
-rw-r--r--src/mame/drivers/hp700.cpp4
-rw-r--r--src/mame/drivers/hp9845.cpp8
-rw-r--r--src/mame/drivers/hp9k.cpp4
-rw-r--r--src/mame/drivers/hp9k_3xx.cpp6
-rw-r--r--src/mame/drivers/hp_ipc.cpp12
-rw-r--r--src/mame/drivers/hprot1.cpp2
-rw-r--r--src/mame/drivers/hpz80unk.cpp2
-rw-r--r--src/mame/drivers/ht68k.cpp6
-rw-r--r--src/mame/drivers/huebler.cpp10
-rw-r--r--src/mame/drivers/hunter2.cpp6
-rw-r--r--src/mame/drivers/hx20.cpp6
-rw-r--r--src/mame/drivers/hyperscan.cpp6
-rw-r--r--src/mame/drivers/hyperspt.cpp10
-rw-r--r--src/mame/drivers/i7000.cpp10
-rw-r--r--src/mame/drivers/ibm3153.cpp2
-rw-r--r--src/mame/drivers/ibm6580.cpp6
-rw-r--r--src/mame/drivers/ibmpc.cpp4
-rw-r--r--src/mame/drivers/ibmpcjr.cpp10
-rw-r--r--src/mame/drivers/icatel.cpp2
-rw-r--r--src/mame/drivers/icecold.cpp8
-rw-r--r--src/mame/drivers/ichiban.cpp2
-rw-r--r--src/mame/drivers/idsa.cpp4
-rw-r--r--src/mame/drivers/igs009.cpp6
-rw-r--r--src/mame/drivers/igs011.cpp10
-rw-r--r--src/mame/drivers/igs017.cpp42
-rw-r--r--src/mame/drivers/igspoker.cpp2
-rw-r--r--src/mame/drivers/imds.cpp2
-rw-r--r--src/mame/drivers/imds2.cpp10
-rw-r--r--src/mame/drivers/imsai.cpp8
-rw-r--r--src/mame/drivers/inder.cpp22
-rw-r--r--src/mame/drivers/indiana.cpp6
-rw-r--r--src/mame/drivers/indy_indigo2.cpp8
-rw-r--r--src/mame/drivers/instantm.cpp6
-rw-r--r--src/mame/drivers/instruct.cpp2
-rw-r--r--src/mame/drivers/interact.cpp4
-rw-r--r--src/mame/drivers/interpro.cpp20
-rw-r--r--src/mame/drivers/intv.cpp10
-rw-r--r--src/mame/drivers/invqix.cpp4
-rw-r--r--src/mame/drivers/ipc.cpp8
-rw-r--r--src/mame/drivers/ipds.cpp4
-rw-r--r--src/mame/drivers/iq151.cpp2
-rw-r--r--src/mame/drivers/iris3130.cpp6
-rw-r--r--src/mame/drivers/irisha.cpp8
-rw-r--r--src/mame/drivers/irobot.cpp4
-rw-r--r--src/mame/drivers/isbc.cpp28
-rw-r--r--src/mame/drivers/isbc8010.cpp8
-rw-r--r--src/mame/drivers/isbc8030.cpp8
-rw-r--r--src/mame/drivers/istrebiteli.cpp6
-rw-r--r--src/mame/drivers/itgambl2.cpp4
-rw-r--r--src/mame/drivers/itgambl3.cpp2
-rw-r--r--src/mame/drivers/itgamble.cpp10
-rw-r--r--src/mame/drivers/itt3030.cpp8
-rw-r--r--src/mame/drivers/jack.cpp6
-rw-r--r--src/mame/drivers/jackie.cpp2
-rw-r--r--src/mame/drivers/jade.cpp10
-rw-r--r--src/mame/drivers/jaguar.cpp6
-rw-r--r--src/mame/drivers/jangou.cpp4
-rw-r--r--src/mame/drivers/jankenmn.cpp2
-rw-r--r--src/mame/drivers/jantotsu.cpp4
-rw-r--r--src/mame/drivers/joctronic.cpp22
-rw-r--r--src/mame/drivers/jokrwild.cpp2
-rw-r--r--src/mame/drivers/jollyjgr.cpp4
-rw-r--r--src/mame/drivers/jonos.cpp2
-rw-r--r--src/mame/drivers/joystand.cpp8
-rw-r--r--src/mame/drivers/jp.cpp10
-rw-r--r--src/mame/drivers/jpmmps.cpp4
-rw-r--r--src/mame/drivers/jpmsys5.cpp8
-rw-r--r--src/mame/drivers/jr100.cpp6
-rw-r--r--src/mame/drivers/jr200.cpp4
-rw-r--r--src/mame/drivers/jtc.cpp2
-rw-r--r--src/mame/drivers/jubilee.cpp2
-rw-r--r--src/mame/drivers/jungleyo.cpp4
-rw-r--r--src/mame/drivers/junior.cpp4
-rw-r--r--src/mame/drivers/jupace.cpp10
-rw-r--r--src/mame/drivers/jupiter.cpp4
-rw-r--r--src/mame/drivers/jvh.cpp8
-rw-r--r--src/mame/drivers/k28.cpp4
-rw-r--r--src/mame/drivers/k8915.cpp8
-rw-r--r--src/mame/drivers/kaneko16.cpp36
-rw-r--r--src/mame/drivers/kangaroo.cpp2
-rw-r--r--src/mame/drivers/kas89.cpp2
-rw-r--r--src/mame/drivers/kaypro.cpp22
-rw-r--r--src/mame/drivers/kc.cpp8
-rw-r--r--src/mame/drivers/kchamp.cpp16
-rw-r--r--src/mame/drivers/kdt6.cpp22
-rw-r--r--src/mame/drivers/kenseim.cpp2
-rw-r--r--src/mame/drivers/kickgoal.cpp6
-rw-r--r--src/mame/drivers/kingdrby.cpp4
-rw-r--r--src/mame/drivers/kingpin.cpp8
-rw-r--r--src/mame/drivers/kinst.cpp2
-rw-r--r--src/mame/drivers/kncljoe.cpp10
-rw-r--r--src/mame/drivers/koftball.cpp4
-rw-r--r--src/mame/drivers/konamigq.cpp14
-rw-r--r--src/mame/drivers/konamigv.cpp6
-rw-r--r--src/mame/drivers/konamigx.cpp12
-rw-r--r--src/mame/drivers/konin.cpp4
-rw-r--r--src/mame/drivers/konmedal.cpp14
-rw-r--r--src/mame/drivers/kontest.cpp2
-rw-r--r--src/mame/drivers/kron.cpp2
-rw-r--r--src/mame/drivers/krz2000.cpp2
-rw-r--r--src/mame/drivers/ksayakyu.cpp2
-rw-r--r--src/mame/drivers/ksys573.cpp8
-rw-r--r--src/mame/drivers/kungfur.cpp4
-rw-r--r--src/mame/drivers/kurukuru.cpp4
-rw-r--r--src/mame/drivers/kyocera.cpp34
-rw-r--r--src/mame/drivers/kyugo.cpp8
-rw-r--r--src/mame/drivers/ladyfrog.cpp10
-rw-r--r--src/mame/drivers/laserbat.cpp14
-rw-r--r--src/mame/drivers/lasso.cpp8
-rw-r--r--src/mame/drivers/lastbank.cpp2
-rw-r--r--src/mame/drivers/lastduel.cpp16
-rw-r--r--src/mame/drivers/lazercmd.cpp2
-rw-r--r--src/mame/drivers/lb186.cpp6
-rw-r--r--src/mame/drivers/lbeach.cpp2
-rw-r--r--src/mame/drivers/lcmate2.cpp4
-rw-r--r--src/mame/drivers/leland.cpp8
-rw-r--r--src/mame/drivers/lethal.cpp6
-rw-r--r--src/mame/drivers/lethalj.cpp8
-rw-r--r--src/mame/drivers/lg-dvd.cpp2
-rw-r--r--src/mame/drivers/limenko.cpp2
-rw-r--r--src/mame/drivers/littlerb.cpp6
-rw-r--r--src/mame/drivers/lkage.cpp8
-rw-r--r--src/mame/drivers/llc.cpp16
-rw-r--r--src/mame/drivers/lockon.cpp10
-rw-r--r--src/mame/drivers/lola8a.cpp6
-rw-r--r--src/mame/drivers/lordgun.cpp16
-rw-r--r--src/mame/drivers/lsasquad.cpp2
-rw-r--r--src/mame/drivers/ltd.cpp8
-rw-r--r--src/mame/drivers/lucky74.cpp2
-rw-r--r--src/mame/drivers/luckybal.cpp6
-rw-r--r--src/mame/drivers/lwings.cpp22
-rw-r--r--src/mame/drivers/lwriter.cpp4
-rw-r--r--src/mame/drivers/m107.cpp8
-rw-r--r--src/mame/drivers/m20.cpp2
-rw-r--r--src/mame/drivers/m24.cpp4
-rw-r--r--src/mame/drivers/m5.cpp16
-rw-r--r--src/mame/drivers/m52.cpp2
-rw-r--r--src/mame/drivers/m57.cpp4
-rw-r--r--src/mame/drivers/m58.cpp2
-rw-r--r--src/mame/drivers/m63.cpp14
-rw-r--r--src/mame/drivers/m6805evs.cpp2
-rw-r--r--src/mame/drivers/m68705prg.cpp8
-rw-r--r--src/mame/drivers/m72.cpp6
-rw-r--r--src/mame/drivers/m79152pc.cpp6
-rw-r--r--src/mame/drivers/m79amb.cpp2
-rw-r--r--src/mame/drivers/m90.cpp6
-rw-r--r--src/mame/drivers/m92.cpp8
-rw-r--r--src/mame/drivers/mac.cpp12
-rw-r--r--src/mame/drivers/mac128.cpp2
-rw-r--r--src/mame/drivers/madalien.cpp2
-rw-r--r--src/mame/drivers/magic10.cpp4
-rw-r--r--src/mame/drivers/magicard.cpp6
-rw-r--r--src/mame/drivers/magicfly.cpp2
-rw-r--r--src/mame/drivers/magmax.cpp10
-rw-r--r--src/mame/drivers/magnum.cpp4
-rw-r--r--src/mame/drivers/magreel.cpp2
-rw-r--r--src/mame/drivers/magtouch.cpp2
-rw-r--r--src/mame/drivers/majorpkr.cpp2
-rw-r--r--src/mame/drivers/manohman.cpp10
-rw-r--r--src/mame/drivers/mappy.cpp2
-rw-r--r--src/mame/drivers/marineb.cpp2
-rw-r--r--src/mame/drivers/marinedt.cpp2
-rw-r--r--src/mame/drivers/marywu.cpp8
-rw-r--r--src/mame/drivers/maygayv1.cpp6
-rw-r--r--src/mame/drivers/mazerbla.cpp4
-rw-r--r--src/mame/drivers/mbc200.cpp8
-rw-r--r--src/mame/drivers/mbc55x.cpp6
-rw-r--r--src/mame/drivers/mbee.cpp14
-rw-r--r--src/mame/drivers/mc10.cpp6
-rw-r--r--src/mame/drivers/mc1000.cpp2
-rw-r--r--src/mame/drivers/mc1502.cpp8
-rw-r--r--src/mame/drivers/mc8020.cpp8
-rw-r--r--src/mame/drivers/mc8030.cpp10
-rw-r--r--src/mame/drivers/mcatadv.cpp8
-rw-r--r--src/mame/drivers/mccpm.cpp6
-rw-r--r--src/mame/drivers/mcr3.cpp2
-rw-r--r--src/mame/drivers/meadows.cpp2
-rw-r--r--src/mame/drivers/megaplay.cpp2
-rw-r--r--src/mame/drivers/megasys1.cpp12
-rw-r--r--src/mame/drivers/megatech.cpp4
-rw-r--r--src/mame/drivers/megazone.cpp8
-rw-r--r--src/mame/drivers/mephisto_montec.cpp18
-rw-r--r--src/mame/drivers/mephistp.cpp14
-rw-r--r--src/mame/drivers/merit.cpp2
-rw-r--r--src/mame/drivers/meritm.cpp4
-rw-r--r--src/mame/drivers/mes.cpp2
-rw-r--r--src/mame/drivers/metalmx.cpp4
-rw-r--r--src/mame/drivers/metlfrzr.cpp4
-rw-r--r--src/mame/drivers/metro.cpp112
-rw-r--r--src/mame/drivers/meyc8080.cpp2
-rw-r--r--src/mame/drivers/meyc8088.cpp8
-rw-r--r--src/mame/drivers/mfabfz.cpp4
-rw-r--r--src/mame/drivers/mgames.cpp2
-rw-r--r--src/mame/drivers/mgavegas.cpp2
-rw-r--r--src/mame/drivers/mice.cpp6
-rw-r--r--src/mame/drivers/micral.cpp4
-rw-r--r--src/mame/drivers/micro20.cpp12
-rw-r--r--src/mame/drivers/micro3d.cpp22
-rw-r--r--src/mame/drivers/microdec.cpp2
-rw-r--r--src/mame/drivers/micronic.cpp6
-rw-r--r--src/mame/drivers/micropin.cpp2
-rw-r--r--src/mame/drivers/microtan.cpp8
-rw-r--r--src/mame/drivers/microterm.cpp18
-rw-r--r--src/mame/drivers/midas.cpp8
-rw-r--r--src/mame/drivers/midyunit.cpp14
-rw-r--r--src/mame/drivers/midzeus.cpp2
-rw-r--r--src/mame/drivers/mightyframe.cpp2
-rw-r--r--src/mame/drivers/mikromik.cpp16
-rw-r--r--src/mame/drivers/mikrosha.cpp6
-rw-r--r--src/mame/drivers/mil4000.cpp4
-rw-r--r--src/mame/drivers/milwaukee.cpp8
-rw-r--r--src/mame/drivers/miniboy7.cpp2
-rw-r--r--src/mame/drivers/minicom.cpp2
-rw-r--r--src/mame/drivers/miniframe.cpp2
-rw-r--r--src/mame/drivers/minitel_2_rpic.cpp2
-rw-r--r--src/mame/drivers/minivadr.cpp2
-rw-r--r--src/mame/drivers/missile.cpp2
-rw-r--r--src/mame/drivers/mitchell.cpp22
-rw-r--r--src/mame/drivers/mits680b.cpp2
-rw-r--r--src/mame/drivers/mk14.cpp2
-rw-r--r--src/mame/drivers/mk85.cpp2
-rw-r--r--src/mame/drivers/mk90.cpp2
-rw-r--r--src/mame/drivers/mkit09.cpp4
-rw-r--r--src/mame/drivers/mmagic.cpp4
-rw-r--r--src/mame/drivers/mmodular.cpp8
-rw-r--r--src/mame/drivers/model1.cpp4
-rw-r--r--src/mame/drivers/model2.cpp4
-rw-r--r--src/mame/drivers/model3.cpp8
-rw-r--r--src/mame/drivers/modellot.cpp2
-rw-r--r--src/mame/drivers/molecular.cpp4
-rw-r--r--src/mame/drivers/momoko.cpp8
-rw-r--r--src/mame/drivers/moo.cpp10
-rw-r--r--src/mame/drivers/mosaic.cpp4
-rw-r--r--src/mame/drivers/mpf1.cpp12
-rw-r--r--src/mame/drivers/mpu12wbk.cpp2
-rw-r--r--src/mame/drivers/mpu3.cpp2
-rw-r--r--src/mame/drivers/mpz80.cpp4
-rw-r--r--src/mame/drivers/mrdo.cpp4
-rw-r--r--src/mame/drivers/mrgame.cpp8
-rw-r--r--src/mame/drivers/ms0515.cpp10
-rw-r--r--src/mame/drivers/ms6102.cpp12
-rw-r--r--src/mame/drivers/msbc1.cpp2
-rw-r--r--src/mame/drivers/mstation.cpp4
-rw-r--r--src/mame/drivers/msx.cpp58
-rw-r--r--src/mame/drivers/mt735.cpp2
-rw-r--r--src/mame/drivers/mtouchxl.cpp2
-rw-r--r--src/mame/drivers/mtx.cpp12
-rw-r--r--src/mame/drivers/multfish.cpp2
-rw-r--r--src/mame/drivers/multi8.cpp4
-rw-r--r--src/mame/drivers/munchmo.cpp8
-rw-r--r--src/mame/drivers/mvme147.cpp4
-rw-r--r--src/mame/drivers/mw18w.cpp2
-rw-r--r--src/mame/drivers/mwarr.cpp4
-rw-r--r--src/mame/drivers/mwsub.cpp2
-rw-r--r--src/mame/drivers/mx2178.cpp6
-rw-r--r--src/mame/drivers/myb3k.cpp14
-rw-r--r--src/mame/drivers/mycom.cpp8
-rw-r--r--src/mame/drivers/mystwarr.cpp4
-rw-r--r--src/mame/drivers/myvision.cpp6
-rw-r--r--src/mame/drivers/mz2000.cpp4
-rw-r--r--src/mame/drivers/mz2500.cpp6
-rw-r--r--src/mame/drivers/mz3500.cpp2
-rw-r--r--src/mame/drivers/mz700.cpp12
-rw-r--r--src/mame/drivers/mz80.cpp6
-rw-r--r--src/mame/drivers/mzr8105.cpp2
-rw-r--r--src/mame/drivers/n8080.cpp4
-rw-r--r--src/mame/drivers/nakajies.cpp2
-rw-r--r--src/mame/drivers/namcona1.cpp2
-rw-r--r--src/mame/drivers/namconb1.cpp2
-rw-r--r--src/mame/drivers/namcond1.cpp10
-rw-r--r--src/mame/drivers/namcos1.cpp12
-rw-r--r--src/mame/drivers/namcos10.cpp8
-rw-r--r--src/mame/drivers/namcos11.cpp8
-rw-r--r--src/mame/drivers/namcos12.cpp8
-rw-r--r--src/mame/drivers/namcos2.cpp4
-rw-r--r--src/mame/drivers/namcos22.cpp4
-rw-r--r--src/mame/drivers/namcos23.cpp10
-rw-r--r--src/mame/drivers/namcos86.cpp10
-rw-r--r--src/mame/drivers/nanos.cpp16
-rw-r--r--src/mame/drivers/naomi.cpp4
-rw-r--r--src/mame/drivers/nascom1.cpp10
-rw-r--r--src/mame/drivers/nc.cpp4
-rw-r--r--src/mame/drivers/neogeo.cpp2
-rw-r--r--src/mame/drivers/neoprint.cpp4
-rw-r--r--src/mame/drivers/nes.cpp6
-rw-r--r--src/mame/drivers/nes_vt.cpp4
-rw-r--r--src/mame/drivers/newbrain.cpp6
-rw-r--r--src/mame/drivers/next.cpp20
-rw-r--r--src/mame/drivers/ngen.cpp36
-rw-r--r--src/mame/drivers/ngp.cpp12
-rw-r--r--src/mame/drivers/nibble.cpp2
-rw-r--r--src/mame/drivers/nightgal.cpp2
-rw-r--r--src/mame/drivers/ninjakd2.cpp4
-rw-r--r--src/mame/drivers/nitedrvr.cpp2
-rw-r--r--src/mame/drivers/nmk16.cpp42
-rw-r--r--src/mame/drivers/norautp.cpp4
-rw-r--r--src/mame/drivers/notechan.cpp2
-rw-r--r--src/mame/drivers/notetaker.cpp24
-rw-r--r--src/mame/drivers/nova2001.cpp2
-rw-r--r--src/mame/drivers/novag6502.cpp28
-rw-r--r--src/mame/drivers/novag68k.cpp4
-rw-r--r--src/mame/drivers/nsg6809.cpp6
-rw-r--r--src/mame/drivers/nsmpoker.cpp2
-rw-r--r--src/mame/drivers/nss.cpp2
-rw-r--r--src/mame/drivers/nwk-tr.cpp12
-rw-r--r--src/mame/drivers/nyny.cpp6
-rw-r--r--src/mame/drivers/ob68k1a.cpp6
-rw-r--r--src/mame/drivers/octopus.cpp16
-rw-r--r--src/mame/drivers/odyssey2.cpp16
-rw-r--r--src/mame/drivers/ojankohs.cpp4
-rw-r--r--src/mame/drivers/okean240.cpp2
-rw-r--r--src/mame/drivers/omegrace.cpp8
-rw-r--r--src/mame/drivers/onetwo.cpp2
-rw-r--r--src/mame/drivers/onyx.cpp44
-rw-r--r--src/mame/drivers/opwolf.cpp6
-rw-r--r--src/mame/drivers/orbit.cpp2
-rw-r--r--src/mame/drivers/oric.cpp14
-rw-r--r--src/mame/drivers/orion.cpp8
-rw-r--r--src/mame/drivers/osbexec.cpp2
-rw-r--r--src/mame/drivers/osborne1.cpp4
-rw-r--r--src/mame/drivers/osi.cpp2
-rw-r--r--src/mame/drivers/othello.cpp6
-rw-r--r--src/mame/drivers/overdriv.cpp16
-rw-r--r--src/mame/drivers/p112.cpp2
-rw-r--r--src/mame/drivers/p8k.cpp24
-rw-r--r--src/mame/drivers/pachifev.cpp10
-rw-r--r--src/mame/drivers/pacland.cpp8
-rw-r--r--src/mame/drivers/pacman.cpp2
-rw-r--r--src/mame/drivers/pandoras.cpp4
-rw-r--r--src/mame/drivers/panicr.cpp6
-rw-r--r--src/mame/drivers/paradise.cpp6
-rw-r--r--src/mame/drivers/partner.cpp8
-rw-r--r--src/mame/drivers/pasogo.cpp2
-rw-r--r--src/mame/drivers/pasopia.cpp6
-rw-r--r--src/mame/drivers/pasopia7.cpp8
-rw-r--r--src/mame/drivers/patapata.cpp6
-rw-r--r--src/mame/drivers/pc.cpp10
-rw-r--r--src/mame/drivers/pc100.cpp2
-rw-r--r--src/mame/drivers/pc1500.cpp2
-rw-r--r--src/mame/drivers/pc1512.cpp28
-rw-r--r--src/mame/drivers/pc2000.cpp2
-rw-r--r--src/mame/drivers/pc4.cpp4
-rw-r--r--src/mame/drivers/pc6001.cpp2
-rw-r--r--src/mame/drivers/pc8001.cpp16
-rw-r--r--src/mame/drivers/pc8401a.cpp4
-rw-r--r--src/mame/drivers/pc8801.cpp12
-rw-r--r--src/mame/drivers/pc9801.cpp8
-rw-r--r--src/mame/drivers/pcat_dyn.cpp2
-rw-r--r--src/mame/drivers/pcat_nit.cpp4
-rw-r--r--src/mame/drivers/pcd.cpp14
-rw-r--r--src/mame/drivers/pce220.cpp4
-rw-r--r--src/mame/drivers/pcfx.cpp10
-rw-r--r--src/mame/drivers/pcm.cpp12
-rw-r--r--src/mame/drivers/pcw16.cpp4
-rw-r--r--src/mame/drivers/pcxt.cpp4
-rw-r--r--src/mame/drivers/pda600.cpp4
-rw-r--r--src/mame/drivers/pdp11.cpp2
-rw-r--r--src/mame/drivers/pegasus.cpp2
-rw-r--r--src/mame/drivers/pencil2.cpp6
-rw-r--r--src/mame/drivers/pengadvb.cpp6
-rw-r--r--src/mame/drivers/pentagon.cpp12
-rw-r--r--src/mame/drivers/peoplepc.cpp14
-rw-r--r--src/mame/drivers/peplus.cpp6
-rw-r--r--src/mame/drivers/pes.cpp2
-rw-r--r--src/mame/drivers/pet.cpp24
-rw-r--r--src/mame/drivers/pg685.cpp26
-rw-r--r--src/mame/drivers/phc25.cpp6
-rw-r--r--src/mame/drivers/phunsy.cpp4
-rw-r--r--src/mame/drivers/picno.cpp2
-rw-r--r--src/mame/drivers/piggypas.cpp4
-rw-r--r--src/mame/drivers/pimps.cpp2
-rw-r--r--src/mame/drivers/pinkiri8.cpp2
-rw-r--r--src/mame/drivers/pipbug.cpp2
-rw-r--r--src/mame/drivers/pipedrm.cpp4
-rw-r--r--src/mame/drivers/piratesh.cpp6
-rw-r--r--src/mame/drivers/pitagjr.cpp2
-rw-r--r--src/mame/drivers/pitnrun.cpp10
-rw-r--r--src/mame/drivers/pk8020.cpp10
-rw-r--r--src/mame/drivers/play_2.cpp10
-rw-r--r--src/mame/drivers/play_3.cpp14
-rw-r--r--src/mame/drivers/playmark.cpp30
-rw-r--r--src/mame/drivers/plus4.cpp16
-rw-r--r--src/mame/drivers/plygonet.cpp6
-rw-r--r--src/mame/drivers/pmi80.cpp2
-rw-r--r--src/mame/drivers/pntnpuzl.cpp8
-rw-r--r--src/mame/drivers/pofo.cpp12
-rw-r--r--src/mame/drivers/poisk1.cpp8
-rw-r--r--src/mame/drivers/pokechmp.cpp10
-rw-r--r--src/mame/drivers/polepos.cpp2
-rw-r--r--src/mame/drivers/polgar.cpp20
-rw-r--r--src/mame/drivers/poly.cpp6
-rw-r--r--src/mame/drivers/poly88.cpp4
-rw-r--r--src/mame/drivers/poly880.cpp8
-rw-r--r--src/mame/drivers/pooyan.cpp2
-rw-r--r--src/mame/drivers/popeye.cpp4
-rw-r--r--src/mame/drivers/popobear.cpp6
-rw-r--r--src/mame/drivers/popper.cpp10
-rw-r--r--src/mame/drivers/potgoldu.cpp4
-rw-r--r--src/mame/drivers/prehisle.cpp8
-rw-r--r--src/mame/drivers/prestige.cpp2
-rw-r--r--src/mame/drivers/pro80.cpp4
-rw-r--r--src/mame/drivers/prodigy.cpp6
-rw-r--r--src/mame/drivers/prof180x.cpp2
-rw-r--r--src/mame/drivers/prof80.cpp4
-rw-r--r--src/mame/drivers/prophet600.cpp12
-rw-r--r--src/mame/drivers/proteus3.cpp4
-rw-r--r--src/mame/drivers/psikyo.cpp8
-rw-r--r--src/mame/drivers/psx.cpp12
-rw-r--r--src/mame/drivers/psychic5.cpp20
-rw-r--r--src/mame/drivers/pt68k4.cpp14
-rw-r--r--src/mame/drivers/ptcsol.cpp2
-rw-r--r--src/mame/drivers/puckpkmn.cpp2
-rw-r--r--src/mame/drivers/pulsar.cpp10
-rw-r--r--src/mame/drivers/punchout.cpp2
-rw-r--r--src/mame/drivers/pv2000.cpp6
-rw-r--r--src/mame/drivers/pve500.cpp12
-rw-r--r--src/mame/drivers/pwrview.cpp12
-rw-r--r--src/mame/drivers/px4.cpp4
-rw-r--r--src/mame/drivers/px8.cpp4
-rw-r--r--src/mame/drivers/pyl601.cpp8
-rw-r--r--src/mame/drivers/qdrmfgp.cpp14
-rw-r--r--src/mame/drivers/ql.cpp6
-rw-r--r--src/mame/drivers/qtsbc.cpp4
-rw-r--r--src/mame/drivers/quantum.cpp4
-rw-r--r--src/mame/drivers/quickpick5.cpp8
-rw-r--r--src/mame/drivers/quizpun2.cpp10
-rw-r--r--src/mame/drivers/quizshow.cpp2
-rw-r--r--src/mame/drivers/qvt103.cpp12
-rw-r--r--src/mame/drivers/qvt201.cpp8
-rw-r--r--src/mame/drivers/qvt6800.cpp20
-rw-r--r--src/mame/drivers/qx10.cpp2
-rw-r--r--src/mame/drivers/r2dx_v33.cpp4
-rw-r--r--src/mame/drivers/rabbit.cpp4
-rw-r--r--src/mame/drivers/radicasi.cpp2
-rw-r--r--src/mame/drivers/radio86.cpp6
-rw-r--r--src/mame/drivers/raiden.cpp10
-rw-r--r--src/mame/drivers/raiden2.cpp20
-rw-r--r--src/mame/drivers/rainbow.cpp16
-rw-r--r--src/mame/drivers/rallyx.cpp2
-rw-r--r--src/mame/drivers/rampart.cpp2
-rw-r--r--src/mame/drivers/rastan.cpp8
-rw-r--r--src/mame/drivers/rastersp.cpp6
-rw-r--r--src/mame/drivers/ravens.cpp4
-rw-r--r--src/mame/drivers/rbisland.cpp18
-rw-r--r--src/mame/drivers/rc702.cpp10
-rw-r--r--src/mame/drivers/rc759.cpp4
-rw-r--r--src/mame/drivers/rd100.cpp2
-rw-r--r--src/mame/drivers/rd110.cpp2
-rw-r--r--src/mame/drivers/re900.cpp6
-rw-r--r--src/mame/drivers/realbrk.cpp6
-rw-r--r--src/mame/drivers/redalert.cpp2
-rw-r--r--src/mame/drivers/retofinv.cpp12
-rw-r--r--src/mame/drivers/rex6000.cpp12
-rw-r--r--src/mame/drivers/risc2500.cpp2
-rw-r--r--src/mame/drivers/riscpc.cpp8
-rw-r--r--src/mame/drivers/rltennis.cpp2
-rw-r--r--src/mame/drivers/rm380z.cpp6
-rw-r--r--src/mame/drivers/rmnimbus.cpp2
-rw-r--r--src/mame/drivers/rmt32.cpp2
-rw-r--r--src/mame/drivers/rockrage.cpp4
-rw-r--r--src/mame/drivers/rocnrope.cpp2
-rw-r--r--src/mame/drivers/rollrace.cpp10
-rw-r--r--src/mame/drivers/ron.cpp6
-rw-r--r--src/mame/drivers/royalmah.cpp16
-rw-r--r--src/mame/drivers/rpunch.cpp4
-rw-r--r--src/mame/drivers/rsc55.cpp2
-rw-r--r--src/mame/drivers/rt1715.cpp12
-rw-r--r--src/mame/drivers/rungun.cpp4
-rw-r--r--src/mame/drivers/rvoice.cpp6
-rw-r--r--src/mame/drivers/rx78.cpp4
-rw-r--r--src/mame/drivers/rzone.cpp4
-rw-r--r--src/mame/drivers/s11.cpp4
-rw-r--r--src/mame/drivers/s11a.cpp8
-rw-r--r--src/mame/drivers/s11b.cpp6
-rw-r--r--src/mame/drivers/s11c.cpp2
-rw-r--r--src/mame/drivers/s8.cpp4
-rw-r--r--src/mame/drivers/s8a.cpp4
-rw-r--r--src/mame/drivers/s9.cpp4
-rw-r--r--src/mame/drivers/safarir.cpp2
-rw-r--r--src/mame/drivers/sage2.cpp10
-rw-r--r--src/mame/drivers/sam.cpp2
-rw-r--r--src/mame/drivers/samcoupe.cpp6
-rw-r--r--src/mame/drivers/sangho.cpp16
-rw-r--r--src/mame/drivers/sanremo.cpp2
-rw-r--r--src/mame/drivers/sapi1.cpp8
-rw-r--r--src/mame/drivers/saturn.cpp2
-rw-r--r--src/mame/drivers/sauro.cpp4
-rw-r--r--src/mame/drivers/savia84.cpp2
-rw-r--r--src/mame/drivers/sbasketb.cpp6
-rw-r--r--src/mame/drivers/sbc6510.cpp8
-rw-r--r--src/mame/drivers/sbowling.cpp4
-rw-r--r--src/mame/drivers/sbrain.cpp8
-rw-r--r--src/mame/drivers/sbrkout.cpp2
-rw-r--r--src/mame/drivers/sc1.cpp4
-rw-r--r--src/mame/drivers/sc2.cpp4
-rw-r--r--src/mame/drivers/scopus.cpp4
-rw-r--r--src/mame/drivers/scregg.cpp16
-rw-r--r--src/mame/drivers/scv.cpp10
-rw-r--r--src/mame/drivers/sderby.cpp4
-rw-r--r--src/mame/drivers/sderby2.cpp4
-rw-r--r--src/mame/drivers/sdk80.cpp4
-rw-r--r--src/mame/drivers/sdk85.cpp12
-rw-r--r--src/mame/drivers/sdk86.cpp4
-rw-r--r--src/mame/drivers/seattlecmp.cpp6
-rw-r--r--src/mame/drivers/segac2.cpp4
-rw-r--r--src/mame/drivers/segae.cpp14
-rw-r--r--src/mame/drivers/segam1.cpp2
-rw-r--r--src/mame/drivers/segaorun.cpp6
-rw-r--r--src/mame/drivers/segas16b.cpp16
-rw-r--r--src/mame/drivers/segas24.cpp14
-rw-r--r--src/mame/drivers/segas32.cpp4
-rw-r--r--src/mame/drivers/segaufo.cpp16
-rw-r--r--src/mame/drivers/segaxbd.cpp12
-rw-r--r--src/mame/drivers/segaybd.cpp4
-rw-r--r--src/mame/drivers/seibucats.cpp8
-rw-r--r--src/mame/drivers/seibuspi.cpp26
-rw-r--r--src/mame/drivers/seicross.cpp6
-rw-r--r--src/mame/drivers/seicupbl.cpp2
-rw-r--r--src/mame/drivers/selz80.cpp2
-rw-r--r--src/mame/drivers/seta.cpp28
-rw-r--r--src/mame/drivers/seta2.cpp18
-rw-r--r--src/mame/drivers/sf.cpp8
-rw-r--r--src/mame/drivers/sfcbox.cpp6
-rw-r--r--src/mame/drivers/sfkick.cpp2
-rw-r--r--src/mame/drivers/sg1000.cpp18
-rw-r--r--src/mame/drivers/sg1000a.cpp10
-rw-r--r--src/mame/drivers/shadfrce.cpp10
-rw-r--r--src/mame/drivers/shangha3.cpp28
-rw-r--r--src/mame/drivers/shanghai.cpp14
-rw-r--r--src/mame/drivers/shangkid.cpp8
-rw-r--r--src/mame/drivers/shaolins.cpp2
-rw-r--r--src/mame/drivers/shootaway2.cpp6
-rw-r--r--src/mame/drivers/shootout.cpp16
-rw-r--r--src/mame/drivers/shougi.cpp8
-rw-r--r--src/mame/drivers/sigmab52.cpp12
-rw-r--r--src/mame/drivers/sigmab98.cpp4
-rw-r--r--src/mame/drivers/silkroad.cpp8
-rw-r--r--src/mame/drivers/silvmil.cpp14
-rw-r--r--src/mame/drivers/simpsons.cpp12
-rw-r--r--src/mame/drivers/sitcom.cpp2
-rw-r--r--src/mame/drivers/skimaxx.cpp14
-rw-r--r--src/mame/drivers/skydiver.cpp2
-rw-r--r--src/mame/drivers/skyfox.cpp8
-rw-r--r--src/mame/drivers/skykid.cpp4
-rw-r--r--src/mame/drivers/skylncr.cpp2
-rw-r--r--src/mame/drivers/slapfght.cpp28
-rw-r--r--src/mame/drivers/slicer.cpp6
-rw-r--r--src/mame/drivers/slotcarn.cpp2
-rw-r--r--src/mame/drivers/sm1800.cpp2
-rw-r--r--src/mame/drivers/sm7238.cpp16
-rw-r--r--src/mame/drivers/smc777.cpp4
-rw-r--r--src/mame/drivers/sms.cpp30
-rw-r--r--src/mame/drivers/sms_bootleg.cpp8
-rw-r--r--src/mame/drivers/smsmcorp.cpp6
-rw-r--r--src/mame/drivers/snes.cpp2
-rw-r--r--src/mame/drivers/snesb.cpp4
-rw-r--r--src/mame/drivers/snk.cpp34
-rw-r--r--src/mame/drivers/snk6502.cpp2
-rw-r--r--src/mame/drivers/snk68.cpp8
-rw-r--r--src/mame/drivers/snookr10.cpp2
-rw-r--r--src/mame/drivers/snowbros.cpp46
-rw-r--r--src/mame/drivers/socrates.cpp16
-rw-r--r--src/mame/drivers/softbox.cpp4
-rw-r--r--src/mame/drivers/sonson.cpp8
-rw-r--r--src/mame/drivers/sothello.cpp14
-rw-r--r--src/mame/drivers/spbactn.cpp20
-rw-r--r--src/mame/drivers/spc1000.cpp8
-rw-r--r--src/mame/drivers/spc1500.cpp6
-rw-r--r--src/mame/drivers/spdodgeb.cpp8
-rw-r--r--src/mame/drivers/special.cpp4
-rw-r--r--src/mame/drivers/spectra.cpp4
-rw-r--r--src/mame/drivers/speedatk.cpp2
-rw-r--r--src/mame/drivers/speedbal.cpp6
-rw-r--r--src/mame/drivers/spinb.cpp16
-rw-r--r--src/mame/drivers/splash.cpp22
-rw-r--r--src/mame/drivers/splus.cpp2
-rw-r--r--src/mame/drivers/spoker.cpp8
-rw-r--r--src/mame/drivers/sprcros2.cpp2
-rw-r--r--src/mame/drivers/sprint2.cpp2
-rw-r--r--src/mame/drivers/spy.cpp4
-rw-r--r--src/mame/drivers/squale.cpp4
-rw-r--r--src/mame/drivers/sshot.cpp2
-rw-r--r--src/mame/drivers/ssozumo.cpp2
-rw-r--r--src/mame/drivers/sspeedr.cpp2
-rw-r--r--src/mame/drivers/ssv.cpp4
-rw-r--r--src/mame/drivers/stadhero.cpp10
-rw-r--r--src/mame/drivers/starwars.cpp4
-rw-r--r--src/mame/drivers/stfight.cpp12
-rw-r--r--src/mame/drivers/stlforce.cpp6
-rw-r--r--src/mame/drivers/studio2.cpp6
-rw-r--r--src/mame/drivers/stuntair.cpp8
-rw-r--r--src/mame/drivers/stv.cpp2
-rw-r--r--src/mame/drivers/su2000.cpp8
-rw-r--r--src/mame/drivers/sub.cpp2
-rw-r--r--src/mame/drivers/subsino.cpp24
-rw-r--r--src/mame/drivers/subsino2.cpp18
-rw-r--r--src/mame/drivers/sun1.cpp6
-rw-r--r--src/mame/drivers/sun2.cpp16
-rw-r--r--src/mame/drivers/sun3.cpp8
-rw-r--r--src/mame/drivers/sun3x.cpp8
-rw-r--r--src/mame/drivers/sun4.cpp10
-rw-r--r--src/mame/drivers/suna16.cpp36
-rw-r--r--src/mame/drivers/suna8.cpp2
-rw-r--r--src/mame/drivers/supbtime.cpp10
-rw-r--r--src/mame/drivers/supdrapo.cpp2
-rw-r--r--src/mame/drivers/supduck.cpp6
-rw-r--r--src/mame/drivers/super6.cpp14
-rw-r--r--src/mame/drivers/super80.cpp4
-rw-r--r--src/mame/drivers/superchs.cpp4
-rw-r--r--src/mame/drivers/supercrd.cpp2
-rw-r--r--src/mame/drivers/superqix.cpp16
-rw-r--r--src/mame/drivers/superslave.cpp10
-rw-r--r--src/mame/drivers/superwng.cpp2
-rw-r--r--src/mame/drivers/supracan.cpp6
-rw-r--r--src/mame/drivers/suprgolf.cpp4
-rw-r--r--src/mame/drivers/suprnova.cpp2
-rw-r--r--src/mame/drivers/suprridr.cpp6
-rw-r--r--src/mame/drivers/supstarf.cpp8
-rw-r--r--src/mame/drivers/surpratk.cpp4
-rw-r--r--src/mame/drivers/sv8000.cpp6
-rw-r--r--src/mame/drivers/svi318.cpp8
-rw-r--r--src/mame/drivers/svmu.cpp4
-rw-r--r--src/mame/drivers/swtpc.cpp8
-rw-r--r--src/mame/drivers/swtpc09.cpp10
-rw-r--r--src/mame/drivers/swyft.cpp8
-rw-r--r--src/mame/drivers/sym1.cpp2
-rw-r--r--src/mame/drivers/symbolics.cpp2
-rw-r--r--src/mame/drivers/sys2900.cpp2
-rw-r--r--src/mame/drivers/sys9002.cpp4
-rw-r--r--src/mame/drivers/systec.cpp4
-rw-r--r--src/mame/drivers/system1.cpp4
-rw-r--r--src/mame/drivers/system16.cpp6
-rw-r--r--src/mame/drivers/tagteam.cpp8
-rw-r--r--src/mame/drivers/tail2nos.cpp8
-rw-r--r--src/mame/drivers/taito.cpp4
-rw-r--r--src/mame/drivers/taito_b.cpp86
-rw-r--r--src/mame/drivers/taito_f2.cpp6
-rw-r--r--src/mame/drivers/taito_f3.cpp4
-rw-r--r--src/mame/drivers/taito_h.cpp18
-rw-r--r--src/mame/drivers/taito_l.cpp30
-rw-r--r--src/mame/drivers/taito_x.cpp14
-rw-r--r--src/mame/drivers/taito_z.cpp18
-rw-r--r--src/mame/drivers/taitoair.cpp8
-rw-r--r--src/mame/drivers/taitogn.cpp6
-rw-r--r--src/mame/drivers/taitojc.cpp6
-rw-r--r--src/mame/drivers/taitopjc.cpp2
-rw-r--r--src/mame/drivers/taitosj.cpp16
-rw-r--r--src/mame/drivers/taitotz.cpp2
-rw-r--r--src/mame/drivers/tamag1.cpp4
-rw-r--r--src/mame/drivers/tandy1t.cpp8
-rw-r--r--src/mame/drivers/tandy2k.cpp16
-rw-r--r--src/mame/drivers/tankbust.cpp10
-rw-r--r--src/mame/drivers/tapatune.cpp12
-rw-r--r--src/mame/drivers/targeth.cpp6
-rw-r--r--src/mame/drivers/tatsumi.cpp4
-rw-r--r--src/mame/drivers/tavernie.cpp6
-rw-r--r--src/mame/drivers/tceptor.cpp14
-rw-r--r--src/mame/drivers/tdv2324.cpp2
-rw-r--r--src/mame/drivers/tec1.cpp2
-rw-r--r--src/mame/drivers/techno.cpp8
-rw-r--r--src/mame/drivers/tecmo.cpp14
-rw-r--r--src/mame/drivers/tecmo16.cpp4
-rw-r--r--src/mame/drivers/tecmosys.cpp10
-rw-r--r--src/mame/drivers/tecnbras.cpp2
-rw-r--r--src/mame/drivers/tek405x.cpp4
-rw-r--r--src/mame/drivers/tek440x.cpp8
-rw-r--r--src/mame/drivers/tekxp33x.cpp4
-rw-r--r--src/mame/drivers/tempest.cpp4
-rw-r--r--src/mame/drivers/terak.cpp2
-rw-r--r--src/mame/drivers/terco.cpp2
-rw-r--r--src/mame/drivers/terracre.cpp10
-rw-r--r--src/mame/drivers/testconsole.cpp4
-rw-r--r--src/mame/drivers/tetrisp2.cpp4
-rw-r--r--src/mame/drivers/tg100.cpp2
-rw-r--r--src/mame/drivers/tgtpanic.cpp2
-rw-r--r--src/mame/drivers/thayers.cpp6
-rw-r--r--src/mame/drivers/thedealr.cpp6
-rw-r--r--src/mame/drivers/thedeep.cpp8
-rw-r--r--src/mame/drivers/thief.cpp10
-rw-r--r--src/mame/drivers/thomson.cpp4
-rw-r--r--src/mame/drivers/thoop2.cpp6
-rw-r--r--src/mame/drivers/thunderx.cpp8
-rw-r--r--src/mame/drivers/ti630.cpp2
-rw-r--r--src/mame/drivers/ti74.cpp4
-rw-r--r--src/mame/drivers/ti89.cpp8
-rw-r--r--src/mame/drivers/ti99_4x.cpp12
-rw-r--r--src/mame/drivers/ti99_8.cpp8
-rw-r--r--src/mame/drivers/tickee.cpp12
-rw-r--r--src/mame/drivers/tigeroad.cpp8
-rw-r--r--src/mame/drivers/tiki100.cpp16
-rw-r--r--src/mame/drivers/tim011.cpp6
-rw-r--r--src/mame/drivers/tim100.cpp4
-rw-r--r--src/mame/drivers/timeplt.cpp4
-rw-r--r--src/mame/drivers/timex.cpp4
-rw-r--r--src/mame/drivers/tispeak.cpp2
-rw-r--r--src/mame/drivers/tk2000.cpp2
-rw-r--r--src/mame/drivers/tk80.cpp6
-rw-r--r--src/mame/drivers/tk80bs.cpp2
-rw-r--r--src/mame/drivers/tm990189.cpp2
-rw-r--r--src/mame/drivers/tmaster.cpp8
-rw-r--r--src/mame/drivers/tmc1800.cpp8
-rw-r--r--src/mame/drivers/tmc2000e.cpp6
-rw-r--r--src/mame/drivers/tmc600.cpp6
-rw-r--r--src/mame/drivers/tmmjprd.cpp2
-rw-r--r--src/mame/drivers/tmnt.cpp72
-rw-r--r--src/mame/drivers/tmspoker.cpp2
-rw-r--r--src/mame/drivers/tnzs.cpp16
-rw-r--r--src/mame/drivers/toaplan1.cpp58
-rw-r--r--src/mame/drivers/toaplan2.cpp230
-rw-r--r--src/mame/drivers/toki.cpp8
-rw-r--r--src/mame/drivers/tomcat.cpp18
-rw-r--r--src/mame/drivers/tonton.cpp2
-rw-r--r--src/mame/drivers/toobin.cpp2
-rw-r--r--src/mame/drivers/topspeed.cpp14
-rw-r--r--src/mame/drivers/tosh1000.cpp4
-rw-r--r--src/mame/drivers/tourtabl.cpp2
-rw-r--r--src/mame/drivers/toypop.cpp2
-rw-r--r--src/mame/drivers/tp84.cpp12
-rw-r--r--src/mame/drivers/tr175.cpp2
-rw-r--r--src/mame/drivers/trackfld.cpp8
-rw-r--r--src/mame/drivers/tranz330.cpp12
-rw-r--r--src/mame/drivers/tricep.cpp2
-rw-r--r--src/mame/drivers/trs80.cpp2
-rw-r--r--src/mame/drivers/trs80m2.cpp36
-rw-r--r--src/mame/drivers/truco.cpp2
-rw-r--r--src/mame/drivers/trvmadns.cpp4
-rw-r--r--src/mame/drivers/trvquest.cpp12
-rw-r--r--src/mame/drivers/ts3000.cpp2
-rw-r--r--src/mame/drivers/ts802.cpp12
-rw-r--r--src/mame/drivers/ts803.cpp12
-rw-r--r--src/mame/drivers/ts816.cpp30
-rw-r--r--src/mame/drivers/tsamurai.cpp24
-rw-r--r--src/mame/drivers/tti.cpp4
-rw-r--r--src/mame/drivers/tugboat.cpp2
-rw-r--r--src/mame/drivers/tunhunt.cpp6
-rw-r--r--src/mame/drivers/turbo.cpp2
-rw-r--r--src/mame/drivers/turrett.cpp2
-rw-r--r--src/mame/drivers/tutankhm.cpp2
-rw-r--r--src/mame/drivers/tutor.cpp4
-rw-r--r--src/mame/drivers/tv910.cpp4
-rw-r--r--src/mame/drivers/tv912.cpp10
-rw-r--r--src/mame/drivers/tv950.cpp4
-rw-r--r--src/mame/drivers/tv990.cpp4
-rw-r--r--src/mame/drivers/tvgame.cpp2
-rw-r--r--src/mame/drivers/twin16.cpp26
-rw-r--r--src/mame/drivers/twincobr.cpp14
-rw-r--r--src/mame/drivers/twinkle.cpp10
-rw-r--r--src/mame/drivers/twins.cpp4
-rw-r--r--src/mame/drivers/ultratnk.cpp2
-rw-r--r--src/mame/drivers/ultrsprt.cpp4
-rw-r--r--src/mame/drivers/undrfire.cpp6
-rw-r--r--src/mame/drivers/unichamp.cpp8
-rw-r--r--src/mame/drivers/unico.cpp20
-rw-r--r--src/mame/drivers/unior.cpp12
-rw-r--r--src/mame/drivers/unistar.cpp4
-rw-r--r--src/mame/drivers/univac.cpp6
-rw-r--r--src/mame/drivers/unixpc.cpp4
-rw-r--r--src/mame/drivers/unkhorse.cpp4
-rw-r--r--src/mame/drivers/usgames.cpp2
-rw-r--r--src/mame/drivers/v100.cpp14
-rw-r--r--src/mame/drivers/v102.cpp10
-rw-r--r--src/mame/drivers/v1050.cpp18
-rw-r--r--src/mame/drivers/v6809.cpp8
-rw-r--r--src/mame/drivers/vamphalf.cpp30
-rw-r--r--src/mame/drivers/vaportra.cpp12
-rw-r--r--src/mame/drivers/vastar.cpp6
-rw-r--r--src/mame/drivers/vax11.cpp2
-rw-r--r--src/mame/drivers/vball.cpp2
-rw-r--r--src/mame/drivers/vboy.cpp6
-rw-r--r--src/mame/drivers/vcombat.cpp22
-rw-r--r--src/mame/drivers/vcs80.cpp4
-rw-r--r--src/mame/drivers/vector06.cpp2
-rw-r--r--src/mame/drivers/vector4.cpp2
-rw-r--r--src/mame/drivers/vectrex.cpp6
-rw-r--r--src/mame/drivers/vectrix.cpp2
-rw-r--r--src/mame/drivers/vegaeo.cpp4
-rw-r--r--src/mame/drivers/vendetta.cpp8
-rw-r--r--src/mame/drivers/vertigo.cpp12
-rw-r--r--src/mame/drivers/vg5k.cpp2
-rw-r--r--src/mame/drivers/vgmplay.cpp2
-rw-r--r--src/mame/drivers/vic10.cpp10
-rw-r--r--src/mame/drivers/vicdual.cpp2
-rw-r--r--src/mame/drivers/victor9k.cpp16
-rw-r--r--src/mame/drivers/vidbrain.cpp4
-rw-r--r--src/mame/drivers/videopkr.cpp8
-rw-r--r--src/mame/drivers/vii.cpp8
-rw-r--r--src/mame/drivers/vip.cpp8
-rw-r--r--src/mame/drivers/vis.cpp11
-rw-r--r--src/mame/drivers/vixen.cpp12
-rw-r--r--src/mame/drivers/vk100.cpp10
-rw-r--r--src/mame/drivers/vlc.cpp12
-rw-r--r--src/mame/drivers/volfied.cpp6
-rw-r--r--src/mame/drivers/votrpss.cpp10
-rw-r--r--src/mame/drivers/votrtnt.cpp2
-rw-r--r--src/mame/drivers/vp122.cpp6
-rw-r--r--src/mame/drivers/vp60.cpp6
-rw-r--r--src/mame/drivers/vpoker.cpp4
-rw-r--r--src/mame/drivers/vsnes.cpp10
-rw-r--r--src/mame/drivers/vt100.cpp14
-rw-r--r--src/mame/drivers/vt220.cpp4
-rw-r--r--src/mame/drivers/vt240.cpp10
-rw-r--r--src/mame/drivers/vt320.cpp2
-rw-r--r--src/mame/drivers/vt520.cpp4
-rw-r--r--src/mame/drivers/vta2000.cpp2
-rw-r--r--src/mame/drivers/vtech1.cpp8
-rw-r--r--src/mame/drivers/vulgus.cpp8
-rw-r--r--src/mame/drivers/wacky_gator.cpp18
-rw-r--r--src/mame/drivers/wardner.cpp12
-rw-r--r--src/mame/drivers/warpsped.cpp2
-rw-r--r--src/mame/drivers/warpwarp.cpp2
-rw-r--r--src/mame/drivers/wc90.cpp8
-rw-r--r--src/mame/drivers/wc90b.cpp8
-rw-r--r--src/mame/drivers/welltris.cpp2
-rw-r--r--src/mame/drivers/wicat.cpp32
-rw-r--r--src/mame/drivers/wico.cpp6
-rw-r--r--src/mame/drivers/wildpkr.cpp10
-rw-r--r--src/mame/drivers/williams.cpp4
-rw-r--r--src/mame/drivers/witch.cpp2
-rw-r--r--src/mame/drivers/wmg.cpp4
-rw-r--r--src/mame/drivers/wms.cpp6
-rw-r--r--src/mame/drivers/wpc_95.cpp4
-rw-r--r--src/mame/drivers/wpc_an.cpp2
-rw-r--r--src/mame/drivers/wpc_dcs.cpp4
-rw-r--r--src/mame/drivers/wpc_s.cpp4
-rw-r--r--src/mame/drivers/wrally.cpp6
-rw-r--r--src/mame/drivers/wswan.cpp4
-rw-r--r--src/mame/drivers/wwfsstar.cpp8
-rw-r--r--src/mame/drivers/x07.cpp2
-rw-r--r--src/mame/drivers/x1.cpp6
-rw-r--r--src/mame/drivers/x1twin.cpp6
-rw-r--r--src/mame/drivers/x68k.cpp2
-rw-r--r--src/mame/drivers/xain.cpp2
-rw-r--r--src/mame/drivers/xavix.cpp2
-rw-r--r--src/mame/drivers/xerox820.cpp40
-rw-r--r--src/mame/drivers/xexex.cpp14
-rw-r--r--src/mame/drivers/xmen.cpp16
-rw-r--r--src/mame/drivers/xor100.cpp14
-rw-r--r--src/mame/drivers/yiear.cpp6
-rw-r--r--src/mame/drivers/ymmu100.cpp2
-rw-r--r--src/mame/drivers/yunsun16.cpp16
-rw-r--r--src/mame/drivers/yunsung8.cpp10
-rw-r--r--src/mame/drivers/yuvomz80.cpp10
-rw-r--r--src/mame/drivers/z100.cpp6
-rw-r--r--src/mame/drivers/z1013.cpp6
-rw-r--r--src/mame/drivers/z80dev.cpp2
-rw-r--r--src/mame/drivers/z80ne.cpp8
-rw-r--r--src/mame/drivers/z88.cpp4
-rw-r--r--src/mame/drivers/z9001.cpp8
-rw-r--r--src/mame/drivers/zac_proto.cpp2
-rw-r--r--src/mame/drivers/zaccaria.cpp2
-rw-r--r--src/mame/drivers/zapcomputer.cpp2
-rw-r--r--src/mame/drivers/zaurus.cpp4
-rw-r--r--src/mame/drivers/zaxxon.cpp6
-rw-r--r--src/mame/drivers/zexall.cpp2
-rw-r--r--src/mame/drivers/zms8085.cpp4
-rw-r--r--src/mame/drivers/zn.cpp36
-rw-r--r--src/mame/drivers/zodiack.cpp8
-rw-r--r--src/mame/drivers/zorba.cpp14
-rw-r--r--src/mame/drivers/zr107.cpp24
-rw-r--r--src/mame/drivers/zrt80.cpp4
-rw-r--r--src/mame/drivers/zsbc3.cpp10
-rw-r--r--src/mame/drivers/zwackery.cpp2
-rw-r--r--src/mame/drivers/zx.cpp4
-rw-r--r--src/mame/etc/korgm1.cpp2
-rw-r--r--src/mame/etc/template_driver.cpp4
-rw-r--r--src/mame/includes/abc80x.h4
-rw-r--r--src/mame/includes/aim65.h2
-rw-r--r--src/mame/includes/amiga.h18
-rw-r--r--src/mame/includes/apple2gs.h2
-rw-r--r--src/mame/includes/astrocde.h2
-rw-r--r--src/mame/includes/atarist.h8
-rw-r--r--src/mame/includes/atom.h4
-rw-r--r--src/mame/includes/bagman.h2
-rw-r--r--src/mame/includes/bishi.h4
-rw-r--r--src/mame/includes/bwidow.h4
-rw-r--r--src/mame/includes/bzone.h4
-rw-r--r--src/mame/includes/cdi.h4
-rw-r--r--src/mame/includes/cidelsa.h6
-rw-r--r--src/mame/includes/cosmic.h4
-rw-r--r--src/mame/includes/cps1.h2
-rw-r--r--src/mame/includes/crbaloon.h2
-rw-r--r--src/mame/includes/crgolf.h2
-rw-r--r--src/mame/includes/divebomb.h2
-rw-r--r--src/mame/includes/dkong.h4
-rw-r--r--src/mame/includes/esripsys.h2
-rw-r--r--src/mame/includes/exerion.h2
-rw-r--r--src/mame/includes/exidy.h2
-rw-r--r--src/mame/includes/exidy440.h2
-rw-r--r--src/mame/includes/fuukifg3.h6
-rw-r--r--src/mame/includes/galaxian.h2
-rw-r--r--src/mame/includes/gameplan.h8
-rw-r--r--src/mame/includes/harddriv.h4
-rw-r--r--src/mame/includes/itech32.h10
-rw-r--r--src/mame/includes/jackal.h4
-rw-r--r--src/mame/includes/jaguar.h6
-rw-r--r--src/mame/includes/jailbrek.h4
-rw-r--r--src/mame/includes/jedi.h4
-rw-r--r--src/mame/includes/lockon.h4
-rw-r--r--src/mame/includes/madalien.h2
-rw-r--r--src/mame/includes/mario.h6
-rw-r--r--src/mame/includes/maygay1b.h4
-rw-r--r--src/mame/includes/mcr.h2
-rw-r--r--src/mame/includes/midzeus.h2
-rw-r--r--src/mame/includes/mpu4.h4
-rw-r--r--src/mame/includes/mystston.h2
-rw-r--r--src/mame/includes/osi.h2
-rw-r--r--src/mame/includes/phoenix.h2
-rw-r--r--src/mame/includes/polyplay.h2
-rw-r--r--src/mame/includes/s11.h2
-rw-r--r--src/mame/includes/saturn.h5
-rw-r--r--src/mame/includes/spectrum.h4
-rw-r--r--src/mame/includes/starfire.h2
-rw-r--r--src/mame/includes/tx1.h6
-rw-r--r--src/mame/includes/victory.h4
-rw-r--r--src/mame/machine/abc1600mac.cpp2
-rw-r--r--src/mame/machine/acs8600_ics.cpp14
-rw-r--r--src/mame/machine/amiga.cpp6
-rw-r--r--src/mame/machine/amstrad.cpp8
-rw-r--r--src/mame/machine/apollo.cpp12
-rw-r--r--src/mame/machine/apricotkb.cpp2
-rw-r--r--src/mame/machine/at.cpp8
-rw-r--r--src/mame/machine/atarigen.h8
-rw-r--r--src/mame/machine/beta.cpp2
-rw-r--r--src/mame/machine/compiskb.cpp2
-rw-r--r--src/mame/machine/cuda.cpp2
-rw-r--r--src/mame/machine/dec_lk201.cpp2
-rw-r--r--src/mame/machine/decopincpu.cpp2
-rw-r--r--src/mame/machine/decopincpu.h2
-rw-r--r--src/mame/machine/dmv_keyb.cpp2
-rw-r--r--src/mame/machine/egret.cpp2
-rw-r--r--src/mame/machine/gamecom.cpp2
-rw-r--r--src/mame/machine/hec2hrp.cpp8
-rw-r--r--src/mame/machine/ibm6580_fdc.cpp2
-rw-r--r--src/mame/machine/ibm6580_kbd.cpp2
-rw-r--r--src/mame/machine/inder_vid.cpp6
-rw-r--r--src/mame/machine/interpro_ioga.cpp2
-rw-r--r--src/mame/machine/isbc_208.cpp2
-rw-r--r--src/mame/machine/isbc_215g.cpp2
-rw-r--r--src/mame/machine/iteagle_fpga.cpp2
-rw-r--r--src/mame/machine/kay_kbd.cpp2
-rw-r--r--src/mame/machine/km035.cpp2
-rw-r--r--src/mame/machine/m20_8086.cpp2
-rw-r--r--src/mame/machine/m24_kbd.cpp2
-rw-r--r--src/mame/machine/m24_z8000.cpp2
-rw-r--r--src/mame/machine/micro3d.cpp2
-rw-r--r--src/mame/machine/ms7004.cpp2
-rw-r--r--src/mame/machine/pc1512kb.cpp2
-rw-r--r--src/mame/machine/pcshare.cpp16
-rw-r--r--src/mame/machine/pgmprot_igs027a_type3.cpp2
-rw-r--r--src/mame/machine/saturn.cpp4
-rw-r--r--src/mame/machine/v1050kb.cpp2
-rw-r--r--src/mame/machine/victor9k_fdc.cpp10
-rw-r--r--src/mame/machine/victor9k_kb.cpp2
-rw-r--r--src/mame/machine/wangpckb.cpp2
-rw-r--r--src/mame/machine/x820kb.cpp2
-rw-r--r--src/mame/machine/zorbakbd.cpp2
-rw-r--r--src/mame/machine/zx8302.h1
-rw-r--r--src/mame/video/abc1600.cpp4
-rw-r--r--src/mame/video/abc80.cpp4
-rw-r--r--src/mame/video/abc800.cpp4
-rw-r--r--src/mame/video/abc802.cpp2
-rw-r--r--src/mame/video/abc806.cpp2
-rw-r--r--src/mame/video/agat7.cpp2
-rw-r--r--src/mame/video/bbc.cpp6
-rw-r--r--src/mame/video/bfm_adr2.cpp2
-rw-r--r--src/mame/video/cgc7900.cpp2
-rw-r--r--src/mame/video/decodmd1.cpp2
-rw-r--r--src/mame/video/decodmd2.cpp4
-rw-r--r--src/mame/video/decodmd3.cpp4
-rw-r--r--src/mame/video/dkong.cpp2
-rw-r--r--src/mame/video/jaguar.cpp2
-rw-r--r--src/mame/video/kyocera.cpp2
-rw-r--r--src/mame/video/lethalj.cpp2
-rw-r--r--src/mame/video/lockon.cpp2
-rw-r--r--src/mame/video/m92.cpp2
-rw-r--r--src/mame/video/midzeus.cpp2
-rw-r--r--src/mame/video/mikromik.cpp6
-rw-r--r--src/mame/video/mystston.cpp4
-rw-r--r--src/mame/video/pc1512.cpp8
-rw-r--r--src/mame/video/pc_t1t.cpp12
-rw-r--r--src/mame/video/pcd.cpp4
-rw-r--r--src/mame/video/tmc1800.cpp12
-rw-r--r--src/mame/video/v1050.cpp2
-rw-r--r--src/mame/video/victory.cpp2
1514 files changed, 5972 insertions, 5965 deletions
diff --git a/src/mame/audio/atarijsa.cpp b/src/mame/audio/atarijsa.cpp
index e3bf8c08acc..a83987fc8d8 100644
--- a/src/mame/audio/atarijsa.cpp
+++ b/src/mame/audio/atarijsa.cpp
@@ -77,7 +77,7 @@ ALL: the LPF (low pass filter) bit which selectively places a lowpass filter in
#include "audio/atarijsa.h"
-#define JSA_MASTER_CLOCK XTAL_3_579545MHz
+#define JSA_MASTER_CLOCK XTAL(3'579'545)
//**************************************************************************
@@ -696,7 +696,7 @@ MACHINE_CONFIG_START(atari_jsa_i_device::device_add_mconfig)
// basic machine hardware
MCFG_CPU_ADD("cpu", M6502, JSA_MASTER_CLOCK/2)
MCFG_CPU_PROGRAM_MAP(atarijsa1_map)
- MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
+ MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, JSA_MASTER_CLOCK/4/16/16/14)
// sound hardware
MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "cpu", WRITELINE(atari_jsa_base_device, main_int_write_line))
@@ -826,7 +826,7 @@ MACHINE_CONFIG_START(atari_jsa_ii_device::device_add_mconfig)
// basic machine hardware
MCFG_CPU_ADD("cpu", M6502, JSA_MASTER_CLOCK/2)
MCFG_CPU_PROGRAM_MAP(atarijsa2_map)
- MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
+ MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, JSA_MASTER_CLOCK/4/16/16/14)
// sound hardware
MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "cpu", WRITELINE(atari_jsa_base_device, main_int_write_line))
@@ -908,7 +908,7 @@ MACHINE_CONFIG_START(atari_jsa_iii_device::device_add_mconfig)
// basic machine hardware
MCFG_CPU_ADD("cpu", M6502, JSA_MASTER_CLOCK/2)
MCFG_CPU_PROGRAM_MAP(atarijsa3_map)
- MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
+ MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, JSA_MASTER_CLOCK/4/16/16/14)
// sound hardware
MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "cpu", WRITELINE(atari_jsa_base_device, main_int_write_line))
diff --git a/src/mame/audio/carnival.cpp b/src/mame/audio/carnival.cpp
index c7717802963..ecc2c5ec84c 100644
--- a/src/mame/audio/carnival.cpp
+++ b/src/mame/audio/carnival.cpp
@@ -199,13 +199,13 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(vicdual_state::carnival_audio)
/* music board */
- MCFG_CPU_ADD("audiocpu", I8039, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", I8039, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(mboard_map)
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(vicdual_state, carnival_music_port_1_w))
MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(vicdual_state, carnival_music_port_2_w))
MCFG_MCS48_PORT_T1_IN_CB(READLINE(vicdual_state, carnival_music_port_t1_r))
- MCFG_SOUND_ADD("psg", AY8912, XTAL_3_579545MHz/3)
+ MCFG_SOUND_ADD("psg", AY8912, XTAL(3'579'545)/3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* samples */
diff --git a/src/mame/audio/crbaloon.cpp b/src/mame/audio/crbaloon.cpp
index b0944b78657..3419edb3d3c 100644
--- a/src/mame/audio/crbaloon.cpp
+++ b/src/mame/audio/crbaloon.cpp
@@ -120,7 +120,7 @@ static DISCRETE_SOUND_START(crbaloon)
* linear ramp.
************************************************/
/* TO BE FIXED - needs proper modulation */
- DISCRETE_NOTE(NODE_20, 1, CRBALOON_16H / 2, CRBALOON_MUSIC_DATA, 255, 7, DISC_CLK_IS_FREQ)
+ DISCRETE_NOTE(NODE_20, 1, CRBALOON_16H.dvalue() / 2, CRBALOON_MUSIC_DATA, 255, 7, DISC_CLK_IS_FREQ)
DISCRETE_DAC_R1(NODE_21, NODE_20, DEFAULT_TTL_V_LOGIC_1, &desc_crbaloon_music_dac)
DISCRETE_ONOFF(NODE_22, CRBALOON_MUSIC_EN, NODE_21)
// DISCRETE_RAMP(NODE_21, 1, RAMP, GRAD, MIN, MAX, CLAMP)
diff --git a/src/mame/audio/csd.cpp b/src/mame/audio/csd.cpp
index 7b2b250bf3f..e90a1287f4c 100644
--- a/src/mame/audio/csd.cpp
+++ b/src/mame/audio/csd.cpp
@@ -36,7 +36,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
MACHINE_CONFIG_START(midway_cheap_squeak_deluxe_device::device_add_mconfig)
- MCFG_CPU_ADD("cpu", M68000, XTAL_16MHz/2)
+ MCFG_CPU_ADD("cpu", M68000, XTAL(16'000'000)/2)
MCFG_CPU_PROGRAM_MAP(csdeluxe_map)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
diff --git a/src/mame/audio/dcs.cpp b/src/mame/audio/dcs.cpp
index 32fa9cd95cb..5bb3ad93019 100644
--- a/src/mame/audio/dcs.cpp
+++ b/src/mame/audio/dcs.cpp
@@ -2452,7 +2452,7 @@ int dcs_audio_device::preprocess_write(uint16_t data)
/* Basic DCS system with ADSP-2105 and 2k of SRAM (T-unit, V-unit, Killer Instinct) */
MACHINE_CONFIG_START(dcs_audio_device::add_mconfig_dcs )
- MCFG_CPU_ADD("dcs", ADSP2105, XTAL_10MHz)
+ MCFG_CPU_ADD("dcs", ADSP2105, XTAL(10'000'000))
MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */
MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device, timer_enable_callback)) /* callback for timer fired */
MCFG_CPU_PROGRAM_MAP(dcs_2k_program_map)
@@ -2555,7 +2555,7 @@ dcs2_audio_device::dcs2_audio_device(const machine_config &mconfig, device_type
}
MACHINE_CONFIG_START(dcs2_audio_device::add_mconfig_dcs2 )
- MCFG_CPU_ADD("dcs2", ADSP2115, XTAL_16MHz)
+ MCFG_CPU_ADD("dcs2", ADSP2115, XTAL(16'000'000))
MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */
MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device, timer_enable_callback)) /* callback for timer fired */
MCFG_CPU_PROGRAM_MAP(dcs2_2115_program_map)
@@ -2608,7 +2608,7 @@ MACHINE_CONFIG_START(dcs2_audio_2104_device::device_add_mconfig)
dcs2_audio_device::add_mconfig_dcs2(config);
- MCFG_CPU_REPLACE("dcs2", ADSP2104, XTAL_16MHz)
+ MCFG_CPU_REPLACE("dcs2", ADSP2104, XTAL(16'000'000))
MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */
MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device,timer_enable_callback)) /* callback for timer fired */
MCFG_CPU_PROGRAM_MAP(dcs2_2104_program_map)
@@ -2627,7 +2627,7 @@ dcs2_audio_dsio_device::dcs2_audio_dsio_device(const machine_config &mconfig, co
}
MACHINE_CONFIG_START(dcs2_audio_dsio_device::device_add_mconfig)
- MCFG_CPU_ADD("dsio", ADSP2181, XTAL_32MHz)
+ MCFG_CPU_ADD("dsio", ADSP2181, XTAL(32'000'000))
MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */
MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device, timer_enable_callback)) /* callback for timer fired */
MCFG_ADSP21XX_DMOVLAY_CB(WRITE32(dcs_audio_device, dmovlay_callback)) // callback for adsp 2181 dmovlay instruction
@@ -2668,7 +2668,7 @@ dcs2_audio_denver_device::dcs2_audio_denver_device(const machine_config &mconfig
}
MACHINE_CONFIG_START(dcs2_audio_denver_device::device_add_mconfig)
- MCFG_CPU_ADD("denver", ADSP2181, XTAL_33_333MHz)
+ MCFG_CPU_ADD("denver", ADSP2181, XTAL(33'333'000))
MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */
MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device, timer_enable_callback)) /* callback for timer fired */
MCFG_ADSP21XX_DMOVLAY_CB(WRITE32(dcs_audio_device, dmovlay_callback)) // callback for adsp 2181 dmovlay instruction
diff --git a/src/mame/audio/decobsmt.cpp b/src/mame/audio/decobsmt.cpp
index 9ad72bab4e6..3b8bcb04149 100644
--- a/src/mame/audio/decobsmt.cpp
+++ b/src/mame/audio/decobsmt.cpp
@@ -47,12 +47,12 @@ DEFINE_DEVICE_TYPE(DECOBSMT, decobsmt_device, "decobsmt", "Data East/Sega/Stern
//-------------------------------------------------
MACHINE_CONFIG_START(decobsmt_device::device_add_mconfig)
- MCFG_CPU_ADD(M6809_TAG, MC6809E, XTAL_24MHz / 12) // 68B09E U6 (E & Q = 2 MHz according to manual)
+ MCFG_CPU_ADD(M6809_TAG, MC6809E, XTAL(24'000'000) / 12) // 68B09E U6 (E & Q = 2 MHz according to manual)
MCFG_CPU_PROGRAM_MAP(decobsmt_map)
MCFG_CPU_PERIODIC_INT_DRIVER(decobsmt_device, decobsmt_firq_interrupt, 489) /* Fixed FIRQ of 489Hz as measured on real (pinball) machine */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_BSMT2000_ADD(BSMT_TAG, XTAL_24MHz)
+ MCFG_BSMT2000_ADD(BSMT_TAG, XTAL(24'000'000))
MCFG_DEVICE_ADDRESS_MAP(0, bsmt_map)
MCFG_BSMT2000_READY_CALLBACK(decobsmt_device, bsmt_ready_callback)
MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
diff --git a/src/mame/audio/dkong.cpp b/src/mame/audio/dkong.cpp
index 952977885a7..fd6a8f4a0c2 100644
--- a/src/mame/audio/dkong.cpp
+++ b/src/mame/audio/dkong.cpp
@@ -360,7 +360,7 @@ static DISCRETE_SOUND_START(dkong2b)
/************************************************/
/* Noise */
DISCRETE_TASK_START(1)
- DISCRETE_LFSR_NOISE(NODE_11, 1, 1, CLOCK_2VF, 1.0, 0, 0.5, &dkong_lfsr)
+ DISCRETE_LFSR_NOISE(NODE_11, 1, 1, CLOCK_2VF.dvalue(), 1.0, 0, 0.5, &dkong_lfsr)
DISCRETE_COUNTER(NODE_12, 1, 0, NODE_11, 0, 7, DISC_COUNT_UP, 0, DISC_CLK_ON_R_EDGE) /* LS161, IC 3J */
DISCRETE_TRANSFORM3(NODE_13,NODE_12,3,DK_SUP_V,"01>2*")
@@ -652,7 +652,7 @@ static DISCRETE_SOUND_START(radarscp)
/* Noise */
/************************************************/
- DISCRETE_LFSR_NOISE(NODE_11, 1, 1, CLOCK_2VF, 1.0, 0, 0.5, &dkong_lfsr)
+ DISCRETE_LFSR_NOISE(NODE_11, 1, 1, CLOCK_2VF.dvalue(), 1.0, 0, 0.5, &dkong_lfsr)
/* Clear (1) from SOUND6 */
DISCRETE_COUNTER(NODE_12, 1, DS_SOUND6_INV, NODE_11, 0, 15, DISC_COUNT_UP, 0, DISC_CLK_ON_R_EDGE) /* LS161, IC 3J */
DISCRETE_TRANSFORM3(NODE_13,NODE_12,0x04,DK_SUP_V,"01&1=2*") /*QC => SND02 */
@@ -1375,7 +1375,7 @@ MACHINE_CONFIG_DERIVED(dkong_state::radarscp1_audio, radarscp_audio)
/* tms memory controller */
MCFG_DEVICE_ADD("m58819", M58819, 0)
- MCFG_SOUND_ADD("tms", M58817, XTAL_640kHz)
+ MCFG_SOUND_ADD("tms", M58817, XTAL(640'000))
MCFG_TMS5110_M0_CB(DEVWRITELINE("m58819", tms6100_device, m0_w))
MCFG_TMS5110_M1_CB(DEVWRITELINE("m58819", tms6100_device, m1_w))
MCFG_TMS5110_ADDR_CB(DEVWRITE8("m58819", tms6100_device, add_w))
diff --git a/src/mame/audio/exidy.cpp b/src/mame/audio/exidy.cpp
index cc6c5649fbb..a35b169ec45 100644
--- a/src/mame/audio/exidy.cpp
+++ b/src/mame/audio/exidy.cpp
@@ -24,7 +24,7 @@
*
*************************************/
-#define CRYSTAL_OSC (XTAL_3_579545MHz)
+#define CRYSTAL_OSC (XTAL(3'579'545))
#define SH8253_CLOCK (CRYSTAL_OSC / 2)
#define SH6840_CLOCK (CRYSTAL_OSC / 4)
#define SH6532_CLOCK (CRYSTAL_OSC / 4)
@@ -196,9 +196,9 @@ void exidy_sound_device::sh6840_register_state_globals()
void exidy_sound_device::common_sh_start()
{
- int sample_rate = SH8253_CLOCK;
+ int sample_rate = SH8253_CLOCK.value();
- m_sh6840_clocks_per_sample = (int)((double)SH6840_CLOCK / (double)sample_rate * (double)(1 << 24));
+ m_sh6840_clocks_per_sample = (int)(SH6840_CLOCK.dvalue() / (double)sample_rate * (double)(1 << 24));
/* allocate the stream */
m_stream = machine().sound().stream_alloc(*this, 0, 1, sample_rate);
@@ -505,7 +505,7 @@ WRITE8_MEMBER( exidy_sound_device::sh8253_w )
m_sh8253_timer[chan].clstate = 0;
m_sh8253_timer[chan].count = (m_sh8253_timer[chan].count & 0x00ff) | ((data << 8) & 0xff00);
if (m_sh8253_timer[chan].count)
- m_sh8253_timer[chan].step = m_freq_to_step * (double)SH8253_CLOCK / (double)m_sh8253_timer[chan].count;
+ m_sh8253_timer[chan].step = m_freq_to_step * SH8253_CLOCK.dvalue() / m_sh8253_timer[chan].count;
else
m_sh8253_timer[chan].step = 0;
}
@@ -687,7 +687,7 @@ void venture_sound_device::device_start()
m_cvsd = machine().device<hc55516_device>("cvsd");
/* 8253 */
- m_freq_to_step = (double)(1 << 24) / (double)SH8253_CLOCK;
+ m_freq_to_step = ((1 << 24) / SH8253_CLOCK).dvalue();
save_item(NAME(m_riot_irq_state));
sh8253_register_state_globals();
@@ -837,7 +837,7 @@ MACHINE_CONFIG_END
*
*************************************/
-#define VICTORY_AUDIO_CPU_CLOCK (XTAL_3_579545MHz / 4)
+#define VICTORY_AUDIO_CPU_CLOCK (XTAL(3'579'545) / 4)
#define VICTORY_LOG_SOUND 0
@@ -937,7 +937,7 @@ void victory_sound_device::device_start()
m_cvsd = machine().device<hc55516_device>("cvsd");
/* 8253 */
- m_freq_to_step = (double)(1 << 24) / (double)SH8253_CLOCK;
+ m_freq_to_step = ((1 << 24) / SH8253_CLOCK).dvalue();
save_item(NAME(m_riot_irq_state));
sh8253_register_state_globals();
diff --git a/src/mame/audio/exidy440.cpp b/src/mame/audio/exidy440.cpp
index b9ad9b13faf..dfa6393db45 100644
--- a/src/mame/audio/exidy440.cpp
+++ b/src/mame/audio/exidy440.cpp
@@ -21,7 +21,7 @@
#define FADE_TO_ZERO 1
-#define EXIDY440_AUDIO_CLOCK (XTAL_12_9792MHz / 4)
+#define EXIDY440_AUDIO_CLOCK (XTAL(12'979'200) / 4)
#define EXIDY440_MC3418_CLOCK (EXIDY440_AUDIO_CLOCK / 4 / 16)
#define EXIDY440_MC3417_CLOCK (EXIDY440_AUDIO_CLOCK / 4 / 32)
diff --git a/src/mame/audio/galaxian.cpp b/src/mame/audio/galaxian.cpp
index ebd0efadf7d..1a0e9ff7a43 100644
--- a/src/mame/audio/galaxian.cpp
+++ b/src/mame/audio/galaxian.cpp
@@ -278,7 +278,7 @@ static DISCRETE_SOUND_START(galaxian)
/* since only a sample of the LFSR is latched @V2 we let the lfsr
* run at a lower speed
*/
- DISCRETE_LFSR_NOISE(NODE_150, 1, 1, RNG_RATE/100, 1.0, 0, 0.5, &galaxian_lfsr)
+ DISCRETE_LFSR_NOISE(NODE_150, 1, 1, RNG_RATE.dvalue()/100, 1.0, 0, 0.5, &galaxian_lfsr)
DISCRETE_SQUAREWFIX(NODE_151,1,60*264/2,1.0,50,0.5,0) /* 2V signal */
DISCRETE_LOGIC_DFLIPFLOP(NODE_152,1,1,NODE_151,NODE_150)
DISCRETE_TASK_END()
@@ -315,7 +315,7 @@ static DISCRETE_SOUND_START(galaxian)
* DISCRETE_COUNTER(NODE_132, 1, 0, NODE_130, 0, 15, DISC_COUNT_UP, 0, DISC_CLK_IS_FREQ)
* but there is a native choice:
*/
- DISCRETE_NOTE(NODE_132, 1, SOUND_CLOCK, GAL_INP_PITCH, 255, 15, DISC_CLK_IS_FREQ)
+ DISCRETE_NOTE(NODE_132, 1, SOUND_CLOCK.dvalue(), GAL_INP_PITCH, 255, 15, DISC_CLK_IS_FREQ)
/* from the 74393 (counter 2 above) only QA, QC, QD are used.
* We decode three here and use SUB_NODE(133,x) below to access.
diff --git a/src/mame/audio/gottlieb.cpp b/src/mame/audio/gottlieb.cpp
index d1d2e89242f..3e7234a847f 100644
--- a/src/mame/audio/gottlieb.cpp
+++ b/src/mame/audio/gottlieb.cpp
@@ -16,9 +16,9 @@
#include "sound/volt_reg.h"
-#define SOUND1_CLOCK XTAL_3_579545MHz
-#define SOUND2_CLOCK XTAL_4MHz
-#define SOUND2_SPEECH_CLOCK XTAL_3_12MHz
+#define SOUND1_CLOCK XTAL(3'579'545)
+#define SOUND2_CLOCK XTAL(4'000'000)
+#define SOUND2_SPEECH_CLOCK XTAL(3'120'000)
//**************************************************************************
diff --git a/src/mame/audio/harddriv.cpp b/src/mame/audio/harddriv.cpp
index 0c9fffc3aad..d5025bcce21 100644
--- a/src/mame/audio/harddriv.cpp
+++ b/src/mame/audio/harddriv.cpp
@@ -432,7 +432,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(harddriv_sound_board_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("soundcpu", M68000, XTAL_16MHz/2)
+ MCFG_CPU_ADD("soundcpu", M68000, XTAL(16'000'000)/2)
MCFG_CPU_PROGRAM_MAP(driversnd_68k_map)
MCFG_DEVICE_ADD("latch", LS259, 0) // 80R
@@ -443,7 +443,7 @@ MACHINE_CONFIG_START(harddriv_sound_board_device::device_add_mconfig)
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(INPUTLINE("sounddsp", INPUT_LINE_HALT)) MCFG_DEVCB_INVERT // RES320
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(harddriv_sound_board_device, led_w))
- MCFG_CPU_ADD("sounddsp", TMS32010, XTAL_20MHz)
+ MCFG_CPU_ADD("sounddsp", TMS32010, XTAL(20'000'000))
MCFG_CPU_PROGRAM_MAP(driversnd_dsp_program_map)
/* Data Map is internal to the CPU */
MCFG_CPU_IO_MAP(driversnd_dsp_io_map)
diff --git a/src/mame/audio/irem.cpp b/src/mame/audio/irem.cpp
index 83647a7e851..5aa0dd025d2 100644
--- a/src/mame/audio/irem.cpp
+++ b/src/mame/audio/irem.cpp
@@ -403,14 +403,14 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(m62_audio_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_ADD("iremsound", M6803, XTAL(3'579'545)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(m62_sound_map)
MCFG_CPU_IO_MAP(irem_sound_portmap)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay_45m", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ay_45m", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_RESISTOR_OUTPUT)
MCFG_AY8910_RES_LOADS(2000.0, 2000.0, 2000.0)
MCFG_AY8910_PORT_A_READ_CB(READ8(irem_audio_device, soundlatch_r))
@@ -419,7 +419,7 @@ MACHINE_CONFIG_START(m62_audio_device::device_add_mconfig)
MCFG_SOUND_ROUTE_EX(1, "snd_nl", 1.0, 1)
MCFG_SOUND_ROUTE_EX(2, "snd_nl", 1.0, 2)
- MCFG_SOUND_ADD("ay_45l", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ay_45l", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_RESISTOR_OUTPUT)
MCFG_AY8910_RES_LOADS(2000.0, 2000.0, 2000.0)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(irem_audio_device, ay8910_45L_porta_w))
@@ -427,13 +427,13 @@ MACHINE_CONFIG_START(m62_audio_device::device_add_mconfig)
MCFG_SOUND_ROUTE_EX(1, "snd_nl", 1.0, 4)
MCFG_SOUND_ROUTE_EX(2, "snd_nl", 1.0, 5)
- MCFG_SOUND_ADD("msm1", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_SOUND_ADD("msm1", MSM5205, XTAL(384'000)) /* verified on pcb */
MCFG_MSM5205_VCK_CALLBACK(INPUTLINE("iremsound", INPUT_LINE_NMI)) // driven through NPN inverter
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("msm2", msm5205_device, vclk_w)) // the first MSM5205 clocks the second
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* default to 4KHz, but can be changed at run time */
MCFG_SOUND_ROUTE_EX(0, "snd_nl", 1.0, 6)
- MCFG_SOUND_ADD("msm2", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_SOUND_ADD("msm2", MSM5205, XTAL(384'000)) /* verified on pcb */
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* default to 4KHz, but can be changed at run time, slave */
MCFG_SOUND_ROUTE_EX(0, "snd_nl", 1.0, 7)
@@ -473,27 +473,27 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m52_soundc_audio_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_ADD("iremsound", M6803, XTAL(3'579'545)) /* verified on pcb */
MCFG_CPU_IO_MAP(irem_sound_portmap)
MCFG_CPU_PROGRAM_MAP(m52_small_sound_map)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay_45m", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ay_45m", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT | AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(470, 0, 0)
MCFG_AY8910_PORT_A_READ_CB(READ8(irem_audio_device, soundlatch_r))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(irem_audio_device, ay8910_45M_portb_w))
MCFG_SOUND_ROUTE_EX(0, "filtermix", 1.0, 0)
- MCFG_SOUND_ADD("ay_45l", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ay_45l", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT | AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(470, 0, 0)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(irem_audio_device, ay8910_45L_porta_w))
MCFG_SOUND_ROUTE_EX(0, "filtermix", 1.0, 1)
- MCFG_SOUND_ADD("msm1", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_SOUND_ADD("msm1", MSM5205, XTAL(384'000)) /* verified on pcb */
MCFG_MSM5205_VCK_CALLBACK(INPUTLINE("iremsound", INPUT_LINE_NMI)) // driven through NPN inverter
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* default to 4KHz, but can be changed at run time */
MCFG_SOUND_ROUTE_EX(0, "filtermix", 1.0, 2)
@@ -507,33 +507,33 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m52_large_audio_device::device_add_mconfig) /* 10 yard fight */
/* basic machine hardware */
- MCFG_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_ADD("iremsound", M6803, XTAL(3'579'545)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(m52_large_sound_map)
MCFG_CPU_IO_MAP(irem_sound_portmap)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay_45m", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ay_45m", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT | AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(470, 0, 0)
MCFG_AY8910_PORT_A_READ_CB(READ8(irem_audio_device, soundlatch_r))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(irem_audio_device, ay8910_45M_portb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("ay_45l", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ay_45l", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT | AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(470, 0, 0)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(irem_audio_device, ay8910_45L_porta_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("msm1", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_SOUND_ADD("msm1", MSM5205, XTAL(384'000)) /* verified on pcb */
MCFG_MSM5205_VCK_CALLBACK(INPUTLINE("iremsound", INPUT_LINE_NMI)) // driven through NPN inverter
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("msm2", msm5205_device, vclk_w)) // the first MSM5205 clocks the second
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* default to 4KHz, but can be changed at run time */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("msm2", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_SOUND_ADD("msm2", MSM5205, XTAL(384'000)) /* verified on pcb */
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* default to 4KHz, but can be changed at run time, slave */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
diff --git a/src/mame/audio/midway.cpp b/src/mame/audio/midway.cpp
index 8c79a4d4db6..3fb238f7903 100644
--- a/src/mame/audio/midway.cpp
+++ b/src/mame/audio/midway.cpp
@@ -20,10 +20,10 @@
// CONSTANTS
//**************************************************************************
-#define SSIO_CLOCK XTAL_16MHz
-#define SOUNDSGOOD_CLOCK XTAL_16MHz
-#define TURBOCS_CLOCK XTAL_8MHz
-#define SQUAWKTALK_CLOCK XTAL_3_579545MHz
+#define SSIO_CLOCK XTAL(16'000'000)
+#define SOUNDSGOOD_CLOCK XTAL(16'000'000)
+#define TURBOCS_CLOCK XTAL(8'000'000)
+#define SQUAWKTALK_CLOCK XTAL(3'579'545)
diff --git a/src/mame/audio/rax.cpp b/src/mame/audio/rax.cpp
index 47bc9a690d6..bc62cfa53dd 100644
--- a/src/mame/audio/rax.cpp
+++ b/src/mame/audio/rax.cpp
@@ -488,7 +488,7 @@ acclaim_rax_device::acclaim_rax_device(const machine_config &mconfig, const char
//-------------------------------------------------
MACHINE_CONFIG_START(acclaim_rax_device::device_add_mconfig)
- MCFG_CPU_ADD("adsp", ADSP2181, XTAL_16_67MHz)
+ MCFG_CPU_ADD("adsp", ADSP2181, XTAL(16'670'000))
MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(acclaim_rax_device, adsp_sound_tx_callback)) /* callback for serial transmit */
MCFG_ADSP21XX_DMOVLAY_CB(WRITE32(acclaim_rax_device, dmovlay_callback)) // callback for adsp 2181 dmovlay instruction
MCFG_CPU_PROGRAM_MAP(adsp_program_map)
diff --git a/src/mame/audio/redalert.cpp b/src/mame/audio/redalert.cpp
index 32111653d09..ac54ee242d7 100644
--- a/src/mame/audio/redalert.cpp
+++ b/src/mame/audio/redalert.cpp
@@ -22,16 +22,16 @@
-#define REDALERT_AUDIO_PCB_CLOCK (XTAL_12_5MHz)
+#define REDALERT_AUDIO_PCB_CLOCK (XTAL(12'500'000))
#define REDALERT_AUDIO_CPU_CLOCK (REDALERT_AUDIO_PCB_CLOCK / 12)
#define REDALERT_AY8910_CLOCK (REDALERT_AUDIO_PCB_CLOCK / 6)
-#define REDALERT_AUDIO_CPU_IRQ_FREQ (1000000000 / PERIOD_OF_555_ASTABLE_NSEC(RES_K(120), RES_K(2.7), CAP_U(0.01)))
+#define REDALERT_AUDIO_CPU_IRQ_FREQ (1000000000.0 / PERIOD_OF_555_ASTABLE_NSEC(RES_K(120), RES_K(2.7), CAP_U(0.01)))
-#define REDALERT_VOICE_PCB_CLOCK (XTAL_6MHz)
+#define REDALERT_VOICE_PCB_CLOCK (XTAL(6'000'000))
#define REDALERT_VOICE_CPU_CLOCK (REDALERT_VOICE_PCB_CLOCK)
#define REDALERT_HC55516_CLOCK (REDALERT_VOICE_PCB_CLOCK / 256)
-#define DEMONEYE_AUDIO_PCB_CLOCK (XTAL_3_579545MHz)
+#define DEMONEYE_AUDIO_PCB_CLOCK (XTAL(3'579'545))
#define DEMONEYE_AUDIO_CPU_CLOCK (DEMONEYE_AUDIO_PCB_CLOCK / 4) /* what's the real divisor? */
#define DEMONEYE_AY8910_CLOCK (DEMONEYE_AUDIO_PCB_CLOCK / 2) /* what's the real divisor? */
diff --git a/src/mame/audio/s11c_bg.cpp b/src/mame/audio/s11c_bg.cpp
index 39d7ea21981..aef8dce6e48 100644
--- a/src/mame/audio/s11c_bg.cpp
+++ b/src/mame/audio/s11c_bg.cpp
@@ -57,11 +57,11 @@ void s11c_bg_device::data_w(uint8_t data)
}
MACHINE_CONFIG_START(s11c_bg_device::device_add_mconfig)
- MCFG_CPU_ADD("bgcpu", MC6809E, XTAL_8MHz / 4) // MC68B09E
+ MCFG_CPU_ADD("bgcpu", MC6809E, XTAL(8'000'000) / 4) // MC68B09E
MCFG_CPU_PROGRAM_MAP(s11c_bg_map)
MCFG_QUANTUM_TIME(attotime::from_hz(50))
- MCFG_YM2151_ADD("ym2151", XTAL_3_579545MHz) // "3.58 MHz" on schematics and parts list
+ MCFG_YM2151_ADD("ym2151", XTAL(3'579'545)) // "3.58 MHz" on schematics and parts list
MCFG_YM2151_IRQ_HANDLER(WRITELINE(s11c_bg_device, ym2151_irq_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, DEVICE_SELF_OWNER, 0.25)
diff --git a/src/mame/audio/scramble.cpp b/src/mame/audio/scramble.cpp
index a37f5fcac2f..e079f4051a1 100644
--- a/src/mame/audio/scramble.cpp
+++ b/src/mame/audio/scramble.cpp
@@ -22,7 +22,7 @@
#include "sound/ay8910.h"
#include "speaker.h"
-#define AD2083_TMS5110_CLOCK XTAL_640kHz
+#define AD2083_TMS5110_CLOCK XTAL(640'000)
/* The timer clock in Scramble which feeds the upper 4 bits of */
/* AY-3-8910 port A is based on the same clock */
diff --git a/src/mame/audio/t5182.cpp b/src/mame/audio/t5182.cpp
index 7044242425d..fc209d47f94 100644
--- a/src/mame/audio/t5182.cpp
+++ b/src/mame/audio/t5182.cpp
@@ -149,7 +149,7 @@ rom.
#include "emu.h"
#include "t5182.h"
-#define T5182_CLOCK XTAL_14_31818MHz/4
+#define T5182_CLOCK XTAL(14'318'181)/4
DEFINE_DEVICE_TYPE(T5182, t5182_device, "t5182", "T5182 MCU")
diff --git a/src/mame/audio/taito_en.cpp b/src/mame/audio/taito_en.cpp
index 9e1d9ed18f5..af48cd7c95f 100644
--- a/src/mame/audio/taito_en.cpp
+++ b/src/mame/audio/taito_en.cpp
@@ -273,11 +273,11 @@ WRITE_LINE_MEMBER(taito_en_device::duart_irq_handler)
MACHINE_CONFIG_START(taito_en_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("audiocpu", M68000, XTAL_30_4761MHz / 2)
+ MCFG_CPU_ADD("audiocpu", M68000, XTAL(30'476'100) / 2)
MCFG_CPU_PROGRAM_MAP(en_sound_map)
- MCFG_DEVICE_ADD("duart68681", MC68681, XTAL_16MHz / 4)
- MCFG_MC68681_SET_EXTERNAL_CLOCKS(XTAL_16MHz/2/8, XTAL_16MHz/2/16, XTAL_16MHz/2/16, XTAL_16MHz/2/8)
+ MCFG_DEVICE_ADD("duart68681", MC68681, XTAL(16'000'000) / 4)
+ MCFG_MC68681_SET_EXTERNAL_CLOCKS(XTAL(16'000'000)/2/8, XTAL(16'000'000)/2/16, XTAL(16'000'000)/2/16, XTAL(16'000'000)/2/8)
MCFG_MC68681_IRQ_CALLBACK(WRITELINE(taito_en_device, duart_irq_handler))
MCFG_DEVICE_ADD("mb87078", MB87078, 0)
@@ -287,7 +287,7 @@ MACHINE_CONFIG_START(taito_en_device::device_add_mconfig)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ensoniq", ES5505, XTAL_30_4761MHz / 2)
+ MCFG_SOUND_ADD("ensoniq", ES5505, XTAL(30'476'100) / 2)
MCFG_ES5505_REGION0("ensoniq.0")
MCFG_ES5505_REGION1("ensoniq.0")
MCFG_ES5506_CHANNELS(1)
diff --git a/src/mame/audio/taito_zm.cpp b/src/mame/audio/taito_zm.cpp
index 61062d99a79..8e8f0b59b67 100644
--- a/src/mame/audio/taito_zm.cpp
+++ b/src/mame/audio/taito_zm.cpp
@@ -170,14 +170,14 @@ WRITE16_MEMBER(taito_zoom_device::reg_address_w)
MACHINE_CONFIG_START(taito_zoom_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("mn10200", MN1020012A, XTAL_25MHz/2)
+ MCFG_CPU_ADD("mn10200", MN1020012A, XTAL(25'000'000)/2)
MCFG_MN10200_READ_PORT_CB(1, DEVREAD8(DEVICE_SELF, taito_zoom_device, tms_ctrl_r))
MCFG_MN10200_WRITE_PORT_CB(1, DEVWRITE8(DEVICE_SELF, taito_zoom_device, tms_ctrl_w))
MCFG_CPU_PROGRAM_MAP(taitozoom_mn_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60000))
- MCFG_ZSG2_ADD("zsg2", XTAL_25MHz)
+ MCFG_ZSG2_ADD("zsg2", XTAL(25'000'000))
// we assume the parent machine has created lspeaker/rspeaker
MCFG_SOUND_ROUTE(0, "^^lspeaker", 1.0)
diff --git a/src/mame/audio/timeplt.cpp b/src/mame/audio/timeplt.cpp
index d240998c957..391925f4b44 100644
--- a/src/mame/audio/timeplt.cpp
+++ b/src/mame/audio/timeplt.cpp
@@ -20,7 +20,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_14_31818MHz
+#define MASTER_CLOCK XTAL(14'318'181)
DEFINE_DEVICE_TYPE(TIMEPLT_AUDIO, timeplt_audio_device, "timplt_audio", "Time Pilot Audio")
diff --git a/src/mame/audio/tx1.cpp b/src/mame/audio/tx1.cpp
index 8c6da07ca78..9a2ce9ff73c 100644
--- a/src/mame/audio/tx1.cpp
+++ b/src/mame/audio/tx1.cpp
@@ -253,9 +253,9 @@ void tx1_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t
memset(outputs[1], 0, samples * sizeof(*outputs[1]));
/* 8253 outputs for the player/opponent engine sounds. */
- step_0 = m_pit8253.counts[0].val ? (TX1_PIT_CLOCK / m_pit8253.counts[0].val) * m_freq_to_step : 0;
- step_1 = m_pit8253.counts[1].val ? (TX1_PIT_CLOCK / m_pit8253.counts[1].val) * m_freq_to_step : 0;
- step_2 = m_pit8253.counts[2].val ? (TX1_PIT_CLOCK / m_pit8253.counts[2].val) * m_freq_to_step : 0;
+ step_0 = m_pit8253.counts[0].val ? (TX1_PIT_CLOCK / m_pit8253.counts[0].val * m_freq_to_step).value() : 0;
+ step_1 = m_pit8253.counts[1].val ? (TX1_PIT_CLOCK / m_pit8253.counts[1].val * m_freq_to_step).value() : 0;
+ step_2 = m_pit8253.counts[2].val ? (TX1_PIT_CLOCK / m_pit8253.counts[2].val * m_freq_to_step).value() : 0;
//gain_0 = tx1_engine_gains[m_ay_outputa & 0xf];
//gain_1 = tx1_engine_gains[m_ay_outputa >> 4];
@@ -492,8 +492,8 @@ void buggyboy_sound_device::sound_stream_update(sound_stream &stream, stream_sam
memset(outputs[1], 0, samples * sizeof(*outputs[1]));
/* 8253 outputs for the player/opponent buggy engine sounds. */
- step_0 = m_pit8253.counts[0].val ? (BUGGYBOY_PIT_CLOCK / m_pit8253.counts[0].val) * m_freq_to_step : 0;
- step_1 = m_pit8253.counts[1].val ? (BUGGYBOY_PIT_CLOCK / m_pit8253.counts[1].val) * m_freq_to_step : 0;
+ step_0 = m_pit8253.counts[0].val ? (BUGGYBOY_PIT_CLOCK / m_pit8253.counts[0].val * m_freq_to_step).value() : 0;
+ step_1 = m_pit8253.counts[1].val ? (BUGGYBOY_PIT_CLOCK / m_pit8253.counts[1].val * m_freq_to_step).value() : 0;
if (!strcmp(machine().system().name, "buggyboyjr"))
gain0 = BIT(m_ym2_outputb, 3) ? 1.0 : 2.0;
@@ -514,7 +514,7 @@ void buggyboy_sound_device::sound_stream_update(sound_stream &stream, stream_sam
pit1 = m_eng_voltages[(m_step1 >> 24) & 0xf];
/* Calculate the tyre screech noise source */
- for (i = 0; i < BUGGYBOY_NOISE_CLOCK / machine().sample_rate(); ++i)
+ for (i = 0; i < BUGGYBOY_NOISE_CLOCK.value() / machine().sample_rate(); ++i)
{
/* CD4006 is a 4-4-1-4-4-1 shift register */
int p13 = BIT(m_noise_lfsra, 3);
diff --git a/src/mame/audio/williams.cpp b/src/mame/audio/williams.cpp
index b074045848a..eee3eb58b26 100644
--- a/src/mame/audio/williams.cpp
+++ b/src/mame/audio/williams.cpp
@@ -41,14 +41,14 @@
#include "sound/volt_reg.h"
-#define NARC_MASTER_CLOCK XTAL_8MHz
-#define NARC_FM_CLOCK XTAL_3_579545MHz
+#define NARC_MASTER_CLOCK XTAL(8'000'000)
+#define NARC_FM_CLOCK XTAL(3'579'545)
-#define CVSD_MASTER_CLOCK XTAL_8MHz
-#define CVSD_FM_CLOCK XTAL_3_579545MHz
+#define CVSD_MASTER_CLOCK XTAL(8'000'000)
+#define CVSD_FM_CLOCK XTAL(3'579'545)
-#define ADPCM_MASTER_CLOCK XTAL_8MHz
-#define ADPCM_FM_CLOCK XTAL_3_579545MHz
+#define ADPCM_MASTER_CLOCK XTAL(8'000'000)
+#define ADPCM_FM_CLOCK XTAL(3'579'545)
diff --git a/src/mame/audio/wpcsnd.cpp b/src/mame/audio/wpcsnd.cpp
index 75b34c75f9d..3564ef176e9 100644
--- a/src/mame/audio/wpcsnd.cpp
+++ b/src/mame/audio/wpcsnd.cpp
@@ -67,7 +67,7 @@ uint8_t wpcsnd_device::data_r()
}
MACHINE_CONFIG_START(wpcsnd_device::device_add_mconfig)
- MCFG_CPU_ADD("bgcpu", MC6809E, XTAL_8MHz / 4) // MC68B09E
+ MCFG_CPU_ADD("bgcpu", MC6809E, XTAL(8'000'000) / 4) // MC68B09E
MCFG_CPU_PROGRAM_MAP(wpcsnd_map)
MCFG_QUANTUM_TIME(attotime::from_hz(50))
diff --git a/src/mame/audio/zaccaria.cpp b/src/mame/audio/zaccaria.cpp
index 90ebf16c7b1..fa031b72f0d 100644
--- a/src/mame/audio/zaccaria.cpp
+++ b/src/mame/audio/zaccaria.cpp
@@ -219,10 +219,10 @@ READ8_MEMBER(zac1b111xx_melody_base::melodypsg1_portb_r)
}
MACHINE_CONFIG_START(zac1b111xx_melody_base::device_add_mconfig)
- MCFG_CPU_ADD("melodycpu", M6802, XTAL_3_579545MHz) // verified on pcb
+ MCFG_CPU_ADD("melodycpu", M6802, XTAL(3'579'545)) // verified on pcb
MCFG_CPU_PROGRAM_MAP(zac1b111xx_melody_base_map)
- MCFG_DEVICE_ADD("timebase", CLOCK, XTAL_3_579545MHz/4096/2) // CPU clock divided using 4040 and half of 74LS74
+ MCFG_DEVICE_ADD("timebase", CLOCK, XTAL(3'579'545)/4096/2) // CPU clock divided using 4040 and half of 74LS74
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("melodypia", pia6821_device, cb1_w))
MCFG_DEVICE_ADD("melodypia", PIA6821, 0)
@@ -232,10 +232,10 @@ MACHINE_CONFIG_START(zac1b111xx_melody_base::device_add_mconfig)
MCFG_PIA_IRQA_HANDLER(INPUTLINE("melodycpu", INPUT_LINE_NMI))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("melodycpu", M6802_IRQ_LINE))
- MCFG_SOUND_ADD("melodypsg1", AY8910, XTAL_3_579545MHz/2) // CPU clock divided using 4040
+ MCFG_SOUND_ADD("melodypsg1", AY8910, XTAL(3'579'545)/2) // CPU clock divided using 4040
MCFG_AY8910_PORT_B_READ_CB(READ8(zac1b111xx_melody_base, melodypsg1_portb_r))
- MCFG_SOUND_ADD("melodypsg2", AY8910, XTAL_3_579545MHz/2) // CPU clock divided using 4040
+ MCFG_SOUND_ADD("melodypsg2", AY8910, XTAL(3'579'545)/2) // CPU clock divided using 4040
MACHINE_CONFIG_END
void zac1b111xx_melody_base::device_start()
@@ -419,7 +419,7 @@ MACHINE_CONFIG_START(zac1b11142_audio_device::device_add_mconfig)
MCFG_SOUND_ROUTE_EX(1, "sound_nl", 1.0, 4)
MCFG_SOUND_ROUTE_EX(2, "sound_nl", 1.0, 5)
- MCFG_CPU_ADD("audiocpu", M6802, XTAL_3_579545MHz) // verified on pcb
+ MCFG_CPU_ADD("audiocpu", M6802, XTAL(3'579'545)) // verified on pcb
MCFG_CPU_PROGRAM_MAP(zac1b11142_audio_map)
MCFG_DEVICE_ADD("pia_1i", PIA6821, 0)
diff --git a/src/mame/drivers/1942.cpp b/src/mame/drivers/1942.cpp
index 75c0f88315a..b2cdaf43952 100644
--- a/src/mame/drivers/1942.cpp
+++ b/src/mame/drivers/1942.cpp
@@ -62,12 +62,12 @@ correctly.
***************************************************************************/
/* 12mhz OSC */
-#define MASTER_CLOCK (XTAL_12MHz)
+#define MASTER_CLOCK (XTAL(12'000'000))
#define MAIN_CPU_CLOCK (MASTER_CLOCK/3)
#define SOUND_CPU_CLOCK (MASTER_CLOCK/4)
#define AUDIO_CLOCK (MASTER_CLOCK/8)
/* 20mhz OSC - both Z80s are 4 MHz */
-#define MASTER_CLOCK_1942P (XTAL_20MHz)
+#define MASTER_CLOCK_1942P (XTAL(20'000'000))
#define MAIN_CPU_CLOCK_1942P (MASTER_CLOCK_1942P/5)
#define SOUND_CPU_CLOCK_1942P (MASTER_CLOCK_1942P/5)
#define AUDIO_CLOCK_1942P (MASTER_CLOCK_1942P/16)
diff --git a/src/mame/drivers/1943.cpp b/src/mame/drivers/1943.cpp
index 9a73b023372..4ff2f24c5de 100644
--- a/src/mame/drivers/1943.cpp
+++ b/src/mame/drivers/1943.cpp
@@ -312,11 +312,11 @@ void _1943_state::machine_reset()
MACHINE_CONFIG_START(_1943_state::_1943)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(c1943_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", _1943_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/8) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/8) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_PERIODIC_INT_DRIVER(_1943_state, irq0_line_hold, 4*60)
@@ -341,13 +341,13 @@ MACHINE_CONFIG_START(_1943_state::_1943)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_24MHz/16) /* verified on pcb */
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(24'000'000)/16) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.10)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL_24MHz/16) /* verified on pcb */
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL(24'000'000)/16) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
diff --git a/src/mame/drivers/1945kiii.cpp b/src/mame/drivers/1945kiii.cpp
index d144ef80137..c6efa99b79b 100644
--- a/src/mame/drivers/1945kiii.cpp
+++ b/src/mame/drivers/1945kiii.cpp
@@ -50,7 +50,7 @@ Notes:
#include "screen.h"
#include "speaker.h"
-#define MASTER_CLOCK XTAL_16MHz
+#define MASTER_CLOCK XTAL(16'000'000)
class k3_state : public driver_device
diff --git a/src/mame/drivers/20pacgal.cpp b/src/mame/drivers/20pacgal.cpp
index 4a7298ed0a7..a0093d6a41f 100644
--- a/src/mame/drivers/20pacgal.cpp
+++ b/src/mame/drivers/20pacgal.cpp
@@ -100,7 +100,7 @@ Graphics: CY37256P160-83AC x 2 (Ultra37000 CPLD family - 160 pin TQFP, 256 Macro
*
*************************************/
-#define MASTER_CLOCK (XTAL_73_728MHz)
+#define MASTER_CLOCK (XTAL(73'728'000))
#define MAIN_CPU_CLOCK (MASTER_CLOCK / 4) /* divider is either 3 or 4 */
#define NAMCO_AUDIO_CLOCK (MASTER_CLOCK / 4 / 6 / 32)
diff --git a/src/mame/drivers/30test.cpp b/src/mame/drivers/30test.cpp
index c7bfc309529..92244fbdd09 100644
--- a/src/mame/drivers/30test.cpp
+++ b/src/mame/drivers/30test.cpp
@@ -50,7 +50,7 @@ http://blogs.yahoo.co.jp/nadegatayosoyuki/59285865.html
#include "30test.lh"
-#define MAIN_CLOCK XTAL_16MHz
+#define MAIN_CLOCK XTAL(16'000'000)
class namco_30test_state : public driver_device
{
diff --git a/src/mame/drivers/3do.cpp b/src/mame/drivers/3do.cpp
index c3fd5175044..ea5a19ae4a3 100644
--- a/src/mame/drivers/3do.cpp
+++ b/src/mame/drivers/3do.cpp
@@ -104,7 +104,7 @@ Part list of Goldstar 3DO Interactive Multiplayer
#define X2_CLOCK_PAL 59000000
#define X2_CLOCK_NTSC 49090000
-#define X601_CLOCK XTAL_16_9344MHz
+#define X601_CLOCK XTAL(16'934'400)
static ADDRESS_MAP_START( 3do_mem, AS_PROGRAM, 32, _3do_state )
@@ -157,7 +157,7 @@ void _3do_state::machine_reset()
MACHINE_CONFIG_START(_3do_state::_3do)
/* Basic machine hardware */
- MCFG_CPU_ADD( "maincpu", ARM7_BE, XTAL_50MHz/4 )
+ MCFG_CPU_ADD( "maincpu", ARM7_BE, XTAL(50'000'000)/4 )
MCFG_CPU_PROGRAM_MAP( 3do_mem)
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -177,7 +177,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(_3do_state::_3do_pal)
/* Basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM7_BE, XTAL_50MHz/4 )
+ MCFG_CPU_ADD("maincpu", ARM7_BE, XTAL(50'000'000)/4 )
MCFG_CPU_PROGRAM_MAP( 3do_mem)
MCFG_NVRAM_ADD_1FILL("nvram")
diff --git a/src/mame/drivers/3x3puzzl.cpp b/src/mame/drivers/3x3puzzl.cpp
index 5e68d4e35c1..419b01b8762 100644
--- a/src/mame/drivers/3x3puzzl.cpp
+++ b/src/mame/drivers/3x3puzzl.cpp
@@ -46,7 +46,7 @@ Notes:
#include "screen.h"
#include "speaker.h"
-#define MAIN_CLOCK XTAL_10MHz
+#define MAIN_CLOCK XTAL(10'000'000)
class _3x3puzzle_state : public driver_device
{
@@ -405,7 +405,7 @@ MACHINE_CONFIG_START(_3x3puzzle_state::_3x3puzzle)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_4MHz/4, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(4'000'000)/4, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/4004clk.cpp b/src/mame/drivers/4004clk.cpp
index 90e6cb1202c..5b087e2b5a1 100644
--- a/src/mame/drivers/4004clk.cpp
+++ b/src/mame/drivers/4004clk.cpp
@@ -127,7 +127,7 @@ void nixieclock_state::machine_start()
MACHINE_CONFIG_START(nixieclock_state::_4004clk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I4004, XTAL_5MHz / 8)
+ MCFG_CPU_ADD("maincpu", I4004, XTAL(5'000'000) / 8)
MCFG_I4004_ROM_MAP(4004clk_rom)
MCFG_I4004_RAM_MEMORY_MAP(4004clk_mem)
MCFG_I4004_ROM_PORTS_MAP(4004clk_rp)
diff --git a/src/mame/drivers/4enlinea.cpp b/src/mame/drivers/4enlinea.cpp
index 011e0d07682..95cb86b981d 100644
--- a/src/mame/drivers/4enlinea.cpp
+++ b/src/mame/drivers/4enlinea.cpp
@@ -196,9 +196,9 @@
#include "speaker.h"
-#define MAIN_CLOCK XTAL_16MHz
-#define SEC_CLOCK XTAL_8MHz
-#define HCGA_CLOCK XTAL_14_31818MHz
+#define MAIN_CLOCK XTAL(16'000'000)
+#define SEC_CLOCK XTAL(8'000'000)
+#define HCGA_CLOCK XTAL(14'318'181)
#define PRG_CPU_CLOCK MAIN_CLOCK /2 /* 8 MHz. (measured) */
#define SND_CPU_CLOCK SEC_CLOCK /2 /* 4 MHz. (measured) */
diff --git a/src/mame/drivers/4enraya.cpp b/src/mame/drivers/4enraya.cpp
index 55751ff44e8..ad1586deb54 100644
--- a/src/mame/drivers/4enraya.cpp
+++ b/src/mame/drivers/4enraya.cpp
@@ -156,7 +156,7 @@
#include "screen.h"
#include "speaker.h"
-#define MAIN_CLOCK XTAL_8MHz
+#define MAIN_CLOCK XTAL(8'000'000)
/***********************************
diff --git a/src/mame/drivers/4roses.cpp b/src/mame/drivers/4roses.cpp
index 0faefbd4d2d..1b1c1b06736 100644
--- a/src/mame/drivers/4roses.cpp
+++ b/src/mame/drivers/4roses.cpp
@@ -184,7 +184,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_16MHz
+#define MASTER_CLOCK XTAL(16'000'000)
class _4roses_state : public funworld_state
{
diff --git a/src/mame/drivers/5clown.cpp b/src/mame/drivers/5clown.cpp
index 0c9dbb8f000..8ec6f6f2be3 100644
--- a/src/mame/drivers/5clown.cpp
+++ b/src/mame/drivers/5clown.cpp
@@ -452,7 +452,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_10MHz
+#define MASTER_CLOCK XTAL(10'000'000)
class _5clown_state : public driver_device
diff --git a/src/mame/drivers/8080bw.cpp b/src/mame/drivers/8080bw.cpp
index e678c0e1cbe..254de8d1d28 100644
--- a/src/mame/drivers/8080bw.cpp
+++ b/src/mame/drivers/8080bw.cpp
@@ -811,7 +811,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(_8080bw_state::spacecom)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080A, XTAL_18MHz / 10) // divider guessed
+ MCFG_CPU_ADD("maincpu", I8080A, XTAL(18'000'000) / 10) // divider guessed
// TODO: move irq handling away from mw8080.c, this game runs on custom hardware
MCFG_CPU_PROGRAM_MAP(spacecom_map)
MCFG_CPU_IO_MAP(spacecom_io_map)
@@ -928,7 +928,7 @@ MACHINE_CONFIG_DERIVED(_8080bw_state::invrvnge, mw8080bw_root)
MCFG_WATCHDOG_ADD("watchdog")
- MCFG_CPU_ADD("audiocpu", M6808, XTAL_4MHz/2) // MC6808P
+ MCFG_CPU_ADD("audiocpu", M6808, XTAL(4'000'000)/2) // MC6808P
MCFG_CPU_PROGRAM_MAP(invrvnge_sound_map)
/* add shifter */
@@ -945,7 +945,7 @@ MACHINE_CONFIG_DERIVED(_8080bw_state::invrvnge, mw8080bw_root)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_4MHz/2)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(4'000'000)/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -1129,7 +1129,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(_8080bw_state::escmars)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL_18MHz / 10) // divider guessed
+ MCFG_CPU_ADD("maincpu", I8080, XTAL(18'000'000) / 10) // divider guessed
MCFG_CPU_PROGRAM_MAP(escmars_map)
MCFG_CPU_IO_MAP(lrescue_io_map)
@@ -2645,7 +2645,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(_8080bw_state::shuttlei)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL_18MHz / 10) // divider guessed
+ MCFG_CPU_ADD("maincpu", I8080, XTAL(18'000'000) / 10) // divider guessed
// TODO: move irq handling away from mw8080.c, this game runs on custom hardware
MCFG_CPU_PROGRAM_MAP(shuttlei_map)
MCFG_CPU_IO_MAP(shuttlei_io_map)
diff --git a/src/mame/drivers/a5105.cpp b/src/mame/drivers/a5105.cpp
index 7815573cd83..0fb48d07aef 100644
--- a/src/mame/drivers/a5105.cpp
+++ b/src/mame/drivers/a5105.cpp
@@ -559,7 +559,7 @@ static const z80_daisy_config a5105_daisy_chain[] =
MACHINE_CONFIG_START(a5105_state::a5105)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_15MHz / 4)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(15'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(a5105_mem)
MCFG_CPU_IO_MAP(a5105_io)
MCFG_Z80_DAISY_CHAIN(a5105_daisy_chain)
@@ -583,17 +583,17 @@ MACHINE_CONFIG_START(a5105_state::a5105)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
- MCFG_DEVICE_ADD("upd7220", UPD7220, XTAL_15MHz / 16) // unk clock
+ MCFG_DEVICE_ADD("upd7220", UPD7220, XTAL(15'000'000) / 16) // unk clock
MCFG_DEVICE_ADDRESS_MAP(0, upd7220_map)
MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(a5105_state, hgdc_display_pixels)
MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(a5105_state, hgdc_draw_text)
- MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL_15MHz / 4)
+ MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL(15'000'000) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", 0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg2))
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg3))
- MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL_15MHz / 4)
+ MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(15'000'000) / 4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_CASSETTE_ADD( "cassette" )
diff --git a/src/mame/drivers/a51xx.cpp b/src/mame/drivers/a51xx.cpp
index 4719976a8fd..aabb433950f 100644
--- a/src/mame/drivers/a51xx.cpp
+++ b/src/mame/drivers/a51xx.cpp
@@ -116,7 +116,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(a51xx_state::a5120)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(a5120_mem)
MCFG_CPU_IO_MAP(a5120_io)
diff --git a/src/mame/drivers/a6809.cpp b/src/mame/drivers/a6809.cpp
index 3538f30f91e..ccb87364c00 100644
--- a/src/mame/drivers/a6809.cpp
+++ b/src/mame/drivers/a6809.cpp
@@ -223,7 +223,7 @@ void a6809_state::kbd_put(u8 data)
MACHINE_CONFIG_START(a6809_state::a6809)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(a6809_mem)
MCFG_CPU_IO_MAP(a6809_io)
MCFG_MACHINE_RESET_OVERRIDE(a6809_state, a6809)
@@ -243,11 +243,11 @@ MACHINE_CONFIG_START(a6809_state::a6809)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* Devices */
- MCFG_DEVICE_ADD("via", VIA6522, XTAL_4MHz / 4)
+ MCFG_DEVICE_ADD("via", VIA6522, XTAL(4'000'000) / 4)
MCFG_VIA6522_CB2_HANDLER(WRITELINE(a6809_state, cass_w))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
- MCFG_MC6845_ADD("mc6845", HD6845, "screen", XTAL_4MHz / 2)
+ MCFG_MC6845_ADD("mc6845", HD6845, "screen", XTAL(4'000'000) / 2)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(12)
diff --git a/src/mame/drivers/a7150.cpp b/src/mame/drivers/a7150.cpp
index 1b028b220f8..0c7b9afca88 100644
--- a/src/mame/drivers/a7150.cpp
+++ b/src/mame/drivers/a7150.cpp
@@ -425,7 +425,7 @@ static const z80_daisy_config k7070_daisy_chain[] =
* (framebuffer and terminal should be slot devices.)
*/
MACHINE_CONFIG_START(a7150_state::a7150)
- MCFG_CPU_ADD("maincpu", I8086, XTAL_9_832MHz/2)
+ MCFG_CPU_ADD("maincpu", I8086, XTAL(9'832'000)/2)
MCFG_CPU_PROGRAM_MAP(a7150_mem)
MCFG_CPU_IO_MAP(a7150_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
@@ -440,10 +440,10 @@ MACHINE_CONFIG_START(a7150_state::a7150)
MCFG_I8255_OUT_PORTC_CB(WRITE8(a7150_state, ppi_c_w))
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_14_7456MHz/4)
+ MCFG_PIT8253_CLK0(XTAL(14'745'600)/4)
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir2_w))
- MCFG_PIT8253_CLK1(XTAL_14_7456MHz/4)
- MCFG_PIT8253_CLK2(XTAL_14_7456MHz/4)
+ MCFG_PIT8253_CLK1(XTAL(14'745'600)/4)
+ MCFG_PIT8253_CLK2(XTAL(14'745'600)/4)
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(a7150_state, a7150_tmr2_w))
MCFG_DEVICE_ADD("uart8251", I8251, 0)
@@ -464,7 +464,7 @@ MACHINE_CONFIG_START(a7150_state::a7150)
MCFG_ISBC_215_IRQ(DEVWRITELINE("pic8259", pic8259_device, ir5_w))
// KGS K7070 graphics terminal controlling ABG K7072 framebuffer
- MCFG_CPU_ADD("gfxcpu", Z80, XTAL_16MHz/4)
+ MCFG_CPU_ADD("gfxcpu", Z80, XTAL(16'000'000)/4)
MCFG_CPU_PROGRAM_MAP(k7070_cpu_mem)
MCFG_CPU_IO_MAP(k7070_cpu_io)
MCFG_Z80_DAISY_CHAIN(k7070_daisy_chain)
@@ -476,7 +476,7 @@ MACHINE_CONFIG_START(a7150_state::a7150)
MCFG_ADDRESS_MAP_BANK_DATA_WIDTH(8)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x10000)
- MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_16MHz/3)
+ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(16'000'000)/3)
MCFG_Z80CTC_INTR_CB(INPUTLINE("gfxcpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(Z80SIO_TAG, z80sio_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80SIO_TAG, z80sio_device, txca_w))
@@ -502,7 +502,7 @@ MACHINE_CONFIG_START(a7150_state::a7150)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80sio_device, rxb_w))
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
- MCFG_SCREEN_RAW_PARAMS( XTAL_16MHz, 737,0,640, 431,0,400 )
+ MCFG_SCREEN_RAW_PARAMS( XTAL(16'000'000), 737,0,640, 431,0,400 )
MCFG_SCREEN_UPDATE_DRIVER(a7150_state, screen_update_k7072)
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD_MONOCHROME("palette")
diff --git a/src/mame/drivers/a7800.cpp b/src/mame/drivers/a7800.cpp
index 893b3fbd35f..bf7b5203236 100644
--- a/src/mame/drivers/a7800.cpp
+++ b/src/mame/drivers/a7800.cpp
@@ -108,7 +108,7 @@
#include "softlist.h"
#include "speaker.h"
-#define A7800_NTSC_Y1 XTAL_14_31818MHz
+#define A7800_NTSC_Y1 XTAL(14'318'181)
#define CLK_PAL 1773447
diff --git a/src/mame/drivers/aa310.cpp b/src/mame/drivers/aa310.cpp
index 7ab0ef2f9c5..84b334394d8 100644
--- a/src/mame/drivers/aa310.cpp
+++ b/src/mame/drivers/aa310.cpp
@@ -399,7 +399,7 @@ WRITE_LINE_MEMBER( archimedes_state::a310_kart_rx_w )
MACHINE_CONFIG_START(aa310_state::aa310)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM, XTAL_24MHz / 3) /* ARM2 8 MHz */
+ MCFG_CPU_ADD("maincpu", ARM, XTAL(24'000'000) / 3) /* ARM2 8 MHz */
MCFG_CPU_PROGRAM_MAP(aa310_mem)
MCFG_ARM_COPRO(VL86C020)
@@ -412,7 +412,7 @@ MACHINE_CONFIG_START(aa310_state::aa310)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_16MHz,1024,0,735,624/2,0,292) // RiscOS 3 default screen settings
+ MCFG_SCREEN_RAW_PARAMS(XTAL(16'000'000),1024,0,735,624/2,0,292) // RiscOS 3 default screen settings
MCFG_SCREEN_UPDATE_DRIVER(archimedes_state, screen_update)
MCFG_PALETTE_ADD("palette", 32768)
@@ -504,7 +504,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(aa310_state::aa540, aa310)
MCFG_CPU_MODIFY("maincpu") // ARM3
- MCFG_CPU_CLOCK(XTAL_52MHz / 2)
+ MCFG_CPU_CLOCK(XTAL(52'000'000) / 2)
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("4M")
@@ -517,7 +517,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(aa310_state::aa5000, aa310)
MCFG_CPU_MODIFY("maincpu") // ARM3
- MCFG_CPU_CLOCK(XTAL_50MHz / 2)
+ MCFG_CPU_CLOCK(XTAL(50'000'000) / 2)
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("2M")
@@ -530,7 +530,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(aa310_state::aa4, aa5000)
MCFG_CPU_MODIFY("maincpu") // ARM3
- MCFG_CPU_CLOCK(XTAL_24MHz)
+ MCFG_CPU_CLOCK(XTAL(24'000'000))
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -548,7 +548,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(aa310_state::aa3010, aa310)
MCFG_CPU_MODIFY("maincpu") // ARM250
- MCFG_CPU_CLOCK(XTAL_72MHz / 6)
+ MCFG_CPU_CLOCK(XTAL(72'000'000) / 6)
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("1M")
diff --git a/src/mame/drivers/abc1600.cpp b/src/mame/drivers/abc1600.cpp
index a806e42f31b..0b0fee776be 100644
--- a/src/mame/drivers/abc1600.cpp
+++ b/src/mame/drivers/abc1600.cpp
@@ -875,7 +875,7 @@ void abc1600_state::machine_reset()
MACHINE_CONFIG_START(abc1600_state::abc1600)
// basic machine hardware
- MCFG_CPU_ADD(MC68008P8_TAG, M68008, XTAL_64MHz/8)
+ MCFG_CPU_ADD(MC68008P8_TAG, M68008, XTAL(64'000'000)/8)
MCFG_CPU_PROGRAM_MAP(abc1600_mem)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(abc1600_state,abc1600_int_ack)
@@ -885,7 +885,7 @@ MACHINE_CONFIG_START(abc1600_state::abc1600)
// devices
MCFG_ABC1600_MAC_ADD(MC68008P8_TAG, mac_mem)
- MCFG_DEVICE_ADD(Z8410AB1_0_TAG, Z80DMA, XTAL_64MHz/16)
+ MCFG_DEVICE_ADD(Z8410AB1_0_TAG, Z80DMA, XTAL(64'000'000)/16)
MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(abc1600_state, dbrq_w))
MCFG_Z80DMA_OUT_BAO_CB(DEVWRITELINE(Z8410AB1_1_TAG, z80dma_device, bai_w))
MCFG_Z80DMA_IN_MREQ_CB(DEVREAD8(ABC1600_MAC_TAG, abc1600_mac_device, dma0_mreq_r))
@@ -893,7 +893,7 @@ MACHINE_CONFIG_START(abc1600_state::abc1600)
MCFG_Z80DMA_IN_IORQ_CB(DEVREAD8(ABC1600_MAC_TAG, abc1600_mac_device, dma0_iorq_r))
MCFG_Z80DMA_OUT_IORQ_CB(DEVWRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma0_iorq_w))
- MCFG_DEVICE_ADD(Z8410AB1_1_TAG, Z80DMA, XTAL_64MHz/16)
+ MCFG_DEVICE_ADD(Z8410AB1_1_TAG, Z80DMA, XTAL(64'000'000)/16)
MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(abc1600_state, dbrq_w))
MCFG_Z80DMA_OUT_BAO_CB(DEVWRITELINE(Z8410AB1_2_TAG, z80dma_device, bai_w))
MCFG_Z80DMA_IN_MREQ_CB(DEVREAD8(ABC1600_MAC_TAG, abc1600_mac_device, dma1_mreq_r))
@@ -901,24 +901,24 @@ MACHINE_CONFIG_START(abc1600_state::abc1600)
MCFG_Z80DMA_IN_IORQ_CB(DEVREAD8(ABC1600_MAC_TAG, abc1600_mac_device, dma1_iorq_r))
MCFG_Z80DMA_OUT_IORQ_CB(DEVWRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma1_iorq_w))
- MCFG_DEVICE_ADD(Z8410AB1_2_TAG, Z80DMA, XTAL_64MHz/16)
+ MCFG_DEVICE_ADD(Z8410AB1_2_TAG, Z80DMA, XTAL(64'000'000)/16)
MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(abc1600_state, dbrq_w))
MCFG_Z80DMA_IN_MREQ_CB(DEVREAD8(ABC1600_MAC_TAG, abc1600_mac_device, dma2_mreq_r))
MCFG_Z80DMA_OUT_MREQ_CB(DEVWRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma2_mreq_w))
MCFG_Z80DMA_IN_IORQ_CB(DEVREAD8(ABC1600_MAC_TAG, abc1600_mac_device, dma2_iorq_r))
MCFG_Z80DMA_OUT_IORQ_CB(DEVWRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma2_iorq_w))
- MCFG_DEVICE_ADD(Z8470AB1_TAG, Z80DART, XTAL_64MHz/16)
+ MCFG_DEVICE_ADD(Z8470AB1_TAG, Z80DART, XTAL(64'000'000)/16)
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(ABC_KEYBOARD_PORT_TAG, abc_keyboard_port_device, txd_w))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(MC68008P8_TAG, M68K_IRQ_5)) // shared with SCC
- MCFG_DEVICE_ADD(Z8530B1_TAG, SCC8530, XTAL_64MHz/16)
+ MCFG_DEVICE_ADD(Z8530B1_TAG, SCC8530, XTAL(64'000'000)/16)
MCFG_Z8530_INTRQ_CALLBACK(INPUTLINE(MC68008P8_TAG, M68K_IRQ_5))
- MCFG_DEVICE_ADD(Z8536B1_TAG, Z8536, XTAL_64MHz/16)
+ MCFG_DEVICE_ADD(Z8536B1_TAG, Z8536, XTAL(64'000'000)/16)
MCFG_Z8536_IRQ_CALLBACK(INPUTLINE(MC68008P8_TAG, M68K_IRQ_2))
MCFG_Z8536_PA_IN_CALLBACK(READ8(abc1600_state, cio_pa_r))
MCFG_Z8536_PB_IN_CALLBACK(READ8(abc1600_state, cio_pb_r))
@@ -928,9 +928,9 @@ MACHINE_CONFIG_START(abc1600_state::abc1600)
MCFG_NMC9306_ADD(NMC9306_TAG)
- MCFG_E0516_ADD(E050_C16PC_TAG, XTAL_32_768kHz)
+ MCFG_E0516_ADD(E050_C16PC_TAG, XTAL(32'768))
- MCFG_FD1797_ADD(SAB1797_02P_TAG, XTAL_64MHz/64)
+ MCFG_FD1797_ADD(SAB1797_02P_TAG, XTAL(64'000'000)/64)
MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(Z8536B1_TAG, z8536_device, pb7_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(abc1600_state, fdc_drq_w))
diff --git a/src/mame/drivers/abc80.cpp b/src/mame/drivers/abc80.cpp
index 767c537efea..333289cc441 100644
--- a/src/mame/drivers/abc80.cpp
+++ b/src/mame/drivers/abc80.cpp
@@ -485,7 +485,7 @@ QUICKLOAD_LOAD_MEMBER( abc80_state, bac )
MACHINE_CONFIG_START(abc80_state::abc80)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_11_9808MHz/2/2) // 2.9952 MHz
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(11'980'800)/2/2) // 2.9952 MHz
MCFG_CPU_PROGRAM_MAP(abc80_mem)
MCFG_CPU_IO_MAP(abc80_io)
MCFG_Z80_DAISY_CHAIN(abc80_daisy_chain)
@@ -511,7 +511,7 @@ MACHINE_CONFIG_START(abc80_state::abc80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
- MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL_11_9808MHz/2/2)
+ MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(11'980'800)/2/2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(READ8(abc80_state, pio_pa_r))
MCFG_Z80PIO_IN_PB_CB(READ8(abc80_state, pio_pb_r))
diff --git a/src/mame/drivers/ac1.cpp b/src/mame/drivers/ac1.cpp
index 4244f8ea07a..7dfec2d39b0 100644
--- a/src/mame/drivers/ac1.cpp
+++ b/src/mame/drivers/ac1.cpp
@@ -128,11 +128,11 @@ INPUT_PORTS_END
/* Machine driver */
MACHINE_CONFIG_START(ac1_state::ac1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(ac1_mem)
MCFG_CPU_IO_MAP(ac1_io)
- MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL_8MHz / 4)
+ MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(8'000'000) / 4)
MCFG_Z80PIO_IN_PA_CB(READ8(ac1_state, ac1_port_a_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(ac1_state, ac1_port_a_w))
MCFG_Z80PIO_IN_PB_CB(READ8(ac1_state, ac1_port_b_r))
diff --git a/src/mame/drivers/accomm.cpp b/src/mame/drivers/accomm.cpp
index 87127e02e9d..7e631ac19a5 100644
--- a/src/mame/drivers/accomm.cpp
+++ b/src/mame/drivers/accomm.cpp
@@ -829,7 +829,7 @@ static INPUT_PORTS_START( accomm )
INPUT_PORTS_END
MACHINE_CONFIG_START(accomm_state::accomm)
- MCFG_CPU_ADD("maincpu", G65816, XTAL_16MHz / 8)
+ MCFG_CPU_ADD("maincpu", G65816, XTAL(16'000'000) / 8)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", accomm_state, vbl_int)
@@ -861,7 +861,7 @@ MACHINE_CONFIG_START(accomm_state::accomm)
/* rtc pcf8573 */
/* via */
- MCFG_DEVICE_ADD("via6522", VIA6522, XTAL_16MHz / 16)
+ MCFG_DEVICE_ADD("via6522", VIA6522, XTAL(16'000'000) / 16)
MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8("cent_data_out", output_latch_device, write))
MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE("centronics", centronics_device, write_strobe))
@@ -876,7 +876,7 @@ MACHINE_CONFIG_START(accomm_state::accomm)
MCFG_RS232_DCD_HANDLER(DEVWRITELINE("acia", acia6850_device, write_dcd))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia", acia6850_device, write_cts))
- MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL_16MHz / 13)
+ MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL(16'000'000) / 13)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(accomm_state, write_acia_clock))
/* econet */
diff --git a/src/mame/drivers/ace.cpp b/src/mame/drivers/ace.cpp
index aadd15aa89a..61f40af6a23 100644
--- a/src/mame/drivers/ace.cpp
+++ b/src/mame/drivers/ace.cpp
@@ -45,7 +45,7 @@ A1 2101 2101
#include "ace.lh"
-#define MASTER_CLOCK XTAL_18MHz
+#define MASTER_CLOCK XTAL(18'000'000)
class aceal_state : public driver_device
diff --git a/src/mame/drivers/actfancr.cpp b/src/mame/drivers/actfancr.cpp
index 61cde39cab0..8d35c97a4de 100644
--- a/src/mame/drivers/actfancr.cpp
+++ b/src/mame/drivers/actfancr.cpp
@@ -342,11 +342,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(actfancr_state::triothep)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",H6280,XTAL_21_4772MHz/3) /* XIN=21.4772Mhz, verified on pcb */
+ MCFG_CPU_ADD("maincpu",H6280,XTAL(21'477'272)/3) /* XIN=21.4772Mhz, verified on pcb */
MCFG_CPU_PROGRAM_MAP(triothep_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", actfancr_state, irq0_line_hold) /* VBL */
- MCFG_CPU_ADD("audiocpu",M6502, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu",M6502, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(dec0_s_map)
MCFG_MACHINE_START_OVERRIDE(actfancr_state,triothep)
@@ -383,17 +383,17 @@ MACHINE_CONFIG_START(actfancr_state::triothep)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "mono", 0.90)
MCFG_SOUND_ROUTE(1, "mono", 0.90)
MCFG_SOUND_ROUTE(2, "mono", 0.90)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_SOUND_ADD("ym2", YM3812, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ym2", YM3812, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/acvirus.cpp b/src/mame/drivers/acvirus.cpp
index 6b508a24e74..139524404e6 100644
--- a/src/mame/drivers/acvirus.cpp
+++ b/src/mame/drivers/acvirus.cpp
@@ -102,7 +102,7 @@ static ADDRESS_MAP_START( virus_map, AS_PROGRAM, 8, acvirus_state )
ADDRESS_MAP_END
MACHINE_CONFIG_START(acvirus_state::virus)
- MCFG_CPU_ADD("maincpu", I8052, XTAL_12MHz)
+ MCFG_CPU_ADD("maincpu", I8052, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(virus_map)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
diff --git a/src/mame/drivers/adam.cpp b/src/mame/drivers/adam.cpp
index 2865c4b9800..43087ee2c92 100644
--- a/src/mame/drivers/adam.cpp
+++ b/src/mame/drivers/adam.cpp
@@ -1049,18 +1049,18 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(adam_state::adam)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_7_15909MHz/2)
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(7'159'090)/2)
MCFG_CPU_PROGRAM_MAP(adam_mem)
MCFG_CPU_IO_MAP(adam_io)
- MCFG_CPU_ADD(M6801_TAG, M6801, XTAL_4MHz)
+ MCFG_CPU_ADD(M6801_TAG, M6801, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(m6801_mem)
MCFG_CPU_IO_MAP(m6801_io)
MCFG_M6801_SC2(WRITELINE(adam_state, os3_w))
MCFG_QUANTUM_PERFECT_CPU(M6801_TAG)
// video hardware
- MCFG_DEVICE_ADD(TMS9928A_TAG, TMS9928A, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD(TMS9928A_TAG, TMS9928A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(adam_state, vdc_int_w))
MCFG_TMS9928A_SCREEN_ADD_NTSC(SCREEN_TAG)
@@ -1068,7 +1068,7 @@ MACHINE_CONFIG_START(adam_state::adam)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76489A_TAG, SN76489A, XTAL_7_15909MHz/2)
+ MCFG_SOUND_ADD(SN76489A_TAG, SN76489A, XTAL(7'159'090)/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SN76496_READY_HANDLER(INPUTLINE(Z80_TAG, Z80_INPUT_LINE_BOGUSWAIT))
@@ -1092,11 +1092,11 @@ MACHINE_CONFIG_START(adam_state::adam)
MCFG_ADAMNET_SLOT_ADD("net15", adamnet_devices, nullptr)
MCFG_COLECOVISION_CARTRIDGE_SLOT_ADD(COLECOVISION_CARTRIDGE_SLOT_TAG, colecovision_cartridges, nullptr)
- MCFG_ADAM_EXPANSION_SLOT_ADD(ADAM_LEFT_EXPANSION_SLOT_TAG, XTAL_7_15909MHz/2, adam_slot1_devices, "adamlink")
+ MCFG_ADAM_EXPANSION_SLOT_ADD(ADAM_LEFT_EXPANSION_SLOT_TAG, XTAL(7'159'090)/2, adam_slot1_devices, "adamlink")
MCFG_ADAM_EXPANSION_SLOT_IRQ_CALLBACK(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_ADAM_EXPANSION_SLOT_ADD(ADAM_CENTER_EXPANSION_SLOT_TAG, XTAL_7_15909MHz/2, adam_slot2_devices, nullptr)
+ MCFG_ADAM_EXPANSION_SLOT_ADD(ADAM_CENTER_EXPANSION_SLOT_TAG, XTAL(7'159'090)/2, adam_slot2_devices, nullptr)
MCFG_ADAM_EXPANSION_SLOT_IRQ_CALLBACK(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_ADAM_EXPANSION_SLOT_ADD(ADAM_RIGHT_EXPANSION_SLOT_TAG, XTAL_7_15909MHz/2, adam_slot3_devices, "ram")
+ MCFG_ADAM_EXPANSION_SLOT_ADD(ADAM_RIGHT_EXPANSION_SLOT_TAG, XTAL(7'159'090)/2, adam_slot3_devices, "ram")
MCFG_COLECOVISION_CONTROL_PORT_ADD(CONTROL1_TAG, colecovision_control_port_devices, "hand")
MCFG_COLECOVISION_CONTROL_PORT_IRQ_CALLBACK(WRITELINE(adam_state, joy1_irq_w))
diff --git a/src/mame/drivers/adp.cpp b/src/mame/drivers/adp.cpp
index 5ab7d5f3ce8..2820e2be70d 100644
--- a/src/mame/drivers/adp.cpp
+++ b/src/mame/drivers/adp.cpp
@@ -540,7 +540,7 @@ MACHINE_CONFIG_START(adp_state::quickjac)
MCFG_MACHINE_START_OVERRIDE(adp_state,skattv)
MCFG_MACHINE_RESET_OVERRIDE(adp_state,skattv)
- MCFG_DEVICE_ADD( "duart", MC68681, XTAL_8_664MHz / 2 )
+ MCFG_DEVICE_ADD( "duart", MC68681, XTAL(8'664'000) / 2 )
MCFG_MC68681_IRQ_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4))
MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("microtouch", microtouch_device, rx))
MCFG_MC68681_INPORT_CALLBACK(IOPORT("DSW1"))
@@ -549,7 +549,7 @@ MACHINE_CONFIG_START(adp_state::quickjac)
MCFG_NVRAM_ADD_NO_FILL("nvram")
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
//MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(adp_state, rtc_irq))
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/advision.cpp b/src/mame/drivers/advision.cpp
index 4fd86302eeb..55665727133 100644
--- a/src/mame/drivers/advision.cpp
+++ b/src/mame/drivers/advision.cpp
@@ -63,7 +63,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(advision_state::advision)
/* basic machine hardware */
- MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_11MHz)
+ MCFG_CPU_ADD(I8048_TAG, I8048, XTAL(11'000'000))
MCFG_CPU_PROGRAM_MAP(program_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_MCS48_PORT_P1_IN_CB(READ8(advision_state, controller_r))
diff --git a/src/mame/drivers/aeroboto.cpp b/src/mame/drivers/aeroboto.cpp
index 03e2abb8755..9ec02e5177a 100644
--- a/src/mame/drivers/aeroboto.cpp
+++ b/src/mame/drivers/aeroboto.cpp
@@ -240,11 +240,11 @@ void aeroboto_state::machine_reset()
MACHINE_CONFIG_START(aeroboto_state::formatz)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_10MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(10'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", aeroboto_state, aeroboto_interrupt)
- MCFG_CPU_ADD("audiocpu", MC6809, XTAL_10MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", MC6809, XTAL(10'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", aeroboto_state, irq0_line_hold)
@@ -268,12 +268,12 @@ MACHINE_CONFIG_START(aeroboto_state::formatz)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_10MHz/8) /* verified on pcb */
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(10'000'000)/8) /* verified on pcb */
MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("soundlatch2", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_10MHz/16) /* verified on pcb */
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(10'000'000)/16) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/aerofgt.cpp b/src/mame/drivers/aerofgt.cpp
index a1936cfe3ec..321a9ea3a81 100644
--- a/src/mame/drivers/aerofgt.cpp
+++ b/src/mame/drivers/aerofgt.cpp
@@ -1403,11 +1403,11 @@ MACHINE_RESET_MEMBER(aerofgt_state,aerofgt)
MACHINE_CONFIG_START(aerofgt_state::pspikes)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu",M68000,XTAL(20'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(pspikes_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */
- MCFG_CPU_ADD("audiocpu",Z80,XTAL_20MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu",Z80,XTAL(20'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(turbofrc_sound_portmap)
/* IRQs are triggered by the YM2610 */
@@ -1433,7 +1433,7 @@ MACHINE_CONFIG_START(aerofgt_state::pspikes)
MCFG_VSYSTEM_SPR2_SET_GFXREGION(1)
MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode")
- MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified
+ MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified
MCFG_VIDEO_START_OVERRIDE(aerofgt_state,pspikes)
@@ -1534,11 +1534,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aerofgt_state::kickball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,XTAL_10MHz) // 10Mhz XTAL near 10Mhz rated CPU
+ MCFG_CPU_ADD("maincpu",M68000,XTAL(10'000'000)) // 10Mhz XTAL near 10Mhz rated CPU
MCFG_CPU_PROGRAM_MAP(kickball_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold) /* only IRQ1 is valid */
- MCFG_CPU_ADD("audiocpu",Z80,XTAL_4MHz)
+ MCFG_CPU_ADD("audiocpu",Z80,XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(kickball_sound_map)
MCFG_CPU_IO_MAP(kickball_sound_portmap)
@@ -1574,11 +1574,11 @@ MACHINE_CONFIG_START(aerofgt_state::kickball)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_4MHz) // K-666 (YM3812)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(4'000'000)) // K-666 (YM3812)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_4MHz/4, PIN7_LOW) // AD-65 (M6295) clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(4'000'000)/4, PIN7_LOW) // AD-65 (M6295) clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1649,7 +1649,7 @@ MACHINE_CONFIG_START(aerofgt_state::karatblz)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
- MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified
+ MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified
MCFG_DEVICE_ADD("vsystem_spr_old", VSYSTEM_SPR2, 0)
MCFG_VSYSTEM_SPR2_SET_TILE_INDIRECT( aerofgt_state, aerofgt_old_tile_callback )
@@ -1670,7 +1670,7 @@ MACHINE_CONFIG_START(aerofgt_state::karatblz)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz ) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(8'000'000) ) /* verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -1726,7 +1726,7 @@ MACHINE_CONFIG_START(aerofgt_state::karatblzbl)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_8MHz/2)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(8'000'000)/2)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -1737,11 +1737,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aerofgt_state::spinlbrk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu",M68000,XTAL(20'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(spinlbrk_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold) /* there are vectors for 3 and 4 too, analog related? */
- MCFG_CPU_ADD("audiocpu",Z80,XTAL_20MHz/4) /* 5mhz verified on pcb */
+ MCFG_CPU_ADD("audiocpu",Z80,XTAL(20'000'000)/4) /* 5mhz verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(spinlbrk_sound_portmap)
/* IRQs are triggered by the YM2610 */
@@ -1762,7 +1762,7 @@ MACHINE_CONFIG_START(aerofgt_state::spinlbrk)
MCFG_PALETTE_ADD_INIT_BLACK("palette", 1024) // doesn't fully initialize palette at start-up ...
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
- MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified
+ MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified
MCFG_DEVICE_ADD("vsystem_spr_old", VSYSTEM_SPR2, 0)
MCFG_VSYSTEM_SPR2_SET_PRITYPE(1)
@@ -1784,7 +1784,7 @@ MACHINE_CONFIG_START(aerofgt_state::spinlbrk)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(8'000'000)) /* verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -1795,11 +1795,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aerofgt_state::turbofrc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu",M68000,XTAL(20'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(turbofrc_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */
- MCFG_CPU_ADD("audiocpu",Z80,XTAL_5MHz) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu",Z80,XTAL(5'000'000)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(turbofrc_sound_portmap)
/* IRQs are triggered by the YM2610 */
@@ -1820,7 +1820,7 @@ MACHINE_CONFIG_START(aerofgt_state::turbofrc)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
- MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified
+ MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified
MCFG_DEVICE_ADD("vsystem_spr_old", VSYSTEM_SPR2, 0)
MCFG_VSYSTEM_SPR2_SET_TILE_INDIRECT( aerofgt_state, aerofgt_old_tile_callback )
@@ -1841,7 +1841,7 @@ MACHINE_CONFIG_START(aerofgt_state::turbofrc)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(8'000'000)) /* verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -1878,7 +1878,7 @@ MACHINE_CONFIG_START(aerofgt_state::aerofgtb)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
- MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL_14_31818MHz / 2) // divider not verified
+ MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified
MCFG_DEVICE_ADD("vsystem_spr_old", VSYSTEM_SPR2, 0)
MCFG_VSYSTEM_SPR2_SET_TILE_INDIRECT( aerofgt_state, aerofgt_old_tile_callback )
@@ -1910,11 +1910,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aerofgt_state::aerofgt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu",M68000,XTAL(20'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(aerofgt_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */
- MCFG_CPU_ADD("audiocpu",Z80,XTAL_20MHz/4) /* 5 MHz verified on pcb */
+ MCFG_CPU_ADD("audiocpu",Z80,XTAL(20'000'000)/4) /* 5 MHz verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(aerofgt_sound_portmap)
/* IRQs are triggered by the YM2610 */
@@ -1962,7 +1962,7 @@ MACHINE_CONFIG_START(aerofgt_state::aerofgt)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(8'000'000)) /* verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
diff --git a/src/mame/drivers/agat.cpp b/src/mame/drivers/agat.cpp
index 496b9af8dee..aa4732111ce 100644
--- a/src/mame/drivers/agat.cpp
+++ b/src/mame/drivers/agat.cpp
@@ -1071,7 +1071,7 @@ static SLOT_INTERFACE_START(agat7_cards)
SLOT_INTERFACE_END
MACHINE_CONFIG_START(agat7_state::agat7)
- MCFG_CPU_ADD("maincpu", M6502, XTAL_14_3MHz / 14)
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(14'300'000) / 14)
MCFG_CPU_PROGRAM_MAP(agat7_map)
MCFG_CPU_VBLANK_INT_DRIVER(A7_VIDEO_TAG ":a7screen", agat7_state, agat_vblank)
diff --git a/src/mame/drivers/aim65_40.cpp b/src/mame/drivers/aim65_40.cpp
index f9af6e40a2e..d967c3acf64 100644
--- a/src/mame/drivers/aim65_40.cpp
+++ b/src/mame/drivers/aim65_40.cpp
@@ -127,7 +127,7 @@ MACHINE_CONFIG_START(aim65_40_state::aim65_40)
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, 1000000)
MCFG_DEVICE_ADD(M6522_2_TAG, VIA6522, 1000000)
MCFG_DEVICE_ADD(M6551_TAG, MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
+ MCFG_MOS6551_XTAL(XTAL(1'843'200))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_MOS6551_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
MCFG_MOS6551_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
diff --git a/src/mame/drivers/airbustr.cpp b/src/mame/drivers/airbustr.cpp
index 5a4fe2daaaf..9a3d54c1120 100644
--- a/src/mame/drivers/airbustr.cpp
+++ b/src/mame/drivers/airbustr.cpp
@@ -546,17 +546,17 @@ void airbustr_state::machine_reset()
MACHINE_CONFIG_START(airbustr_state::airbustr)
/* basic machine hardware */
- MCFG_CPU_ADD("master", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("master", Z80, XTAL(12'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(master_map)
MCFG_CPU_IO_MAP(master_io_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", airbustr_state, airbustr_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("slave", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("slave", Z80, XTAL(12'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(slave_map)
MCFG_CPU_IO_MAP(slave_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", airbustr_state, slave_interrupt) /* nmi signal from master cpu */
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", airbustr_state, irq0_line_hold) // nmi are caused by sub cpu writing a sound command
@@ -593,7 +593,7 @@ MACHINE_CONFIG_START(airbustr_state::airbustr)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1")) // DSW-1 connected to port A
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2")) // DSW-2 connected to port B
MCFG_SOUND_ROUTE(0, "mono", 0.25)
@@ -601,7 +601,7 @@ MACHINE_CONFIG_START(airbustr_state::airbustr)
MCFG_SOUND_ROUTE(2, "mono", 0.25)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/4, PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL(12'000'000)/4, PIN7_LOW) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/airraid.cpp b/src/mame/drivers/airraid.cpp
index 9601fbde89d..6998818a50b 100644
--- a/src/mame/drivers/airraid.cpp
+++ b/src/mame/drivers/airraid.cpp
@@ -380,11 +380,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(airraid_state::airraid)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80,XTAL(12'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(airraid_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", airraid_state, cshooter_scanline, "airraid_vid:screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(airraid_sound_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(airraid_sound_decrypted_opcodes_map)
@@ -398,7 +398,7 @@ MACHINE_CONFIG_START(airraid_state::airraid)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4)
+ MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4)
MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
diff --git a/src/mame/drivers/ajax.cpp b/src/mame/drivers/ajax.cpp
index 09e167dbda2..4c7bb289c3f 100644
--- a/src/mame/drivers/ajax.cpp
+++ b/src/mame/drivers/ajax.cpp
@@ -170,7 +170,7 @@ WRITE8_MEMBER(ajax_state::volume_callback1)
MACHINE_CONFIG_START(ajax_state::ajax)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* 052001 12/4 MHz*/
+ MCFG_CPU_ADD("maincpu", KONAMI, XTAL(24'000'000)/2/4) /* 052001 12/4 MHz*/
MCFG_CPU_PROGRAM_MAP(ajax_main_map)
MCFG_CPU_ADD("sub", HD6309E, 3000000) /* ? */
@@ -185,9 +185,9 @@ MACHINE_CONFIG_START(ajax_state::ajax)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/3, 528, 108, 412, 256, 16, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/3, 528, 108, 412, 256, 16, 240)
// 6MHz dotclock is more realistic, however needs drawing updates. replace when ready
-// MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/4, 396, hbend, hbstart, 256, 16, 240)
+// MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/4, 396, hbend, hbstart, 256, 16, 240)
MCFG_SCREEN_UPDATE_DRIVER(ajax_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/akaiax80.cpp b/src/mame/drivers/akaiax80.cpp
index 714fd2e4c93..0e88bb88b0e 100644
--- a/src/mame/drivers/akaiax80.cpp
+++ b/src/mame/drivers/akaiax80.cpp
@@ -89,7 +89,7 @@ static ADDRESS_MAP_START( ax80_map, AS_PROGRAM, 8, ax80_state )
ADDRESS_MAP_END
MACHINE_CONFIG_START(ax80_state::ax80)
- MCFG_CPU_ADD("maincpu", UPD7810, XTAL_12MHz)
+ MCFG_CPU_ADD("maincpu", UPD7810, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(ax80_map)
//MCFG_CPU_IO_MAP(ax80_io)
diff --git a/src/mame/drivers/albazg.cpp b/src/mame/drivers/albazg.cpp
index 213bf80f11a..15537b9bac2 100644
--- a/src/mame/drivers/albazg.cpp
+++ b/src/mame/drivers/albazg.cpp
@@ -44,7 +44,7 @@ PCB:
#include "screen.h"
#include "speaker.h"
-#define MASTER_CLOCK XTAL_12MHz
+#define MASTER_CLOCK XTAL(12'000'000)
class albazg_state : public driver_device
{
diff --git a/src/mame/drivers/alesis.cpp b/src/mame/drivers/alesis.cpp
index 0c49e78d194..84efd4fcbf7 100644
--- a/src/mame/drivers/alesis.cpp
+++ b/src/mame/drivers/alesis.cpp
@@ -357,7 +357,7 @@ HD44780_PIXEL_UPDATE(alesis_state::sr16_pixel_update)
MACHINE_CONFIG_START(alesis_state::hr16)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8031, XTAL_12MHz)
+ MCFG_CPU_ADD("maincpu",I8031, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(hr16_mem)
MCFG_CPU_IO_MAP(hr16_io)
@@ -382,7 +382,7 @@ MACHINE_CONFIG_START(alesis_state::hr16)
MCFG_HD44780_LCD_SIZE(2, 16)
/* sound hardware */
- MCFG_ALESIS_DM3AG_ADD("dm3ag", XTAL_12MHz/2)
+ MCFG_ALESIS_DM3AG_ADD("dm3ag", XTAL(12'000'000)/2)
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/alesis_qs.cpp b/src/mame/drivers/alesis_qs.cpp
index 784b4187716..12ea0764cb2 100644
--- a/src/mame/drivers/alesis_qs.cpp
+++ b/src/mame/drivers/alesis_qs.cpp
@@ -49,7 +49,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(qs_state::qs7)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H83048, XTAL_10MHz) /* FIX-ME! Actual CPU is H8/510 and XTAL value is a guess */
+ MCFG_CPU_ADD("maincpu", H83048, XTAL(10'000'000)) /* FIX-ME! Actual CPU is H8/510 and XTAL value is a guess */
MCFG_CPU_PROGRAM_MAP(qs7_prog_map)
//MCFG_ALESIS_KEYSCAN_ASIC_ADD("keyscan")
diff --git a/src/mame/drivers/alien.cpp b/src/mame/drivers/alien.cpp
index 2f22185b43a..a2dbf1822a4 100644
--- a/src/mame/drivers/alien.cpp
+++ b/src/mame/drivers/alien.cpp
@@ -28,7 +28,7 @@
#include "screen.h"
#include "speaker.h"
-#define MASTER_CLOCK XTAL_200MHz
+#define MASTER_CLOCK XTAL(200'000'000)
class alien_state : public driver_device
{
diff --git a/src/mame/drivers/aliens.cpp b/src/mame/drivers/aliens.cpp
index cbfbaea5d78..4b0a71ac574 100644
--- a/src/mame/drivers/aliens.cpp
+++ b/src/mame/drivers/aliens.cpp
@@ -194,11 +194,11 @@ WRITE8_MEMBER( aliens_state::banking_callback )
MACHINE_CONFIG_START(aliens_state::aliens)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* 052001 (verified on pcb) */
+ MCFG_CPU_ADD("maincpu", KONAMI, XTAL(24'000'000)/2/4) /* 052001 (verified on pcb) */
MCFG_CPU_PROGRAM_MAP(aliens_map)
MCFG_KONAMICPU_LINE_CB(WRITE8(aliens_state, banking_callback))
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(aliens_sound_map)
MCFG_DEVICE_ADD("bank0000", ADDRESS_MAP_BANK, 0)
@@ -212,9 +212,9 @@ MACHINE_CONFIG_START(aliens_state::aliens)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/3, 528, 112, 400, 256, 16, 240) // measured 59.17
+ MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/3, 528, 112, 400, 256, 16, 240) // measured 59.17
// 6MHz dotclock is more realistic, however needs drawing updates. replace when ready
-// MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/4, 396, hbend, hbstart, 256, 16, 240)
+// MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/4, 396, hbend, hbstart, 256, 16, 240)
MCFG_SCREEN_UPDATE_DRIVER(aliens_state, screen_update_aliens)
MCFG_SCREEN_PALETTE("palette")
@@ -237,12 +237,12 @@ MACHINE_CONFIG_START(aliens_state::aliens)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */
MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(aliens_state,aliens_snd_bankswitch_w))
MCFG_SOUND_ROUTE(0, "mono", 0.60)
MCFG_SOUND_ROUTE(1, "mono", 0.60)
- MCFG_SOUND_ADD("k007232", K007232, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("k007232", K007232, XTAL(3'579'545)) /* verified on pcb */
MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(aliens_state, volume_callback))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
diff --git a/src/mame/drivers/alpha68k.cpp b/src/mame/drivers/alpha68k.cpp
index daa8b833f40..1fa77937d16 100644
--- a/src/mame/drivers/alpha68k.cpp
+++ b/src/mame/drivers/alpha68k.cpp
@@ -1903,7 +1903,7 @@ MACHINE_START_MEMBER(alpha68k_state,alpha68k_II)
// Pixel clock, assuming that it can't be 4 MHz because 4 MHz / 15,20 KHz = 263 HTOTAL (VERY unlikely).
-#define ALPHA68K_PIXEL_CLOCK XTAL_24MHz/4
+#define ALPHA68K_PIXEL_CLOCK XTAL(24'000'000)/4
#define ALPHA68K_HTOTAL 394
#define ALPHA68K_HBEND 0
#define ALPHA68K_HBSTART 256
@@ -1975,12 +1975,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(alpha68k_state::kyros)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* Verified on bootleg PCB */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/4) /* Verified on bootleg PCB */
MCFG_CPU_PROGRAM_MAP(kyros_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold)
MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60) // MCU irq
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) /* Verified on bootleg PCB */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/6) /* Verified on bootleg PCB */
MCFG_CPU_PROGRAM_MAP(kyros_sound_map)
MCFG_CPU_IO_MAP(kyros_sound_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq0_line_hold)
@@ -2010,13 +2010,13 @@ MACHINE_CONFIG_START(alpha68k_state::kyros)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_24MHz/12) /* Verified on bootleg PCB */
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(24'000'000)/12) /* Verified on bootleg PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.35)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL_24MHz/12) /* Verified on bootleg PCB */
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL(24'000'000)/12) /* Verified on bootleg PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.35)
- MCFG_SOUND_ADD("ym3", YM2203, XTAL_24MHz/12) /* Verified on bootleg PCB */
+ MCFG_SOUND_ADD("ym3", YM2203, XTAL(24'000'000)/12) /* Verified on bootleg PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.9)
MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC
diff --git a/src/mame/drivers/alphasma.cpp b/src/mame/drivers/alphasma.cpp
index 34c5106bc90..009a48a98ef 100644
--- a/src/mame/drivers/alphasma.cpp
+++ b/src/mame/drivers/alphasma.cpp
@@ -422,7 +422,7 @@ void alphasmart_state::machine_reset()
MACHINE_CONFIG_START(alphasmart_state::alphasmart)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC68HC11, XTAL_8MHz/2) // MC68HC11D0, XTAL is 8 Mhz, unknown divider
+ MCFG_CPU_ADD("maincpu", MC68HC11, XTAL(8'000'000)/2) // MC68HC11D0, XTAL is 8 Mhz, unknown divider
MCFG_CPU_PROGRAM_MAP(alphasmart_mem)
MCFG_CPU_IO_MAP(alphasmart_io)
MCFG_MC68HC11_CONFIG(0, 192, 0x00)
diff --git a/src/mame/drivers/alphatpx.cpp b/src/mame/drivers/alphatpx.cpp
index d34c212ee6c..37389da111f 100644
--- a/src/mame/drivers/alphatpx.cpp
+++ b/src/mame/drivers/alphatpx.cpp
@@ -597,13 +597,13 @@ void alphatpx_state::machine_reset()
//**************************************************************************
MACHINE_CONFIG_START(alphatpx_state::alphatp3)
- MCFG_CPU_ADD("maincpu", I8085A, XTAL_6MHz)
+ MCFG_CPU_ADD("maincpu", I8085A, XTAL(6'000'000))
MCFG_CPU_PROGRAM_MAP(alphatp3_mem)
MCFG_CPU_IO_MAP(alphatp3_io)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MCFG_CPU_ADD("kbdmcu", I8041, XTAL_12_8544MHz/2)
+ MCFG_CPU_ADD("kbdmcu", I8041, XTAL(12'854'400)/2)
MCFG_MCS48_PORT_T0_IN_CB(READLINE(alphatpx_state, kbd_matrix_r))
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(alphatpx_state, kbd_matrix_w))
MCFG_MCS48_PORT_P2_IN_CB(READ8(alphatpx_state, kbd_port2_r))
@@ -618,12 +618,12 @@ MACHINE_CONFIG_START(alphatpx_state::alphatp3)
// video hardware
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
- MCFG_SCREEN_RAW_PARAMS(XTAL_12_8544MHz, 824, 0, 640, 312, 0, 288)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'854'400), 824, 0, 640, 312, 0, 288)
MCFG_SCREEN_UPDATE_DRIVER(alphatpx_state, screen_update)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_DEVICE_ADD("crtc", CRT5037, XTAL_12_8544MHz)
+ MCFG_DEVICE_ADD("crtc", CRT5037, XTAL(12'854'400))
MCFG_TMS9927_CHAR_WIDTH(8)
MCFG_TMS9927_VSYN_CALLBACK(INPUTLINE("maincpu", I8085_RST65_LINE)) MCFG_DEVCB_XOR(1)
@@ -637,9 +637,9 @@ MACHINE_CONFIG_START(alphatpx_state::alphatp3)
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MCFG_DEVICE_ADD("uart", I8251, 0)
- // XTAL_4_9152MHz serial clock
+ // XTAL(4'915'200) serial clock
- MCFG_FD1791_ADD("fdc", XTAL_4MHz / 4)
+ MCFG_FD1791_ADD("fdc", XTAL(4'000'000) / 4)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(alphatpx_state, fdcirq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(alphatpx_state, fdcdrq_w))
MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(alphatpx_state, fdchld_w))
@@ -648,13 +648,13 @@ MACHINE_CONFIG_START(alphatpx_state::alphatp3)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(alphatpx_state::alphatp2)
- MCFG_CPU_ADD("maincpu", I8085A, XTAL_6MHz)
+ MCFG_CPU_ADD("maincpu", I8085A, XTAL(6'000'000))
MCFG_CPU_PROGRAM_MAP(alphatp3_mem)
MCFG_CPU_IO_MAP(alphatp3_io)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MCFG_CPU_ADD("kbdmcu", I8041, XTAL_12_8544MHz/2)
+ MCFG_CPU_ADD("kbdmcu", I8041, XTAL(12'854'400)/2)
MCFG_MCS48_PORT_T0_IN_CB(READLINE(alphatpx_state, kbd_matrix_r))
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(alphatpx_state, kbd_matrix_w))
MCFG_MCS48_PORT_P2_IN_CB(READ8(alphatpx_state, kbd_port2_r))
@@ -669,12 +669,12 @@ MACHINE_CONFIG_START(alphatpx_state::alphatp2)
// video hardware
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
- MCFG_SCREEN_RAW_PARAMS(XTAL_12_8544MHz, 824, 0, 640, 312, 0, 288)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'854'400), 824, 0, 640, 312, 0, 288)
MCFG_SCREEN_UPDATE_DRIVER(alphatpx_state, screen_update)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_DEVICE_ADD("crtc", CRT5037, XTAL_12_8544MHz)
+ MCFG_DEVICE_ADD("crtc", CRT5037, XTAL(12'854'400))
MCFG_TMS9927_CHAR_WIDTH(8)
MCFG_TMS9927_HSYN_CALLBACK(INPUTLINE("maincpu", I8085_RST55_LINE))
MCFG_TMS9927_VSYN_CALLBACK(INPUTLINE("maincpu", I8085_RST65_LINE)) MCFG_DEVCB_XOR(1)
@@ -688,9 +688,9 @@ MACHINE_CONFIG_START(alphatpx_state::alphatp2)
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MCFG_DEVICE_ADD("uart", I8251, 0)
- // XTAL_4_9152MHz serial clock
+ // XTAL(4'915'200) serial clock
- MCFG_FD1791_ADD("fdc", XTAL_4MHz / 4)
+ MCFG_FD1791_ADD("fdc", XTAL(4'000'000) / 4)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(alphatpx_state, fdcirq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(alphatpx_state, fdcdrq_w))
MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(alphatpx_state, fdchld_w))
diff --git a/src/mame/drivers/alphatro.cpp b/src/mame/drivers/alphatro.cpp
index 328ebc922ef..c4e11a7b684 100644
--- a/src/mame/drivers/alphatro.cpp
+++ b/src/mame/drivers/alphatro.cpp
@@ -45,7 +45,7 @@
#include "softlist.h"
#include "speaker.h"
-#define MAIN_CLOCK XTAL_4MHz
+#define MAIN_CLOCK XTAL(4'000'000)
class alphatro_state : public driver_device
@@ -727,7 +727,7 @@ MACHINE_CONFIG_START(alphatro_state::alphatro)
MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8("fdc", upd765a_device, mdma_w))
MCFG_I8257_OUT_TC_CB(DEVWRITELINE("fdc", upd765a_device, tc_line_w))
- MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_12_288MHz / 8) // clk unknown
+ MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(12'288'000) / 8) // clk unknown
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(alphatro_state, crtc_update_row)
diff --git a/src/mame/drivers/altair.cpp b/src/mame/drivers/altair.cpp
index 0957d94dfc6..a7735e6abec 100644
--- a/src/mame/drivers/altair.cpp
+++ b/src/mame/drivers/altair.cpp
@@ -93,7 +93,7 @@ void altair_state::machine_reset()
MACHINE_CONFIG_START(altair_state::altair)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL_2MHz)
+ MCFG_CPU_ADD("maincpu", I8080, XTAL(2'000'000))
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
diff --git a/src/mame/drivers/alto2.cpp b/src/mame/drivers/alto2.cpp
index 99b35501ad6..d06368e5861 100644
--- a/src/mame/drivers/alto2.cpp
+++ b/src/mame/drivers/alto2.cpp
@@ -277,14 +277,14 @@ MACHINE_CONFIG_START(alto2_state::alto2)
// Basic machine hardware
// SYSCLK is Display Control part A51 (tagged 29.4MHz) divided by 5(?)
// 5.8MHz according to de.wikipedia.org/wiki/Xerox_Alto
- MCFG_CPU_ADD("maincpu", ALTO2, XTAL_29_4912MHz/5)
+ MCFG_CPU_ADD("maincpu", ALTO2, XTAL(29'491'200)/5)
MCFG_CPU_PROGRAM_MAP(alto2_ucode_map)
MCFG_CPU_DATA_MAP(alto2_const_map)
MCFG_CPU_IO_MAP(alto2_iomem_map)
// Video hardware
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::white())
- MCFG_SCREEN_RAW_PARAMS(XTAL_20_16MHz,
+ MCFG_SCREEN_RAW_PARAMS(XTAL(20'160'000),
A2_DISP_TOTAL_WIDTH, 0, A2_DISP_WIDTH,
A2_DISP_TOTAL_HEIGHT, 0, A2_DISP_HEIGHT)
// Two interlaced fields at 60Hz => 30Hz frame rate
diff --git a/src/mame/drivers/altos2.cpp b/src/mame/drivers/altos2.cpp
index 0f8bb47802f..e570b3542c5 100644
--- a/src/mame/drivers/altos2.cpp
+++ b/src/mame/drivers/altos2.cpp
@@ -97,7 +97,7 @@ static const z80_daisy_config daisy_chain[] =
MACHINE_CONFIG_START(altos2_state::altos2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) // unknown clock
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000)) // unknown clock
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
@@ -107,7 +107,7 @@ MACHINE_CONFIG_START(altos2_state::altos2)
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg2))
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_4MHz)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(4'000'000))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("dart1", z80dart_device, txca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart1", z80dart_device, rxca_w))
@@ -115,16 +115,16 @@ MACHINE_CONFIG_START(altos2_state::altos2)
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("dart2", z80dart_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart2", z80dart_device, txca_w))
- MCFG_DEVICE_ADD("dart1", Z80DART, XTAL_4MHz)
+ MCFG_DEVICE_ADD("dart1", Z80DART, XTAL(4'000'000))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("dart2", Z80DART, XTAL_4MHz) // channel B not used for communications
+ MCFG_DEVICE_ADD("dart2", Z80DART, XTAL(4'000'000)) // channel B not used for communications
MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE("novram", x2210_device, store)) MCFG_DEVCB_INVERT // FIXME: no inverter should be needed
MCFG_DEVICE_ADD("novram", X2210, 0)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_40MHz / 2, 960, 0, 800, 347, 0, 325)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(40'000'000) / 2, 960, 0, 800, 347, 0, 325)
MCFG_SCREEN_UPDATE_DRIVER(altos2_state, screen_update)
//MCFG_DEVICE_ADD("vpac", CRT9007, VPAC_CLOCK)
diff --git a/src/mame/drivers/altos486.cpp b/src/mame/drivers/altos486.cpp
index 44331e85752..e7a8eae4f79 100644
--- a/src/mame/drivers/altos486.cpp
+++ b/src/mame/drivers/altos486.cpp
@@ -121,12 +121,12 @@ static ADDRESS_MAP_START(altos486_z80_io, AS_IO, 8, altos486_state)
ADDRESS_MAP_END
MACHINE_CONFIG_START(altos486_state::altos486)
- MCFG_CPU_ADD("maincpu", I80186, XTAL_8MHz)
+ MCFG_CPU_ADD("maincpu", I80186, XTAL(8'000'000))
MCFG_CPU_PROGRAM_MAP(altos486_mem)
MCFG_CPU_IO_MAP(altos486_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb) // yes, really
- MCFG_CPU_ADD("iocpu", Z80, XTAL_8MHz / 2)
+ MCFG_CPU_ADD("iocpu", Z80, XTAL(8'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(altos486_z80_mem)
MCFG_CPU_IO_MAP(altos486_z80_io)
@@ -165,7 +165,7 @@ MACHINE_CONFIG_START(altos486_state::altos486)
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232_lp", rs232_port_device, write_rts))
//MCFG_Z80DART_OUT_INT_CB(WRITELINE(altos486_state, sio_interrupt))
- MCFG_DEVICE_ADD("i8274", I8274, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD("i8274", I8274, XTAL(16'000'000)/4)
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs422_wn", rs232_port_device, write_txd))
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs422_wn", rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs422_wn", rs232_port_device, write_rts))
@@ -203,13 +203,13 @@ MACHINE_CONFIG_START(altos486_state::altos486)
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("i8274", z80dart_device, ctsa_w))
MCFG_DEVICE_ADD("pit0", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_22_1184MHz/18)
- MCFG_PIT8253_CLK1(XTAL_22_1184MHz/144)
- MCFG_PIT8253_CLK2(XTAL_22_1184MHz/18)
+ MCFG_PIT8253_CLK0(XTAL(22'118'400)/18)
+ MCFG_PIT8253_CLK1(XTAL(22'118'400)/144)
+ MCFG_PIT8253_CLK2(XTAL(22'118'400)/18)
MCFG_DEVICE_ADD("pit1", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_22_1184MHz/18)
- MCFG_PIT8253_CLK1(XTAL_22_1184MHz/144)
- MCFG_PIT8253_CLK2(XTAL_22_1184MHz/18)
+ MCFG_PIT8253_CLK0(XTAL(22'118'400)/18)
+ MCFG_PIT8253_CLK1(XTAL(22'118'400)/144)
+ MCFG_PIT8253_CLK2(XTAL(22'118'400)/18)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/altos5.cpp b/src/mame/drivers/altos5.cpp
index 0f6d009c12e..f08b004b689 100644
--- a/src/mame/drivers/altos5.cpp
+++ b/src/mame/drivers/altos5.cpp
@@ -347,18 +347,18 @@ DRIVER_INIT_MEMBER( altos5_state, altos5 )
MACHINE_CONFIG_START(altos5_state::altos5)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
- MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL_8MHz / 4) // 2MHz
+ MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(8'000'000) / 4) // 2MHz
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc" ,z80ctc_device, trg0))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc" ,z80ctc_device, trg1))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc" ,z80ctc_device, trg2))
/* devices */
- MCFG_DEVICE_ADD("dma", Z80DMA, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(8'000'000) / 2)
MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(altos5_state, busreq_w))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
// BAO, not used
@@ -367,22 +367,22 @@ MACHINE_CONFIG_START(altos5_state::altos5)
MCFG_Z80DMA_IN_IORQ_CB(READ8(altos5_state, io_read_byte))
MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(altos5_state, io_write_byte))
- MCFG_DEVICE_ADD("pio0", Z80PIO, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("pio0", Z80PIO, XTAL(8'000'000) / 2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(READ8(altos5_state, port08_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(altos5_state, port08_w))
MCFG_Z80PIO_IN_PB_CB(READ8(altos5_state, port09_r))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(altos5_state, port09_w))
- MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL(8'000'000) / 2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("dart", Z80DART, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("dart", Z80DART, XTAL(8'000'000) / 2)
// Channel A - console #3
// Channel B - printer
MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("sio", Z80SIO, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(8'000'000) / 2)
// Channel A - console #2
// WRDY connects to (altos5_state, fdc_intrq_w)
// Channel B - console #1
@@ -391,7 +391,7 @@ MACHINE_CONFIG_START(altos5_state::altos5)
MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(8'000'000) / 2)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio", z80sio_device, rxtxcb_w)) // SIO Ch B
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("dart", z80dart_device, txca_w)) // Z80DART Ch A, SIO Ch A
@@ -405,7 +405,7 @@ MACHINE_CONFIG_START(altos5_state::altos5)
MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio", z80sio_device, dcdb_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsb_w))
- MCFG_FD1797_ADD("fdc", XTAL_8MHz / 8)
+ MCFG_FD1797_ADD("fdc", XTAL(8'000'000) / 8)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(altos5_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("dma", z80dma_device, rdy_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", altos5_floppies, "525qd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/altos8600.cpp b/src/mame/drivers/altos8600.cpp
index fb45b6911ac..74a2aaa7fa5 100644
--- a/src/mame/drivers/altos8600.cpp
+++ b/src/mame/drivers/altos8600.cpp
@@ -679,7 +679,7 @@ static SLOT_INTERFACE_START(altos8600_floppies)
SLOT_INTERFACE_END
MACHINE_CONFIG_START(altos8600_state::altos8600)
- MCFG_CPU_ADD("maincpu", I8086, XTAL_5MHz)
+ MCFG_CPU_ADD("maincpu", I8086, XTAL(5'000'000))
MCFG_CPU_PROGRAM_MAP(cpu_mem)
MCFG_CPU_IO_MAP(cpu_io)
MCFG_CPU_DECRYPTED_OPCODES_MAP(code_mem)
@@ -689,7 +689,7 @@ MACHINE_CONFIG_START(altos8600_state::altos8600)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(altos8600_state, inta)
MCFG_I8086_IF_HANDLER(WRITELINE(altos8600_state, cpuif_w))
- MCFG_CPU_ADD("dmac", I8089, XTAL_5MHz)
+ MCFG_CPU_ADD("dmac", I8089, XTAL(5'000'000))
MCFG_CPU_PROGRAM_MAP(dmac_mem)
MCFG_CPU_IO_MAP(dmac_io)
MCFG_I8089_DATA_WIDTH(16)
@@ -713,7 +713,7 @@ MACHINE_CONFIG_START(altos8600_state::altos8600)
MCFG_RAM_DEFAULT_SIZE("1M")
//MCFG_RAM_EXTRA_OPTIONS("512K")
- MCFG_DEVICE_ADD("uart8274", I8274_NEW, XTAL_16MHz/4)
+ MCFG_DEVICE_ADD("uart8274", I8274_NEW, XTAL(16'000'000)/4)
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
diff --git a/src/mame/drivers/amaticmg.cpp b/src/mame/drivers/amaticmg.cpp
index d3cfc480345..00c5ef87eb7 100644
--- a/src/mame/drivers/amaticmg.cpp
+++ b/src/mame/drivers/amaticmg.cpp
@@ -422,7 +422,7 @@
#include "suprstar.lh"
-#define MASTER_CLOCK XTAL_16MHz
+#define MASTER_CLOCK XTAL(16'000'000)
#define CPU_CLOCK MASTER_CLOCK/4 /* guess */
#define SND_CLOCK MASTER_CLOCK/4 /* guess */
#define CRTC_CLOCK MASTER_CLOCK/8 /* guess */
diff --git a/src/mame/drivers/ambush.cpp b/src/mame/drivers/ambush.cpp
index 4d11d18004d..fccfbf1f12c 100644
--- a/src/mame/drivers/ambush.cpp
+++ b/src/mame/drivers/ambush.cpp
@@ -682,7 +682,7 @@ WRITE8_MEMBER(ambush_state::output_latches_w)
//**************************************************************************
MACHINE_CONFIG_START(ambush_state::ambush)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(main_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", ambush_state, irq0_line_hold)
@@ -702,7 +702,7 @@ MACHINE_CONFIG_START(ambush_state::ambush)
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_18_432MHz/3, 384, 0, 256, 264, 16, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(18'432'000)/3, 384, 0, 256, 264, 16, 240)
MCFG_SCREEN_UPDATE_DRIVER(ambush_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
@@ -713,11 +713,11 @@ MACHINE_CONFIG_START(ambush_state::ambush)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8912, XTAL_18_432MHz/6/2)
+ MCFG_SOUND_ADD("ay1", AY8912, XTAL(18'432'000)/6/2)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("buttons"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
- MCFG_SOUND_ADD("ay2", AY8912, XTAL_18_432MHz/6/2)
+ MCFG_SOUND_ADD("ay2", AY8912, XTAL(18'432'000)/6/2)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("joystick"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
@@ -743,11 +743,11 @@ MACHINE_CONFIG_DERIVED(ambush_state::mariobl, ambush)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_INIT_OWNER(ambush_state, mario)
- MCFG_SOUND_REPLACE("ay1", AY8910, XTAL_18_432MHz/6/2)
+ MCFG_SOUND_REPLACE("ay1", AY8910, XTAL(18'432'000)/6/2)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("buttons"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
- MCFG_SOUND_REPLACE("ay2", AY8910, XTAL_18_432MHz/6/2)
+ MCFG_SOUND_REPLACE("ay2", AY8910, XTAL(18'432'000)/6/2)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("joystick"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/amerihok.cpp b/src/mame/drivers/amerihok.cpp
index 337d1ec2ace..96ff255301d 100644
--- a/src/mame/drivers/amerihok.cpp
+++ b/src/mame/drivers/amerihok.cpp
@@ -75,7 +75,7 @@ void amerihok_state::machine_reset()
MACHINE_CONFIG_START(amerihok_state::amerihok)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z8681, XTAL_12MHz)
+ MCFG_CPU_ADD("maincpu", Z8681, XTAL(12'000'000))
MCFG_CPU_PROGRAM_MAP(amerihok_map)
MCFG_CPU_DATA_MAP(amerihok_data_map)
diff --git a/src/mame/drivers/amiga.cpp b/src/mame/drivers/amiga.cpp
index 0df199e8def..3650317097c 100644
--- a/src/mame/drivers/amiga.cpp
+++ b/src/mame/drivers/amiga.cpp
@@ -1463,7 +1463,7 @@ MACHINE_CONFIG_DERIVED(a2000_state::a2000, amiga_base)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x200000)
// real-time clock
- MCFG_DEVICE_ADD("u65", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("u65", MSM6242, XTAL(32'768))
// cpu slot
MCFG_EXPANSION_SLOT_ADD("maincpu", a2000_expansion_cards, nullptr)
@@ -1534,13 +1534,13 @@ MACHINE_CONFIG_DERIVED(cdtv_state::cdtv, amiga_base)
MCFG_CPU_PROGRAM_MAP(cdtv_mem)
// remote control input converter
- MCFG_CPU_ADD("u75", M6502, XTAL_3MHz)
+ MCFG_CPU_ADD("u75", M6502, XTAL(3'000'000))
MCFG_CPU_PROGRAM_MAP(cdtv_rc_mem)
MCFG_DEVICE_DISABLE()
// lcd controller
#if 0
- MCFG_CPU_ADD("u62", LC6554, XTAL_4MHz)
+ MCFG_CPU_ADD("u62", LC6554, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(lcd_mem)
#endif
@@ -1558,7 +1558,7 @@ MACHINE_CONFIG_DERIVED(cdtv_state::cdtv, amiga_base)
MCFG_NVRAM_ADD_0FILL("memcard")
// real-time clock
- MCFG_DEVICE_ADD("u61", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("u61", MSM6242, XTAL(32'768))
// cd-rom controller
MCFG_DMAC_ADD("u36", amiga_state::CLK_7M_PAL)
@@ -1604,7 +1604,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(a3000_state::a3000, amiga_base)
// main cpu
- MCFG_CPU_ADD("maincpu", M68030, XTAL_32MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68030, XTAL(32'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(a3000_mem)
MCFG_DEVICE_ADD("overlay", ADDRESS_MAP_BANK, 0)
@@ -1615,7 +1615,7 @@ MACHINE_CONFIG_DERIVED(a3000_state::a3000, amiga_base)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x200000)
// real-time clock
- MCFG_DEVICE_ADD("rtc", RP5C01, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", RP5C01, XTAL(32'768))
// todo: zorro3 slots, super dmac, scsi
@@ -1648,7 +1648,7 @@ MACHINE_CONFIG_DERIVED(a500p_state::a500p, amiga_base)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x200000)
// real-time clock
- MCFG_DEVICE_ADD("u9", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("u9", MSM6242, XTAL(32'768))
// cpu slot
MCFG_EXPANSION_SLOT_ADD("maincpu", a500_expansion_cards, nullptr)
@@ -1782,7 +1782,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(a4000_state::a4000, amiga_base)
// main cpu
- MCFG_CPU_ADD("maincpu", M68040, XTAL_50MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68040, XTAL(50'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(a4000_mem)
MCFG_DEVICE_ADD("overlay", ADDRESS_MAP_BANK, 0)
@@ -1801,7 +1801,7 @@ MACHINE_CONFIG_DERIVED(a4000_state::a4000, amiga_base)
MCFG_VIDEO_START_OVERRIDE(amiga_state, amiga_aga)
// real-time clock
- MCFG_DEVICE_ADD("rtc", RP5C01, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", RP5C01, XTAL(32'768))
// ide
MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, false)
@@ -1833,7 +1833,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(a4000_state::a400030, a4000)
// main cpu
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", M68EC030, XTAL_50MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68EC030, XTAL(50'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(a400030_mem)
// todo: ide
@@ -1922,7 +1922,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(a4000_state::a4000t, a4000)
// main cpu
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", M68040, XTAL_50MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68040, XTAL(50'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(a4000t_mem)
// todo: ide, zorro3, scsi, super dmac
diff --git a/src/mame/drivers/ampex.cpp b/src/mame/drivers/ampex.cpp
index a0e6dcbd693..e3bd9dd36b0 100644
--- a/src/mame/drivers/ampex.cpp
+++ b/src/mame/drivers/ampex.cpp
@@ -62,15 +62,15 @@ static INPUT_PORTS_START( ampex )
INPUT_PORTS_END
MACHINE_CONFIG_START(ampex_state::ampex)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_23_814MHz / 9) // clocked by 8224?
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(23'814'000) / 9) // clocked by 8224?
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_23_814MHz / 2, 105 * CHAR_WIDTH, 0, 80 * CHAR_WIDTH, 270, 0, 250)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(23'814'000) / 2, 105 * CHAR_WIDTH, 0, 80 * CHAR_WIDTH, 270, 0, 250)
MCFG_SCREEN_UPDATE_DRIVER(ampex_state, screen_update)
// FIXME: dot clock should be divided by char width
- MCFG_DEVICE_ADD("vtac", CRT5037, XTAL_23_814MHz / 2)
+ MCFG_DEVICE_ADD("vtac", CRT5037, XTAL(23'814'000) / 2)
MCFG_TMS9927_CHAR_WIDTH(CHAR_WIDTH)
MCFG_VIDEO_SET_SCREEN("screen")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ampoker2.cpp b/src/mame/drivers/ampoker2.cpp
index 3a7179fbd36..0b8e0fbff9f 100644
--- a/src/mame/drivers/ampoker2.cpp
+++ b/src/mame/drivers/ampoker2.cpp
@@ -374,7 +374,7 @@
*********************************************************************************/
-#define MASTER_CLOCK XTAL_6MHz
+#define MASTER_CLOCK XTAL(6'000'000)
#include "emu.h"
#include "includes/ampoker2.h"
diff --git a/src/mame/drivers/ampro.cpp b/src/mame/drivers/ampro.cpp
index 749e4675bf5..1e89e9a2ca4 100644
--- a/src/mame/drivers/ampro.cpp
+++ b/src/mame/drivers/ampro.cpp
@@ -146,24 +146,24 @@ DRIVER_INIT_MEMBER( ampro_state, ampro )
MACHINE_CONFIG_START(ampro_state::ampro)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(ampro_mem)
MCFG_CPU_IO_MAP(ampro_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
MCFG_MACHINE_RESET_OVERRIDE(ampro_state, ampro)
- MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL_16MHz / 8) // 2MHz
+ MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(16'000'000) / 8) // 2MHz
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
/* Devices */
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(16'000'000) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("dart", z80dart_device, txca_w)) // Z80DART Ch A, SIO Ch A
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart", z80dart_device, rxca_w))
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("dart", z80dart_device, rxtxcb_w)) // SIO Ch B
- MCFG_DEVICE_ADD("dart", Z80DART, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("dart", Z80DART, XTAL(16'000'000) / 4)
MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
@@ -172,7 +172,7 @@ MACHINE_CONFIG_START(ampro_state::ampro)
MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("dart", z80dart_device, rxa_w))
- MCFG_WD1772_ADD("fdc", XTAL_16MHz / 2)
+ MCFG_WD1772_ADD("fdc", XTAL(16'000'000) / 2)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ampro_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_SOFTWARE_LIST_ADD("flop_list", "ampro")
diff --git a/src/mame/drivers/amstr_pc.cpp b/src/mame/drivers/amstr_pc.cpp
index d0a09fa54f3..b0f508ad1ee 100644
--- a/src/mame/drivers/amstr_pc.cpp
+++ b/src/mame/drivers/amstr_pc.cpp
@@ -526,7 +526,7 @@ MACHINE_CONFIG_DERIVED(amstrad_pc_state::ppc640, pc200)
MCFG_DEVICE_REMOVE("isa1")
MCFG_DEVICE_REMOVE("isa2")
- MCFG_MC146818_ADD( "rtc", XTAL_32_768kHz )
+ MCFG_MC146818_ADD( "rtc", XTAL(32'768) )
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(amstrad_pc_state::ppc512, ppc640)
diff --git a/src/mame/drivers/amstrad.cpp b/src/mame/drivers/amstrad.cpp
index af49931da6e..37e268f7466 100644
--- a/src/mame/drivers/amstrad.cpp
+++ b/src/mame/drivers/amstrad.cpp
@@ -900,7 +900,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(amstrad_state::amstrad_base)
/* Machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(amstrad_mem)
MCFG_CPU_IO_MAP(amstrad_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(amstrad_state,amstrad_cpu_acknowledge_int)
@@ -918,7 +918,7 @@ MACHINE_CONFIG_START(amstrad_state::amstrad_base)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS( XTAL_16MHz, 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
+ MCFG_SCREEN_RAW_PARAMS( XTAL(16'000'000), 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
MCFG_SCREEN_UPDATE_DRIVER(amstrad_state, screen_update_amstrad)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(amstrad_state, screen_vblank_amstrad))
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
@@ -927,7 +927,7 @@ MACHINE_CONFIG_START(amstrad_state::amstrad_base)
MCFG_PALETTE_ADD("palette", 32)
MCFG_PALETTE_INIT_OWNER(amstrad_state,amstrad_cpc)
- MCFG_MC6845_ADD("mc6845", HD6845, nullptr, XTAL_16MHz / 16)
+ MCFG_MC6845_ADD("mc6845", HD6845, nullptr, XTAL(16'000'000) / 16)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(16)
MCFG_MC6845_OUT_DE_CB(WRITELINE(amstrad_state, amstrad_de_changed))
@@ -941,7 +941,7 @@ MACHINE_CONFIG_START(amstrad_state::amstrad_base)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay", AY8912, XTAL_16MHz / 16)
+ MCFG_SOUND_ADD("ay", AY8912, XTAL(16'000'000) / 16)
MCFG_AY8910_PORT_A_READ_CB(READ8(amstrad_state, amstrad_psg_porta_read)) /* portA read */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -1025,7 +1025,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(amstrad_state::cpcplus)
/* Machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_40MHz / 10)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(40'000'000) / 10)
MCFG_CPU_PROGRAM_MAP(amstrad_mem)
MCFG_CPU_IO_MAP(amstrad_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(amstrad_state,amstrad_cpu_acknowledge_int)
@@ -1043,7 +1043,7 @@ MACHINE_CONFIG_START(amstrad_state::cpcplus)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS( ( XTAL_40MHz * 2 ) / 5, 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
+ MCFG_SCREEN_RAW_PARAMS( ( XTAL(40'000'000) * 2 ) / 5, 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
MCFG_SCREEN_UPDATE_DRIVER(amstrad_state, screen_update_amstrad)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(amstrad_state, screen_vblank_amstrad))
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
@@ -1052,7 +1052,7 @@ MACHINE_CONFIG_START(amstrad_state::cpcplus)
MCFG_PALETTE_ADD("palette", 4096)
MCFG_PALETTE_INIT_OWNER(amstrad_state,amstrad_plus)
- MCFG_MC6845_ADD("mc6845", AMS40489, nullptr, XTAL_40MHz / 40)
+ MCFG_MC6845_ADD("mc6845", AMS40489, nullptr, XTAL(40'000'000) / 40)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(16)
MCFG_MC6845_OUT_DE_CB(WRITELINE(amstrad_state, amstrad_plus_de_changed))
@@ -1065,7 +1065,7 @@ MACHINE_CONFIG_START(amstrad_state::cpcplus)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay", AY8912, XTAL_40MHz / 40)
+ MCFG_SOUND_ADD("ay", AY8912, XTAL(40'000'000) / 40)
MCFG_AY8910_PORT_A_READ_CB(READ8(amstrad_state, amstrad_psg_porta_read)) /* portA read */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -1104,7 +1104,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(amstrad_state::gx4000)
/* Machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_40MHz / 10)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(40'000'000) / 10)
MCFG_CPU_PROGRAM_MAP(amstrad_mem)
MCFG_CPU_IO_MAP(amstrad_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(amstrad_state,amstrad_cpu_acknowledge_int)
@@ -1122,7 +1122,7 @@ MACHINE_CONFIG_START(amstrad_state::gx4000)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS( ( XTAL_40MHz * 2 ) / 5, 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
+ MCFG_SCREEN_RAW_PARAMS( ( XTAL(40'000'000) * 2 ) / 5, 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
MCFG_SCREEN_UPDATE_DRIVER(amstrad_state, screen_update_amstrad)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(amstrad_state, screen_vblank_amstrad))
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
@@ -1131,7 +1131,7 @@ MACHINE_CONFIG_START(amstrad_state::gx4000)
MCFG_PALETTE_ADD("palette", 4096)
MCFG_PALETTE_INIT_OWNER(amstrad_state,amstrad_plus)
- MCFG_MC6845_ADD("mc6845", AMS40489, nullptr, XTAL_40MHz / 40)
+ MCFG_MC6845_ADD("mc6845", AMS40489, nullptr, XTAL(40'000'000) / 40)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(16)
MCFG_MC6845_OUT_DE_CB(WRITELINE(amstrad_state, amstrad_plus_de_changed))
@@ -1142,7 +1142,7 @@ MACHINE_CONFIG_START(amstrad_state::gx4000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay", AY8912, XTAL_40MHz / 40)
+ MCFG_SOUND_ADD("ay", AY8912, XTAL(40'000'000) / 40)
MCFG_AY8910_PORT_A_READ_CB(READ8(amstrad_state, amstrad_psg_porta_read)) /* portA read */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -1158,14 +1158,14 @@ MACHINE_CONFIG_DERIVED(amstrad_state::aleste, cpc6128)
MCFG_MACHINE_START_OVERRIDE(amstrad_state,aleste)
MCFG_MACHINE_RESET_OVERRIDE(amstrad_state,aleste)
- MCFG_SOUND_REPLACE("ay", AY8912, XTAL_16MHz / 16)
+ MCFG_SOUND_REPLACE("ay", AY8912, XTAL(16'000'000) / 16)
MCFG_AY8910_PORT_A_READ_CB(READ8(amstrad_state, amstrad_psg_porta_read)) /* portA read */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_ENTRIES(32+64)
MCFG_PALETTE_INIT_OWNER(amstrad_state,aleste)
- MCFG_MC146818_ADD( "rtc", XTAL_4_194304Mhz )
+ MCFG_MC146818_ADD( "rtc", XTAL(4'194'304) )
MCFG_DEVICE_REMOVE("upd765")
MCFG_I8272A_ADD("upd765", true)
diff --git a/src/mame/drivers/amusco.cpp b/src/mame/drivers/amusco.cpp
index 5137cf5d78e..ca83c71a86c 100644
--- a/src/mame/drivers/amusco.cpp
+++ b/src/mame/drivers/amusco.cpp
@@ -86,8 +86,8 @@
#include "amusco.lh"
-#define MASTER_CLOCK XTAL_22_1184MHz /* confirmed */
-#define SECOND_CLOCK XTAL_15MHz /* confirmed */
+#define MASTER_CLOCK XTAL(22'118'400) /* confirmed */
+#define SECOND_CLOCK XTAL(15'000'000) /* confirmed */
#define CPU_CLOCK MASTER_CLOCK / 4 /* guess */
#define CRTC_CLOCK SECOND_CLOCK / 8 /* guess */
@@ -554,7 +554,7 @@ MACHINE_CONFIG_START(amusco_state::amusco)
MCFG_I8155_IN_PORTB_CB(READ8(amusco_state, lpt_status_r))
// Port C uses ALT 3 mode, which MAME does not currently emulate
- MCFG_MSM5832_ADD("rtc", XTAL_32_768kHz)
+ MCFG_MSM5832_ADD("rtc", XTAL(32'768))
MCFG_DEVICE_ADD("rtc_interface", I8155, 0)
MCFG_I8155_OUT_PORTA_CB(WRITE8(amusco_state, rtc_control_w))
diff --git a/src/mame/drivers/amust.cpp b/src/mame/drivers/amust.cpp
index ccdfaf50b5d..fbba23ce7a3 100644
--- a/src/mame/drivers/amust.cpp
+++ b/src/mame/drivers/amust.cpp
@@ -373,7 +373,7 @@ DRIVER_INIT_MEMBER( amust_state, amust )
MACHINE_CONFIG_START(amust_state::amust)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", amust_state, irq_vs)
@@ -395,7 +395,7 @@ MACHINE_CONFIG_START(amust_state::amust)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
- MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_14_31818MHz / 8)
+ MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(14'318'181) / 8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(amust_state, crtc_update_row)
diff --git a/src/mame/drivers/anes.cpp b/src/mame/drivers/anes.cpp
index 38bce775911..2f223df67ea 100644
--- a/src/mame/drivers/anes.cpp
+++ b/src/mame/drivers/anes.cpp
@@ -152,7 +152,7 @@ void anes_state::machine_start()
MACHINE_CONFIG_START(anes_state::anes)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 2) // Z0840008PSC
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 2) // Z0840008PSC
MCFG_CPU_PROGRAM_MAP(prg_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", anes_state, irq0_line_hold)
@@ -170,7 +170,7 @@ MACHINE_CONFIG_START(anes_state::anes)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ym", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/angelkds.cpp b/src/mame/drivers/angelkds.cpp
index e82b09d2fe6..8fd41668baf 100644
--- a/src/mame/drivers/angelkds.cpp
+++ b/src/mame/drivers/angelkds.cpp
@@ -513,12 +513,12 @@ void angelkds_state::machine_reset()
MACHINE_CONFIG_START(angelkds_state::angelkds)
- MCFG_CPU_ADD("maincpu", Z80, XTAL_6MHz)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(6'000'000))
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(main_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", angelkds_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, XTAL_4MHz)
+ MCFG_CPU_ADD("sub", Z80, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(sub_map)
MCFG_CPU_IO_MAP(sub_portmap)
@@ -551,14 +551,14 @@ MACHINE_CONFIG_START(angelkds_state::angelkds)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_4MHz)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(4'000'000))
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("sub", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.65)
MCFG_SOUND_ROUTE(1, "mono", 0.65)
MCFG_SOUND_ROUTE(2, "mono", 0.65)
MCFG_SOUND_ROUTE(3, "mono", 0.45)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL_4MHz)
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL(4'000'000))
MCFG_SOUND_ROUTE(0, "mono", 0.65)
MCFG_SOUND_ROUTE(1, "mono", 0.65)
MCFG_SOUND_ROUTE(2, "mono", 0.65)
@@ -567,7 +567,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(angelkds_state::spcpostn, angelkds)
/* encryption */
- MCFG_CPU_REPLACE("maincpu", SEGA_317_0005, XTAL_6MHz)
+ MCFG_CPU_REPLACE("maincpu", SEGA_317_0005, XTAL(6'000'000))
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(main_portmap)
MCFG_CPU_VBLANK_INT_DRIVER("screen", angelkds_state, irq0_line_hold)
diff --git a/src/mame/drivers/apc.cpp b/src/mame/drivers/apc.cpp
index f20879d0936..a02ba94bcf1 100644
--- a/src/mame/drivers/apc.cpp
+++ b/src/mame/drivers/apc.cpp
@@ -67,7 +67,7 @@
#include "speaker.h"
//#include "sound/ay8910.h"
-#define MAIN_CLOCK XTAL_5MHz
+#define MAIN_CLOCK XTAL(5'000'000)
class apc_state : public driver_device
{
@@ -946,7 +946,7 @@ MACHINE_CONFIG_START(apc_state::apc)
MCFG_I8237_OUT_DACK_3_CB(WRITELINE(apc_state, apc_dack3_w))
MCFG_NVRAM_ADD_1FILL("cmos")
- MCFG_UPD1990A_ADD("upd1990a", XTAL_32_768kHz, NOOP, NOOP)
+ MCFG_UPD1990A_ADD("upd1990a", XTAL(32'768), NOOP, NOOP)
MCFG_UPD765A_ADD("upd765", true, true)
MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("pic8259_slave", pic8259_device, ir4_w))
diff --git a/src/mame/drivers/apf.cpp b/src/mame/drivers/apf.cpp
index 1d0ef3dfad2..d381df67c79 100644
--- a/src/mame/drivers/apf.cpp
+++ b/src/mame/drivers/apf.cpp
@@ -513,13 +513,13 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(apf_state::apfm1000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL_3_579545MHz / 4 ) // divided by 4 in external clock circuit
+ MCFG_CPU_ADD("maincpu", M6800, XTAL(3'579'545) / 4 ) // divided by 4 in external clock circuit
MCFG_CPU_PROGRAM_MAP(apfm1000_map)
/* video hardware */
MCFG_SCREEN_MC6847_NTSC_ADD("screen", "mc6847")
- MCFG_DEVICE_ADD("mc6847", MC6847_NTSC, XTAL_3_579545MHz)
+ MCFG_DEVICE_ADD("mc6847", MC6847_NTSC, XTAL(3'579'545))
MCFG_MC6847_FSYNC_CALLBACK(DEVWRITELINE("pia0", pia6821_device, cb1_w))
MCFG_MC6847_INPUT_CALLBACK(READ8(apf_state, videoram_r))
MCFG_MC6847_FIXED_MODE(mc6847_ntsc_device::MODE_GM2 | mc6847_ntsc_device::MODE_GM1)
diff --git a/src/mame/drivers/apogee.cpp b/src/mame/drivers/apogee.cpp
index 0fc0b837bd5..8ccee7f2fb3 100644
--- a/src/mame/drivers/apogee.cpp
+++ b/src/mame/drivers/apogee.cpp
@@ -215,16 +215,16 @@ GFXDECODE_END
/* Machine driver */
MACHINE_CONFIG_START(apogee_state::apogee)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL_16MHz / 9)
+ MCFG_CPU_ADD("maincpu", I8080, XTAL(16'000'000) / 9)
MCFG_CPU_PROGRAM_MAP(apogee_mem)
MCFG_MACHINE_RESET_OVERRIDE(apogee_state, radio86 )
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_16MHz/9)
+ MCFG_PIT8253_CLK0(XTAL(16'000'000)/9)
MCFG_PIT8253_OUT0_HANDLER(WRITELINE(apogee_state,pit8253_out0_changed))
- MCFG_PIT8253_CLK1(XTAL_16MHz/9)
+ MCFG_PIT8253_CLK1(XTAL(16'000'000)/9)
MCFG_PIT8253_OUT1_HANDLER(WRITELINE(apogee_state,pit8253_out1_changed))
- MCFG_PIT8253_CLK2(XTAL_16MHz/9)
+ MCFG_PIT8253_CLK2(XTAL(16'000'000)/9)
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(apogee_state,pit8253_out2_changed))
MCFG_DEVICE_ADD("ppi8255_1", I8255, 0)
@@ -235,7 +235,7 @@ MACHINE_CONFIG_START(apogee_state::apogee)
//MCFG_DEVICE_ADD("ppi8255_2", I8255, 0)
- MCFG_DEVICE_ADD("i8275", I8275, XTAL_16MHz / 12)
+ MCFG_DEVICE_ADD("i8275", I8275, XTAL(16'000'000) / 12)
MCFG_I8275_CHARACTER_WIDTH(6)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(apogee_state, display_pixels)
MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("dma8257",i8257_device, dreq2_w))
@@ -258,7 +258,7 @@ MACHINE_CONFIG_START(apogee_state::apogee)
MCFG_SPEAKER_LEVELS(4, speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MCFG_DEVICE_ADD("dma8257", I8257, XTAL_16MHz / 9)
+ MCFG_DEVICE_ADD("dma8257", I8257, XTAL(16'000'000) / 9)
MCFG_I8257_OUT_HRQ_CB(WRITELINE(radio86_state, hrq_w))
MCFG_I8257_IN_MEMR_CB(READ8(radio86_state, memory_read_byte))
MCFG_I8257_OUT_MEMW_CB(WRITE8(radio86_state, memory_write_byte))
diff --git a/src/mame/drivers/apple1.cpp b/src/mame/drivers/apple1.cpp
index faf37205dad..903a3b598c6 100644
--- a/src/mame/drivers/apple1.cpp
+++ b/src/mame/drivers/apple1.cpp
@@ -592,7 +592,7 @@ MACHINE_CONFIG_START(apple1_state::apple1)
// video timings are identical to the Apple II, unsurprisingly
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz, (65*7)*2, 0, (40*7)*2, 262, 0, 192)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(14'318'181), (65*7)*2, 0, (40*7)*2, 262, 0, 192)
MCFG_SCREEN_UPDATE_DRIVER(apple1_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/apple2.cpp b/src/mame/drivers/apple2.cpp
index aa7decd6ed6..bdd1d117e87 100644
--- a/src/mame/drivers/apple2.cpp
+++ b/src/mame/drivers/apple2.cpp
@@ -1365,7 +1365,7 @@ MACHINE_CONFIG_START(napple2_state::apple2_common)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", napple2_state, apple2_interrupt, "screen", 0, 1)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_DEVICE_ADD(A2_VIDEO_TAG, APPLE2_VIDEO, XTAL_14_31818MHz)
+ MCFG_DEVICE_ADD(A2_VIDEO_TAG, APPLE2_VIDEO, XTAL(14'318'181))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(1021800*14, (65*7)*2, 0, (40*7)*2, 262, 0, 192)
diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp
index 8fb88629dd6..84a96caf037 100644
--- a/src/mame/drivers/apple2e.cpp
+++ b/src/mame/drivers/apple2e.cpp
@@ -3853,7 +3853,7 @@ MACHINE_CONFIG_START(apple2e_state::apple2e)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", apple2e_state, apple2_interrupt, "screen", 0, 1)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_DEVICE_ADD(A2_VIDEO_TAG, APPLE2_VIDEO, XTAL_14_31818MHz)
+ MCFG_DEVICE_ADD(A2_VIDEO_TAG, APPLE2_VIDEO, XTAL(14'318'181))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(1021800*14, (65*7)*2, 0, (40*7)*2, 262, 0, 192)
@@ -4018,7 +4018,7 @@ MACHINE_CONFIG_DERIVED(apple2e_state::apple2ee, apple2e)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(apple2e_state::spectred, apple2e)
- MCFG_CPU_ADD("keyb_mcu", I8035, XTAL_4MHz) /* guessed frequency */
+ MCFG_CPU_ADD("keyb_mcu", I8035, XTAL(4'000'000)) /* guessed frequency */
MCFG_CPU_PROGRAM_MAP(spectred_keyb_map)
//TODO: implement the actual interfacing to this 8035 MCU and
@@ -4054,11 +4054,11 @@ MACHINE_CONFIG_DERIVED(apple2e_state::apple2c, apple2ee)
MCFG_A2BUS_SLOT_REMOVE("sl7")
MCFG_DEVICE_ADD(IIC_ACIA1_TAG, MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_14_31818MHz / 8) // ~1.789 MHz
+ MCFG_MOS6551_XTAL(XTAL(14'318'181) / 8) // ~1.789 MHz
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(PRINTER_PORT_TAG, rs232_port_device, write_txd))
MCFG_DEVICE_ADD(IIC_ACIA2_TAG, MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz) // matches SSC so modem software is compatible
+ MCFG_MOS6551_XTAL(XTAL(1'843'200)) // matches SSC so modem software is compatible
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("modem", rs232_port_device, write_txd))
MCFG_RS232_PORT_ADD(PRINTER_PORT_TAG, default_rs232_devices, nullptr)
diff --git a/src/mame/drivers/apple2gs.cpp b/src/mame/drivers/apple2gs.cpp
index 92c9b13e225..e1ece633c59 100644
--- a/src/mame/drivers/apple2gs.cpp
+++ b/src/mame/drivers/apple2gs.cpp
@@ -250,9 +250,9 @@ WRITE8_MEMBER(apple2gs_state::adbmicro_p3_out)
{
if (((data & 0x08) == 0x08) != m_adb_line)
{
- m_adb_dtime = (int)(machine().time().as_ticks(XTAL_3_579545MHz*2) - m_last_adb_time);
+ m_adb_dtime = (int)(machine().time().as_ticks(XTAL(3'579'545)*2) - m_last_adb_time);
// printf("ADB change to %d (dtime %d)\n", (data>>3) & 1, m_adb_dtime);
- m_last_adb_time = machine().time().as_ticks(XTAL_3_579545MHz*2);
+ m_last_adb_time = machine().time().as_ticks(XTAL(3'579'545)*2);
m_adb_line = (data & 0x8) ? true : false;
}
}
@@ -312,7 +312,7 @@ MACHINE_CONFIG_START(apple2gs_state::apple2gs)
MCFG_CPU_ADD("maincpu", G65816, APPLE2GS_14M/5)
MCFG_CPU_PROGRAM_MAP(apple2gs_map)
#if RUN_ADB_MICRO
- MCFG_CPU_ADD(ADBMICRO_TAG, M50741, XTAL_3_579545MHz)
+ MCFG_CPU_ADD(ADBMICRO_TAG, M50741, XTAL(3'579'545))
MCFG_M5074X_PORT0_READ_CALLBACK(READ8(apple2gs_state, adbmicro_p0_in))
MCFG_M5074X_PORT0_WRITE_CALLBACK(WRITE8(apple2gs_state, adbmicro_p0_out))
MCFG_M5074X_PORT1_READ_CALLBACK(READ8(apple2gs_state, adbmicro_p1_in))
@@ -419,7 +419,7 @@ MACHINE_CONFIG_DERIVED(apple2gs_state::apple2gsr1, apple2gs)
MCFG_MACHINE_START_OVERRIDE(apple2gs_state, apple2gsr1 )
#if RUN_ADB_MICRO
- MCFG_CPU_REPLACE(ADBMICRO_TAG, M50740, XTAL_3_579545MHz)
+ MCFG_CPU_REPLACE(ADBMICRO_TAG, M50740, XTAL(3'579'545))
MCFG_M5074X_PORT0_READ_CALLBACK(READ8(apple2gs_state, adbmicro_p0_in))
MCFG_M5074X_PORT0_WRITE_CALLBACK(WRITE8(apple2gs_state, adbmicro_p0_out))
MCFG_M5074X_PORT1_READ_CALLBACK(READ8(apple2gs_state, adbmicro_p1_in))
diff --git a/src/mame/drivers/apple3.cpp b/src/mame/drivers/apple3.cpp
index 44b0347afeb..879a30c77fb 100644
--- a/src/mame/drivers/apple3.cpp
+++ b/src/mame/drivers/apple3.cpp
@@ -115,7 +115,7 @@ MACHINE_CONFIG_START(apple3_state::apple3)
/* acia */
MCFG_DEVICE_ADD("acia", MOS6551, 0)
- MCFG_MOS6551_XTAL(XTAL_1_8432MHz) // HACK: The schematic shows an external clock generator but using a XTAL is faster to emulate.
+ MCFG_MOS6551_XTAL(XTAL(1'843'200)) // HACK: The schematic shows an external clock generator but using a XTAL is faster to emulate.
MCFG_MOS6551_IRQ_HANDLER(WRITELINE(apple3_state, apple3_acia_irq_func))
MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_MOS6551_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
@@ -131,7 +131,7 @@ MACHINE_CONFIG_START(apple3_state::apple3)
MCFG_TIMER_DRIVER_ADD("pdltimer", apple3_state, paddle_timer);
/* rtc */
- MCFG_DEVICE_ADD("rtc", MM58167, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MM58167, XTAL(32'768))
/* via */
MCFG_DEVICE_ADD("via6522_0", VIA6522, 1000000)
diff --git a/src/mame/drivers/applix.cpp b/src/mame/drivers/applix.cpp
index 30671715471..bfe3dfcf0d8 100644
--- a/src/mame/drivers/applix.cpp
+++ b/src/mame/drivers/applix.cpp
@@ -836,9 +836,9 @@ TIMER_DEVICE_CALLBACK_MEMBER(applix_state::cass_timer)
MACHINE_CONFIG_START(applix_state::applix)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_30MHz / 4) // MC68000-P10 @ 7.5 MHz
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(30'000'000) / 4) // MC68000-P10 @ 7.5 MHz
MCFG_CPU_PROGRAM_MAP(applix_mem)
- MCFG_CPU_ADD("subcpu", Z80, XTAL_16MHz / 2) // Z80H
+ MCFG_CPU_ADD("subcpu", Z80, XTAL(16'000'000) / 2) // Z80H
MCFG_CPU_PROGRAM_MAP(subcpu_mem)
MCFG_CPU_IO_MAP(subcpu_io)
MCFG_CPU_ADD("kbdcpu", I8051, 11060250)
@@ -867,13 +867,13 @@ MACHINE_CONFIG_START(applix_state::applix)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
/* Devices */
- MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_30MHz / 16) // MC6545 @ 1.875 MHz
+ MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(30'000'000) / 16) // MC6545 @ 1.875 MHz
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(applix_state, crtc_update_row)
MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(applix_state, vsync_w))
- MCFG_DEVICE_ADD("via6522", VIA6522, XTAL_30MHz / 4 / 10) // VIA uses 68000 E clock
+ MCFG_DEVICE_ADD("via6522", VIA6522, XTAL(30'000'000) / 4 / 10) // VIA uses 68000 E clock
MCFG_VIA6522_READPB_HANDLER(READ8(applix_state, applix_pb_r))
// in CB1 kbd clk
// in CA2 vsync
@@ -891,7 +891,7 @@ MACHINE_CONFIG_START(applix_state::applix)
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED)
- MCFG_WD1772_ADD("fdc", XTAL_16MHz / 2) //connected to Z80H clock pin
+ MCFG_WD1772_ADD("fdc", XTAL(16'000'000) / 2) //connected to Z80H clock pin
MCFG_FLOPPY_DRIVE_ADD("fdc:0", applix_floppies, "35dd", applix_state::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", applix_floppies, "35dd", applix_state::floppy_formats)
diff --git a/src/mame/drivers/apricot.cpp b/src/mame/drivers/apricot.cpp
index cc4ffc38c85..774d48d7058 100644
--- a/src/mame/drivers/apricot.cpp
+++ b/src/mame/drivers/apricot.cpp
@@ -188,7 +188,7 @@ WRITE8_MEMBER( apricot_state::i8255_portb_w )
floppy->mon_w(0);
// switch video modes
- m_crtc->set_clock(m_video_mode ? XTAL_15MHz / 10 : XTAL_15MHz / 16);
+ m_crtc->set_clock(m_video_mode ? XTAL(15'000'000) / 10 : XTAL(15'000'000) / 16);
m_crtc->set_hpixels_per_column(m_video_mode ? 10 : 16);
// PB7 Centronics transceiver direction. 0 = output, 1 = input
@@ -352,14 +352,14 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(apricot_state::apricot)
// main cpu
- MCFG_CPU_ADD("ic91", I8086, XTAL_15MHz / 3)
+ MCFG_CPU_ADD("ic91", I8086, XTAL(15'000'000) / 3)
MCFG_CPU_PROGRAM_MAP(apricot_mem)
MCFG_CPU_IO_MAP(apricot_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("ic31", pic8259_device, inta_cb)
MCFG_I8086_LOCK_HANDLER(WRITELINE(apricot_state, i8086_lock_w))
// i/o cpu
- MCFG_CPU_ADD("ic71", I8089, XTAL_15MHz / 3)
+ MCFG_CPU_ADD("ic71", I8089, XTAL(15'000'000) / 3)
MCFG_CPU_PROGRAM_MAP(apricot_mem)
MCFG_CPU_IO_MAP(apricot_io)
MCFG_I8089_DATA_WIDTH(16)
@@ -379,7 +379,7 @@ MACHINE_CONFIG_START(apricot_state::apricot)
MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
- MCFG_MC6845_ADD("ic30", HD6845, "screen", XTAL_15MHz / 10)
+ MCFG_MC6845_ADD("ic30", HD6845, "screen", XTAL(15'000'000) / 10)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(10)
MCFG_MC6845_UPDATE_ROW_CB(apricot_state, crtc_update_row)
@@ -387,7 +387,7 @@ MACHINE_CONFIG_START(apricot_state::apricot)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ic7", SN76489, XTAL_4MHz / 2)
+ MCFG_SOUND_ADD("ic7", SN76489, XTAL(4'000'000) / 2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
// devices
@@ -402,11 +402,11 @@ MACHINE_CONFIG_START(apricot_state::apricot)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("ic91", 0))
MCFG_DEVICE_ADD("ic16", PIT8253, 0)
- MCFG_PIT8253_CLK0(XTAL_4MHz / 16)
+ MCFG_PIT8253_CLK0(XTAL(4'000'000) / 16)
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("ic31", pic8259_device, ir6_w))
- MCFG_PIT8253_CLK1(XTAL_4MHz / 2)
+ MCFG_PIT8253_CLK1(XTAL(4'000'000) / 2)
MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("ic14", ttl153_device, i0a_w))
- MCFG_PIT8253_CLK2(XTAL_4MHz / 2)
+ MCFG_PIT8253_CLK2(XTAL(4'000'000) / 2)
MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("ic14", ttl153_device, i0b_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ic14", ttl153_device, i2a_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ic14", ttl153_device, i2b_w))
@@ -415,10 +415,10 @@ MACHINE_CONFIG_START(apricot_state::apricot)
MCFG_TTL153_ZA_CB(DEVWRITELINE("ic15", z80sio_device, rxca_w))
MCFG_TTL153_ZB_CB(DEVWRITELINE("ic15", z80sio_device, txca_w))
- MCFG_CLOCK_ADD("ic15_rxtxcb", XTAL_4MHz / 16)
+ MCFG_CLOCK_ADD("ic15_rxtxcb", XTAL(4'000'000) / 16)
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ic15", z80sio_device, rxtxcb_w))
- MCFG_DEVICE_ADD("ic15", Z80SIO, XTAL_15MHz / 6)
+ MCFG_DEVICE_ADD("ic15", Z80SIO, XTAL(15'000'000) / 6)
MCFG_Z80SIO_CPU("ic91")
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
@@ -454,7 +454,7 @@ MACHINE_CONFIG_START(apricot_state::apricot)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
// floppy
- MCFG_WD2797_ADD("ic68", XTAL_4MHz / 2)
+ MCFG_WD2797_ADD("ic68", XTAL(4'000'000) / 2)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(apricot_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("ic71", i8089_device, drq1_w))
MCFG_FLOPPY_DRIVE_ADD("ic68:0", apricot_floppies, "d32w", apricot_state::floppy_formats)
diff --git a/src/mame/drivers/apricotf.cpp b/src/mame/drivers/apricotf.cpp
index 29ec8a3a295..1a0369f40fd 100644
--- a/src/mame/drivers/apricotf.cpp
+++ b/src/mame/drivers/apricotf.cpp
@@ -332,7 +332,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(f1_state::act_f1)
/* basic machine hardware */
- MCFG_CPU_ADD(I8086_TAG, I8086, XTAL_14MHz/4)
+ MCFG_CPU_ADD(I8086_TAG, I8086, XTAL(14'000'000)/4)
MCFG_CPU_PROGRAM_MAP(act_f1_mem)
MCFG_CPU_IO_MAP(act_f1_io)
@@ -368,7 +368,7 @@ MACHINE_CONFIG_START(f1_state::act_f1)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
// floppy
- MCFG_WD2797_ADD(WD2797_TAG, XTAL_4MHz / 2 /* ? */)
+ MCFG_WD2797_ADD(WD2797_TAG, XTAL(4'000'000) / 2 /* ? */)
MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE(I8086_TAG, INPUT_LINE_NMI))
MCFG_WD_FDC_DRQ_CALLBACK(INPUTLINE(I8086_TAG, INPUT_LINE_TEST))
diff --git a/src/mame/drivers/apricotp.cpp b/src/mame/drivers/apricotp.cpp
index 77fe340d911..38fb1e435d0 100644
--- a/src/mame/drivers/apricotp.cpp
+++ b/src/mame/drivers/apricotp.cpp
@@ -577,7 +577,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(fp_state::fp)
/* basic machine hardware */
- MCFG_CPU_ADD(I8086_TAG, I8086, XTAL_15MHz/3)
+ MCFG_CPU_ADD(I8086_TAG, I8086, XTAL(15'000'000)/3)
MCFG_CPU_PROGRAM_MAP(fp_mem)
MCFG_CPU_IO_MAP(fp_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(I8259A_TAG, pic8259_device, inta_cb)
diff --git a/src/mame/drivers/aquarium.cpp b/src/mame/drivers/aquarium.cpp
index ba8f2cf66c7..f502b90a23d 100644
--- a/src/mame/drivers/aquarium.cpp
+++ b/src/mame/drivers/aquarium.cpp
@@ -287,11 +287,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(aquarium_state::aquarium)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) // clock not verified on pcb
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) // clock not verified on pcb
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", aquarium_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/6) // clock not verified on pcb
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/6) // clock not verified on pcb
MCFG_CPU_PROGRAM_MAP(snd_map)
MCFG_CPU_IO_MAP(snd_portmap)
@@ -320,12 +320,12 @@ MACHINE_CONFIG_START(aquarium_state::aquarium)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4) // clock not verified on pcb
+ MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4) // clock not verified on pcb
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH) // pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) // pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/aquarius.cpp b/src/mame/drivers/aquarius.cpp
index 3a98374f985..95977aca0a8 100644
--- a/src/mame/drivers/aquarius.cpp
+++ b/src/mame/drivers/aquarius.cpp
@@ -33,7 +33,7 @@
***************************************************************************/
#define XTAL1 8866000
-#define XTAL2 XTAL_7_15909MHz
+#define XTAL2 XTAL(7'159'090)
/***************************************************************************
@@ -349,7 +349,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(aquarius_state::aquarius)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz) // ???
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(3'579'545)) // ???
MCFG_CPU_PROGRAM_MAP(aquarius_mem)
MCFG_CPU_IO_MAP(aquarius_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", aquarius_state, irq0_line_hold)
@@ -364,7 +364,7 @@ MACHINE_CONFIG_START(aquarius_state::aquarius)
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", aquarius )
- MCFG_TEA1002_ADD("encoder", XTAL_8_867238MHz)
+ MCFG_TEA1002_ADD("encoder", XTAL(8'867'238))
MCFG_PALETTE_ADD("palette", 512)
MCFG_PALETTE_INDIRECT_ENTRIES(16)
MCFG_PALETTE_INIT_OWNER(aquarius_state, aquarius)
@@ -374,7 +374,7 @@ MACHINE_CONFIG_START(aquarius_state::aquarius)
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay8910", AY8910, XTAL_3_579545MHz/2) // ??? AY-3-8914
+ MCFG_SOUND_ADD("ay8910", AY8910, XTAL(3'579'545)/2) // ??? AY-3-8914
MCFG_AY8910_PORT_A_READ_CB(IOPORT("RIGHT"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("LEFT"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/arabian.cpp b/src/mame/drivers/arabian.cpp
index 9f7589e81be..d12ecc3ff8a 100644
--- a/src/mame/drivers/arabian.cpp
+++ b/src/mame/drivers/arabian.cpp
@@ -55,7 +55,7 @@
/* constants */
-#define MAIN_OSC XTAL_12MHz
+#define MAIN_OSC XTAL(12'000'000)
/*************************************
diff --git a/src/mame/drivers/arachnid.cpp b/src/mame/drivers/arachnid.cpp
index 55ebbe329ea..2954a7185ad 100644
--- a/src/mame/drivers/arachnid.cpp
+++ b/src/mame/drivers/arachnid.cpp
@@ -420,7 +420,7 @@ void arachnid_state::machine_start()
MACHINE_CONFIG_START(arachnid_state::arachnid)
// basic machine hardware
- MCFG_CPU_ADD(M6809_TAG, M6809, XTAL_1MHz)
+ MCFG_CPU_ADD(M6809_TAG, M6809, XTAL(1'000'000))
MCFG_CPU_PROGRAM_MAP(arachnid_map)
// devices
@@ -441,7 +441,7 @@ MACHINE_CONFIG_START(arachnid_state::arachnid)
MCFG_PIA_CB2_HANDLER(WRITELINE(arachnid_state, pia_u17_pcb_w))
// video hardware
- MCFG_DEVICE_ADD( TMS9118_TAG, TMS9118, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( TMS9118_TAG, TMS9118, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE(M6809_TAG, INPUT_LINE_IRQ0))
MCFG_TMS9928A_SCREEN_ADD_NTSC( SCREEN_TAG )
@@ -452,7 +452,7 @@ MACHINE_CONFIG_START(arachnid_state::arachnid)
MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADD(PTM6840_TAG, PTM6840, XTAL_8MHz / 4)
+ MCFG_DEVICE_ADD(PTM6840_TAG, PTM6840, XTAL(8'000'000) / 4)
MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0)
MCFG_PTM6840_OUT0_CB(WRITELINE(arachnid_state, ptm_o1_callback))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/arcadecl.cpp b/src/mame/drivers/arcadecl.cpp
index faed251705b..9e7a561dc46 100644
--- a/src/mame/drivers/arcadecl.cpp
+++ b/src/mame/drivers/arcadecl.cpp
@@ -78,7 +78,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_14_31818MHz
+#define MASTER_CLOCK XTAL(14'318'181)
/*************************************
diff --git a/src/mame/drivers/argox.cpp b/src/mame/drivers/argox.cpp
index e506809fb36..3bb61dc086b 100644
--- a/src/mame/drivers/argox.cpp
+++ b/src/mame/drivers/argox.cpp
@@ -66,7 +66,7 @@ ADDRESS_MAP_END
MACHINE_CONFIG_START(os214_state::os214)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H83002, XTAL_16MHz) /* X1 xtal value is correct,
+ MCFG_CPU_ADD("maincpu", H83002, XTAL(16'000'000)) /* X1 xtal value is correct,
but there can be some clock divider perhaps ? */
MCFG_CPU_PROGRAM_MAP(os214_prg_map)
MCFG_CPU_IO_MAP(os214_io_map)
diff --git a/src/mame/drivers/aristmk4.cpp b/src/mame/drivers/aristmk4.cpp
index baae97d1c35..3d14c757d8c 100644
--- a/src/mame/drivers/aristmk4.cpp
+++ b/src/mame/drivers/aristmk4.cpp
@@ -315,7 +315,7 @@
***********************************************************************************************************************************************/
-#define MAIN_CLOCK XTAL_12MHz
+#define MAIN_CLOCK XTAL(12'000'000)
#include "emu.h"
#include "cpu/m6809/m6809.h"
@@ -1798,7 +1798,7 @@ MACHINE_CONFIG_START(aristmk4_state::aristmk4)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
- MCFG_MC146818_ADD( "rtc", XTAL_4_194304Mhz )
+ MCFG_MC146818_ADD( "rtc", XTAL(4'194'304) )
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/aristmk5.cpp b/src/mame/drivers/aristmk5.cpp
index abf9e74827a..ba75ccc9184 100644
--- a/src/mame/drivers/aristmk5.cpp
+++ b/src/mame/drivers/aristmk5.cpp
@@ -465,7 +465,7 @@
#include "swhr2u.lh" // 5 1, 2, 3, 4, 5 25
#include "wnpost.lh" // 5 1, 2, 3, 5, 10 50
-#define MASTER_CLOCK XTAL_72MHz /* confirmed */
+#define MASTER_CLOCK XTAL(72'000'000) /* confirmed */
class aristmk5_state : public archimedes_state
{
@@ -594,7 +594,7 @@ WRITE8_MEMBER(aristmk5_state::spi_data_w)
m_spi_bits = 0;
// start the SPI clock
- m_spi_timer->adjust(attotime::from_hz((double)MASTER_CLOCK / 9 / 512 / 2), 0, attotime::from_hz((double)MASTER_CLOCK / 9 / 512 / 2));
+ m_spi_timer->adjust(attotime::from_hz(MASTER_CLOCK / 9 / 512 / 2), 0, attotime::from_hz(MASTER_CLOCK / 9 / 512 / 2));
}
READ8_MEMBER(aristmk5_state::spi_data_r)
@@ -750,7 +750,7 @@ READ32_MEMBER(aristmk5_state::Ns5x58)
// reset 2KHz timer
- m_mk5_2KHz_timer->adjust(attotime::from_hz((double)MASTER_CLOCK / 9 / 4096));
+ m_mk5_2KHz_timer->adjust(attotime::from_hz(MASTER_CLOCK / 9 / 4096));
archimedes_clear_irq_a(0x01);
return 0xffffffff;
}
@@ -1980,7 +1980,7 @@ void aristmk5_state::machine_start()
void aristmk5_state::machine_reset()
{
archimedes_reset();
- m_mk5_2KHz_timer->adjust(attotime::from_hz((double)MASTER_CLOCK / 9 / 4096)); // 8MHz / 4096
+ m_mk5_2KHz_timer->adjust(attotime::from_hz(MASTER_CLOCK / 9 / 4096)); // 8MHz / 4096
m_mk5_VSYNC_timer->adjust(attotime::from_hz(50000)); // default bit 1 & bit 2 == 0
m_ioc_regs[IRQ_STATUS_B] |= 0x40; //hack, set keyboard irq empty to be ON
@@ -2066,7 +2066,7 @@ MACHINE_CONFIG_START(aristmk5_state::aristmk5)
MCFG_INPUT_MERGER_ANY_HIGH("uart_irq")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(aristmk5_state, uart_irq_callback))
- MCFG_DS1302_ADD("rtc", XTAL_32_768kHz)
+ MCFG_DS1302_ADD("rtc", XTAL(32'768))
MCFG_TICKET_DISPENSER_ADD("hopper", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW)
diff --git a/src/mame/drivers/aristmk6.cpp b/src/mame/drivers/aristmk6.cpp
index a60b30d7afd..f54d56f482f 100644
--- a/src/mame/drivers/aristmk6.cpp
+++ b/src/mame/drivers/aristmk6.cpp
@@ -316,7 +316,7 @@ static INPUT_PORTS_START( aristmk6 )
INPUT_PORTS_END
// ?
-#define ARISTMK6_CPU_CLOCK XTAL_200MHz
+#define ARISTMK6_CPU_CLOCK XTAL(200'000'000)
// ?
MACHINE_CONFIG_START(aristmk6_state::aristmk6)
@@ -338,8 +338,8 @@ MACHINE_CONFIG_START(aristmk6_state::aristmk6)
MCFG_CPU_FORCE_NO_DRC()
// MCFG_DEVICE_DISABLE()
- MCFG_DEVICE_ADD( "uart0", NS16550, XTAL_8MHz )
- MCFG_DEVICE_ADD( "uart1", NS16550, XTAL_8MHz )
+ MCFG_DEVICE_ADD( "uart0", NS16550, XTAL(8'000'000) )
+ MCFG_DEVICE_ADD( "uart1", NS16550, XTAL(8'000'000) )
MCFG_EEPROM_SERIAL_93C56_ADD("eeprom0")
MCFG_EEPROM_SERIAL_DEFAULT_VALUE(0xFF)
diff --git a/src/mame/drivers/arkanoid.cpp b/src/mame/drivers/arkanoid.cpp
index c95fcc34c0e..bd4df7e52d3 100644
--- a/src/mame/drivers/arkanoid.cpp
+++ b/src/mame/drivers/arkanoid.cpp
@@ -1325,7 +1325,7 @@ void arkanoid_state::machine_reset()
/*
Pixel clock: 3 MHz = 192 HTotal, assuming it's 6 MHz
*/
-#define ARKANOID_PIXEL_CLOCK XTAL_12MHz/2
+#define ARKANOID_PIXEL_CLOCK XTAL(12'000'000)/2
#define ARKANOID_HTOTAL 384
#define ARKANOID_HBEND 0
#define ARKANOID_HBSTART 256
@@ -1336,14 +1336,14 @@ Pixel clock: 3 MHz = 192 HTotal, assuming it's 6 MHz
MACHINE_CONFIG_START(arkanoid_state::arkanoid)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(arkanoid_map)
MCFG_CPU_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
- MCFG_DEVICE_ADD("mcu", ARKANOID_68705P5, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("mcu", ARKANOID_68705P5, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_ARKANOID_MCU_PORTB_R_CB(IOPORT("MUX"))
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) // 100 CPU slices per second to synchronize between the MCU and the main CPU
@@ -1364,7 +1364,7 @@ MACHINE_CONFIG_START(arkanoid_state::arkanoid)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", YM2149, XTAL_12MHz/4) /* YM2149 clock is 3mhz, pin 26 is low so final clock is 3mhz/2, handled inside the ay core */
+ MCFG_SOUND_ADD("aysnd", YM2149, XTAL(12'000'000)/4) /* YM2149 clock is 3mhz, pin 26 is low so final clock is 3mhz/2, handled inside the ay core */
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT | YM2149_PIN26_LOW) // all outputs are tied together with no resistors, and pin 26 is low
MCFG_AY8910_PORT_A_READ_CB(IOPORT("UNUSED"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW"))
@@ -1374,17 +1374,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(arkanoid_state::p3mcu, arkanoid)
/* unprotected MCU */
- MCFG_DEVICE_REPLACE("mcu", ARKANOID_68705P3, XTAL_12MHz/4)
+ MCFG_DEVICE_REPLACE("mcu", ARKANOID_68705P3, XTAL(12'000'000)/4)
MCFG_ARKANOID_MCU_PORTB_R_CB(IOPORT("MUX"))
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(arkanoid_state::p3mcuay, arkanoid)
/* unprotected MCU */
- MCFG_DEVICE_REPLACE("mcu", ARKANOID_68705P3, XTAL_12MHz/4)
+ MCFG_DEVICE_REPLACE("mcu", ARKANOID_68705P3, XTAL(12'000'000)/4)
MCFG_ARKANOID_MCU_PORTB_R_CB(IOPORT("MUX"))
- MCFG_SOUND_REPLACE("aysnd", AY8910, XTAL_12MHz/4) // AY-3-8910A
+ MCFG_SOUND_REPLACE("aysnd", AY8910, XTAL(12'000'000)/4) // AY-3-8910A
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("UNUSED"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW"))
@@ -1401,7 +1401,7 @@ MACHINE_CONFIG_DERIVED(arkanoid_state::bootleg, arkanoid)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(arkanoid_state::aysnd, bootleg)
- MCFG_SOUND_REPLACE("aysnd", AY8910, XTAL_12MHz/4)
+ MCFG_SOUND_REPLACE("aysnd", AY8910, XTAL(12'000'000)/4)
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("UNUSED"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW"))
@@ -1412,7 +1412,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(arkanoid_state::hexa)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* Imported from arkanoid - correct? */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* Imported from arkanoid - correct? */
MCFG_CPU_PROGRAM_MAP(hexa_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", arkanoid_state, irq0_line_hold)
@@ -1433,7 +1433,7 @@ MACHINE_CONFIG_START(arkanoid_state::hexa)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_12MHz/4/2) /* Imported from arkanoid - correct? */
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(12'000'000)/4/2) /* Imported from arkanoid - correct? */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("INPUTS"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -1444,7 +1444,7 @@ MACHINE_CONFIG_DERIVED(arkanoid_state::hexaa, hexa)
MCFG_CPU_PROGRAM_MAP(hexaa_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", arkanoid_state, irq0_line_hold)
- MCFG_CPU_ADD("subcpu", Z80, XTAL_12MHz/2) // ?
+ MCFG_CPU_ADD("subcpu", Z80, XTAL(12'000'000)/2) // ?
MCFG_CPU_PROGRAM_MAP(hexaa_sub_map)
MCFG_CPU_IO_MAP(hexaa_sub_iomap)
MACHINE_CONFIG_END
@@ -1453,7 +1453,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(arkanoid_state::brixian)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2)
MCFG_CPU_PROGRAM_MAP(brixian_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", arkanoid_state, irq0_line_hold)
@@ -1475,7 +1475,7 @@ MACHINE_CONFIG_START(arkanoid_state::brixian)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_12MHz/4/2) /* Imported from arkanoid - correct? */
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(12'000'000)/4/2) /* Imported from arkanoid - correct? */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("INPUTS"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/armedf.cpp b/src/mame/drivers/armedf.cpp
index 94224001ec9..96bfa3e3264 100644
--- a/src/mame/drivers/armedf.cpp
+++ b/src/mame/drivers/armedf.cpp
@@ -1238,16 +1238,16 @@ MACHINE_RESET_MEMBER(armedf_state,armedf)
MACHINE_CONFIG_START(armedf_state::terraf_sound)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) // 4mhz
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL_8MHz/2/512) // ?
+ MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_24MHz/6) // 4mhz
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(24'000'000)/6) // 4mhz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.8) // 10-pin SIP with 74HC374P latch
@@ -1260,7 +1260,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(armedf_state::terraf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz?
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz?
MCFG_CPU_PROGRAM_MAP(terraf_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq1_line_assert)
@@ -1295,16 +1295,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(armedf_state::terrafjb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
MCFG_CPU_PROGRAM_MAP(terraf_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq1_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) // 4mhz
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL_8MHz/2/512) // ?
+ MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
- MCFG_CPU_ADD("extra", Z80, XTAL_16MHz/4) // 4mhz?
+ MCFG_CPU_ADD("extra", Z80, XTAL(16'000'000)/4) // 4mhz?
MCFG_CPU_PROGRAM_MAP(terrafjb_extraz80_map)
MCFG_CPU_IO_MAP(terrafjb_extraz80_portmap)
@@ -1334,7 +1334,7 @@ MACHINE_CONFIG_START(armedf_state::terrafjb)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_24MHz/6) // 4mhz
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(24'000'000)/6) // 4mhz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.8) // unknown DAC
@@ -1351,7 +1351,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(armedf_state::kozure)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
MCFG_CPU_PROGRAM_MAP(kozure_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq1_line_assert)
@@ -1385,14 +1385,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(armedf_state::armedf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
MCFG_CPU_PROGRAM_MAP(armedf_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq1_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) // 4mhz
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL_8MHz/2/512) // ?
+ MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
@@ -1420,7 +1420,7 @@ MACHINE_CONFIG_START(armedf_state::armedf)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_24MHz/6) // 4mhz
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(24'000'000)/6) // 4mhz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
@@ -1433,14 +1433,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(armedf_state::cclimbr2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
MCFG_CPU_PROGRAM_MAP(cclimbr2_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq2_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) // 4mhz
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
MCFG_CPU_PROGRAM_MAP(cclimbr2_soundmap)
MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL_8MHz/2/512) // ?
+ MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
@@ -1470,7 +1470,7 @@ MACHINE_CONFIG_START(armedf_state::cclimbr2)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_24MHz/6) // or YM3526?
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(24'000'000)/6) // or YM3526?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
@@ -1483,14 +1483,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(armedf_state::legion)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
MCFG_CPU_PROGRAM_MAP(legion_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq2_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) // 4mhz
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
MCFG_CPU_PROGRAM_MAP(cclimbr2_soundmap)
MCFG_CPU_IO_MAP(sound_3526_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL_8MHz/2/512) // ?
+ MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
@@ -1520,7 +1520,7 @@ MACHINE_CONFIG_START(armedf_state::legion)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3526, XTAL_24MHz/6) // 4mhz
+ MCFG_SOUND_ADD("ymsnd", YM3526, XTAL(24'000'000)/6) // 4mhz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // 10-pin SIP with 74HC374P latch
@@ -1533,14 +1533,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(armedf_state::legionjb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
MCFG_CPU_PROGRAM_MAP(legionjb_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq2_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) // 4mhz
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
MCFG_CPU_PROGRAM_MAP(cclimbr2_soundmap)
MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL_8MHz/2/512) // ?
+ MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
@@ -1568,7 +1568,7 @@ MACHINE_CONFIG_START(armedf_state::legionjb)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_24MHz/6) // or YM3526?
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(24'000'000)/6) // or YM3526?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
@@ -1580,11 +1580,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bigfghtr_state::bigfghtr)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // verified
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // verified
MCFG_CPU_PROGRAM_MAP(bigfghtr_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq1_line_assert)
- MCFG_CPU_ADD("mcu", I8751, XTAL_16MHz/2) // verified
+ MCFG_CPU_ADD("mcu", I8751, XTAL(16'000'000)/2) // verified
MCFG_CPU_PROGRAM_MAP(bigfghtr_mcu_map)
MCFG_CPU_IO_MAP(bigfghtr_mcu_io_map)
@@ -1593,7 +1593,7 @@ MACHINE_CONFIG_START(bigfghtr_state::bigfghtr)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_16MHz/2,531,12*8,(64-12)*8, 254, 1*8, 31*8) // guess, matches 59.3 Hz from reference - measured at 59.1358Hz
+ MCFG_SCREEN_RAW_PARAMS(XTAL(16'000'000)/2,531,12*8,(64-12)*8, 254, 1*8, 31*8) // guess, matches 59.3 Hz from reference - measured at 59.1358Hz
MCFG_SCREEN_PALETTE("palette")
MCFG_VIDEO_START_OVERRIDE(armedf_state,armedf)
diff --git a/src/mame/drivers/artmagic.cpp b/src/mame/drivers/artmagic.cpp
index 7615b3f529a..ee7022c0884 100644
--- a/src/mame/drivers/artmagic.cpp
+++ b/src/mame/drivers/artmagic.cpp
@@ -38,8 +38,8 @@
#include "speaker.h"
-#define MASTER_CLOCK_40MHz (XTAL_40MHz)
-#define MASTER_CLOCK_25MHz (XTAL_25MHz)
+#define MASTER_CLOCK_40MHz (XTAL(40'000'000))
+#define MASTER_CLOCK_25MHz (XTAL(25'000'000))
/*************************************
diff --git a/src/mame/drivers/asterix.cpp b/src/mame/drivers/asterix.cpp
index 9d1da62fe81..bdd067c4775 100644
--- a/src/mame/drivers/asterix.cpp
+++ b/src/mame/drivers/asterix.cpp
@@ -260,11 +260,11 @@ void asterix_state::machine_reset()
MACHINE_CONFIG_START(asterix_state::asterix)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) // 12MHz
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) // 12MHz
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", asterix_state, asterix_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_32MHz/4) // 8MHz Z80E ??
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/4) // 8MHz Z80E ??
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_EEPROM_SERIAL_ER5911_8BIT_ADD("eeprom")
@@ -297,11 +297,11 @@ MACHINE_CONFIG_START(asterix_state::asterix)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_32MHz/8) // 4MHz
+ MCFG_YM2151_ADD("ymsnd", XTAL(32'000'000)/8) // 4MHz
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_K053260_ADD("k053260", XTAL_32MHz/8) // 4MHz
+ MCFG_K053260_ADD("k053260", XTAL(32'000'000)/8) // 4MHz
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/asteroid.cpp b/src/mame/drivers/asteroid.cpp
index 0abbede0a58..b456b64fb1e 100644
--- a/src/mame/drivers/asteroid.cpp
+++ b/src/mame/drivers/asteroid.cpp
@@ -198,8 +198,8 @@ There is not a rev 03 known or dumped. An Asteroids rev 03 is not mentioned in a
#include "astdelux.lh"
-#define MASTER_CLOCK (XTAL_12_096MHz)
-#define CLOCK_3KHZ (double(MASTER_CLOCK) / 4096)
+#define MASTER_CLOCK (XTAL(12'096'000))
+#define CLOCK_3KHZ (MASTER_CLOCK / 4096)
/*************************************
*
@@ -716,7 +716,7 @@ MACHINE_CONFIG_DERIVED(asteroid_state::llander, asteroid_base)
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(llander_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(asteroid_state, llander_interrupt, (double)MASTER_CLOCK/4096/12)
+ MCFG_CPU_PERIODIC_INT_DRIVER(asteroid_state, llander_interrupt, MASTER_CLOCK/4096/12)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_REFRESH_RATE(CLOCK_3KHZ/12/6)
diff --git a/src/mame/drivers/astinvad.cpp b/src/mame/drivers/astinvad.cpp
index 313f1bf8ad9..4c435e128e1 100644
--- a/src/mame/drivers/astinvad.cpp
+++ b/src/mame/drivers/astinvad.cpp
@@ -26,8 +26,8 @@ DIP locations verified for:
#include "speaker.h"
-#define MASTER_CLOCK XTAL_2MHz
-#define VIDEO_CLOCK XTAL_4_9152MHz
+#define MASTER_CLOCK XTAL(2'000'000)
+#define VIDEO_CLOCK XTAL(4'915'200)
/* sample sound IDs - must match sample file name table below */
diff --git a/src/mame/drivers/astrcorp.cpp b/src/mame/drivers/astrcorp.cpp
index 9108e60b9ff..76146864009 100644
--- a/src/mame/drivers/astrcorp.cpp
+++ b/src/mame/drivers/astrcorp.cpp
@@ -489,7 +489,7 @@ static const uint16_t showhand_default_eeprom[15] = {0x0001,0x0007,0x000a,0x00
TODO: understand if later hardware uses different parameters (XTAL is almost surely NOT 20 MHz so ...). Also, weirdly enough, there's an unused
6x PAL XTAL according to notes, but VSync = 58,85 Hz?
*/
-#define ASTROCORP_PIXEL_CLOCK XTAL_20MHz/2
+#define ASTROCORP_PIXEL_CLOCK XTAL(20'000'000)/2
#define ASTROCORP_HTOTAL 651
#define ASTROCORP_HBEND 0
//#define ASTROCORP_HBSTART 320
@@ -500,7 +500,7 @@ TODO: understand if later hardware uses different parameters (XTAL is almost sur
MACHINE_CONFIG_START(astrocorp_state::showhand)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(showhand_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", astrocorp_state, irq4_line_hold)
@@ -527,7 +527,7 @@ MACHINE_CONFIG_START(astrocorp_state::showhand)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_20MHz/20, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(20'000'000)/20, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -552,7 +552,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(astrocorp_state::skilldrp_scanline)
MACHINE_CONFIG_START(astrocorp_state::skilldrp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) // JX-1689F1028N GRX586.V5
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2) // JX-1689F1028N GRX586.V5
MCFG_CPU_PROGRAM_MAP(skilldrp_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", astrocorp_state, skilldrp_scanline, "screen", 0, 1)
@@ -581,7 +581,7 @@ MACHINE_CONFIG_START(astrocorp_state::skilldrp)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz/24, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(24'000'000)/24, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/astrof.cpp b/src/mame/drivers/astrof.cpp
index 239bc63c8aa..94ff5a56639 100644
--- a/src/mame/drivers/astrof.cpp
+++ b/src/mame/drivers/astrof.cpp
@@ -63,7 +63,7 @@
#include "cpu/m6502/m6502.h"
-#define MASTER_CLOCK (XTAL_10_595MHz)
+#define MASTER_CLOCK (XTAL(10'595'000))
#define MAIN_CPU_CLOCK (MASTER_CLOCK / 16)
#define PIXEL_CLOCK (MASTER_CLOCK / 2)
#define HTOTAL (0x150)
diff --git a/src/mame/drivers/asuka.cpp b/src/mame/drivers/asuka.cpp
index 92736e2379f..b2958b925b2 100644
--- a/src/mame/drivers/asuka.cpp
+++ b/src/mame/drivers/asuka.cpp
@@ -835,7 +835,7 @@ MACHINE_CONFIG_START(asuka_state::bonzeadv)
MCFG_CPU_ADD("audiocpu", Z80,4000000) /* sound CPU, also required for test mode */
MCFG_CPU_PROGRAM_MAP(bonzeadv_z80_map)
- MCFG_TAITO_CCHIP_ADD("cchip", XTAL_12MHz/2) /* ? MHz */
+ MCFG_TAITO_CCHIP_ADD("cchip", XTAL(12'000'000)/2) /* ? MHz */
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -885,11 +885,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(asuka_state::asuka)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(asuka_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", asuka_state, irq5_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_16MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(z80_map)
@@ -934,13 +934,13 @@ MACHINE_CONFIG_START(asuka_state::asuka)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_16MHz/4) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000)/4) /* verified on pcb */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(asuka_state,sound_bankswitch_2151_w))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000)) /* verified on pcb */
MCFG_MSM5205_VCLK_CB(WRITELINE(asuka_state, asuka_msm5205_vck)) /* VCK function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -956,11 +956,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(asuka_state::cadash)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 68000p12 running at 16Mhz, verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 68000p12 running at 16Mhz, verified on pcb */
MCFG_CPU_PROGRAM_MAP(cadash_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", asuka_state, cadash_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(cadash_z80_map)
MCFG_CPU_ADD("subcpu", Z180, 4000000) /* 4 MHz ??? */
@@ -1010,7 +1010,7 @@ MACHINE_CONFIG_START(asuka_state::cadash)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_8MHz/2) /* verified on pcb */
+ MCFG_YM2151_ADD("ymsnd", XTAL(8'000'000)/2) /* verified on pcb */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(asuka_state,sound_bankswitch_2151_w))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
diff --git a/src/mame/drivers/at.cpp b/src/mame/drivers/at.cpp
index 75a183ecca6..00548d1b4c1 100644
--- a/src/mame/drivers/at.cpp
+++ b/src/mame/drivers/at.cpp
@@ -364,7 +364,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(at_state::ibm5170)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80286, XTAL_12MHz/2 /*6000000*/)
+ MCFG_CPU_ADD("maincpu", I80286, XTAL(12'000'000)/2 /*6000000*/)
MCFG_CPU_PROGRAM_MAP(at16_map)
MCFG_CPU_IO_MAP(at16_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
@@ -389,7 +389,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(at_state::ibm5170a, ibm5170)
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL_16MHz/2)
+ MCFG_CPU_CLOCK(XTAL(16'000'000)/2)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(at_state::ec1842, ibm5170)
@@ -407,7 +407,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(at_state::ibmps1, ibm5170)
MCFG_MACHINE_START_OVERRIDE(at_state, vrom_fix)
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL_10MHz)
+ MCFG_CPU_CLOCK(XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(at16l_map)
MCFG_CPU_IO_MAP(ps1_16_io)
MCFG_DEVICE_MODIFY("isa1")
@@ -513,7 +513,7 @@ MACHINE_CONFIG_END
// Commodore PC 30-III
MACHINE_CONFIG_DERIVED(at_state::pc30iii, ibm5170)
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(6000000) // should be XTAL_24MHz/2, but doesn't post with that setting
+ MCFG_CPU_CLOCK(6000000) // should be XTAL(24'000'000)/2, but doesn't post with that setting
MCFG_DEVICE_MODIFY("isa1")
MCFG_DEVICE_SLOT_INTERFACE(pc_isa16_cards, "vga", false) // should be ATI EGA Wonder 800+
MACHINE_CONFIG_END
@@ -521,18 +521,18 @@ MACHINE_CONFIG_END
// Commodore PC 40-III
MACHINE_CONFIG_DERIVED(at_state::pc40iii, ibm5170)
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(6000000) // should be XTAL_24MHz/2, but doesn't post with that setting
+ MCFG_CPU_CLOCK(6000000) // should be XTAL(24'000'000)/2, but doesn't post with that setting
MCFG_DEVICE_MODIFY("isa1")
MCFG_DEVICE_SLOT_INTERFACE(pc_isa16_cards, "vga", false) // should be onboard Paradise VGA, see ROM declarations
MACHINE_CONFIG_END
MACHINE_CONFIG_START(megapc_state::megapc)
- MCFG_CPU_ADD("maincpu", I386SX, XTAL_50MHz / 2)
+ MCFG_CPU_ADD("maincpu", I386SX, XTAL(50'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(megapc_map)
MCFG_CPU_IO_MAP(megapc_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("wd7600", wd7600_device, intack_cb)
- MCFG_WD7600_ADD("wd7600",XTAL_50MHz / 2, ":maincpu", ":isa", ":bios", ":keybc")
+ MCFG_WD7600_ADD("wd7600",XTAL(50'000'000) / 2, ":maincpu", ":isa", ":bios", ":keybc")
MCFG_WD7600_HOLD(WRITELINE(megapc_state, wd7600_hold));
MCFG_WD7600_NMI(INPUTLINE("maincpu", INPUT_LINE_NMI));
MCFG_WD7600_INTR(INPUTLINE("maincpu", INPUT_LINE_IRQ0));
@@ -575,7 +575,7 @@ MACHINE_CONFIG_START(megapc_state::megapc)
// ISA cards
MCFG_ISA16_SLOT_ADD("isabus","isa1", pc_isa16_cards, nullptr, false)
- MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL_12MHz)
+ MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL(12'000'000))
MCFG_AT_KEYBOARD_CONTROLLER_SYSTEM_RESET_CB(DEVWRITELINE("wd7600", wd7600_device, kbrst_w))
MCFG_AT_KEYBOARD_CONTROLLER_GATE_A20_CB(DEVWRITELINE("wd7600", wd7600_device, gatea20_w))
MCFG_AT_KEYBOARD_CONTROLLER_INPUT_BUFFER_FULL_CB(DEVWRITELINE("wd7600", wd7600_device, irq01_w))
@@ -689,7 +689,7 @@ MACHINE_CONFIG_END
// Compaq Portable III
MACHINE_CONFIG_START(at_state::comportiii)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80286, XTAL_48MHz/4 /*12000000*/)
+ MCFG_CPU_ADD("maincpu", I80286, XTAL(48'000'000)/4 /*12000000*/)
MCFG_CPU_PROGRAM_MAP(at16_map)
MCFG_CPU_IO_MAP(at16_io)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
diff --git a/src/mame/drivers/atari_s1.cpp b/src/mame/drivers/atari_s1.cpp
index 36519754105..fde4c670d00 100644
--- a/src/mame/drivers/atari_s1.cpp
+++ b/src/mame/drivers/atari_s1.cpp
@@ -56,7 +56,7 @@ ToDo:
#include "atari_s1.lh"
-#define MASTER_CLK XTAL_4MHz / 4
+#define MASTER_CLK XTAL(4'000'000) / 4
#define DMA_CLK MASTER_CLK / 2
#define AUDIO_CLK DMA_CLK / 4
#define DMA_INT DMA_CLK / 128
diff --git a/src/mame/drivers/atari_s2.cpp b/src/mame/drivers/atari_s2.cpp
index 0acbd73284b..af72ef03f47 100644
--- a/src/mame/drivers/atari_s2.cpp
+++ b/src/mame/drivers/atari_s2.cpp
@@ -469,7 +469,7 @@ void atari_s2_state::machine_reset()
MACHINE_CONFIG_START(atari_s2_state::atari_s2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL_4MHz / 4)
+ MCFG_CPU_ADD("maincpu", M6800, XTAL(4'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(atari_s2_map)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_WATCHDOG_ADD("watchdog")
@@ -487,7 +487,7 @@ MACHINE_CONFIG_START(atari_s2_state::atari_s2)
/* Video */
MCFG_DEFAULT_LAYOUT(layout_atari_s2)
- MCFG_TIMER_DRIVER_ADD_PERIODIC("irq", atari_s2_state, irq, attotime::from_hz(XTAL_4MHz / 8192))
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("irq", atari_s2_state, irq, attotime::from_hz(XTAL(4'000'000) / 8192))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_s", atari_s2_state, timer_s, attotime::from_hz(150000))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/atarist.cpp b/src/mame/drivers/atarist.cpp
index dc6eb9ea3b7..b7f8252fc9b 100644
--- a/src/mame/drivers/atarist.cpp
+++ b/src/mame/drivers/atarist.cpp
@@ -2189,7 +2189,7 @@ MACHINE_CONFIG_START(megast_state::megast)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// devices
- MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, XTAL(32'768))
MCFG_WD1772_ADD(WD1772_TAG, Y2/4)
MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(MC68901_TAG, mc68901_device, i5_w)) MCFG_DEVCB_INVERT
@@ -2354,7 +2354,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(megaste_state::megaste, ste)
MCFG_CPU_MODIFY(M68000_TAG)
MCFG_CPU_PROGRAM_MAP(megaste_map)
- MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, XTAL(32'768))
MCFG_DEVICE_ADD(Z8530_TAG, SCC8530, Y2/4)
/* internal ram */
diff --git a/src/mame/drivers/atarisy2.cpp b/src/mame/drivers/atarisy2.cpp
index 630d5b2857c..0ea5c72285a 100644
--- a/src/mame/drivers/atarisy2.cpp
+++ b/src/mame/drivers/atarisy2.cpp
@@ -132,9 +132,9 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_20MHz
-#define SOUND_CLOCK XTAL_14_31818MHz
-#define VIDEO_CLOCK XTAL_32MHz
+#define MASTER_CLOCK XTAL(20'000'000)
+#define SOUND_CLOCK XTAL(14'318'181)
+#define VIDEO_CLOCK XTAL(32'000'000)
@@ -1195,7 +1195,7 @@ MACHINE_CONFIG_START(atarisy2_state::atarisy2)
MCFG_CPU_ADD("audiocpu", M6502, SOUND_CLOCK/8)
MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, (double)MASTER_CLOCK/2/16/16/16/10)
+ MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, MASTER_CLOCK/2/16/16/16/10)
MCFG_MACHINE_START_OVERRIDE(atarisy2_state,atarisy2)
MCFG_MACHINE_RESET_OVERRIDE(atarisy2_state,atarisy2)
diff --git a/src/mame/drivers/atetris.cpp b/src/mame/drivers/atetris.cpp
index 219419c0605..bdac29bac25 100644
--- a/src/mame/drivers/atetris.cpp
+++ b/src/mame/drivers/atetris.cpp
@@ -60,8 +60,8 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_14_31818MHz
-#define BOOTLEG_CLOCK XTAL_14_7456MHz
+#define MASTER_CLOCK XTAL(14'318'181)
+#define BOOTLEG_CLOCK XTAL(14'745'600)
/*************************************
diff --git a/src/mame/drivers/atlantis.cpp b/src/mame/drivers/atlantis.cpp
index 68c665fba7a..a3210de8912 100644
--- a/src/mame/drivers/atlantis.cpp
+++ b/src/mame/drivers/atlantis.cpp
@@ -854,13 +854,13 @@ MACHINE_CONFIG_START(atlantis_state::mwskins)
}
// TL16C552 UART
- MCFG_DEVICE_ADD("uart1", NS16550, XTAL_24MHz)
+ MCFG_DEVICE_ADD("uart1", NS16550, XTAL(24'000'000))
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("com1", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("com1", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("com1", rs232_port_device, write_rts))
MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(":", atlantis_state, duart_irq_callback))
- MCFG_DEVICE_ADD("uart2", NS16550, XTAL_24MHz)
+ MCFG_DEVICE_ADD("uart2", NS16550, XTAL(24'000'000))
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("com2", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("com2", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("com2", rs232_port_device, write_rts))
diff --git a/src/mame/drivers/atom.cpp b/src/mame/drivers/atom.cpp
index b9c059c3431..9a5d0b8bcfb 100644
--- a/src/mame/drivers/atom.cpp
+++ b/src/mame/drivers/atom.cpp
@@ -712,7 +712,7 @@ MACHINE_CONFIG_START(atom_state::atom)
/* video hardware */
MCFG_SCREEN_MC6847_PAL_ADD(SCREEN_TAG, MC6847_TAG)
- MCFG_DEVICE_ADD(MC6847_TAG, MC6847_PAL, XTAL_4_433619MHz)
+ MCFG_DEVICE_ADD(MC6847_TAG, MC6847_PAL, XTAL(4'433'619))
MCFG_MC6847_INPUT_CALLBACK(READ8(atom_state, vdg_videoram_r))
/* sound hardware */
@@ -821,7 +821,7 @@ MACHINE_CONFIG_START(atom_state::atombb)
/* video hardware */
MCFG_SCREEN_MC6847_PAL_ADD(SCREEN_TAG, MC6847_TAG)
- MCFG_DEVICE_ADD(MC6847_TAG, MC6847_PAL, XTAL_4_433619MHz)
+ MCFG_DEVICE_ADD(MC6847_TAG, MC6847_PAL, XTAL(4'433'619))
MCFG_MC6847_INPUT_CALLBACK(READ8(atom_state, vdg_videoram_r))
/* sound hardware */
diff --git a/src/mame/drivers/att4425.cpp b/src/mame/drivers/att4425.cpp
index 1c63726adb8..c48cf8f8418 100644
--- a/src/mame/drivers/att4425.cpp
+++ b/src/mame/drivers/att4425.cpp
@@ -234,7 +234,7 @@ static const z80_daisy_config att4425_daisy_chain[] =
MACHINE_CONFIG_START(att4425_state::att4425)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_32MHz/8) // XXX
+ MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(32'000'000)/8) // XXX
MCFG_CPU_PROGRAM_MAP(att4425_mem)
MCFG_CPU_IO_MAP(att4425_io)
MCFG_Z80_DAISY_CHAIN(att4425_daisy_chain)
@@ -251,7 +251,7 @@ MACHINE_CONFIG_START(att4425_state::att4425)
MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
// ch.3 -- timer?
- MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_32MHz) // XXX
+ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(32'000'000)) // XXX
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
#ifdef notdef
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(Z80SIO_TAG, z80sio_device, rxca_w))
diff --git a/src/mame/drivers/att630.cpp b/src/mame/drivers/att630.cpp
index f87a2f96fca..1951e0cf46f 100644
--- a/src/mame/drivers/att630.cpp
+++ b/src/mame/drivers/att630.cpp
@@ -45,16 +45,16 @@ static INPUT_PORTS_START( att630 )
INPUT_PORTS_END
MACHINE_CONFIG_START(att630_state::att630)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_40MHz / 4) // clock not confirmed
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(40'000'000) / 4) // clock not confirmed
MCFG_CPU_PROGRAM_MAP(mem_map)
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_87_18336MHz, 1376, 0, 1024, 1056, 0, 1024)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(87'183'360), 1376, 0, 1024, 1056, 0, 1024)
MCFG_SCREEN_UPDATE_DRIVER(att630_state, screen_update)
- MCFG_DEVICE_ADD("duart1", SCN2681, XTAL_3_6864MHz)
+ MCFG_DEVICE_ADD("duart1", SCN2681, XTAL(3'686'400))
- MCFG_DEVICE_ADD("duart2", SCN2681, XTAL_3_6864MHz)
+ MCFG_DEVICE_ADD("duart2", SCN2681, XTAL(3'686'400))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/attache.cpp b/src/mame/drivers/attache.cpp
index 689168e5552..d86bc478d96 100644
--- a/src/mame/drivers/attache.cpp
+++ b/src/mame/drivers/attache.cpp
@@ -1097,7 +1097,7 @@ void attache816_state::machine_reset()
}
MACHINE_CONFIG_START(attache_state::attache)
- MCFG_CPU_ADD("maincpu",Z80,XTAL_8MHz / 2)
+ MCFG_CPU_ADD("maincpu",Z80,XTAL(8'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(attache_map)
MCFG_CPU_IO_MAP(attache_io)
MCFG_Z80_DAISY_CHAIN(attache_daisy_chain)
@@ -1105,24 +1105,24 @@ MACHINE_CONFIG_START(attache_state::attache)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
- MCFG_SCREEN_RAW_PARAMS(XTAL_12_324MHz, 784, 0, 640, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'324'000), 784, 0, 640, 262, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(attache_state, screen_update)
MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("psg", AY8912, XTAL_8MHz / 4)
+ MCFG_SOUND_ADD("psg", AY8912, XTAL(8'000'000) / 4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_MSM5832_ADD("rtc",XTAL_32_768kHz)
+ MCFG_MSM5832_ADD("rtc",XTAL(32'768))
- MCFG_DEVICE_ADD("pio", Z80PIO, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(8'000'000) / 2)
MCFG_Z80PIO_IN_PA_CB(READ8(attache_state, pio_portA_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(attache_state, pio_portA_w))
MCFG_Z80PIO_IN_PB_CB(READ8(attache_state, pio_portB_r))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(attache_state, pio_portB_w))
- MCFG_DEVICE_ADD("sio", Z80SIO, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(8'000'000) / 2)
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
@@ -1137,17 +1137,17 @@ MACHINE_CONFIG_START(attache_state::attache)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxb_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsb_w))
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(8'000'000) / 2)
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio", z80sio_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, txca_w))
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("sio", z80sio_device, rxtxcb_w))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("brc", CLOCK, XTAL_8MHz / 26) // 307.692 KHz
+ MCFG_DEVICE_ADD("brc", CLOCK, XTAL(8'000'000) / 26) // 307.692 KHz
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
- MCFG_DEVICE_ADD("dma", AM9517A, XTAL_8MHz / 4)
+ MCFG_DEVICE_ADD("dma", AM9517A, XTAL(8'000'000) / 4)
MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(attache_state, hreq_w))
MCFG_AM9517A_OUT_EOP_CB(WRITELINE(attache_state, eop_w))
MCFG_AM9517A_IN_MEMR_CB(READ8(attache_state, dma_mem_r))
@@ -1175,37 +1175,37 @@ MACHINE_CONFIG_START(attache_state::attache)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(attache816_state::attache816)
- MCFG_CPU_ADD("maincpu",Z80,XTAL_8MHz / 2)
+ MCFG_CPU_ADD("maincpu",Z80,XTAL(8'000'000) / 2)
MCFG_CPU_PROGRAM_MAP(attache_map)
MCFG_CPU_IO_MAP(attache816_io)
MCFG_Z80_DAISY_CHAIN(attache_daisy_chain)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_CPU_ADD("extcpu",I8086,XTAL_24MHz / 3)
+ MCFG_CPU_ADD("extcpu",I8086,XTAL(24'000'000) / 3)
MCFG_CPU_PROGRAM_MAP(attache_x86_map)
MCFG_CPU_IO_MAP(attache_x86_io)
MCFG_QUANTUM_PERFECT_CPU("extcpu")
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
- MCFG_SCREEN_RAW_PARAMS(XTAL_12_324MHz, 784, 0, 640, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(12'324'000), 784, 0, 640, 262, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(attache_state, screen_update)
MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("psg", AY8912, XTAL_8MHz / 4)
+ MCFG_SOUND_ADD("psg", AY8912, XTAL(8'000'000) / 4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_MSM5832_ADD("rtc",XTAL_32_768kHz)
+ MCFG_MSM5832_ADD("rtc",XTAL(32'768))
- MCFG_DEVICE_ADD("pio", Z80PIO, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(8'000'000) / 2)
MCFG_Z80PIO_IN_PA_CB(READ8(attache_state, pio_portA_r))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(attache_state, pio_portA_w))
MCFG_Z80PIO_IN_PB_CB(READ8(attache_state, pio_portB_r))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(attache_state, pio_portB_w))
- MCFG_DEVICE_ADD("sio", Z80SIO, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(8'000'000) / 2)
MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
@@ -1220,13 +1220,13 @@ MACHINE_CONFIG_START(attache816_state::attache816)
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxb_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsb_w))
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_8MHz / 2)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(8'000'000) / 2)
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio", z80sio_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, txca_w))
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("sio", z80sio_device, rxtxcb_w))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_DEVICE_ADD("brc", CLOCK, XTAL_8MHz / 26) // 307.692 KHz
+ MCFG_DEVICE_ADD("brc", CLOCK, XTAL(8'000'000) / 26) // 307.692 KHz
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
@@ -1237,7 +1237,7 @@ MACHINE_CONFIG_START(attache816_state::attache816)
MCFG_I8255_OUT_PORTC_CB(WRITELINE(attache816_state, x86_dsr)) MCFG_DEVCB_BIT(0)
MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(attache816_state, ppi_irq)) MCFG_DEVCB_BIT(7) MCFG_DEVCB_INVERT
- MCFG_DEVICE_ADD("dma", AM9517A, XTAL_8MHz / 4)
+ MCFG_DEVICE_ADD("dma", AM9517A, XTAL(8'000'000) / 4)
MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(attache_state, hreq_w))
MCFG_AM9517A_OUT_EOP_CB(WRITELINE(attache_state, eop_w))
MCFG_AM9517A_IN_MEMR_CB(READ8(attache_state, dma_mem_r))
diff --git a/src/mame/drivers/attckufo.cpp b/src/mame/drivers/attckufo.cpp
index fe748071947..7fe822ba16d 100644
--- a/src/mame/drivers/attckufo.cpp
+++ b/src/mame/drivers/attckufo.cpp
@@ -112,7 +112,7 @@ READ8_MEMBER(attckufo_state::vic_colorram_r)
//**************************************************************************
MACHINE_CONFIG_START(attckufo_state::attckufo)
- MCFG_CPU_ADD("maincpu", M6502, XTAL_14_31818MHz / 14)
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(14'318'181) / 14)
MCFG_CPU_PROGRAM_MAP(cpu_map)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
@@ -120,7 +120,7 @@ MACHINE_CONFIG_START(attckufo_state::attckufo)
MCFG_PIA_READPB_HANDLER(IOPORT("INPUT"))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_MOS656X_ATTACK_UFO_ADD("mos6560", "screen", XTAL_14_31818MHz / 14, vic_videoram_map, vic_colorram_map)
+ MCFG_MOS656X_ATTACK_UFO_ADD("mos6560", "screen", XTAL(14'318'181) / 14, vic_videoram_map, vic_colorram_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/atvtrack.cpp b/src/mame/drivers/atvtrack.cpp
index 38e31873ed6..bf5c5e66386 100644
--- a/src/mame/drivers/atvtrack.cpp
+++ b/src/mame/drivers/atvtrack.cpp
@@ -550,7 +550,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( atvtrack )
INPUT_PORTS_END
-#define ATV_CPU_CLOCK XTAL_33MHz*6
+#define ATV_CPU_CLOCK XTAL(33'000'000)*6
MACHINE_CONFIG_START(atvtrack_state::atvtrack)
/* basic machine hardware */
diff --git a/src/mame/drivers/aussiebyte.cpp b/src/mame/drivers/aussiebyte.cpp
index 3271bb4dc70..dde11c4ff0e 100644
--- a/src/mame/drivers/aussiebyte.cpp
+++ b/src/mame/drivers/aussiebyte.cpp
@@ -443,7 +443,7 @@ MACHINE_RESET_MEMBER( aussiebyte_state, aussiebyte )
MACHINE_CONFIG_START(aussiebyte_state::aussiebyte)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(aussiebyte_map)
MCFG_CPU_IO_MAP(aussiebyte_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
@@ -474,12 +474,12 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte)
MCFG_DEVICE_ADD("cent_data_in", INPUT_BUFFER, 0)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
- MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL_4_9152MHz / 4)
+ MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(4'915'200) / 4)
MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg2))
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(16'000'000) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio1", z80sio_device, rxca_w))
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio1", z80sio_device, txca_w))
@@ -489,7 +489,7 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte)
MCFG_Z80CTC_ZC2_CB(WRITELINE(aussiebyte_state, ctc_z2_w)) // SIO2 Ch B, CTC Ch 3
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio2", z80sio_device, rxtxcb_w))
- MCFG_DEVICE_ADD("dma", Z80DMA, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(16'000'000) / 4)
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(aussiebyte_state, busreq_w))
// BAO, not used
@@ -498,22 +498,22 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte)
MCFG_Z80DMA_IN_IORQ_CB(READ8(aussiebyte_state, io_read_byte))
MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(aussiebyte_state, io_write_byte))
- MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL(16'000'000) / 4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_OUT_PA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
MCFG_Z80PIO_IN_PB_CB(DEVREAD8("cent_data_in", input_buffer_device, read))
MCFG_Z80PIO_OUT_ARDY_CB(DEVWRITELINE("centronics", centronics_device, write_strobe)) MCFG_DEVCB_INVERT
- MCFG_DEVICE_ADD("pio2", Z80PIO, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("pio2", Z80PIO, XTAL(16'000'000) / 4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_OUT_PA_CB(WRITE8(aussiebyte_state, port20_w))
- MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL(16'000'000) / 4)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80SIO_OUT_WRDYA_CB(WRITELINE(aussiebyte_state, sio1_rdya_w))
MCFG_Z80SIO_OUT_WRDYB_CB(WRITELINE(aussiebyte_state, sio1_rdyb_w))
- MCFG_DEVICE_ADD("sio2", Z80SIO, XTAL_16MHz / 4)
+ MCFG_DEVICE_ADD("sio2", Z80SIO, XTAL(16'000'000) / 4)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80SIO_OUT_WRDYA_CB(WRITELINE(aussiebyte_state, sio2_rdya_w))
MCFG_Z80SIO_OUT_WRDYB_CB(WRITELINE(aussiebyte_state, sio2_rdyb_w))
@@ -524,7 +524,7 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte)
MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "keyboard")
MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio2", z80sio_device, rxa_w))
- MCFG_WD2797_ADD("fdc", XTAL_16MHz / 16)
+ MCFG_WD2797_ADD("fdc", XTAL(16'000'000) / 16)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(aussiebyte_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(aussiebyte_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", aussiebyte_floppies, "525qd", floppy_image_device::default_floppy_formats)
@@ -533,13 +533,13 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte)
MCFG_FLOPPY_DRIVE_SOUND(true)
/* devices */
- MCFG_MC6845_ADD("crtc", SY6545_1, "screen", XTAL_16MHz / 8)
+ MCFG_MC6845_ADD("crtc", SY6545_1, "screen", XTAL(16'000'000) / 8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(aussiebyte_state, crtc_update_row)
MCFG_MC6845_ADDR_CHANGED_CB(aussiebyte_state, crtc_update_addr)
- MCFG_MSM5832_ADD("rtc", XTAL_32_768kHz)
+ MCFG_MSM5832_ADD("rtc", XTAL(32'768))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/avalnche.cpp b/src/mame/drivers/avalnche.cpp
index c0bd018cf95..c19e1b6051c 100644
--- a/src/mame/drivers/avalnche.cpp
+++ b/src/mame/drivers/avalnche.cpp
@@ -39,7 +39,7 @@
#include "avalnche.lh"
-#define MASTER_CLOCK XTAL_12_096MHz
+#define MASTER_CLOCK XTAL(12'096'000)
/*************************************
diff --git a/src/mame/drivers/avigo.cpp b/src/mame/drivers/avigo.cpp
index 0ce9c77b669..75bc83c881b 100644
--- a/src/mame/drivers/avigo.cpp
+++ b/src/mame/drivers/avigo.cpp
@@ -753,7 +753,7 @@ MACHINE_CONFIG_START(avigo_state::avigo)
MCFG_CPU_IO_MAP(avigo_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_DEVICE_ADD( "ns16550", NS16550, XTAL_1_8432MHz )
+ MCFG_DEVICE_ADD( "ns16550", NS16550, XTAL(1'843'200) )
MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport", rs232_port_device, write_txd))
MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport", rs232_port_device, write_dtr))
MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport", rs232_port_device, write_rts))
@@ -787,7 +787,7 @@ MACHINE_CONFIG_START(avigo_state::avigo)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* real time clock */
- MCFG_DEVICE_ADD("rtc", TC8521, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", TC8521, XTAL(32'768))
MCFG_RP5C01_OUT_ALARM_CB(WRITELINE(avigo_state, tc8521_alarm_int))
/* flash ROMs */
diff --git a/src/mame/drivers/avt.cpp b/src/mame/drivers/avt.cpp
index 809fe1f8e35..b0153799bc1 100644
--- a/src/mame/drivers/avt.cpp
+++ b/src/mame/drivers/avt.cpp
@@ -428,7 +428,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_16MHz /* unknown */
+#define MASTER_CLOCK XTAL(16'000'000) /* unknown */
#define CPU_CLOCK MASTER_CLOCK/4 /* guess... seems accurate */
#define CRTC_CLOCK MASTER_CLOCK/24 /* it gives 63.371293 Hz. with current settings */
diff --git a/src/mame/drivers/ax20.cpp b/src/mame/drivers/ax20.cpp
index aef08791b16..fc75f4ff6c3 100644
--- a/src/mame/drivers/ax20.cpp
+++ b/src/mame/drivers/ax20.cpp
@@ -124,7 +124,7 @@ SLOT_INTERFACE_END
MACHINE_CONFIG_START(ax20_state::ax20)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8088, XTAL_14_31818MHz/3)
+ MCFG_CPU_ADD("maincpu", I8088, XTAL(14'318'181)/3)
MCFG_CPU_PROGRAM_MAP(ax20_map)
MCFG_CPU_IO_MAP(ax20_io)
diff --git a/src/mame/drivers/b16.cpp b/src/mame/drivers/b16.cpp
index 807b46461e3..5ae948eb4ed 100644
--- a/src/mame/drivers/b16.cpp
+++ b/src/mame/drivers/b16.cpp
@@ -272,7 +272,7 @@ WRITE8_MEMBER(b16_state::memory_write_byte)
MACHINE_CONFIG_START(b16_state::b16)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8086, XTAL_14_31818MHz/2) //unknown xtal
+ MCFG_CPU_ADD("maincpu",I8086, XTAL(14'318'181)/2) //unknown xtal
MCFG_CPU_PROGRAM_MAP(b16_map)
MCFG_CPU_IO_MAP(b16_io)
@@ -286,11 +286,11 @@ MACHINE_CONFIG_START(b16_state::b16)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 400-1)
MCFG_SCREEN_PALETTE("palette")
- MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_14_31818MHz/5) /* unknown clock, hand tuned to get ~60 fps */
+ MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(14'318'181)/5) /* unknown clock, hand tuned to get ~60 fps */
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
- MCFG_DEVICE_ADD("8237dma", AM9517A, XTAL_14_31818MHz/2)
+ MCFG_DEVICE_ADD("8237dma", AM9517A, XTAL(14'318'181)/2)
MCFG_I8237_IN_MEMR_CB(READ8(b16_state, memory_read_byte))
MCFG_I8237_OUT_MEMW_CB(WRITE8(b16_state, memory_write_byte))
diff --git a/src/mame/drivers/b2m.cpp b/src/mame/drivers/b2m.cpp
index 9a72f7d5581..daf7193ce0b 100644
--- a/src/mame/drivers/b2m.cpp
+++ b/src/mame/drivers/b2m.cpp
@@ -238,7 +238,7 @@ MACHINE_CONFIG_START(b2m_state::b2m)
/* uart */
MCFG_DEVICE_ADD("uart", I8251, 0)
- MCFG_FD1793_ADD("fd1793", XTAL_8MHz / 8)
+ MCFG_FD1793_ADD("fd1793", XTAL(8'000'000) / 8)
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(b2m_state, b2m_fdc_drq))
MCFG_FLOPPY_DRIVE_ADD("fd0", b2m_floppies, "525qd", b2m_state::b2m_floppy_formats)
diff --git a/src/mame/drivers/badlands.cpp b/src/mame/drivers/badlands.cpp
index 8623ad78c3f..8f8b4aa0c65 100644
--- a/src/mame/drivers/badlands.cpp
+++ b/src/mame/drivers/badlands.cpp
@@ -759,11 +759,11 @@ TIMER_DEVICE_CALLBACK_MEMBER(badlands_state::bootleg_sound_scanline)
MACHINE_CONFIG_START(badlands_state::badlandsb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz/4) /* Divisor estimated */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000)/4) /* Divisor estimated */
MCFG_CPU_PROGRAM_MAP(bootleg_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", badlands_state, irq1_line_hold) //vblank_int)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_20MHz/12) /* Divisor estimated */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(20'000'000)/12) /* Divisor estimated */
MCFG_CPU_PROGRAM_MAP(bootleg_audio_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", badlands_state, bootleg_sound_scanline, "screen", 0, 1)
@@ -796,7 +796,7 @@ MACHINE_CONFIG_START(badlands_state::badlandsb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_YM2151_ADD("ymsnd", XTAL_20MHz/8) /* Divisor estimated */
+ MCFG_YM2151_ADD("ymsnd", XTAL(20'000'000)/8) /* Divisor estimated */
MCFG_SOUND_ROUTE(0, "mono", 0.30)
MCFG_SOUND_ROUTE(1, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/balsente.cpp b/src/mame/drivers/balsente.cpp
index 36a23406088..66baf414bf6 100644
--- a/src/mame/drivers/balsente.cpp
+++ b/src/mame/drivers/balsente.cpp
@@ -1289,11 +1289,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(balsente_state::balsente)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL_20MHz/16) /* xtal verified but not speed */
+ MCFG_CPU_ADD("maincpu", MC6809E, XTAL(20'000'000)/16) /* xtal verified but not speed */
MCFG_CPU_PROGRAM_MAP(cpu1_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", balsente_state, balsente_update_analog_inputs)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_8MHz/2) /* xtal verified but not speed */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* xtal verified but not speed */
MCFG_CPU_PROGRAM_MAP(cpu2_map)
MCFG_CPU_IO_MAP(cpu2_io_map)
diff --git a/src/mame/drivers/banctec.cpp b/src/mame/drivers/banctec.cpp
index f786e2120e7..57ad4b392d5 100644
--- a/src/mame/drivers/banctec.cpp
+++ b/src/mame/drivers/banctec.cpp
@@ -131,7 +131,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(banctec_state::banctec)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C31, XTAL_11_0592MHz)
+ MCFG_CPU_ADD("maincpu", I80C31, XTAL(11'059'200))
MCFG_CPU_PROGRAM_MAP(banctec_mem)
MCFG_CPU_ADD("mcu", M6803, 4000000) /* Actual MCU is a Motorola 6803 and the clock frequency is still unknown */
@@ -149,7 +149,7 @@ MACHINE_CONFIG_START(banctec_state::banctec)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", banctec)
- MCFG_MC6845_ADD("crtc", R6545_1, "screen", XTAL_2MHz) /* (?) */
+ MCFG_MC6845_ADD("crtc", R6545_1, "screen", XTAL(2'000'000)) /* (?) */
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(banctec_state, crtc_update_row)
diff --git a/src/mame/drivers/bankp.cpp b/src/mame/drivers/bankp.cpp
index be8342ead7e..ab1a8e4b422 100644
--- a/src/mame/drivers/bankp.cpp
+++ b/src/mame/drivers/bankp.cpp
@@ -102,7 +102,7 @@
#include "speaker.h"
-#define MASTER_CLOCK XTAL_15_468MHz
+#define MASTER_CLOCK XTAL(15'468'480)
// Video timing
// PCB measured: H = 15.61khz V = 60.99hz, +/- 0.01hz
diff --git a/src/mame/drivers/baraduke.cpp b/src/mame/drivers/baraduke.cpp
index 7e5f962cf32..7a5559ba77d 100644
--- a/src/mame/drivers/baraduke.cpp
+++ b/src/mame/drivers/baraduke.cpp
@@ -373,11 +373,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(baraduke_state::baraduke)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL_49_152MHz/32) // 68A09E
+ MCFG_CPU_ADD("maincpu", MC6809E, XTAL(49'152'000)/32) // 68A09E
MCFG_CPU_PROGRAM_MAP(baraduke_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", baraduke_state, irq0_line_assert)
- MCFG_CPU_ADD("mcu", HD63701, XTAL_49_152MHz/8)
+ MCFG_CPU_ADD("mcu", HD63701, XTAL(49'152'000)/8)
MCFG_CPU_PROGRAM_MAP(mcu_map)
MCFG_CPU_IO_MAP(mcu_port_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", baraduke_state, irq0_line_hold)
@@ -388,7 +388,7 @@ MACHINE_CONFIG_START(baraduke_state::baraduke)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_49_152MHz/8, 384, 0, 36*8, 264, 2*8, 30*8)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(49'152'000)/8, 384, 0, 36*8, 264, 2*8, 30*8)
MCFG_SCREEN_UPDATE_DRIVER(baraduke_state, screen_update_baraduke)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(baraduke_state, screen_vblank_baraduke))
MCFG_SCREEN_PALETTE("palette")
@@ -400,7 +400,7 @@ MACHINE_CONFIG_START(baraduke_state::baraduke)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("namco", NAMCO_CUS30, XTAL_49_152MHz/2048)
+ MCFG_SOUND_ADD("namco", NAMCO_CUS30, XTAL(49'152'000)/2048)
MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/barata.cpp b/src/mame/drivers/barata.cpp
index 9983df33cd0..61341adf869 100644
--- a/src/mame/drivers/barata.cpp
+++ b/src/mame/drivers/barata.cpp
@@ -41,7 +41,7 @@
#include "barata.lh"
-#define CPU_CLOCK (XTAL_6MHz) /* main cpu clock */
+#define CPU_CLOCK (XTAL(6'000'000)) /* main cpu clock */
class barata_state : public driver_device
{
diff --git a/src/mame/drivers/barni.cpp b/src/mame/drivers/barni.cpp
index 80b82806731..6d993a5683d 100644
--- a/src/mame/drivers/barni.cpp
+++ b/src/mame/drivers/barni.cpp
@@ -58,10 +58,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(barni_state::barni)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL_4MHz / 4)
+ MCFG_CPU_ADD("maincpu", MC6809E, XTAL(4'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(maincpu_map)
- MCFG_CPU_ADD("subcpu", MC6809E, XTAL_4MHz / 4)
+ MCFG_CPU_ADD("subcpu", MC6809E, XTAL(4'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(subcpu_map)
MCFG_CPU_ADD("audiocpu", M6802, 4000000) // uses own XTAL, but what is the value?
diff --git a/src/mame/drivers/basic52.cpp b/src/mame/drivers/basic52.cpp
index cc54d3ee011..0afa43daf99 100644
--- a/src/mame/drivers/basic52.cpp
+++ b/src/mame/drivers/basic52.cpp
@@ -102,7 +102,7 @@ void basic52_state::kbd_put(u8 data)
MACHINE_CONFIG_START(basic52_state::basic31)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8031, XTAL_11_0592MHz)
+ MCFG_CPU_ADD("maincpu", I8031, XTAL(11'059'200))
MCFG_CPU_PROGRAM_MAP(basic52_mem)
MCFG_CPU_IO_MAP(basic52_io)
MCFG_MCS51_SERIAL_TX_CB(DEVWRITE8("terminal", generic_terminal_device, write))
@@ -117,7 +117,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED(basic52_state::basic52, basic31)
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", I8052, XTAL_11_0592MHz)
+ MCFG_CPU_REPLACE("maincpu", I8052, XTAL(11'059'200))
MCFG_CPU_PROGRAM_MAP(basic52_mem)
MCFG_CPU_IO_MAP(basic52_io)
MCFG_MCS51_SERIAL_TX_CB(DEVWRITE8("terminal", generic_terminal_device, write))
diff --git a/src/mame/drivers/battlex.cpp b/src/mame/drivers/battlex.cpp
index 28817b66699..7ff7e72b081 100644
--- a/src/mame/drivers/battlex.cpp
+++ b/src/mame/drivers/battlex.cpp
@@ -291,7 +291,7 @@ void battlex_state::machine_reset()
MACHINE_CONFIG_START(battlex_state::battlex)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,XTAL_10MHz/4 ) // ?
+ MCFG_CPU_ADD("maincpu", Z80,XTAL(10'000'000)/4 ) // ?
MCFG_CPU_PROGRAM_MAP(battlex_map)
MCFG_CPU_IO_MAP(io_map)
MCFG_CPU_PERIODIC_INT_DRIVER(battlex_state, battlex_interrupt, 400) /* controls game speed? */
@@ -311,7 +311,7 @@ MACHINE_CONFIG_START(battlex_state::battlex)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_10MHz/8) // ?
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(10'000'000)/8) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
@@ -322,7 +322,7 @@ MACHINE_CONFIG_DERIVED(battlex_state::dodgeman, battlex)
MCFG_VIDEO_START_OVERRIDE(battlex_state, dodgeman)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_10MHz/8) // ?
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(10'000'000)/8) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/battlnts.cpp b/src/mame/drivers/battlnts.cpp
index 7e63ff4e74d..eb458792b63 100644
--- a/src/mame/drivers/battlnts.cpp
+++ b/src/mame/drivers/battlnts.cpp
@@ -232,11 +232,11 @@ void battlnts_state::machine_reset()
MACHINE_CONFIG_START(battlnts_state::battlnts)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309, XTAL_24MHz / 2 /* 3000000*4? */)
+ MCFG_CPU_ADD("maincpu", HD6309, XTAL(24'000'000) / 2 /* 3000000*4? */)
MCFG_CPU_PROGRAM_MAP(battlnts_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", battlnts_state, battlnts_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz / 6 /* 3579545? */)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000) / 6 /* 3579545? */)
MCFG_CPU_PROGRAM_MAP(battlnts_sound_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -269,10 +269,10 @@ MACHINE_CONFIG_START(battlnts_state::battlnts)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM3812, XTAL_24MHz / 8)
+ MCFG_SOUND_ADD("ym1", YM3812, XTAL(24'000'000) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("ym2", YM3812, XTAL_24MHz / 8)
+ MCFG_SOUND_ADD("ym2", YM3812, XTAL(24'000'000) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp
index f3c4ce2d070..220ef2fce6b 100644
--- a/src/mame/drivers/bbc.cpp
+++ b/src/mame/drivers/bbc.cpp
@@ -853,7 +853,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_state::bbca)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL_16MHz/8) /* 2.00 MHz */
+ MCFG_CPU_ADD("maincpu", M6502, XTAL(16'000'000)/8) /* 2.00 MHz */
MCFG_CPU_PROGRAM_MAP(bbca_mem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bbc_state, bbcb_vsync) /* screen refresh interrupts */
MCFG_CPU_PERIODIC_INT_DRIVER(bbc_state, bbcb_keyscan, 1000) /* scan keyboard */
@@ -873,7 +873,7 @@ MACHINE_CONFIG_START(bbc_state::bbca)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- //MCFG_SCREEN_RAW_PARAMS(XTAL_16MHz, 1024, 0, 640, 312, 0, 256)
+ //MCFG_SCREEN_RAW_PARAMS(XTAL(16'000'000), 1024, 0, 640, 312, 0, 256)
MCFG_SCREEN_SIZE(640, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 256-1)
MCFG_SCREEN_REFRESH_RATE(50)
@@ -883,11 +883,11 @@ MACHINE_CONFIG_START(bbc_state::bbca)
MCFG_PALETTE_ADD("palette", 16)
MCFG_PALETTE_INIT_OWNER(bbc_state,bbc)
- MCFG_DEVICE_ADD("saa5050", SAA5050, XTAL_12MHz/2)
+ MCFG_DEVICE_ADD("saa5050", SAA5050, XTAL(12'000'000)/2)
MCFG_SAA5050_SCREEN_SIZE(40, 25, 40)
/* crtc */
- MCFG_MC6845_ADD("hd6845", HD6845, "screen", XTAL_16MHz / 8)
+ MCFG_MC6845_ADD("hd6845", HD6845, "screen", XTAL(16'000'000) / 8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(12)
MCFG_MC6845_UPDATE_ROW_CB(bbc_state, crtc_update_row)
@@ -901,7 +901,7 @@ MACHINE_CONFIG_START(bbc_state::bbca)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn76489", SN76489, XTAL_16MHz/4) /* 4 MHz */
+ MCFG_SOUND_ADD("sn76489", SN76489, XTAL(16'000'000)/4) /* 4 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* cassette */
@@ -924,11 +924,11 @@ MACHINE_CONFIG_START(bbc_state::bbca)
MCFG_RS232_DCD_HANDLER(WRITELINE(bbc_state, write_dcd_serial))
MCFG_RS232_CTS_HANDLER(WRITELINE(bbc_state, write_cts_serial))
- MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL_16MHz / 13)
+ MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL(16'000'000) / 13)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(bbc_state, write_acia_clock))
/* system via */
- MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL_16MHz / 16)
+ MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL(16'000'000) / 16)
MCFG_VIA6522_READPA_HANDLER(READ8(bbc_state, bbcb_via_system_read_porta))
MCFG_VIA6522_READPB_HANDLER(READ8(bbc_state, bbcb_via_system_read_portb))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(bbc_state, bbcb_via_system_write_porta))
@@ -960,7 +960,7 @@ MACHINE_CONFIG_DERIVED(bbc_state::bbcb, bbca)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* user via */
- MCFG_DEVICE_ADD("via6522_1", VIA6522, XTAL_16MHz / 16)
+ MCFG_DEVICE_ADD("via6522_1", VIA6522, XTAL(16'000'000) / 16)
MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8("cent_data_out", output_latch_device, write))
MCFG_VIA6522_READPB_HANDLER(DEVREAD8("userport", bbc_userport_slot_device, pb_r))
MCFG_VIA6522_WRITEPB_HANDLER(DEVWRITE8("userport", bbc_userport_slot_device, pb_w))
@@ -1073,7 +1073,7 @@ MACHINE_CONFIG_DERIVED(bbc_state::bbcbp, bbcb)
/* fdc */
MCFG_DEVICE_REMOVE("fdc")
- MCFG_WD1770_ADD("wd1770", XTAL_16MHz / 2)
+ MCFG_WD1770_ADD("wd1770", XTAL(16'000'000) / 2)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_state, fdc_drq_w))
@@ -1299,7 +1299,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_state::bbcm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M65SC02, XTAL_16MHz/8) /* 2.00 MHz */
+ MCFG_CPU_ADD("maincpu", M65SC02, XTAL(16'000'000)/8) /* 2.00 MHz */
MCFG_CPU_PROGRAM_MAP(bbcm_mem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bbc_state, bbcb_vsync) /* screen refresh interrupts */
MCFG_CPU_PERIODIC_INT_DRIVER(bbc_state, bbcb_keyscan, 1000) /* scan keyboard */
@@ -1329,11 +1329,11 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
MCFG_PALETTE_ADD("palette", 16)
MCFG_PALETTE_INIT_OWNER(bbc_state, bbc)
- MCFG_DEVICE_ADD("saa5050", SAA5050, XTAL_12MHz / 2)
+ MCFG_DEVICE_ADD("saa5050", SAA5050, XTAL(12'000'000) / 2)
MCFG_SAA5050_SCREEN_SIZE(40, 25, 40)
/* crtc */
- MCFG_MC6845_ADD("hd6845", HD6845, "screen", XTAL_16MHz / 8)
+ MCFG_MC6845_ADD("hd6845", HD6845, "screen", XTAL(16'000'000) / 8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(12)
MCFG_MC6845_UPDATE_ROW_CB(bbc_state, crtc_update_row)
@@ -1345,11 +1345,11 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn76489", SN76489, XTAL_16MHz/4) /* 4 MHz */
+ MCFG_SOUND_ADD("sn76489", SN76489, XTAL(16'000'000)/4) /* 4 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* rtc and cmos */
- MCFG_MC146818_ADD( "rtc", XTAL_32_768kHz )
+ MCFG_MC146818_ADD( "rtc", XTAL(32'768) )
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
@@ -1389,7 +1389,7 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
MCFG_RS232_DCD_HANDLER(WRITELINE(bbc_state, write_dcd_serial))
MCFG_RS232_CTS_HANDLER(WRITELINE(bbc_state, write_cts_serial))
- MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL_16MHz / 13)
+ MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL(16'000'000) / 13)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(bbc_state, write_acia_clock))
/* adc */
@@ -1398,7 +1398,7 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
MCFG_UPD7002_EOC_CB(bbc_state, BBC_uPD7002_EOC)
/* system via */
- MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL_16MHz / 16)
+ MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL(16'000'000) / 16)
MCFG_VIA6522_READPA_HANDLER(READ8(bbc_state, bbcb_via_system_read_porta))
MCFG_VIA6522_READPB_HANDLER(READ8(bbc_state, bbcb_via_system_read_portb))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(bbc_state, bbcb_via_system_write_porta))
@@ -1406,7 +1406,7 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<1>))
/* user via */
- MCFG_DEVICE_ADD("via6522_1", VIA6522, XTAL_16MHz / 16)
+ MCFG_DEVICE_ADD("via6522_1", VIA6522, XTAL(16'000'000) / 16)
MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8("cent_data_out", output_latch_device, write))
MCFG_VIA6522_READPB_HANDLER(DEVREAD8("userport", bbc_userport_slot_device, pb_r))
MCFG_VIA6522_WRITEPB_HANDLER(DEVWRITE8("userport", bbc_userport_slot_device, pb_w))
@@ -1414,7 +1414,7 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<2>))
/* fdc */
- MCFG_WD1770_ADD("wd1770", XTAL_16MHz / 2)
+ MCFG_WD1770_ADD("wd1770", XTAL(16'000'000) / 2)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_state, fdc_drq_w))
@@ -1586,7 +1586,7 @@ MACHINE_CONFIG_DERIVED(bbc_state::bbcmc, bbcm)
/* fdc */
MCFG_DEVICE_REMOVE("wd1770")
- MCFG_WD1772_ADD("wd1772", XTAL_16MHz / 2)
+ MCFG_WD1772_ADD("wd1772", XTAL(16'000'000) / 2)
MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_state, fdc_intrq_w))
MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_state, fdc_drq_w))
diff --git a/src/mame/drivers/bbcbc.cpp b/src/mame/drivers/bbcbc.cpp
index d392e07a9c4..51ea1fa81b7 100644
--- a/src/mame/drivers/bbcbc.cpp
+++ b/src/mame/drivers/bbcbc.cpp
@@ -58,7 +58,7 @@ private:
};
-#define MAIN_CLOCK XTAL_4_433619MHz
+#define MAIN_CLOCK XTAL(4'433'619)
static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, bbcbc_state )
@@ -118,7 +118,7 @@ MACHINE_CONFIG_START(bbcbc_state::bbcbc)
MCFG_Z80PIO_IN_PB_CB(READ8(bbcbc_state, input_r))
MCFG_Z80PIO_OUT_PB_CB(WRITE8(bbcbc_state, input_select_w))
- MCFG_DEVICE_ADD( "tms9129", TMS9129, XTAL_10_738635MHz / 2 )
+ MCFG_DEVICE_ADD( "tms9129", TMS9129, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE("maincpu", 0))
MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" )
diff --git a/src/mame/drivers/bcs3.cpp b/src/mame/drivers/bcs3.cpp
index baccc7cf6d3..9d66b5f8bf3 100644
--- a/src/mame/drivers/bcs3.cpp
+++ b/src/mame/drivers/bcs3.cpp
@@ -380,7 +380,7 @@ DRIVER_INIT_MEMBER( bcs3_state, bcs3d )
MACHINE_CONFIG_START(bcs3_state::bcs3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz /2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(5'000'000) /2)
MCFG_CPU_PROGRAM_MAP(bcs3_mem)
MCFG_CPU_IO_MAP(bcs3_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
@@ -396,7 +396,7 @@ MACHINE_CONFIG_START(bcs3_state::bcs3)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", bcs3)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_5MHz / 2)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(5'000'000) / 2)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(WRITELINE(bcs3_state, ctc_z0_w))
MCFG_Z80CTC_ZC1_CB(WRITELINE(bcs3_state, ctc_z1_w))
@@ -407,7 +407,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bcs3_state::bcs3a)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_7MHz /2)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(7'000'000) /2)
MCFG_CPU_PROGRAM_MAP(bcs3a_mem)
MCFG_CPU_IO_MAP(bcs3_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
@@ -423,7 +423,7 @@ MACHINE_CONFIG_START(bcs3_state::bcs3a)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", bcs3)
MCFG_PALETTE_ADD_MONOCHROME("palette")
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_7MHz / 2)
+ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(7'000'000) / 2)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(WRITELINE(bcs3_state, ctc_z0_w))
MCFG_Z80CTC_ZC1_CB(WRITELINE(bcs3_state, ctc_z1_w))
diff --git a/src/mame/drivers/bebox.cpp b/src/mame/drivers/bebox.cpp
index c3bd10f0cdf..3ca835ef3ed 100644
--- a/src/mame/drivers/bebox.cpp
+++ b/src/mame/drivers/bebox.cpp
@@ -158,7 +158,7 @@ MACHINE_CONFIG_START(bebox_state::bebox)
MCFG_PIT8253_CLK2(4772720/4) /* pio port c pin 4, and speaker polling enough */
MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("kbdc", kbdc8042_device, write_out2))
- MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL_14_31818MHz/3 )
+ MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL(14'318'181)/3 )
MCFG_I8237_OUT_HREQ_CB(WRITELINE(bebox_state, bebox_dma_hrq_changed))
MCFG_I8237_OUT_EOP_CB(WRITELINE(bebox_state, bebox_dma8237_out_eop))
MCFG_I8237_IN_MEMR_CB(READ8(bebox_state, bebox_dma_read_byte))
@@ -170,7 +170,7 @@ MACHINE_CONFIG_START(bebox_state::bebox)
MCFG_I8237_OUT_DACK_2_CB(WRITELINE(bebox_state, pc_dack2_w))
MCFG_I8237_OUT_DACK_3_CB(WRITELINE(bebox_state, pc_dack3_w))
- MCFG_DEVICE_ADD( "dma8237_2", AM9517A, XTAL_14_31818MHz/3 )
+ MCFG_DEVICE_ADD( "dma8237_2", AM9517A, XTAL(14'318'181)/3 )
MCFG_DEVICE_ADD("pic8259_1", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(WRITELINE(bebox_state, bebox_pic8259_master_set_int_line))
@@ -188,7 +188,7 @@ MACHINE_CONFIG_START(bebox_state::bebox)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_25_1748MHz,900,0,640,526,0,480)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480)
MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5428_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x100)
@@ -227,7 +227,7 @@ MACHINE_CONFIG_START(bebox_state::bebox)
MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("dma8237_1", am9517a_device, dreq2_w))
MCFG_FLOPPY_DRIVE_ADD("smc37c78:0", bebox_floppies, "35hd", bebox_state::floppy_formats)
- MCFG_MC146818_ADD( "rtc", XTAL_32_768kHz )
+ MCFG_MC146818_ADD( "rtc", XTAL(32'768) )
MCFG_DEVICE_ADD("kbdc", KBDC8042, 0)
MCFG_KBDC8042_KEYBOARD_TYPE(KBDC8042_STANDARD)
diff --git a/src/mame/drivers/beehive.cpp b/src/mame/drivers/beehive.cpp
index 74651e8aa68..96784d6278a 100644
--- a/src/mame/drivers/beehive.cpp
+++ b/src/mame/drivers/beehive.cpp
@@ -288,7 +288,7 @@ uint32_t beehive_state::screen_update(screen_device &screen, bitmap_ind16 &bitma
MACHINE_CONFIG_START(beehive_state::beehive)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A, XTAL_4MHz)
+ MCFG_CPU_ADD("maincpu",I8085A, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(beehive_mem)
MCFG_CPU_IO_MAP(beehive_io)
diff --git a/src/mame/drivers/beezer.cpp b/src/mame/drivers/beezer.cpp
index 64a06efbcaf..590d67d2e50 100644
--- a/src/mame/drivers/beezer.cpp
+++ b/src/mame/drivers/beezer.cpp
@@ -452,7 +452,7 @@ void beezer_state::machine_reset()
bankswitch_w(machine().dummy_space(), 0, 0);
// start timer
- m_timer_count->adjust(attotime::zero, 0, attotime::from_hz((XTAL_4MHz / 4) / 16));
+ m_timer_count->adjust(attotime::zero, 0, attotime::from_hz((XTAL(4'000'000) / 4) / 16));
}
@@ -462,7 +462,7 @@ void beezer_state::machine_reset()
MACHINE_CONFIG_START(beezer_state::beezer)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", MC6809, XTAL_12MHz / 3)
+ MCFG_CPU_ADD("maincpu", MC6809, XTAL(12'000'000) / 3)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_DEVICE_ADD("sysbank", ADDRESS_MAP_BANK, 0)
@@ -474,7 +474,7 @@ MACHINE_CONFIG_START(beezer_state::beezer)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", beezer_state, scanline_cb, "screen", 0, 1)
- MCFG_DEVICE_ADD("via_u6", VIA6522, XTAL_12MHz / 12)
+ MCFG_DEVICE_ADD("via_u6", VIA6522, XTAL(12'000'000) / 12)
MCFG_VIA6522_READPA_HANDLER(READ8(beezer_state, via_system_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(beezer_state, via_system_pb_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(beezer_state, via_system_pa_w))
@@ -498,13 +498,13 @@ MACHINE_CONFIG_START(beezer_state::beezer)
MCFG_PALETTE_INIT_OWNER(beezer_state, beezer)
// sound hardware
- MCFG_CPU_ADD("audiocpu", MC6809, XTAL_4MHz)
+ MCFG_CPU_ADD("audiocpu", MC6809, XTAL(4'000'000))
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_INPUT_MERGER_ANY_HIGH("audio_irqs")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", M6809_IRQ_LINE))
- MCFG_DEVICE_ADD("via_u18", VIA6522, XTAL_4MHz / 4)
+ MCFG_DEVICE_ADD("via_u18", VIA6522, XTAL(4'000'000) / 4)
MCFG_VIA6522_READPA_HANDLER(READ8(beezer_state, via_audio_pa_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(beezer_state, via_audio_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(beezer_state, via_audio_pb_w))
@@ -513,7 +513,7 @@ MACHINE_CONFIG_START(beezer_state::beezer)
MCFG_VIA6522_CB2_HANDLER(WRITELINE(beezer_state, dmod_data_w))
MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("audio_irqs", input_merger_device, in_w<0>))
- MCFG_DEVICE_ADD("ptm", PTM6840, XTAL_4MHz / 4)
+ MCFG_DEVICE_ADD("ptm", PTM6840, XTAL(4'000'000) / 4)
MCFG_PTM6840_OUT0_CB(WRITELINE(beezer_state, ptm_out0_w))
MCFG_PTM6840_OUT1_CB(WRITELINE(beezer_state, ptm_out1_w))
MCFG_PTM6840_OUT2_CB(WRITELINE(beezer_state, ptm_out2_w))
diff --git a/src/mame/drivers/berzerk.cpp b/src/mame/drivers/berzerk.cpp
index 82b0899d9ce..18a64937d1b 100644
--- a/src/mame/drivers/berzerk.cpp
+++ b/src/mame/drivers/berzerk.cpp
@@ -98,7 +98,7 @@ public:
};
-#define MASTER_CLOCK (XTAL_10MHz)
+#define MASTER_CLOCK (XTAL(10'000'000))
#define MAIN_CPU_CLOCK (MASTER_CLOCK / 4)
#define PIXEL_CLOCK (MASTER_CLOCK / 2)
#define S14001_CLOCK (MASTER_CLOCK / 4)
diff --git a/src/mame/drivers/beta.cpp b/src/mame/drivers/beta.cpp
index 1ae78f61b11..16cc503da3d 100644
--- a/src/mame/drivers/beta.cpp
+++ b/src/mame/drivers/beta.cpp
@@ -338,7 +338,7 @@ void beta_state::machine_start()
MACHINE_CONFIG_START(beta_state::beta)
/* basic machine hardware */
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_4MHz/4)
+ MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(4'000'000)/4)
MCFG_CPU_PROGRAM_MAP(beta_mem)
/* video hardware */
@@ -350,7 +350,7 @@ MACHINE_CONFIG_START(beta_state::beta)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
- MCFG_DEVICE_ADD(M6532_TAG, MOS6532_NEW, XTAL_4MHz/4)
+ MCFG_DEVICE_ADD(M6532_TAG, MOS6532_NEW, XTAL(4'000'000)/4)
MCFG_MOS6530n_IN_PA_CB(READ8(beta_state, riot_pa_r))
MCFG_MOS6530n_OUT_PA_CB(WRITE8(beta_state, riot_pa_w))
MCFG_MOS6530n_IN_PB_CB(READ8(beta_state, riot_pb_r))
diff --git a/src/mame/drivers/bfm_sc1.cpp b/src/mame/drivers/bfm_sc1.cpp
index 8590c5b23d2..07df0cc9ff8 100644
--- a/src/mame/drivers/bfm_sc1.cpp
+++ b/src/mame/drivers/bfm_sc1.cpp
@@ -224,7 +224,7 @@ public:
#define VFD_CLOCK1 0x80
#define VFD_DATA 0x40
-#define MASTER_CLOCK (XTAL_4MHz)
+#define MASTER_CLOCK (XTAL(4'000'000))
void bfm_sc1_state::save_state()
diff --git a/src/mame/drivers/bfm_sc2.cpp b/src/mame/drivers/bfm_sc2.cpp
index a9f64d907b0..d9acd631343 100644
--- a/src/mame/drivers/bfm_sc2.cpp
+++ b/src/mame/drivers/bfm_sc2.cpp
@@ -389,7 +389,7 @@ public:
#define UART_LOG(x) do { if (VERBOSE) logerror x; } while (0)
#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
-#define MASTER_CLOCK (XTAL_8MHz)
+#define MASTER_CLOCK (XTAL(8'000'000))
/* INPUTS layout
@@ -2249,7 +2249,7 @@ MACHINE_CONFIG_START(bfm_sc2_state::scorpion2_vid)
MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -3716,7 +3716,7 @@ MACHINE_CONFIG_START(bfm_sc2_state::scorpion2)
MCFG_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ymsnd",YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd",YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -3770,7 +3770,7 @@ MACHINE_CONFIG_START(bfm_sc2_state::scorpion2_dm01)
MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_MONOSTABLE(120000,100e-9))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd",YM2413, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("ymsnd",YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_MACHINE_START_OVERRIDE(bfm_sc2_state,sc2dmd)
diff --git a/src/mame/drivers/bfm_sc4.cpp b/src/mame/drivers/bfm_sc4.cpp
index b951e449d56..732c474d39b 100644
--- a/src/mame/drivers/bfm_sc4.cpp
+++ b/src/mame/drivers/bfm_sc4.cpp
@@ -906,7 +906,7 @@ MACHINE_CONFIG_START(sc4_state::sc4_common)
MCFG_NVRAM_ADD_1FILL("nvram")
MCFG_DEVICE_ADD("duart68681", MC68681, 16000000/4) // ?? Mhz
- MCFG_MC68681_SET_EXTERNAL_CLOCKS(XTAL_16MHz/2/8, XTAL_16MHz/2/16, XTAL_16MHz/2/16, XTAL_16MHz/2/8)
+ MCFG_MC68681_SET_EXTERNAL_CLOCKS(XTAL(16'000'000)/2/8, XTAL(16'000'000)/2/16, XTAL(16'000'000)/2/16, XTAL(16'000'000)/2/8)
MCFG_MC68681_IRQ_CALLBACK(WRITELINE(sc4_state, bfm_sc4_duart_irq_handler))
MCFG_MC68681_A_TX_CALLBACK(WRITELINE(sc4_state, bfm_sc4_duart_txa))
MCFG_MC68681_INPORT_CALLBACK(READ8(sc4_state, bfm_sc4_duart_input_r))
diff --git a/src/mame/drivers/bfmsys85.cpp b/src/mame/drivers/bfmsys85.cpp
index 08417de869c..22b95111fb7 100644
--- a/src/mame/drivers/bfmsys85.cpp
+++ b/src/mame/drivers/bfmsys85.cpp
@@ -137,7 +137,7 @@ public:
void bfmsys85(machine_config &config);
};
-#define MASTER_CLOCK (XTAL_4MHz)
+#define MASTER_CLOCK (XTAL(4'000'000))
///////////////////////////////////////////////////////////////////////////
// Serial Communications (Where does this go?) ////////////////////////////
diff --git a/src/mame/drivers/big10.cpp b/src/mame/drivers/big10.cpp
index b61be68cd0f..c039d67e6da 100644
--- a/src/mame/drivers/big10.cpp
+++ b/src/mame/drivers/big10.cpp
@@ -51,7 +51,7 @@
***************************************************************************/
-#define MASTER_CLOCK XTAL_21_4772MHz /* Dumper notes poorly refers to a 21.?727 Xtal. */
+#define MASTER_CLOCK XTAL(21'477'272) /* Dumper notes poorly refers to a 21.?727 Xtal. */
#include "emu.h"
diff --git a/src/mame/drivers/bigbord2.cpp b/src/mame/drivers/bigbord2.cpp
index 46c5ff9cdbf..b735cdacfc3 100644
--- a/src/mame/drivers/bigbord2.cpp
+++ b/src/mame/drivers/bigbord2.cpp
@@ -539,7 +539,7 @@ MC6845_UPDATE_ROW( bigbord2_state::crtc_update_row )
/* Machine Drivers */
-#define MAIN_CLOCK XTAL_8MHz / 2
+#define MAIN_CLOCK XTAL(8'000'000) / 2
MACHINE_CONFIG_START(bigbord2_state::bigbord2)
/* basic machine hardware */
@@ -550,7 +550,7 @@ MACHINE_CONFIG_START(bigbord2_state::bigbord2)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_10_69425MHz, 700, 0, 560, 260, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(10'694'250), 700, 0, 560, 260, 0, 240)
MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", crt8002)
MCFG_PALETTE_ADD_MONOCHROME("palette")
@@ -582,14 +582,14 @@ MACHINE_CONFIG_START(bigbord2_state::bigbord2)
MCFG_Z80CTC_ZC1_CB(WRITELINE(bigbord2_state, ctc_z1_w)) // to SIO Ch A
MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("ctc2", z80ctc_device, trg3))
- MCFG_MB8877_ADD("fdc", XTAL_16MHz / 8) // 2MHz for 8 inch, or 1MHz otherwise (jumper-selectable)
+ MCFG_MB8877_ADD("fdc", XTAL(16'000'000) / 8) // 2MHz for 8 inch, or 1MHz otherwise (jumper-selectable)
//MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE("maincpu", ??)) // info missing from schematic
MCFG_FLOPPY_DRIVE_ADD("fdc:0", bigbord2_floppies, "8dsdd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", bigbord2_floppies, "8dsdd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
- MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_16MHz / 8)
+ MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(16'000'000) / 8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(bigbord2_state, crtc_update_row)
diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp
index 9e7861b0a08..4ae385d6e8b 100644
--- a/src/mame/drivers/binbug.cpp
+++ b/src/mame/drivers/binbug.cpp
@@ -296,7 +296,7 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(binbug_state::binbug)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",S2650, XTAL_1MHz)
+ MCFG_CPU_ADD("maincpu",S2650, XTAL(1'000'000))
MCFG_CPU_PROGRAM_MAP(binbug_mem)
MCFG_CPU_DATA_MAP(binbug_data)
MCFG_S2650_SENSE_INPUT(READLINE(binbug_state, binbug_serial_r))
@@ -529,7 +529,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(dg680_state::uart_tick)
MACHINE_CONFIG_START(dg680_state::dg680)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL_8MHz / 4)
+ MCFG_CPU_ADD("maincpu",Z80, XTAL(8'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(dg680_mem)
MCFG_CPU_IO_MAP(dg680_io)
MCFG_Z80_DAISY_CHAIN(dg680_daisy_chain)
@@ -557,11 +557,11 @@ MACHINE_CONFIG_START(dg680_state::dg680)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* Devices */
- MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL_8MHz / 4)
+ MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL(8'000'000) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg1))
- MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL_8MHz / 4)
+ MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(8'000'000) / 4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(READ8(dg680_state, porta_r))
// OUT_ARDY - this activates to ask for kbd data but not known if actually used
diff --git a/src/mame/drivers/bingoman.cpp b/src/mame/drivers/bingoman.cpp
index b7a71cf0f58..645963c3367 100644
--- a/src/mame/drivers/bingoman.cpp
+++ b/src/mame/drivers/bingoman.cpp
@@ -375,7 +375,7 @@ PALETTE_INIT_MEMBER(bingoman_state, bingoman)
MACHINE_CONFIG_START(bingoman_state::bingoman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H83002, XTAL_20MHz) /* TODO: correct CPU type */
+ MCFG_CPU_ADD("maincpu", H83002, XTAL(20'000'000)) /* TODO: correct CPU type */
MCFG_CPU_PROGRAM_MAP(bingoman_prg_map)
MCFG_CPU_IO_MAP(bingoman_io_map)
diff --git a/src/mame/drivers/bingor.cpp b/src/mame/drivers/bingor.cpp
index 4e14f5a99a5..e0b2b0cce10 100644
--- a/src/mame/drivers/bingor.cpp
+++ b/src/mame/drivers/bingor.cpp
@@ -681,7 +681,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(bingor_state::bingor)
- MCFG_CPU_ADD("maincpu", I80186, XTAL_16MHz)
+ MCFG_CPU_ADD("maincpu", I80186, XTAL(16'000'000))
MCFG_CPU_PROGRAM_MAP(bingor_map)
MCFG_CPU_IO_MAP(bingor_io)
MCFG_CPU_PERIODIC_INT_DRIVER(bingor_state, nmi_line_pulse, 30)
@@ -765,7 +765,7 @@ static ADDRESS_MAP_START( slave_io, AS_IO, 8, bingor_state)
ADDRESS_MAP_END
MACHINE_CONFIG_START(bingor_state::vip2000)
- MCFG_CPU_ADD("maincpu", I80186, XTAL_10MHz)
+ MCFG_CPU_ADD("maincpu", I80186, XTAL(10'000'000))
MCFG_CPU_PROGRAM_MAP(vip2000_map)
MCFG_CPU_IO_MAP(vip2000_io)
MCFG_CPU_PERIODIC_INT_DRIVER(bingor_state, nmi_line_pulse, 30)
@@ -773,11 +773,11 @@ MACHINE_CONFIG_START(bingor_state::vip2000)
MCFG_ATMEL_49F4096_ADD("flash")
- MCFG_CPU_ADD("slavecpu", I80C31, XTAL_11_0592MHz)
+ MCFG_CPU_ADD("slavecpu", I80C31, XTAL(11'059'200))
MCFG_CPU_PROGRAM_MAP(slave_map)
MCFG_CPU_IO_MAP(slave_io)
- MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz)
+ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/bingowav.cpp b/src/mame/drivers/bingowav.cpp
index a841d3335d1..c2bcb01d45d 100644
--- a/src/mame/drivers/bingowav.cpp
+++ b/src/mame/drivers/bingowav.cpp
@@ -136,7 +136,7 @@ MACHINE_CONFIG_START(bingowav_state::bingowav)
MCFG_CPU_PROGRAM_MAP(bingowav_drive_map)
MCFG_DEVICE_DISABLE()
- MCFG_CPU_ADD("ctrlcpu", Z80, XTAL_16MHz / 4)
+ MCFG_CPU_ADD("ctrlcpu", Z80, XTAL(16'000'000) / 4)
MCFG_CPU_PROGRAM_MAP(bingowav_control_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bionicc.cpp b/src/mame/drivers/bionicc.cpp
index 3545d007eac..753f3db252d 100644
--- a/src/mame/drivers/bionicc.cpp
+++ b/src/mame/drivers/bionicc.cpp
@@ -372,13 +372,13 @@ void bionicc_state::machine_reset()
MACHINE_CONFIG_START(bionicc_state::bionicc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 12 MHz - verified in schematics */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2) /* 12 MHz - verified in schematics */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", bionicc_state, scanline, "screen", 0, 1)
/* Protection MCU Intel C8751H-88 runs at 24MHz / 4 = 6MHz */
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz / 4) /* EXO3 C,B=GND, A=5V ==> Divisor 2^2 */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181) / 4) /* EXO3 C,B=GND, A=5V ==> Divisor 2^2 */
MCFG_CPU_PROGRAM_MAP(sound_map)
/* FIXME: interrupt timing
* schematics indicate that nmi_line is set on M680000 access with AB1=1
@@ -390,7 +390,7 @@ MACHINE_CONFIG_START(bionicc_state::bionicc)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
/* FIXME: should be 257 visible horizontal pixels, first visible pixel should be repeated, back porch/front porch should be separated */
- MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz / 4, 386, 0, 256, 260, 16, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000) / 4, 386, 0, 256, 260, 16, 240)
MCFG_SCREEN_UPDATE_DRIVER(bionicc_state, screen_update)
MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
@@ -408,7 +408,7 @@ MACHINE_CONFIG_START(bionicc_state::bionicc)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz / 4)
+ MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181) / 4)
MCFG_SOUND_ROUTE(0, "mono", 0.60)
MCFG_SOUND_ROUTE(1, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bitgraph.cpp b/src/mame/drivers/bitgraph.cpp
index e7ad9e72d8f..49b812fdeac 100644
--- a/src/mame/drivers/bitgraph.cpp
+++ b/src/mame/drivers/bitgraph.cpp
@@ -528,11 +528,11 @@ MACHINE_CONFIG_START(bitgraph_state::bg_motherboard)
MCFG_RS232_CTS_HANDLER(DEVWRITELINE(ACIA2_TAG, acia6850_device, write_cts))
// XXX actual part may be something else
- MCFG_DEVICE_ADD(COM8116_A_TAG, COM8116, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD(COM8116_A_TAG, COM8116, XTAL(5'068'800))
MCFG_COM8116_FR_HANDLER(WRITELINE(bitgraph_state, com8116_a_fr_w))
MCFG_COM8116_FT_HANDLER(WRITELINE(bitgraph_state, com8116_a_ft_w))
- MCFG_DEVICE_ADD(COM8116_B_TAG, COM8116, XTAL_5_0688MHz)
+ MCFG_DEVICE_ADD(COM8116_B_TAG, COM8116, XTAL(5'068'800))
MCFG_COM8116_FR_HANDLER(WRITELINE(bitgraph_state, com8116_b_fr_w))
MCFG_COM8116_FT_HANDLER(WRITELINE(bitgraph_state, com8116_b_ft_w))
@@ -547,14 +547,14 @@ MACHINE_CONFIG_START(bitgraph_state::bg_motherboard)
MCFG_ER2055_ADD(EAROM_TAG)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(PSG_TAG, AY8912, XTAL_1_2944MHz)
+ MCFG_SOUND_ADD(PSG_TAG, AY8912, XTAL(1'294'400))
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(bitgraph_state, earom_write))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
#ifdef UNUSED_FUNCTION
MACHINE_CONFIG_START(bitgraph_state::bg_ppu)
- MCFG_CPU_ADD(PPU_TAG, I8035, XTAL_6_9MHz)
+ MCFG_CPU_ADD(PPU_TAG, I8035, XTAL(6'900'000))
MCFG_CPU_IO_MAP(ppu_io)
// MCFG_MCS48_PORT_T0_IN_CB(READLINE(bitgraph_state, ppu_t0_r))
MCFG_MCS48_PORT_PROG_OUT_CB(DEVWRITELINE("i8243", i8243_device, prog_w))
@@ -574,7 +574,7 @@ MACHINE_CONFIG_END
#endif
MACHINE_CONFIG_START(bitgraph_state::bitgrpha)
- MCFG_CPU_ADD(M68K_TAG, M68000, XTAL_6_9MHz)
+ MCFG_CPU_ADD(M68K_TAG, M68000, XTAL(6'900'000))
MCFG_CPU_PROGRAM_MAP(bitgrapha_mem)
MCFG_FRAGMENT_ADD(bg_motherboard)
@@ -597,7 +597,7 @@ MACHINE_CONFIG_START(bitgraph_state::bitgrpha)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(bitgraph_state::bitgrphb)
- MCFG_CPU_ADD(M68K_TAG, M68000, XTAL_6_9MHz)
+ MCFG_CPU_ADD(M68K_TAG, M68000, XTAL(6'900'000))
MCFG_CPU_PROGRAM_MAP(bitgraphb_mem)
MCFG_FRAGMENT_ADD(bg_motherboard)
diff --git a/src/mame/drivers/bking.cpp b/src/mame/drivers/bking.cpp
index 49d36630a9a..b60301fcd6b 100644
--- a/src/mame/drivers/bking.cpp
+++ b/src/mame/drivers/bking.cpp
@@ -388,12 +388,12 @@ MACHINE_RESET_MEMBER(bking_state,bking3)
MACHINE_CONFIG_START(bking_state::bking)
/* basic machine hardware */
- MCFG_CPU_ADD("main_cpu", Z80, XTAL_12MHz/4) /* 3 MHz */
+ MCFG_CPU_ADD("main_cpu", Z80, XTAL(12'000'000)/4) /* 3 MHz */
MCFG_CPU_PROGRAM_MAP(bking_map)
MCFG_CPU_IO_MAP(bking_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bking_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_6MHz/2) /* 3 MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(6'000'000)/2) /* 3 MHz */
MCFG_CPU_PROGRAM_MAP(bking_audio_map)
/* interrupts (from Jungle King hardware, might be wrong): */
/* - no interrupts synced with vblank */
@@ -426,10 +426,10 @@ MACHINE_CONFIG_START(bking_state::bking)
MCFG_INPUT_MERGER_ALL_HIGH("soundnmi")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ay1", AY8910, XTAL_6MHz/4)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL(6'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL_6MHz/4)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL(6'000'000)/4)
MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("dac", dac_byte_interface, write))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(bking_state, port_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
@@ -445,7 +445,7 @@ MACHINE_CONFIG_DERIVED(bking_state::bking3, bking)
MCFG_CPU_MODIFY("main_cpu")
MCFG_CPU_IO_MAP(bking3_io_map)
- MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL_3MHz) /* xtal is 3MHz, divided by 4 internally */
+ MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL(3'000'000)) /* xtal is 3MHz, divided by 4 internally */
MCFG_MACHINE_START_OVERRIDE(bking_state,bking3)
MCFG_MACHINE_RESET_OVERRIDE(bking_state,bking3)
diff --git a/src/mame/drivers/bladestl.cpp b/src/mame/drivers/bladestl.cpp
index 0a5af96ec25..3ba43e7b4e1 100644
--- a/src/mame/drivers/bladestl.cpp
+++ b/src/mame/drivers/bladestl.cpp
@@ -302,11 +302,11 @@ void bladestl_state::machine_reset()
MACHINE_CONFIG_START(bladestl_state::bladestl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309E, XTAL_24MHz / 8) // divider not verified (from 007342 custom)
+ MCFG_CPU_ADD("maincpu", HD6309E, XTAL(24'000'000) / 8) // divider not verified (from 007342 custom)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", bladestl_state, bladestl_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", MC6809E, XTAL_24MHz / 16)
+ MCFG_CPU_ADD("audiocpu", MC6809E, XTAL(24'000'000) / 16)
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -347,10 +347,10 @@ MACHINE_CONFIG_START(bladestl_state::bladestl)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("upd", UPD7759, XTAL_640kHz)
+ MCFG_SOUND_ADD("upd", UPD7759, XTAL(640'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_24MHz / 8)
+ MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(24'000'000) / 8)
MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("upd", upd775x_device, port_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(bladestl_state, bladestl_port_B_w))
MCFG_SOUND_ROUTE(0, "filter1", 0.45)
diff --git a/src/mame/drivers/blitz68k.cpp b/src/mame/drivers/blitz68k.cpp
index f728d41dd5f..ac86656986e 100644
--- a/src/mame/drivers/blitz68k.cpp
+++ b/src/mame/drivers/blitz68k.cpp
@@ -1751,7 +1751,7 @@ MACHINE_CONFIG_DERIVED(blitz68k_state::steaser, ilpag)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(blitz68k_state::cjffruit)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_22_1184MHz/2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(22'118'400)/2)
MCFG_CPU_PROGRAM_MAP(cjffruit_map)
// MC68HC705C8P (Sound MCU)
@@ -1765,7 +1765,7 @@ MACHINE_CONFIG_START(blitz68k_state::cjffruit)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-8-1)
MCFG_SCREEN_UPDATE_DRIVER(blitz68k_state, screen_update_blitz68k)
- MCFG_MC6845_ADD("crtc", R6545_1, "screen", XTAL_22_1184MHz/8)
+ MCFG_MC6845_ADD("crtc", R6545_1, "screen", XTAL(22'118'400)/8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr)
@@ -1779,7 +1779,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(blitz68k_state::bankrob)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(11'059'200))
MCFG_CPU_PROGRAM_MAP(bankrob_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq3_line_hold) // protection prevents correct irq frequency by crtc
// irq 2 reads from MCUs
@@ -1797,7 +1797,7 @@ MACHINE_CONFIG_START(blitz68k_state::bankrob)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+4, 256-1-4)
MCFG_SCREEN_UPDATE_DRIVER(blitz68k_state, screen_update_blitz68k)
- MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_11_0592MHz/4)
+ MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(11'059'200)/4)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr)
@@ -1811,7 +1811,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(blitz68k_state::bankroba)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz )
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(11'059'200) )
MCFG_CPU_PROGRAM_MAP(bankroba_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq5_line_hold) // protection prevents correct irq frequency by crtc
// irq 3,4 read from MCUs
@@ -1827,7 +1827,7 @@ MACHINE_CONFIG_START(blitz68k_state::bankroba)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+7, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(blitz68k_state, screen_update_blitz68k)
- MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_11_0592MHz/4)
+ MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(11'059'200)/4)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr)
@@ -1841,7 +1841,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(blitz68k_state::deucesw2)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_22_1184MHz / 2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(22'118'400) / 2)
MCFG_CPU_PROGRAM_MAP(deucesw2_map)
// irq 2 reads from MCUs
@@ -1856,7 +1856,7 @@ MACHINE_CONFIG_START(blitz68k_state::deucesw2)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(blitz68k_state, screen_update_blitz68k)
- MCFG_MC6845_ADD("crtc", R6545_1, "screen", XTAL_22_1184MHz/8)
+ MCFG_MC6845_ADD("crtc", R6545_1, "screen", XTAL(22'118'400)/8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr)
@@ -1870,7 +1870,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(blitz68k_state::dualgame)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz )
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(11'059'200) )
MCFG_CPU_PROGRAM_MAP(dualgame_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq2_line_hold) // lev 2 = MCUs, lev 3 = vblank
@@ -1887,7 +1887,7 @@ MACHINE_CONFIG_START(blitz68k_state::dualgame)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+4, 256-1-4)
MCFG_SCREEN_UPDATE_DRIVER(blitz68k_state, screen_update_blitz68k)
- MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_11_0592MHz/4)
+ MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(11'059'200)/4)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr)
@@ -1901,7 +1901,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(blitz68k_state::hermit)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_22_1184MHz/2 )
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(22'118'400)/2 )
MCFG_CPU_PROGRAM_MAP(hermit_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq1_line_hold) // protection prevents correct irq frequency by crtc
@@ -1916,7 +1916,7 @@ MACHINE_CONFIG_START(blitz68k_state::hermit)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0+4, 256-1-4)
MCFG_SCREEN_UPDATE_DRIVER(blitz68k_state, screen_update_blitz68k)
- MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_22_1184MHz/8)
+ MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(22'118'400)/8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr)
@@ -1930,7 +1930,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(blitz68k_state::maxidbl)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(11'059'200))
MCFG_CPU_PROGRAM_MAP(maxidbl_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq3_line_hold) // protection prevents correct irq frequency by crtc
// irq 2 reads from MCUs
@@ -1950,7 +1950,7 @@ MACHINE_CONFIG_START(blitz68k_state::maxidbl)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(blitz68k_state, screen_update_blitz68k_noblit)
- MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_11_0592MHz/4)
+ MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(11'059'200)/4)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr)
@@ -1960,7 +1960,7 @@ MACHINE_CONFIG_START(blitz68k_state::maxidbl)
MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SAA1099_ADD("saa", XTAL_8MHz/2)
+ MCFG_SAA1099_ADD("saa", XTAL(8'000'000)/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/blktiger.cpp b/src/mame/drivers/blktiger.cpp
index 1f66b74e86a..b19291d24a7 100644
--- a/src/mame/drivers/blktiger.cpp
+++ b/src/mame/drivers/blktiger.cpp
@@ -298,15 +298,15 @@ void blktiger_state::machine_reset()
MACHINE_CONFIG_START(blktiger_state::blktiger)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000)/4) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(blktiger_map)
MCFG_CPU_IO_MAP(blktiger_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", blktiger_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(blktiger_sound_map)
- MCFG_CPU_ADD("mcu", I8751, XTAL_24MHz/4) /* ??? */
+ MCFG_CPU_ADD("mcu", I8751, XTAL(24'000'000)/4) /* ??? */
MCFG_CPU_PROGRAM_MAP(blktiger_mcu_map)
MCFG_CPU_IO_MAP(blktiger_mcu_io_map)
//MCFG_CPU_VBLANK_INT_DRIVER("screen", blktiger_state, irq0_line_hold)
@@ -335,11 +335,11 @@ MACHINE_CONFIG_START(blktiger_state::blktiger)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL(3'579'545)) /* verified on pcb */
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL(3'579'545)) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/blmbycar.cpp b/src/mame/drivers/blmbycar.cpp
index f6d774bcc67..44505469126 100644
--- a/src/mame/drivers/blmbycar.cpp
+++ b/src/mame/drivers/blmbycar.cpp
@@ -346,7 +346,7 @@ MACHINE_RESET_MEMBER(blmbycar_state,blmbycar)
MACHINE_CONFIG_START(blmbycar_state::blmbycar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12MHz */
MCFG_CPU_PROGRAM_MAP(blmbycar_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", blmbycar_state, irq1_line_hold)
@@ -370,7 +370,7 @@ MACHINE_CONFIG_START(blmbycar_state::blmbycar)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(1'000'000), PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_DEVICE_ADDRESS_MAP(0, blmbycar_oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
diff --git a/src/mame/drivers/blockade.cpp b/src/mame/drivers/blockade.cpp
index 3517fc36d07..efaeef97b9d 100644
--- a/src/mame/drivers/blockade.cpp
+++ b/src/mame/drivers/blockade.cpp
@@ -463,13 +463,13 @@ void blockade_state::device_timer(emu_timer &timer, device_timer_id id, int para
//**************************************************************************
MACHINE_CONFIG_START(blockade_state::blockade)
- MCFG_CPU_ADD("maincpu", I8080A, XTAL_20_079MHz / 10)
+ MCFG_CPU_ADD("maincpu", I8080A, XTAL(20'790'000) / 10)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(main_io_map)
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_20_079MHz / 4, 330, 0, 256, 262, 0, 224)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(20'790'000) / 4, 330, 0, 256, 262, 0, 224)
MCFG_SCREEN_UPDATE_DRIVER(blockade_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/blockhl.cpp b/src/mame/drivers/blockhl.cpp
index 6afb1bcd717..b25fde97ca3 100644
--- a/src/mame/drivers/blockhl.cpp
+++ b/src/mame/drivers/blockhl.cpp
@@ -273,7 +273,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(blockhl_state::blockhl)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/8) // Konami 052526
+ MCFG_CPU_ADD("maincpu", KONAMI, XTAL(24'000'000)/8) // Konami 052526
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_KONAMICPU_LINE_CB(WRITE8(blockhl_state, banking_callback))
@@ -284,16 +284,16 @@ MACHINE_CONFIG_START(blockhl_state::blockhl)
MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(12)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x0800)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_3_579545MHz)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
MCFG_CPU_PROGRAM_MAP(audio_map)
MCFG_WATCHDOG_ADD("watchdog")
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/3, 528, 112, 400, 256, 16, 240)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/3, 528, 112, 400, 256, 16, 240)
// 6MHz dotclock is more realistic, however needs drawing updates. replace when ready
-// MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/4, 396, hbend, hbstart, 256, 16, 240)
+// MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000)/4, 396, hbend, hbstart, 256, 16, 240)
MCFG_SCREEN_UPDATE_DRIVER(blockhl_state, screen_update_blockhl)
MCFG_SCREEN_PALETTE("palette")
@@ -317,7 +317,7 @@ MACHINE_CONFIG_START(blockhl_state::blockhl)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz)
+ MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545))
MCFG_SOUND_ROUTE(0, "mono", 0.60)
MCFG_SOUND_ROUTE(1, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/blockout.cpp b/src/mame/drivers/blockout.cpp
index 29465cda159..c7b88f3d9d3 100644
--- a/src/mame/drivers/blockout.cpp
+++ b/src/mame/drivers/blockout.cpp
@@ -76,8 +76,8 @@
#include "speaker.h"
-#define MAIN_CLOCK XTAL_10MHz
-#define AUDIO_CLOCK XTAL_3_579545MHz
+#define MAIN_CLOCK XTAL(10'000'000)
+#define AUDIO_CLOCK XTAL(3'579'545)
WRITE16_MEMBER(blockout_state::blockout_irq6_ack_w)
{
@@ -315,7 +315,7 @@ MACHINE_CONFIG_START(blockout_state::blockout)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
/* assume same as ddragon3 with adjusted visible display area */
- MCFG_SCREEN_RAW_PARAMS(XTAL_28MHz / 4, 448, 0, 320, 272, 10, 250)
+ MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 448, 0, 320, 272, 10, 250)
MCFG_SCREEN_UPDATE_DRIVER(blockout_state, screen_update_blockout)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/bloodbro.cpp b/src/mame/drivers/bloodbro.cpp
index e7c1b1a5307..04fb23364fa 100644
--- a/src/mame/drivers/bloodbro.cpp
+++ b/src/mame/drivers/bloodbro.cpp
@@ -519,11 +519,11 @@ WRITE16_MEMBER( bloodbro_state::weststry_layer_scroll_w )
MACHINE_CONFIG_START(bloodbro_state::bloodbro)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(bloodbro_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bloodbro_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_7_15909MHz/2) /* verified on pcb */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL(7'159'090)/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
// video hardware
@@ -548,11 +548,11 @@ MACHINE_CONFIG_START(bloodbro_state::bloodbro)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_7_15909MHz/2)
+ MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(7'159'090)/2)
MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL(12'000'000)/12, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
@@ -569,7 +569,7 @@ MACHINE_CONFIG_DERIVED(bloodbro_state::weststry, bloodbro)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bloodbro_state, irq6_line_hold)
MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_CLOCK(XTAL_20MHz/4) /* 5MHz - verified on PCB */
+ MCFG_CPU_CLOCK(XTAL(20'000'000)/4) /* 5MHz - verified on PCB */
MCFG_CPU_PROGRAM_MAP(weststry_sound_map)
MCFG_GFXDECODE_MODIFY("gfxdecode", weststry)
@@ -585,10 +585,10 @@ MACHINE_CONFIG_DERIVED(bloodbro_state::weststry, bloodbro)
// Bootleg sound hardware is close copy of Seibu, but uses different interrupts
- MCFG_OKIM6295_REPLACE("oki", XTAL_20MHz/16, PIN7_HIGH) /* 1.25MHz - verified on PCB */
+ MCFG_OKIM6295_REPLACE("oki", XTAL(20'000'000)/16, PIN7_HIGH) /* 1.25MHz - verified on PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_REPLACE("ymsnd", YM3812, XTAL_20MHz/4) /* ~4.9MHz - see notes at top */
+ MCFG_SOUND_REPLACE("ymsnd", YM3812, XTAL(20'000'000)/4) /* ~4.9MHz - see notes at top */
MCFG_YM3812_IRQ_HANDLER(WRITELINE(bloodbro_state, weststry_opl_irq_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/bmcbowl.cpp b/src/mame/drivers/bmcbowl.cpp
index 30737bd3f75..55acb371e40 100644
--- a/src/mame/drivers/bmcbowl.cpp
+++ b/src/mame/drivers/bmcbowl.cpp
@@ -452,7 +452,7 @@ static ADDRESS_MAP_START( ramdac_map, 0, 8, bmcbowl_state )
ADDRESS_MAP_END
MACHINE_CONFIG_START(bmcbowl_state::bmcbowl)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_21_4772MHz / 2 )
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(21'477'272) / 2 )
MCFG_CPU_PROGRAM_MAP(bmcbowl_mem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bmcbowl_state, irq2_line_hold)
@@ -471,11 +471,11 @@ MACHINE_CONFIG_START(bmcbowl_state::bmcbowl)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz ) // guessed chip type, clock not verified
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545) ) // guessed chip type, clock not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_3_579545MHz / 2)
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL(3'579'545) / 2)
MCFG_AY8910_PORT_A_READ_CB(READ8(bmcbowl_state, dips1_r))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(bmcbowl_state, input_mux_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
diff --git a/src/mame/drivers/bmcpokr.cpp b/src/mame/drivers/bmcpokr.cpp
index 514f671b284..24cd9425658 100644
--- a/src/mame/drivers/bmcpokr.cpp
+++ b/src/mame/drivers/bmcpokr.cpp
@@ -803,7 +803,7 @@ static ADDRESS_MAP_START( ramdac_map, 0, 8, bmcpokr_state )
ADDRESS_MAP_END
MACHINE_CONFIG_START(bmcpokr_state::bmcpokr)
- MCFG_CPU_ADD("maincpu", M68000, XTAL_42MHz / 4) // 68000 @10.50MHz (42/4)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL(42'000'000) / 4) // 68000 @10.50MHz (42/4)
MCFG_CPU_PROGRAM_MAP(bmcpokr_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", bmcpokr_state, interrupt, "screen", 0, 1)
@@ -826,11 +826,11 @@ MACHINE_CONFIG_START(bmcpokr_state::bmcpokr)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_42MHz / 12) // UM3567 @3.50MHz (42/12)
+ MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(42'000'000) / 12) // UM3567 @3.50MHz (42/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MCFG_OKIM6295_ADD("oki", XTAL_42MHz / 40, PIN7_HIGH) // M6295 @1.05MHz (42/40), pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL(42'000'000) / 40, PIN7_HIGH) // M6295 @1.05MHz (42/40), pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bmjr.cpp b/src/mame/drivers/bmjr.cpp
index 015f539707b..722ffb97786 100644
--- a/src/mame/drivers/bmjr.cpp
+++ b/src/mame/drivers/bmjr.cpp
@@ -336,7 +336,7 @@ void bmjr_state::machine_reset()
MACHINE_CONFIG_START(bmjr_state::bmjr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6800, XTAL_4MHz/4) //unknown clock / divider
+ MCFG_CPU_ADD("maincpu",M6800, XTAL(4'000'000)/4)