summaryrefslogtreecommitdiffstats
path: root/src/mame
diff options
context:
space:
mode:
authorGravatarGravatar Aaron Giles <aaron@aarongiles.com>2010-12-31 21:18:45 +0000
committerGravatarGravatar Aaron Giles <aaron@aarongiles.com>2010-12-31 21:18:45 +0000
commitba6d1bd8a355c8f0225b0a3093cd7f999152b505 (patch)
tree96196f3c9713b729d42bb1969109a9d517e93edd /src/mame
parent80f4cfa981c948232d3c1ef2c65b18cc6005b651 (diff)
MDRV_* -> MCFG_*
There hasn't been a machine driver for many years.
Diffstat (limited to 'src/mame')
-rw-r--r--src/mame/audio/astrof.c16
-rw-r--r--src/mame/audio/atarijsa.c108
-rw-r--r--src/mame/audio/bzone.c14
-rw-r--r--src/mame/audio/cage.c42
-rw-r--r--src/mame/audio/carnival.c18
-rw-r--r--src/mame/audio/cinemat.c202
-rw-r--r--src/mame/audio/crbaloon.c14
-rw-r--r--src/mame/audio/dcs.c118
-rw-r--r--src/mame/audio/depthch.c6
-rw-r--r--src/mame/audio/dkong.c150
-rw-r--r--src/mame/audio/exidy.c44
-rw-r--r--src/mame/audio/exidy440.c30
-rw-r--r--src/mame/audio/galaxian.c16
-rw-r--r--src/mame/audio/gottlieb.c42
-rw-r--r--src/mame/audio/hyprolyb.c12
-rw-r--r--src/mame/audio/invinco.c6
-rw-r--r--src/mame/audio/irem.c74
-rw-r--r--src/mame/audio/jedi.c36
-rw-r--r--src/mame/audio/mario.c36
-rw-r--r--src/mame/audio/mcr.c86
-rw-r--r--src/mame/audio/mw8080bw.c242
-rw-r--r--src/mame/audio/n8080.c52
-rw-r--r--src/mame/audio/namco52.c4
-rw-r--r--src/mame/audio/namco52.h6
-rw-r--r--src/mame/audio/namco54.c4
-rw-r--r--src/mame/audio/namco54.h8
-rw-r--r--src/mame/audio/namcoc7x.h28
-rw-r--r--src/mame/audio/pulsar.c6
-rw-r--r--src/mame/audio/qix.c32
-rw-r--r--src/mame/audio/redalert.c62
-rw-r--r--src/mame/audio/scramble.c32
-rw-r--r--src/mame/audio/segag80r.c56
-rw-r--r--src/mame/audio/segasnd.c28
-rw-r--r--src/mame/audio/seibu.h100
-rw-r--r--src/mame/audio/spacefb.c12
-rw-r--r--src/mame/audio/spiders.c8
-rw-r--r--src/mame/audio/taito_en.c18
-rw-r--r--src/mame/audio/taito_zm.c16
-rw-r--r--src/mame/audio/taitosnd.h6
-rw-r--r--src/mame/audio/targ.c24
-rw-r--r--src/mame/audio/timeplt.c64
-rw-r--r--src/mame/audio/turbo.c88
-rw-r--r--src/mame/audio/vicdual.c18
-rw-r--r--src/mame/audio/williams.c78
-rw-r--r--src/mame/audio/zaxxon.c12
-rw-r--r--src/mame/drivers/1942.c48
-rw-r--r--src/mame/drivers/1943.c64
-rw-r--r--src/mame/drivers/1945kiii.c38
-rw-r--r--src/mame/drivers/20pacgal.c28
-rw-r--r--src/mame/drivers/2mindril.c54
-rw-r--r--src/mame/drivers/39in1.c38
-rw-r--r--src/mame/drivers/3super8.c32
-rw-r--r--src/mame/drivers/40love.c166
-rw-r--r--src/mame/drivers/4enraya.c40
-rw-r--r--src/mame/drivers/4roses.c40
-rw-r--r--src/mame/drivers/5clown.c52
-rw-r--r--src/mame/drivers/8080bw.c294
-rw-r--r--src/mame/drivers/86lions.c40
-rw-r--r--src/mame/drivers/88games.c56
-rw-r--r--src/mame/drivers/ace.c32
-rw-r--r--src/mame/drivers/acefruit.c36
-rw-r--r--src/mame/drivers/acommand.c42
-rw-r--r--src/mame/drivers/actfancr.c116
-rw-r--r--src/mame/drivers/adp.c140
-rw-r--r--src/mame/drivers/aeroboto.c50
-rw-r--r--src/mame/drivers/aerofgt.c548
-rw-r--r--src/mame/drivers/airbustr.c82
-rw-r--r--src/mame/drivers/ajax.c80
-rw-r--r--src/mame/drivers/albazc.c36
-rw-r--r--src/mame/drivers/albazg.c48
-rw-r--r--src/mame/drivers/aleck64.c58
-rw-r--r--src/mame/drivers/alg.c68
-rw-r--r--src/mame/drivers/aliens.c56
-rw-r--r--src/mame/drivers/alpha68k.c482
-rw-r--r--src/mame/drivers/amaticmg.c52
-rw-r--r--src/mame/drivers/ambush.c44
-rw-r--r--src/mame/drivers/ampoker2.c46
-rw-r--r--src/mame/drivers/amspdwy.c48
-rw-r--r--src/mame/drivers/angelkds.c72
-rw-r--r--src/mame/drivers/appoooh.c80
-rw-r--r--src/mame/drivers/aquarium.c54
-rw-r--r--src/mame/drivers/arabian.c46
-rw-r--r--src/mame/drivers/arcadecl.c34
-rw-r--r--src/mame/drivers/arcadia.c46
-rw-r--r--src/mame/drivers/argus.c204
-rw-r--r--src/mame/drivers/aristmk4.c64
-rw-r--r--src/mame/drivers/aristmk5.c62
-rw-r--r--src/mame/drivers/arkanoid.c94
-rw-r--r--src/mame/drivers/armedf.c400
-rw-r--r--src/mame/drivers/artmagic.c66
-rw-r--r--src/mame/drivers/ashnojoe.c50
-rw-r--r--src/mame/drivers/asterix.c54
-rw-r--r--src/mame/drivers/asteroid.c74
-rw-r--r--src/mame/drivers/astinvad.c68
-rw-r--r--src/mame/drivers/astrocde.c194
-rw-r--r--src/mame/drivers/astrocorp.c86
-rw-r--r--src/mame/drivers/astrof.c46
-rw-r--r--src/mame/drivers/asuka.c378
-rw-r--r--src/mame/drivers/atarifb.c70
-rw-r--r--src/mame/drivers/atarig1.c32
-rw-r--r--src/mame/drivers/atarig42.c34
-rw-r--r--src/mame/drivers/atarigt.c34
-rw-r--r--src/mame/drivers/atarigx2.c32
-rw-r--r--src/mame/drivers/atarisy1.c64
-rw-r--r--src/mame/drivers/atarisy2.c70
-rw-r--r--src/mame/drivers/atarisy4.c38
-rw-r--r--src/mame/drivers/ataxx.c40
-rw-r--r--src/mame/drivers/atetris.c76
-rw-r--r--src/mame/drivers/attckufo.c30
-rw-r--r--src/mame/drivers/avalnche.c32
-rw-r--r--src/mame/drivers/avt.c40
-rw-r--r--src/mame/drivers/aztarac.c46
-rw-r--r--src/mame/drivers/backfire.c56
-rw-r--r--src/mame/drivers/badlands.c80
-rw-r--r--src/mame/drivers/bagman.c130
-rw-r--r--src/mame/drivers/balsente.c86
-rw-r--r--src/mame/drivers/bankp.c48
-rw-r--r--src/mame/drivers/baraduke.c50
-rw-r--r--src/mame/drivers/bartop52.c36
-rw-r--r--src/mame/drivers/batman.c28
-rw-r--r--src/mame/drivers/battlane.c46
-rw-r--r--src/mame/drivers/battlera.c58
-rw-r--r--src/mame/drivers/battlex.c40
-rw-r--r--src/mame/drivers/battlnts.c46
-rw-r--r--src/mame/drivers/bbusters.c102
-rw-r--r--src/mame/drivers/beaminv.c22
-rw-r--r--src/mame/drivers/beathead.c24
-rw-r--r--src/mame/drivers/beezer.c36
-rw-r--r--src/mame/drivers/berzerk.c38
-rw-r--r--src/mame/drivers/bestleag.c36
-rw-r--r--src/mame/drivers/bfcobra.c52
-rw-r--r--src/mame/drivers/bfm_sc1.c60
-rw-r--r--src/mame/drivers/bfm_sc2.c128
-rw-r--r--src/mame/drivers/bfmsys85.c22
-rw-r--r--src/mame/drivers/big10.c40
-rw-r--r--src/mame/drivers/bigevglf.c86
-rw-r--r--src/mame/drivers/bigfghtr.c56
-rw-r--r--src/mame/drivers/bigstrkb.c42
-rw-r--r--src/mame/drivers/bingoc.c46
-rw-r--r--src/mame/drivers/bingor.c44
-rw-r--r--src/mame/drivers/bionicc.c56
-rw-r--r--src/mame/drivers/bishi.c46
-rw-r--r--src/mame/drivers/bishjan.c66
-rw-r--r--src/mame/drivers/bking.c76
-rw-r--r--src/mame/drivers/blackt96.c46
-rw-r--r--src/mame/drivers/bladestl.c54
-rw-r--r--src/mame/drivers/blitz.c44
-rw-r--r--src/mame/drivers/blitz68k.c280
-rw-r--r--src/mame/drivers/blktiger.c66
-rw-r--r--src/mame/drivers/blmbycar.c76
-rw-r--r--src/mame/drivers/blockade.c58
-rw-r--r--src/mame/drivers/blockhl.c46
-rw-r--r--src/mame/drivers/blockout.c48
-rw-r--r--src/mame/drivers/bloodbro.c46
-rw-r--r--src/mame/drivers/blstroid.c30
-rw-r--r--src/mame/drivers/blueprnt.c52
-rw-r--r--src/mame/drivers/bmcbowl.c46
-rw-r--r--src/mame/drivers/bnstars.c62
-rw-r--r--src/mame/drivers/bogeyman.c46
-rw-r--r--src/mame/drivers/bombjack.c52
-rw-r--r--src/mame/drivers/boogwing.c54
-rw-r--r--src/mame/drivers/bottom9.c60
-rw-r--r--src/mame/drivers/boxer.c28
-rw-r--r--src/mame/drivers/brkthru.c96
-rw-r--r--src/mame/drivers/bsktball.c40
-rw-r--r--src/mame/drivers/btime.c166
-rw-r--r--src/mame/drivers/btoads.c38
-rw-r--r--src/mame/drivers/bublbobl.c124
-rw-r--r--src/mame/drivers/buggychl.c84
-rw-r--r--src/mame/drivers/buster.c34
-rw-r--r--src/mame/drivers/bwidow.c58
-rw-r--r--src/mame/drivers/bwing.c62
-rw-r--r--src/mame/drivers/bzone.c54
-rw-r--r--src/mame/drivers/cabal.c118
-rw-r--r--src/mame/drivers/cabaret.c36
-rw-r--r--src/mame/drivers/calchase.c60
-rw-r--r--src/mame/drivers/calomega.c92
-rw-r--r--src/mame/drivers/calorie.c52
-rw-r--r--src/mame/drivers/canyon.c40
-rw-r--r--src/mame/drivers/capbowl.c58
-rw-r--r--src/mame/drivers/cardline.c38
-rw-r--r--src/mame/drivers/carjmbre.c48
-rw-r--r--src/mame/drivers/carpolo.c76
-rw-r--r--src/mame/drivers/carrera.c38
-rw-r--r--src/mame/drivers/caswin.c40
-rw-r--r--src/mame/drivers/cave.c818
-rw-r--r--src/mame/drivers/cb2001.c44
-rw-r--r--src/mame/drivers/cball.c32
-rw-r--r--src/mame/drivers/cbasebal.c46
-rw-r--r--src/mame/drivers/cbuster.c58
-rw-r--r--src/mame/drivers/ccastles.c40
-rw-r--r--src/mame/drivers/cchance.c40
-rw-r--r--src/mame/drivers/cchasm.c48
-rw-r--r--src/mame/drivers/cclimber.c144
-rw-r--r--src/mame/drivers/cdi.c74
-rw-r--r--src/mame/drivers/centiped.c140
-rw-r--r--src/mame/drivers/chaknpop.c46
-rw-r--r--src/mame/drivers/cham24.c42
-rw-r--r--src/mame/drivers/champbas.c210
-rw-r--r--src/mame/drivers/champbwl.c44
-rw-r--r--src/mame/drivers/chanbara.c38
-rw-r--r--src/mame/drivers/changela.c44
-rw-r--r--src/mame/drivers/cheekyms.c38
-rw-r--r--src/mame/drivers/chihiro.c46
-rw-r--r--src/mame/drivers/chinagat.c166
-rw-r--r--src/mame/drivers/chinsan.c58
-rw-r--r--src/mame/drivers/chqflag.c80
-rw-r--r--src/mame/drivers/chsuper.c36
-rw-r--r--src/mame/drivers/cidelsa.c80
-rw-r--r--src/mame/drivers/cinemat.c112
-rw-r--r--src/mame/drivers/circus.c184
-rw-r--r--src/mame/drivers/circusc.c58
-rw-r--r--src/mame/drivers/cischeat.c184
-rw-r--r--src/mame/drivers/citycon.c56
-rw-r--r--src/mame/drivers/clayshoo.c30
-rw-r--r--src/mame/drivers/cliffhgr.c40
-rw-r--r--src/mame/drivers/cloak.c50
-rw-r--r--src/mame/drivers/cloud9.c44
-rw-r--r--src/mame/drivers/clshroad.c84
-rw-r--r--src/mame/drivers/cmmb.c34
-rw-r--r--src/mame/drivers/cninja.c342
-rw-r--r--src/mame/drivers/cntsteer.c118
-rw-r--r--src/mame/drivers/coinmstr.c58
-rw-r--r--src/mame/drivers/coinmvga.c42
-rw-r--r--src/mame/drivers/cojag.c52
-rw-r--r--src/mame/drivers/combatsc.c104
-rw-r--r--src/mame/drivers/comebaby.c22
-rw-r--r--src/mame/drivers/commando.c52
-rw-r--r--src/mame/drivers/compgolf.c40
-rw-r--r--src/mame/drivers/contra.c48
-rw-r--r--src/mame/drivers/coolpool.c72
-rw-r--r--src/mame/drivers/coolridr.c38
-rw-r--r--src/mame/drivers/cop01.c100
-rw-r--r--src/mame/drivers/copsnrob.c38
-rw-r--r--src/mame/drivers/cosmic.c150
-rw-r--r--src/mame/drivers/cps1.c238
-rw-r--r--src/mame/drivers/cps2.c56
-rw-r--r--src/mame/drivers/cps3.c178
-rw-r--r--src/mame/drivers/crbaloon.c36
-rw-r--r--src/mame/drivers/crgolf.c32
-rw-r--r--src/mame/drivers/crimfght.c64
-rw-r--r--src/mame/drivers/crospang.c96
-rw-r--r--src/mame/drivers/crshrace.c56
-rw-r--r--src/mame/drivers/crystal.c52
-rw-r--r--src/mame/drivers/cshooter.c68
-rw-r--r--src/mame/drivers/csplayh5.c64
-rw-r--r--src/mame/drivers/cubeqst.c142
-rw-r--r--src/mame/drivers/cubocd32.c50
-rw-r--r--src/mame/drivers/cultures.c38
-rw-r--r--src/mame/drivers/cvs.c78
-rw-r--r--src/mame/drivers/cyberbal.c100
-rw-r--r--src/mame/drivers/cybertnk.c70
-rw-r--r--src/mame/drivers/cyclemb.c44
-rw-r--r--src/mame/drivers/d9final.c38
-rw-r--r--src/mame/drivers/dacholer.c62
-rw-r--r--src/mame/drivers/dai3wksi.c66
-rw-r--r--src/mame/drivers/dambustr.c36
-rw-r--r--src/mame/drivers/darius.c224
-rw-r--r--src/mame/drivers/darkhors.c112
-rw-r--r--src/mame/drivers/darkmist.c46
-rw-r--r--src/mame/drivers/darkseal.c54
-rw-r--r--src/mame/drivers/dassault.c68
-rw-r--r--src/mame/drivers/dblewing.c50
-rw-r--r--src/mame/drivers/dbz.c64
-rw-r--r--src/mame/drivers/dcheese.c48
-rw-r--r--src/mame/drivers/dcon.c60
-rw-r--r--src/mame/drivers/dday.c42
-rw-r--r--src/mame/drivers/ddayjlc.c52
-rw-r--r--src/mame/drivers/ddealer.c40
-rw-r--r--src/mame/drivers/ddenlovr.c506
-rw-r--r--src/mame/drivers/ddragon.c180
-rw-r--r--src/mame/drivers/ddragon3.c70
-rw-r--r--src/mame/drivers/ddribble.c90
-rw-r--r--src/mame/drivers/ddz.c40
-rw-r--r--src/mame/drivers/deadang.c40
-rw-r--r--src/mame/drivers/dec0.c556
-rw-r--r--src/mame/drivers/dec8.c528
-rw-r--r--src/mame/drivers/deco156.c88
-rw-r--r--src/mame/drivers/deco32.c398
-rw-r--r--src/mame/drivers/deco_ld.c54
-rw-r--r--src/mame/drivers/deco_mlc.c80
-rw-r--r--src/mame/drivers/decocass.c110
-rw-r--r--src/mame/drivers/deniam.c94
-rw-r--r--src/mame/drivers/deshoros.c28
-rw-r--r--src/mame/drivers/destroyr.c30
-rw-r--r--src/mame/drivers/dgpix.c34
-rw-r--r--src/mame/drivers/dietgo.c44
-rw-r--r--src/mame/drivers/discoboy.c54
-rw-r--r--src/mame/drivers/diverboy.c38
-rw-r--r--src/mame/drivers/djboy.c72
-rw-r--r--src/mame/drivers/djmain.c56
-rw-r--r--src/mame/drivers/dkong.c134
-rw-r--r--src/mame/drivers/dlair.c78
-rw-r--r--src/mame/drivers/dmndrby.c44
-rw-r--r--src/mame/drivers/docastle.c90
-rw-r--r--src/mame/drivers/dogfgt.c48
-rw-r--r--src/mame/drivers/dominob.c36
-rw-r--r--src/mame/drivers/dooyong.c376
-rw-r--r--src/mame/drivers/dorachan.c24
-rw-r--r--src/mame/drivers/dotrikun.c28
-rw-r--r--src/mame/drivers/dragrace.c46
-rw-r--r--src/mame/drivers/dreamwld.c44
-rw-r--r--src/mame/drivers/drgnmst.c48
-rw-r--r--src/mame/drivers/dribling.c36
-rw-r--r--src/mame/drivers/drmicro.c56
-rw-r--r--src/mame/drivers/drtomy.c36
-rw-r--r--src/mame/drivers/drw80pkr.c40
-rw-r--r--src/mame/drivers/dunhuang.c50
-rw-r--r--src/mame/drivers/dwarfd.c56
-rw-r--r--src/mame/drivers/dynadice.c46
-rw-r--r--src/mame/drivers/dynax.c540
-rw-r--r--src/mame/drivers/dynduke.c44
-rw-r--r--src/mame/drivers/egghunt.c42
-rw-r--r--src/mame/drivers/embargo.c22
-rw-r--r--src/mame/drivers/enigma2.c62
-rw-r--r--src/mame/drivers/eolith.c36
-rw-r--r--src/mame/drivers/eolith16.c36
-rw-r--r--src/mame/drivers/epos.c66
-rw-r--r--src/mame/drivers/eprom.c100
-rw-r--r--src/mame/drivers/equites.c148
-rw-r--r--src/mame/drivers/ertictac.c64
-rw-r--r--src/mame/drivers/esd16.c74
-rw-r--r--src/mame/drivers/esh.c32
-rw-r--r--src/mame/drivers/espial.c56
-rw-r--r--src/mame/drivers/esripsys.c46
-rw-r--r--src/mame/drivers/ettrivia.c50
-rw-r--r--src/mame/drivers/exedexes.c56
-rw-r--r--src/mame/drivers/exerion.c40
-rw-r--r--src/mame/drivers/exidy.c68
-rw-r--r--src/mame/drivers/exidy440.c18
-rw-r--r--src/mame/drivers/expro02.c44
-rw-r--r--src/mame/drivers/exprraid.c52
-rw-r--r--src/mame/drivers/exterm.c48
-rw-r--r--src/mame/drivers/exzisus.c56
-rw-r--r--src/mame/drivers/f-32.c42
-rw-r--r--src/mame/drivers/f1gp.c122
-rw-r--r--src/mame/drivers/fantland.c178
-rw-r--r--src/mame/drivers/fastfred.c68
-rw-r--r--src/mame/drivers/fastlane.c52
-rw-r--r--src/mame/drivers/fcombat.c42
-rw-r--r--src/mame/drivers/fcrash.c126
-rw-r--r--src/mame/drivers/feversoc.c34
-rw-r--r--src/mame/drivers/fgoal.c34
-rw-r--r--src/mame/drivers/finalizr.c48
-rw-r--r--src/mame/drivers/firebeat.c130
-rw-r--r--src/mame/drivers/firefox.c74
-rw-r--r--src/mame/drivers/firetrap.c96
-rw-r--r--src/mame/drivers/firetrk.c78
-rw-r--r--src/mame/drivers/fitfight.c82
-rw-r--r--src/mame/drivers/flkatck.c62
-rw-r--r--src/mame/drivers/flower.c50
-rw-r--r--src/mame/drivers/flstory.c312
-rw-r--r--src/mame/drivers/flyball.c34
-rw-r--r--src/mame/drivers/foodf.c46
-rw-r--r--src/mame/drivers/forte2.c30
-rw-r--r--src/mame/drivers/fortecar.c48
-rw-r--r--src/mame/drivers/freekick.c88
-rw-r--r--src/mame/drivers/fromanc2.c216
-rw-r--r--src/mame/drivers/fromance.c138
-rw-r--r--src/mame/drivers/funkybee.c42
-rw-r--r--src/mame/drivers/funkyjet.c48
-rw-r--r--src/mame/drivers/funworld.c104
-rw-r--r--src/mame/drivers/funybubl.c42
-rw-r--r--src/mame/drivers/fuukifg2.c54
-rw-r--r--src/mame/drivers/fuukifg3.c46
-rw-r--r--src/mame/drivers/gaelco.c150
-rw-r--r--src/mame/drivers/gaelco2.c288
-rw-r--r--src/mame/drivers/gaelco3d.c80
-rw-r--r--src/mame/drivers/gaiden.c186
-rw-r--r--src/mame/drivers/gal3.c88
-rw-r--r--src/mame/drivers/galaga.c292
-rw-r--r--src/mame/drivers/galastrm.c34
-rw-r--r--src/mame/drivers/galaxi.c42
-rw-r--r--src/mame/drivers/galaxia.c54
-rw-r--r--src/mame/drivers/galaxian.c324
-rw-r--r--src/mame/drivers/galaxold.c300
-rw-r--r--src/mame/drivers/galivan.c112
-rw-r--r--src/mame/drivers/galpani2.c50
-rw-r--r--src/mame/drivers/galpani3.c36
-rw-r--r--src/mame/drivers/galpanic.c108
-rw-r--r--src/mame/drivers/galspnbl.c44
-rw-r--r--src/mame/drivers/gamecstl.c54
-rw-r--r--src/mame/drivers/gameplan.c44
-rw-r--r--src/mame/drivers/gaplus.c84
-rw-r--r--src/mame/drivers/gatron.c42
-rw-r--r--src/mame/drivers/gauntlet.c52
-rw-r--r--src/mame/drivers/gberet.c66
-rw-r--r--src/mame/drivers/gbusters.c54
-rw-r--r--src/mame/drivers/gcpinbal.c42
-rw-r--r--src/mame/drivers/gei.c96
-rw-r--r--src/mame/drivers/ggconnie.c36
-rw-r--r--src/mame/drivers/ghosteo.c34
-rw-r--r--src/mame/drivers/gijoe.c52
-rw-r--r--src/mame/drivers/ginganin.c46
-rw-r--r--src/mame/drivers/gladiatr.c138
-rw-r--r--src/mame/drivers/glass.c36
-rw-r--r--src/mame/drivers/gng.c66
-rw-r--r--src/mame/drivers/go2000.c42
-rw-r--r--src/mame/drivers/goal92.c54
-rw-r--r--src/mame/drivers/goindol.c44
-rw-r--r--src/mame/drivers/goldngam.c40
-rw-r--r--src/mame/drivers/goldnpkr.c160
-rw-r--r--src/mame/drivers/goldstar.c920
-rw-r--r--src/mame/drivers/gomoku.c34
-rw-r--r--src/mame/drivers/good.c34
-rw-r--r--src/mame/drivers/goodejan.c34
-rw-r--r--src/mame/drivers/gotcha.c50
-rw-r--r--src/mame/drivers/gottlieb.c78
-rw-r--r--src/mame/drivers/gotya.c40
-rw-r--r--src/mame/drivers/gpworld.c28
-rw-r--r--src/mame/drivers/gradius3.c70
-rw-r--r--src/mame/drivers/grchamp.c68
-rw-r--r--src/mame/drivers/gridlee.c36
-rw-r--r--src/mame/drivers/groundfx.c34
-rw-r--r--src/mame/drivers/gstream.c44
-rw-r--r--src/mame/drivers/gstriker.c98
-rw-r--r--src/mame/drivers/gsword.c126
-rw-r--r--src/mame/drivers/gticlub.c166
-rw-r--r--src/mame/drivers/guab.c34
-rw-r--r--src/mame/drivers/gumbo.c42
-rw-r--r--src/mame/drivers/gunbustr.c32
-rw-r--r--src/mame/drivers/gundealr.c38
-rw-r--r--src/mame/drivers/gunpey.c44
-rw-r--r--src/mame/drivers/gunsmoke.c64
-rw-r--r--src/mame/drivers/gyruss.c122
-rw-r--r--src/mame/drivers/halleys.c62
-rw-r--r--src/mame/drivers/hanaawas.c42
-rw-r--r--src/mame/drivers/harddriv.c188
-rw-r--r--src/mame/drivers/hcastle.c62
-rw-r--r--src/mame/drivers/hexion.c38
-rw-r--r--src/mame/drivers/higemaru.c38
-rw-r--r--src/mame/drivers/highvdeo.c104
-rw-r--r--src/mame/drivers/hikaru.c54
-rw-r--r--src/mame/drivers/himesiki.c52
-rw-r--r--src/mame/drivers/hitme.c52
-rw-r--r--src/mame/drivers/hitpoker.c40
-rw-r--r--src/mame/drivers/hnayayoi.c72
-rw-r--r--src/mame/drivers/hng64.c44
-rw-r--r--src/mame/drivers/holeland.c90
-rw-r--r--src/mame/drivers/homedata.c232
-rw-r--r--src/mame/drivers/homerun.c40
-rw-r--r--src/mame/drivers/hornet.c148
-rw-r--r--src/mame/drivers/hotblock.c34
-rw-r--r--src/mame/drivers/hotstuff.c24
-rw-r--r--src/mame/drivers/hvyunit.c64
-rw-r--r--src/mame/drivers/hyhoo.c40
-rw-r--r--src/mame/drivers/hyperspt.c66
-rw-r--r--src/mame/drivers/hyprduel.c102
-rw-r--r--src/mame/drivers/igs009.c46
-rw-r--r--src/mame/drivers/igs011.c98
-rw-r--r--src/mame/drivers/igs017.c158
-rw-r--r--src/mame/drivers/igs_m027.c28
-rw-r--r--src/mame/drivers/igspoker.c56
-rw-r--r--src/mame/drivers/ikki.c50
-rw-r--r--src/mame/drivers/imolagp.c60
-rw-r--r--src/mame/drivers/intrscti.c32
-rw-r--r--src/mame/drivers/inufuku.c50
-rw-r--r--src/mame/drivers/iqblock.c36
-rw-r--r--src/mame/drivers/irobot.c54
-rw-r--r--src/mame/drivers/ironhors.c80
-rw-r--r--src/mame/drivers/istellar.c42
-rw-r--r--src/mame/drivers/itech32.c80
-rw-r--r--src/mame/drivers/itech8.c228
-rw-r--r--src/mame/drivers/itgambl2.c36
-rw-r--r--src/mame/drivers/itgambl3.c36
-rw-r--r--src/mame/drivers/itgamble.c50
-rw-r--r--src/mame/drivers/jack.c88
-rw-r--r--src/mame/drivers/jackal.c46
-rw-r--r--src/mame/drivers/jackie.c36
-rw-r--r--src/mame/drivers/jackpool.c34
-rw-r--r--src/mame/drivers/jailbrek.c38
-rw-r--r--src/mame/drivers/jalmah.c46
-rw-r--r--src/mame/drivers/jangou.c114
-rw-r--r--src/mame/drivers/jantotsu.c48
-rw-r--r--src/mame/drivers/jchan.c40
-rw-r--r--src/mame/drivers/jedi.c16
-rw-r--r--src/mame/drivers/jokrwild.c40
-rw-r--r--src/mame/drivers/jollyjgr.c44
-rw-r--r--src/mame/drivers/jongkyo.c46
-rw-r--r--src/mame/drivers/jpmimpct.c62
-rw-r--r--src/mame/drivers/jpmsys5.c40
-rw-r--r--src/mame/drivers/jrpacman.c38
-rw-r--r--src/mame/drivers/jubilee.c32
-rw-r--r--src/mame/drivers/junofrst.c68
-rw-r--r--src/mame/drivers/kaneko16.c304
-rw-r--r--src/mame/drivers/kangaroo.c42
-rw-r--r--src/mame/drivers/karnov.c100
-rw-r--r--src/mame/drivers/kchamp.c116
-rw-r--r--src/mame/drivers/kickgoal.c94
-rw-r--r--src/mame/drivers/kingdrby.c94
-rw-r--r--src/mame/drivers/kingobox.c132
-rw-r--r--src/mame/drivers/kingpin.c34
-rw-r--r--src/mame/drivers/kinst.c36
-rw-r--r--src/mame/drivers/klax.c34
-rw-r--r--src/mame/drivers/kncljoe.c58
-rw-r--r--src/mame/drivers/koftball.c34
-rw-r--r--src/mame/drivers/koikoi.c42
-rw-r--r--src/mame/drivers/konamigq.c58
-rw-r--r--src/mame/drivers/konamigv.c60
-rw-r--r--src/mame/drivers/konamigx.c200
-rw-r--r--src/mame/drivers/konamim2.c38
-rw-r--r--src/mame/drivers/kongambl.c34
-rw-r--r--src/mame/drivers/kopunch.c38
-rw-r--r--src/mame/drivers/ksayakyu.c58
-rw-r--r--src/mame/drivers/ksys573.c132
-rw-r--r--src/mame/drivers/kungfur.c46
-rw-r--r--src/mame/drivers/kyugo.c92
-rw-r--r--src/mame/drivers/labyrunr.c64
-rw-r--r--src/mame/drivers/ladybug.c102
-rw-r--r--src/mame/drivers/ladyfrog.c72
-rw-r--r--src/mame/drivers/laserbas.c36
-rw-r--r--src/mame/drivers/laserbat.c110
-rw-r--r--src/mame/drivers/lasso.c124
-rw-r--r--src/mame/drivers/lastduel.c104
-rw-r--r--src/mame/drivers/lastfght.c28
-rw-r--r--src/mame/drivers/lazercmd.c114
-rw-r--r--src/mame/drivers/legionna.c226
-rw-r--r--src/mame/drivers/leland.c64
-rw-r--r--src/mame/drivers/lemmings.c52
-rw-r--r--src/mame/drivers/lethal.c64
-rw-r--r--src/mame/drivers/lethalj.c44
-rw-r--r--src/mame/drivers/lgp.c36
-rw-r--r--src/mame/drivers/liberate.c138
-rw-r--r--src/mame/drivers/liberatr.c38
-rw-r--r--src/mame/drivers/limenko.c70
-rw-r--r--src/mame/drivers/littlerb.c26
-rw-r--r--src/mame/drivers/lkage.c132
-rw-r--r--src/mame/drivers/lockon.c116
-rw-r--r--src/mame/drivers/looping.c60
-rw-r--r--src/mame/drivers/lordgun.c104
-rw-r--r--src/mame/drivers/lsasquad.c122
-rw-r--r--src/mame/drivers/ltcasino.c32
-rw-r--r--src/mame/drivers/luckgrln.c32
-rw-r--r--src/mame/drivers/lucky74.c68
-rw-r--r--src/mame/drivers/lvcards.c58
-rw-r--r--src/mame/drivers/lwings.c108
-rw-r--r--src/mame/drivers/m10.c80
-rw-r--r--src/mame/drivers/m107.c72
-rw-r--r--src/mame/drivers/m14.c44
-rw-r--r--src/mame/drivers/m52.c32
-rw-r--r--src/mame/drivers/m57.c30
-rw-r--r--src/mame/drivers/m58.c24
-rw-r--r--src/mame/drivers/m62.c190
-rw-r--r--src/mame/drivers/m63.c106
-rw-r--r--src/mame/drivers/m72.c702
-rw-r--r--src/mame/drivers/m79amb.c28
-rw-r--r--src/mame/drivers/m90.c228
-rw-r--r--src/mame/drivers/m92.c148
-rw-r--r--src/mame/drivers/macrossp.c50
-rw-r--r--src/mame/drivers/macs.c40
-rw-r--r--src/mame/drivers/madalien.c30
-rw-r--r--src/mame/drivers/madmotor.c58
-rw-r--r--src/mame/drivers/magic10.c64
-rw-r--r--src/mame/drivers/magicard.c32
-rw-r--r--src/mame/drivers/magicfly.c40
-rw-r--r--src/mame/drivers/magictg.c24
-rw-r--r--src/mame/drivers/magmax.c54
-rw-r--r--src/mame/drivers/magtouch.c24
-rw-r--r--src/mame/drivers/mainevt.c112
-rw-r--r--src/mame/drivers/mainsnk.c46
-rw-r--r--src/mame/drivers/malzak.c64
-rw-r--r--src/mame/drivers/mappy.c214
-rw-r--r--src/mame/drivers/marineb.c76
-rw-r--r--src/mame/drivers/marinedt.c38
-rw-r--r--src/mame/drivers/mario.c36
-rw-r--r--src/mame/drivers/markham.c46
-rw-r--r--src/mame/drivers/mastboy.c44
-rw-r--r--src/mame/drivers/matmania.c106
-rw-r--r--src/mame/drivers/maxaflex.c52
-rw-r--r--src/mame/drivers/maygay1b.c30
-rw-r--r--src/mame/drivers/maygayv1.c54
-rw-r--r--src/mame/drivers/mayumi.c50
-rw-r--r--src/mame/drivers/mazerbla.c108
-rw-r--r--src/mame/drivers/mcatadv.c60
-rw-r--r--src/mame/drivers/mcr.c102
-rw-r--r--src/mame/drivers/mcr3.c80
-rw-r--r--src/mame/drivers/mcr68.c100
-rw-r--r--src/mame/drivers/meadows.c126
-rw-r--r--src/mame/drivers/mediagx.c58
-rw-r--r--src/mame/drivers/megadriv.c254
-rw-r--r--src/mame/drivers/megaplay.c24
-rw-r--r--src/mame/drivers/megasys1.c216
-rw-r--r--src/mame/drivers/megatech.c32
-rw-r--r--src/mame/drivers/megazone.c82
-rw-r--r--src/mame/drivers/meijinsn.c46
-rw-r--r--src/mame/drivers/merit.c96
-rw-r--r--src/mame/drivers/meritm.c78
-rw-r--r--src/mame/drivers/mermaid.c54
-rw-r--r--src/mame/drivers/metalmx.c54
-rw-r--r--src/mame/drivers/metlclsh.c52
-rw-r--r--src/mame/drivers/metro.c1160
-rw-r--r--src/mame/drivers/mexico86.c76
-rw-r--r--src/mame/drivers/mgolf.c32
-rw-r--r--src/mame/drivers/mhavoc.c74
-rw-r--r--src/mame/drivers/micro3d.c72
-rw-r--r--src/mame/drivers/midas.c82
-rw-r--r--src/mame/drivers/midqslvr.c26
-rw-r--r--src/mame/drivers/midtunit.c26
-rw-r--r--src/mame/drivers/midvunit.c44
-rw-r--r--src/mame/drivers/midwunit.c24
-rw-r--r--src/mame/drivers/midxunit.c24
-rw-r--r--src/mame/drivers/midyunit.c104
-rw-r--r--src/mame/drivers/midzeus.c56
-rw-r--r--src/mame/drivers/mikie.c46
-rw-r--r--src/mame/drivers/mil4000.c34
-rw-r--r--src/mame/drivers/miniboy7.c42
-rw-r--r--src/mame/drivers/minivadr.c22
-rw-r--r--src/mame/drivers/mirage.c44
-rw-r--r--src/mame/drivers/mirax.c52
-rw-r--r--src/mame/drivers/missb2.c56
-rw-r--r--src/mame/drivers/missile.c28
-rw-r--r--src/mame/drivers/mitchell.c244
-rw-r--r--src/mame/drivers/mjkjidai.c46
-rw-r--r--src/mame/drivers/mjsister.c44
-rw-r--r--src/mame/drivers/mlanding.c70
-rw-r--r--src/mame/drivers/model1.c114
-rw-r--r--src/mame/drivers/model2.c294
-rw-r--r--src/mame/drivers/model3.c228
-rw-r--r--src/mame/drivers/mogura.c42
-rw-r--r--src/mame/drivers/mole.c38
-rw-r--r--src/mame/drivers/momoko.c60
-rw-r--r--src/mame/drivers/monzagp.c34
-rw-r--r--src/mame/drivers/moo.c118
-rw-r--r--src/mame/drivers/mosaic.c46
-rw-r--r--src/mame/drivers/mouser.c48
-rw-r--r--src/mame/drivers/mpoker.c36
-rw-r--r--src/mame/drivers/mpu4.c68
-rw-r--r--src/mame/drivers/mpu4drvr.c136
-rw-r--r--src/mame/drivers/mpu5.c24
-rw-r--r--src/mame/drivers/mquake.c58
-rw-r--r--src/mame/drivers/mrdo.c32
-rw-r--r--src/mame/drivers/mrflea.c58
-rw-r--r--src/mame/drivers/mrjong.c40
-rw-r--r--src/mame/drivers/ms32.c50
-rw-r--r--src/mame/drivers/msisaac.c78
-rw-r--r--src/mame/drivers/mugsmash.c48
-rw-r--r--src/mame/drivers/multfish.c54
-rw-r--r--src/mame/drivers/multigam.c60
-rw-r--r--src/mame/drivers/munchmo.c48
-rw-r--r--src/mame/drivers/murogem.c28
-rw-r--r--src/mame/drivers/murogmbl.c32
-rw-r--r--src/mame/drivers/mustache.c46
-rw-r--r--src/mame/drivers/mw8080bw.c252
-rw-r--r--src/mame/drivers/mwarr.c40
-rw-r--r--src/mame/drivers/mystston.c16
-rw-r--r--src/mame/drivers/mystwarr.c176
-rw-r--r--src/mame/drivers/n8080.c110
-rw-r--r--src/mame/drivers/namcofl.c48
-rw-r--r--src/mame/drivers/namcona1.c60
-rw-r--r--src/mame/drivers/namconb1.c120
-rw-r--r--src/mame/drivers/namcond1.c56
-rw-r--r--src/mame/drivers/namcops2.c22
-rw-r--r--src/mame/drivers/namcos1.c80
-rw-r--r--src/mame/drivers/namcos10.c30
-rw-r--r--src/mame/drivers/namcos11.c64
-rw-r--r--src/mame/drivers/namcos12.c50
-rw-r--r--src/mame/drivers/namcos2.c444
-rw-r--r--src/mame/drivers/namcos21.c262
-rw-r--r--src/mame/drivers/namcos22.c158
-rw-r--r--src/mame/drivers/namcos23.c210
-rw-r--r--src/mame/drivers/namcos86.c114
-rw-r--r--src/mame/drivers/naomi.c70
-rw-r--r--src/mame/drivers/naughtyb.c80
-rw-r--r--src/mame/drivers/nbmj8688.c246
-rw-r--r--src/mame/drivers/nbmj8891.c224
-rw-r--r--src/mame/drivers/nbmj8900.c42
-rw-r--r--src/mame/drivers/nbmj8991.c146
-rw-r--r--src/mame/drivers/nbmj9195.c204
-rw-r--r--src/mame/drivers/nemesis.c564
-rw-r--r--src/mame/drivers/neogeo.c50
-rw-r--r--src/mame/drivers/neoprint.c52
-rw-r--r--src/mame/drivers/neptunp2.c32
-rw-r--r--src/mame/drivers/news.c36
-rw-r--r--src/mame/drivers/nightgal.c76
-rw-r--r--src/mame/drivers/ninjakd2.c110
-rw-r--r--src/mame/drivers/ninjaw.c276
-rw-r--r--src/mame/drivers/nitedrvr.c44
-rw-r--r--src/mame/drivers/niyanpai.c60
-rw-r--r--src/mame/drivers/nmg5.c76
-rw-r--r--src/mame/drivers/nmk16.c1164
-rw-r--r--src/mame/drivers/norautp.c150
-rw-r--r--src/mame/drivers/nova2001.c178
-rw-r--r--src/mame/drivers/nsmpoker.c30
-rw-r--r--src/mame/drivers/nss.c48
-rw-r--r--src/mame/drivers/nwk-tr.c66
-rw-r--r--src/mame/drivers/nycaptor.c284
-rw-r--r--src/mame/drivers/nyny.c58
-rw-r--r--src/mame/drivers/offtwall.c28
-rw-r--r--src/mame/drivers/ohmygod.c38
-rw-r--r--src/mame/drivers/ojankohs.c192
-rw-r--r--src/mame/drivers/olibochu.c46
-rw-r--r--src/mame/drivers/omegrace.c42
-rw-r--r--src/mame/drivers/oneshot.c48
-rw-r--r--src/mame/drivers/onetwo.c48
-rw-r--r--src/mame/drivers/opwolf.c136
-rw-r--r--src/mame/drivers/orbit.c38
-rw-r--r--src/mame/drivers/othello.c58
-rw-r--r--src/mame/drivers/othldrby.c38
-rw-r--r--src/mame/drivers/othunder.c94
-rw-r--r--src/mame/drivers/overdriv.c78
-rw-r--r--src/mame/drivers/pachifev.c38
-rw-r--r--src/mame/drivers/pacland.c46
-rw-r--r--src/mame/drivers/pacman.c192
-rw-r--r--src/mame/drivers/pandoras.c62
-rw-r--r--src/mame/drivers/pangofun.c22
-rw-r--r--src/mame/drivers/panicr.c44
-rw-r--r--src/mame/drivers/paradise.c70
-rw-r--r--src/mame/drivers/paranoia.c48
-rw-r--r--src/mame/drivers/parodius.c52
-rw-r--r--src/mame/drivers/pasha2.c42
-rw-r--r--src/mame/drivers/pass.c44
-rw-r--r--src/mame/drivers/pastelg.c90
-rw-r--r--src/mame/drivers/pbaction.c54
-rw-r--r--src/mame/drivers/pcat_dyn.c54
-rw-r--r--src/mame/drivers/pcat_nit.c24
-rw-r--r--src/mame/drivers/pcktgal.c50
-rw-r--r--src/mame/drivers/pcxt.c104
-rw-r--r--src/mame/drivers/pengadvb.c32
-rw-r--r--src/mame/drivers/pengo.c36
-rw-r--r--src/mame/drivers/peplus.c40
-rw-r--r--src/mame/drivers/pgm.c162
-rw-r--r--src/mame/drivers/phoenix.c96
-rw-r--r--src/mame/drivers/photon.c40
-rw-r--r--src/mame/drivers/photon2.c42
-rw-r--r--src/mame/drivers/photoply.c44
-rw-r--r--src/mame/drivers/pingpong.c42
-rw-r--r--src/mame/drivers/pinkiri8.c36
-rw-r--r--src/mame/drivers/pipedrm.c100
-rw-r--r--src/mame/drivers/pipeline.c56
-rw-r--r--src/mame/drivers/pirates.c34
-rw-r--r--src/mame/drivers/pitnrun.c60
-rw-r--r--src/mame/drivers/pkscram.c42
-rw-r--r--src/mame/drivers/pktgaldx.c82
-rw-r--r--src/mame/drivers/playch10.c74
-rw-r--r--src/mame/drivers/playmark.c208
-rw-r--r--src/mame/drivers/plygonet.c64
-rw-r--r--src/mame/drivers/pntnpuzl.c26
-rw-r--r--src/mame/drivers/pokechmp.c48
-rw-r--r--src/mame/drivers/poker72.c38
-rw-r--r--src/mame/drivers/polepos.c172
-rw-r--r--src/mame/drivers/policetr.c40
-rw-r--r--src/mame/drivers/polyplay.c42
-rw-r--r--src/mame/drivers/poo.c54
-rw-r--r--src/mame/drivers/poolshrk.c36
-rw-r--r--src/mame/drivers/pooyan.c32
-rw-r--r--src/mame/drivers/popeye.c52
-rw-r--r--src/mame/drivers/popper.c50
-rw-r--r--src/mame/drivers/portrait.c40
-rw-r--r--src/mame/drivers/powerbal.c76
-rw-r--r--src/mame/drivers/powerins.c82
-rw-r--r--src/mame/drivers/ppmast93.c48
-rw-r--r--src/mame/drivers/prehisle.c44
-rw-r--r--src/mame/drivers/progolf.c46
-rw-r--r--src/mame/drivers/psattack.c44
-rw-r--r--src/mame/drivers/psikyo.c196
-rw-r--r--src/mame/drivers/psikyo4.c72
-rw-r--r--src/mame/drivers/psikyosh.c58
-rw-r--r--src/mame/drivers/psychic5.c132
-rw-r--r--src/mame/drivers/pturn.c46
-rw-r--r--src/mame/drivers/puckpkmn.c16
-rw-r--r--src/mame/drivers/punchout.c80
-rw-r--r--src/mame/drivers/pushman.c104
-rw-r--r--src/mame/drivers/pzletime.c42
-rw-r--r--src/mame/drivers/qdrmfgp.c90
-rw-r--r--src/mame/drivers/qix.c50
-rw-r--r--src/mame/drivers/quakeat.c30
-rw-r--r--src/mame/drivers/quantum.c34
-rw-r--r--src/mame/drivers/quasar.c54
-rw-r--r--src/mame/drivers/queen.c24
-rw-r--r--src/mame/drivers/quizdna.c56
-rw-r--r--src/mame/drivers/quizo.c32
-rw-r--r--src/mame/drivers/quizpani.c36
-rw-r--r--src/mame/drivers/quizpun2.c46
-rw-r--r--src/mame/drivers/r2dtank.c42
-rw-r--r--src/mame/drivers/r2dx_v33.c70
-rw-r--r--src/mame/drivers/rabbit.c42
-rw-r--r--src/mame/drivers/raiden.c56
-rw-r--r--src/mame/drivers/raiden2.c74
-rw-r--r--src/mame/drivers/rainbow.c94
-rw-r--r--src/mame/drivers/rallyx.c106
-rw-r--r--src/mame/drivers/rampart.c40
-rw-r--r--src/mame/drivers/rastan.c56
-rw-r--r--src/mame/drivers/rbmk.c52
-rw-r--r--src/mame/drivers/rcorsair.c32
-rw-r--r--src/mame/drivers/re900.c30
-rw-r--r--src/mame/drivers/realbrk.c60
-rw-r--r--src/mame/drivers/redalert.c40
-rw-r--r--src/mame/drivers/redclash.c68
-rw-r--r--src/mame/drivers/relief.c36
-rw-r--r--src/mame/drivers/renegade.c52
-rw-r--r--src/mame/drivers/retofinv.c58
-rw-r--r--src/mame/drivers/rgum.c38
-rw-r--r--src/mame/drivers/rmhaihai.c60
-rw-r--r--src/mame/drivers/rockrage.c50
-rw-r--r--src/mame/drivers/rocnrope.c30
-rw-r--r--src/mame/drivers/rohga.c220
-rw-r--r--src/mame/drivers/rollerg.c48
-rw-r--r--src/mame/drivers/rollrace.c50
-rw-r--r--src/mame/drivers/rotaryf.c20
-rw-r--r--src/mame/drivers/roul.c42
-rw-r--r--src/mame/drivers/route16.c78
-rw-r--r--src/mame/drivers/royalmah.c208
-rw-r--r--src/mame/drivers/rpunch.c42
-rw-r--r--src/mame/drivers/runaway.c48
-rw-r--r--src/mame/drivers/rungun.c66
-rw-r--r--src/mame/drivers/safarir.c38
-rw-r--r--src/mame/drivers/sandscrp.c56
-rw-r--r--src/mame/drivers/sangho.c76
-rw-r--r--src/mame/drivers/sauro.c62
-rw-r--r--src/mame/drivers/savquest.c26
-rw-r--r--src/mame/drivers/sbasketb.c48
-rw-r--r--src/mame/drivers/sbowling.c34
-rw-r--r--src/mame/drivers/sbrkout.c32
-rw-r--r--src/mame/drivers/sbugger.c40
-rw-r--r--src/mame/drivers/scobra.c174
-rw-r--r--src/mame/drivers/scotrsht.c40
-rw-r--r--src/mame/drivers/scramble.c252
-rw-r--r--src/mame/drivers/scregg.c84
-rw-r--r--src/mame/drivers/sderby.c110
-rw-r--r--src/mame/drivers/seattle.c80
-rw-r--r--src/mame/drivers/segac2.c50
-rw-r--r--src/mame/drivers/segae.c40
-rw-r--r--src/mame/drivers/segag80r.c92
-rw-r--r--src/mame/drivers/segag80v.c58
-rw-r--r--src/mame/drivers/segahang.c208
-rw-r--r--src/mame/drivers/segald.c28
-rw-r--r--src/mame/drivers/segamsys.c38
-rw-r--r--src/mame/drivers/segaorun.c68
-rw-r--r--src/mame/drivers/segas16a.c76
-rw-r--r--src/mame/drivers/segas16b.c92
-rw-r--r--src/mame/drivers/segas18.c60
-rw-r--r--src/mame/drivers/segas24.c52
-rw-r--r--src/mame/drivers/segas32.c132
-rw-r--r--src/mame/drivers/segaxbd.c74
-rw-r--r--src/mame/drivers/segaybd.c78
-rw-r--r--src/mame/drivers/seibuspi.c164
-rw-r--r--src/mame/drivers/seicross.c58
-rw-r--r--src/mame/drivers/sengokmj.c36
-rw-r--r--src/mame/drivers/senjyo.c68
-rw-r--r--src/mame/drivers/seta.c1526
-rw-r--r--src/mame/drivers/seta2.c152
-rw-r--r--src/mame/drivers/sf.c86
-rw-r--r--src/mame/drivers/sfbonus.c40
-rw-r--r--src/mame/drivers/sfcbox.c32
-rw-r--r--src/mame/drivers/sfkick.c54
-rw-r--r--src/mame/drivers/sg1000a.c26
-rw-r--r--src/mame/drivers/shadfrce.c42
-rw-r--r--src/mame/drivers/shangha3.c136
-rw-r--r--src/mame/drivers/shanghai.c126
-rw-r--r--src/mame/drivers/shangkid.c114
-rw-r--r--src/mame/drivers/shaolins.c46
-rw-r--r--src/mame/drivers/shisen.c58
-rw-r--r--src/mame/drivers/shootout.c72
-rw-r--r--src/mame/drivers/shougi.c44
-rw-r--r--src/mame/drivers/shuuz.c32
-rw-r--r--src/mame/drivers/sidearms.c174
-rw-r--r--src/mame/drivers/sidepckt.c44
-rw-r--r--src/mame/drivers/sigmab52.c36
-rw-r--r--src/mame/drivers/sigmab98.c40
-rw-r--r--src/mame/drivers/silkroad.c46
-rw-r--r--src/mame/drivers/simpl156.c66
-rw-r--r--src/mame/drivers/simpsons.c58
-rw-r--r--src/mame/drivers/skeetsht.c34
-rw-r--r--src/mame/drivers/skimaxx.c62
-rw-r--r--src/mame/drivers/skullxbo.c30
-rw-r--r--src/mame/drivers/skyarmy.c38
-rw-r--r--src/mame/drivers/skydiver.c40
-rw-r--r--src/mame/drivers/skyfox.c44
-rw-r--r--src/mame/drivers/skykid.c48
-rw-r--r--src/mame/drivers/skylncr.c42
-rw-r--r--src/mame/drivers/skyraid.c38
-rw-r--r--src/mame/drivers/slapfght.c248
-rw-r--r--src/mame/drivers/slapshot.c120
-rw-r--r--src/mame/drivers/sliver.c36
-rw-r--r--src/mame/drivers/slotcarn.c36
-rw-r--r--src/mame/drivers/sms.c52
-rw-r--r--src/mame/drivers/snesb.c32
-rw-r--r--src/mame/drivers/snk.c456
-rw-r--r--src/mame/drivers/snk6502.c180
-rw-r--r--src/mame/drivers/snk68.c44
-rw-r--r--src/mame/drivers/snookr10.c46
-rw-r--r--src/mame/drivers/snowbros.c226
-rw-r--r--src/mame/drivers/solomon.c50
-rw-r--r--src/mame/drivers/sonson.c46
-rw-r--r--src/mame/drivers/sothello.c68
-rw-r--r--src/mame/drivers/spacefb.c30
-rw-r--r--src/mame/drivers/spaceg.c42
-rw-r--r--src/mame/drivers/spbactn.c42
-rw-r--r--src/mame/drivers/spcforce.c46
-rw-r--r--src/mame/drivers/spdodgeb.c66
-rw-r--r--src/mame/drivers/speedatk.c42
-rw-r--r--src/mame/drivers/speedbal.c44
-rw-r--r--src/mame/drivers/speedspn.c38
-rw-r--r--src/mame/drivers/speglsht.c50
-rw-r--r--src/mame/drivers/spiders.c36
-rw-r--r--src/mame/drivers/splash.c154
-rw-r--r--src/mame/drivers/spoker.c42
-rw-r--r--src/mame/drivers/spool99.c44
-rw-r--r--src/mame/drivers/sprcros2.c54
-rw-r--r--src/mame/drivers/sprint2.c68
-rw-r--r--src/mame/drivers/sprint4.c36
-rw-r--r--src/mame/drivers/sprint8.c52
-rw-r--r--src/mame/drivers/spy.c62
-rw-r--r--src/mame/drivers/srmp2.c132
-rw-r--r--src/mame/drivers/srmp5.c46
-rw-r--r--src/mame/drivers/srmp6.c32
-rw-r--r--src/mame/drivers/srumbler.c64
-rw-r--r--src/mame/drivers/ssfindo.c48
-rw-r--r--src/mame/drivers/sshangha.c56
-rw-r--r--src/mame/drivers/ssingles.c36
-rw-r--r--src/mame/drivers/sslam.c72
-rw-r--r--src/mame/drivers/ssozumo.c48
-rw-r--r--src/mame/drivers/sspeedr.c36
-rw-r--r--src/mame/drivers/ssrj.c40
-rw-r--r--src/mame/drivers/sstrangr.c22
-rw-r--r--src/mame/drivers/ssv.c240
-rw-r--r--src/mame/drivers/st0016.c48
-rw-r--r--src/mame/drivers/stactics.c10
-rw-r--r--src/mame/drivers/stadhero.c52
-rw-r--r--src/mame/drivers/starcrus.c38
-rw-r--r--src/mame/drivers/starfire.c16
-rw-r--r--src/mame/drivers/starshp1.c32
-rw-r--r--src/mame/drivers/starwars.c54
-rw-r--r--src/mame/drivers/statriv2.c48
-rw-r--r--src/mame/drivers/stepstag.c64
-rw-r--r--src/mame/drivers/stfight.c72
-rw-r--r--src/mame/drivers/stlforce.c42
-rw-r--r--src/mame/drivers/strnskil.c50
-rw-r--r--src/mame/drivers/stv.c60
-rw-r--r--src/mame/drivers/sub.c48
-rw-r--r--src/mame/drivers/subs.c58
-rw-r--r--src/mame/drivers/subsino.c224
-rw-r--r--src/mame/drivers/suna16.c250
-rw-r--r--src/mame/drivers/suna8.c314
-rw-r--r--src/mame/drivers/supbtime.c96
-rw-r--r--src/mame/drivers/supdrapo.c42
-rw-r--r--src/mame/drivers/superchs.c40
-rw-r--r--src/mame/drivers/superdq.c38
-rw-r--r--src/mame/drivers/superqix.c190
-rw-r--r--src/mame/drivers/supertnk.c32
-rw-r--r--src/mame/drivers/suprgolf.c44
-rw-r--r--src/mame/drivers/suprloco.c44
-rw-r--r--src/mame/drivers/suprnova.c58
-rw-r--r--src/mame/drivers/suprridr.c48
-rw-r--r--src/mame/drivers/suprslam.c54
-rw-r--r--src/mame/drivers/surpratk.c44
-rw-r--r--src/mame/drivers/system1.c94
-rw-r--r--src/mame/drivers/system16.c316
-rw-r--r--src/mame/drivers/tagteam.c48
-rw-r--r--src/mame/drivers/tail2nos.c54
-rw-r--r--src/mame/drivers/taito_b.c1038
-rw-r--r--src/mame/drivers/taito_f2.c566
-rw-r--r--src/mame/drivers/taito_f3.c98
-rw-r--r--src/mame/drivers/taito_h.c156
-rw-r--r--src/mame/drivers/taito_l.c316
-rw-r--r--src/mame/drivers/taito_o.c42
-rw-r--r--src/mame/drivers/taito_x.c198
-rw-r--r--src/mame/drivers/taito_z.c912
-rw-r--r--src/mame/drivers/taitoair.c60
-rw-r--r--src/mame/drivers/taitogn.c56
-rw-r--r--src/mame/drivers/taitojc.c48
-rw-r--r--src/mame/drivers/taitopjc.c22
-rw-r--r--src/mame/drivers/taitosj.c82
-rw-r--r--src/mame/drivers/taitotz.c22
-rw-r--r--src/mame/drivers/taitowlf.c54
-rw-r--r--src/mame/drivers/tank8.c40
-rw-r--r--src/mame/drivers/tankbatt.c36
-rw-r--r--src/mame/drivers/tankbust.c54
-rw-r--r--src/mame/drivers/taotaido.c50
-rw-r--r--src/mame/drivers/targeth.c32
-rw-r--r--src/mame/drivers/tatsumi.c218
-rw-r--r--src/mame/drivers/tattack.c32
-rw-r--r--src/mame/drivers/taxidrvr.c64
-rw-r--r--src/mame/drivers/tbowl.c78
-rw-r--r--src/mame/drivers/tceptor.c118
-rw-r--r--src/mame/drivers/tcl.c34
-rw-r--r--src/mame/drivers/tecmo.c102
-rw-r--r--src/mame/drivers/tecmo16.c56
-rw-r--r--src/mame/drivers/tecmosys.c70
-rw-r--r--src/mame/drivers/tehkanwc.c62
-rw-r--r--src/mame/drivers/tempest.c40
-rw-r--r--src/mame/drivers/terracre.c168
-rw-r--r--src/mame/drivers/tetrisp2.c200
-rw-r--r--src/mame/drivers/tgtpanic.c24
-rw-r--r--src/mame/drivers/thayers.c30
-rw-r--r--src/mame/drivers/thedeep.c42
-rw-r--r--src/mame/drivers/thepit.c52
-rw-r--r--src/mame/drivers/thief.c132
-rw-r--r--src/mame/drivers/thoop2.c32
-rw-r--r--src/mame/drivers/thunderj.c34
-rw-r--r--src/mame/drivers/thunderx.c100
-rw-r--r--src/mame/drivers/tiamc1.c38
-rw-r--r--src/mame/drivers/tickee.c108
-rw-r--r--src/mame/drivers/tigeroad.c62
-rw-r--r--src/mame/drivers/timelimt.c60
-rw-r--r--src/mame/drivers/timeplt.c50
-rw-r--r--src/mame/drivers/timetrv.c30
-rw-r--r--src/mame/drivers/tmaster.c86
-rw-r--r--src/mame/drivers/tmmjprd.c76
-rw-r--r--src/mame/drivers/tmnt.c648
-rw-r--r--src/mame/drivers/tnzs.c382
-rw-r--r--src/mame/drivers/toaplan1.c370
-rw-r--r--src/mame/drivers/toaplan2.c920
-rw-r--r--src/mame/drivers/toki.c74
-rw-r--r--src/mame/drivers/tokyocop.c22
-rw-r--r--src/mame/drivers/tomcat.c66
-rw-r--r--src/mame/drivers/toobin.c30
-rw-r--r--src/mame/drivers/topspeed.c62
-rw-r--r--src/mame/drivers/toratora.c44
-rw-r--r--src/mame/drivers/tourtabl.c30
-rw-r--r--src/mame/drivers/toypop.c66
-rw-r--r--src/mame/drivers/tp84.c72
-rw-r--r--src/mame/drivers/trackfld.c140
-rw-r--r--src/mame/drivers/travrusa.c36
-rw-r--r--src/mame/drivers/triforce.c24
-rw-r--r--src/mame/drivers/triplhnt.c44
-rw-r--r--src/mame/drivers/truco.c32
-rw-r--r--src/mame/drivers/trucocl.c34
-rw-r--r--src/mame/drivers/trvmadns.c36
-rw-r--r--src/mame/drivers/trvquest.c30
-rw-r--r--src/mame/drivers/tryout.c38
-rw-r--r--src/mame/drivers/tsamurai.c158
-rw-r--r--src/mame/drivers/ttchamp.c26
-rw-r--r--src/mame/drivers/tubep.c146
-rw-r--r--src/mame/drivers/tugboat.c36
-rw-r--r--src/mame/drivers/tumbleb.c370
-rw-r--r--src/mame/drivers/tumblep.c48
-rw-r--r--src/mame/drivers/tunhunt.c42
-rw-r--r--src/mame/drivers/turbo.c104
-rw-r--r--src/mame/drivers/turrett.c24
-rw-r--r--src/mame/drivers/tutankhm.c26
-rw-r--r--src/mame/drivers/twin16.c162
-rw-r--r--src/mame/drivers/twincobr.c64
-rw-r--r--src/mame/drivers/twinkle.c62
-rw-r--r--src/mame/drivers/twins.c68
-rw-r--r--src/mame/drivers/tx1.c208
-rw-r--r--src/mame/drivers/uapce.c42
-rw-r--r--src/mame/drivers/ultraman.c60
-rw-r--r--src/mame/drivers/ultratnk.c34
-rw-r--r--src/mame/drivers/ultrsprt.c44
-rw-r--r--src/mame/drivers/undrfire.c76
-rw-r--r--src/mame/drivers/unico.c130
-rw-r--r--src/mame/drivers/upscope.c46
-rw-r--r--src/mame/drivers/usgames.c42
-rw-r--r--src/mame/drivers/vamphalf.c186
-rw-r--r--src/mame/drivers/vaportra.c58
-rw-r--r--src/mame/drivers/vastar.c50
-rw-r--r--src/mame/drivers/vball.c42
-rw-r--r--src/mame/drivers/vcombat.c90
-rw-r--r--src/mame/drivers/vega.c22
-rw-r--r--src/mame/drivers/vegaeo.c26
-rw-r--r--src/mame/drivers/vegas.c100
-rw-r--r--src/mame/drivers/vendetta.c82
-rw-r--r--src/mame/drivers/vertigo.c34
-rw-r--r--src/mame/drivers/vicdual.c190
-rw-r--r--src/mame/drivers/victory.c26
-rw-r--r--src/mame/drivers/videopin.c34
-rw-r--r--src/mame/drivers/videopkr.c102
-rw-r--r--src/mame/drivers/vigilant.c216
-rw-r--r--src/mame/drivers/vindictr.c28
-rw-r--r--src/mame/drivers/viper.c40
-rw-r--r--src/mame/drivers/vmetal.c40
-rw-r--r--src/mame/drivers/volfied.c54
-rw-r--r--src/mame/drivers/vp101.c28
-rw-r--r--src/mame/drivers/vpoker.c40
-rw-r--r--src/mame/drivers/vroulet.c42
-rw-r--r--src/mame/drivers/vsnes.c124
-rw-r--r--src/mame/drivers/vulgus.c44
-rw-r--r--src/mame/drivers/wallc.c34
-rw-r--r--src/mame/drivers/wardner.c58
-rw-r--r--src/mame/drivers/warpwarp.c72
-rw-r--r--src/mame/drivers/warriorb.c216
-rw-r--r--src/mame/drivers/wc90.c50
-rw-r--r--src/mame/drivers/wc90b.c50
-rw-r--r--src/mame/drivers/wecleman.c114
-rw-r--r--src/mame/drivers/welltris.c48
-rw-r--r--src/mame/drivers/wgp.c70
-rw-r--r--src/mame/drivers/wheelfir.c46
-rw-r--r--src/mame/drivers/williams.c194
-rw-r--r--src/mame/drivers/wink.c48
-rw-r--r--src/mame/drivers/wiping.c38
-rw-r--r--src/mame/drivers/witch.c52
-rw-r--r--src/mame/drivers/wiz.c82
-rw-r--r--src/mame/drivers/wldarrow.c26
-rw-r--r--src/mame/drivers/wolfpack.c34
-rw-r--r--src/mame/drivers/wrally.c42
-rw-r--r--src/mame/drivers/wwfsstar.c40
-rw-r--r--src/mame/drivers/wwfwfest.c44
-rw-r--r--src/mame/drivers/xain.c66
-rw-r--r--src/mame/drivers/xexex.c98
-rw-r--r--src/mame/drivers/xmen.c134
-rw-r--r--src/mame/drivers/xorworld.c38
-rw-r--r--src/mame/drivers/xtheball.c28
-rw-r--r--src/mame/drivers/xtom3d.c26
-rw-r--r--src/mame/drivers/xxmissio.c66
-rw-r--r--src/mame/drivers/xybots.c30
-rw-r--r--src/mame/drivers/xyonix.c42
-rw-r--r--src/mame/drivers/yiear.c46
-rw-r--r--src/mame/drivers/yunsun16.c90
-rw-r--r--src/mame/drivers/yunsung8.c54
-rw-r--r--src/mame/drivers/zac2650.c34
-rw-r--r--src/mame/drivers/zaccaria.c72
-rw-r--r--src/mame/drivers/zaxxon.c76
-rw-r--r--src/mame/drivers/zerozone.c42
-rw-r--r--src/mame/drivers/zn.c222
-rw-r--r--src/mame/drivers/zodiack.c48
-rw-r--r--src/mame/drivers/zr107.c132
-rw-r--r--src/mame/includes/naomibd.h48
-rw-r--r--src/mame/machine/asic65.c6
-rw-r--r--src/mame/machine/atari_vg.h4
-rw-r--r--src/mame/machine/cdicdic.h8
-rw-r--r--src/mame/machine/cdislave.h8
-rw-r--r--src/mame/machine/decocass.h4
-rw-r--r--src/mame/machine/mathbox.h4
-rw-r--r--src/mame/machine/namco06.h14
-rw-r--r--src/mame/machine/namco50.c4
-rw-r--r--src/mame/machine/namco50.h4
-rw-r--r--src/mame/machine/namco51.c6
-rw-r--r--src/mame/machine/namco51.h6
-rw-r--r--src/mame/machine/namco53.c4
-rw-r--r--src/mame/machine/namco53.h6
-rw-r--r--src/mame/machine/namcoio.h18
-rw-r--r--src/mame/machine/nmk112.h6
-rw-r--r--src/mame/machine/pcshare.c12
-rw-r--r--src/mame/machine/segaic16.h14
-rw-r--r--src/mame/machine/taitoio.h18
-rw-r--r--src/mame/machine/ticket.h8
-rw-r--r--src/mame/video/20pacgal.c16
-rw-r--r--src/mame/video/cidelsa.c36
-rw-r--r--src/mame/video/crgolf.c18
-rw-r--r--src/mame/video/deco16ic.h6
-rw-r--r--src/mame/video/exidy440.c26
-rw-r--r--src/mame/video/gameplan.c22
-rw-r--r--src/mame/video/gp9001.h8
-rw-r--r--src/mame/video/jedi.c16
-rw-r--r--src/mame/video/kan_pand.h6
-rw-r--r--src/mame/video/konicdev.h132
-rw-r--r--src/mame/video/leland.c22
-rw-r--r--src/mame/video/madalien.c18
-rw-r--r--src/mame/video/mystston.c16
-rw-r--r--src/mame/video/ppu2c0x.h48
-rw-r--r--src/mame/video/qix.c28
-rw-r--r--src/mame/video/redalert.c54
-rw-r--r--src/mame/video/segaic16.h54
-rw-r--r--src/mame/video/stactics.c22
-rw-r--r--src/mame/video/taitoic.h64
-rw-r--r--src/mame/video/vrender0.h6
1147 files changed, 46993 insertions, 46993 deletions
diff --git a/src/mame/audio/astrof.c b/src/mame/audio/astrof.c
index a25660796da..7a76fa0ea6d 100644
--- a/src/mame/audio/astrof.c
+++ b/src/mame/audio/astrof.c
@@ -150,10 +150,10 @@ static const samples_interface astrof_samples_interface =
MACHINE_CONFIG_FRAGMENT( astrof_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(astrof_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(astrof_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -235,8 +235,8 @@ static const sn76477_interface tomahawk_sn76477_interface =
MACHINE_CONFIG_FRAGMENT( tomahawk_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76477, 0)
- MDRV_SOUND_CONFIG(tomahawk_sn76477_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_SOUND_CONFIG(tomahawk_sn76477_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c
index 88045e784ae..7d3cbbc7daf 100644
--- a/src/mame/audio/atarijsa.c
+++ b/src/mame/audio/atarijsa.c
@@ -806,17 +806,17 @@ static const ym2151_interface ym2151_config =
MACHINE_CONFIG_FRAGMENT( jsa_i_stereo )
/* basic machine hardware */
- MDRV_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(atarijsa1_map)
- MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
+ MCFG_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(atarijsa1_map)
+ MCFG_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, JSA_MASTER_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2151, JSA_MASTER_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
MACHINE_CONFIG_END
@@ -826,10 +826,10 @@ MACHINE_CONFIG_DERIVED( jsa_i_stereo_swapped, jsa_i_stereo )
/* basic machine hardware */
/* sound hardware */
- MDRV_SOUND_REPLACE("ymsnd", YM2151, JSA_MASTER_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.60)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.60)
+ MCFG_SOUND_REPLACE("ymsnd", YM2151, JSA_MASTER_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.60)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.60)
MACHINE_CONFIG_END
@@ -839,9 +839,9 @@ MACHINE_CONFIG_DERIVED( jsa_i_stereo_pokey, jsa_i_stereo )
/* basic machine hardware */
/* sound hardware */
- MDRV_SOUND_ADD("pokey", POKEY, JSA_MASTER_CLOCK/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("pokey", POKEY, JSA_MASTER_CLOCK/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
@@ -849,20 +849,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( jsa_i_mono_speech )
/* basic machine hardware */
- MDRV_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(atarijsa1_map)
- MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
+ MCFG_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(atarijsa1_map)
+ MCFG_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, JSA_MASTER_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.60)
- MDRV_SOUND_ROUTE(1, "mono", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2151, JSA_MASTER_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.60)
+ MCFG_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_SOUND_ADD("tms", TMS5220C, JSA_MASTER_CLOCK*2/11) /* potentially JSA_MASTER_CLOCK/9 as well */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("tms", TMS5220C, JSA_MASTER_CLOCK*2/11) /* potentially JSA_MASTER_CLOCK/9 as well */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -870,20 +870,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( jsa_ii_mono )
/* basic machine hardware */
- MDRV_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(atarijsa2_map)
- MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
+ MCFG_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(atarijsa2_map)
+ MCFG_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, JSA_MASTER_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.60)
- MDRV_SOUND_ROUTE(1, "mono", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2151, JSA_MASTER_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.60)
+ MCFG_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_OKIM6295_ADD("adpcm", JSA_MASTER_CLOCK/3, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_OKIM6295_ADD("adpcm", JSA_MASTER_CLOCK/3, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
@@ -891,11 +891,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( jsa_iii_mono, jsa_ii_mono )
/* basic machine hardware */
- MDRV_CPU_MODIFY("jsa")
- MDRV_CPU_PROGRAM_MAP(atarijsa3_map)
+ MCFG_CPU_MODIFY("jsa")
+ MCFG_CPU_PROGRAM_MAP(atarijsa3_map)
- MDRV_DEVICE_MODIFY("adpcm")
- MDRV_DEVICE_ADDRESS_MAP(0, jsa3_oki_map)
+ MCFG_DEVICE_MODIFY("adpcm")
+ MCFG_DEVICE_ADDRESS_MAP(0, jsa3_oki_map)
MACHINE_CONFIG_END
@@ -905,7 +905,7 @@ MACHINE_CONFIG_DERIVED( jsa_iii_mono_noadpcm, jsa_iii_mono )
/* basic machine hardware */
/* sound hardware */
- MDRV_DEVICE_REMOVE("adpcm")
+ MCFG_DEVICE_REMOVE("adpcm")
MACHINE_CONFIG_END
@@ -913,25 +913,25 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( jsa_iiis_stereo )
/* basic machine hardware */
- MDRV_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(atarijsa3s_map)
- MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
+ MCFG_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(atarijsa3s_map)
+ MCFG_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, JSA_MASTER_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2151, JSA_MASTER_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
- MDRV_OKIM6295_ADD("adpcml", JSA_MASTER_CLOCK/3, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
- MDRV_DEVICE_ADDRESS_MAP(0, jsa3_oki_map)
+ MCFG_OKIM6295_ADD("adpcml", JSA_MASTER_CLOCK/3, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
+ MCFG_DEVICE_ADDRESS_MAP(0, jsa3_oki_map)
- MDRV_OKIM6295_ADD("adpcmr", JSA_MASTER_CLOCK/3, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
- MDRV_DEVICE_ADDRESS_MAP(0, jsa3_oki2_map)
+ MCFG_OKIM6295_ADD("adpcmr", JSA_MASTER_CLOCK/3, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
+ MCFG_DEVICE_ADDRESS_MAP(0, jsa3_oki2_map)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/bzone.c b/src/mame/audio/bzone.c
index aa606add98c..ec07873f1b1 100644
--- a/src/mame/audio/bzone.c
+++ b/src/mame/audio/bzone.c
@@ -409,14 +409,14 @@ WRITE8_DEVICE_HANDLER( bzone_sounds_w )
MACHINE_CONFIG_FRAGMENT( bzone_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("pokey", POKEY, BZONE_MASTER_CLOCK / 8)
- MDRV_SOUND_CONFIG(bzone_pokey_interface)
- MDRV_SOUND_ROUTE_EX(0, "discrete", 1.0, 0)
+ MCFG_SOUND_ADD("pokey", POKEY, BZONE_MASTER_CLOCK / 8)
+ MCFG_SOUND_CONFIG(bzone_pokey_interface)
+ MCFG_SOUND_ROUTE_EX(0, "discrete", 1.0, 0)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(bzone)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(bzone)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0 / BZ_FINAL_GAIN)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0 / BZ_FINAL_GAIN)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/cage.c b/src/mame/audio/cage.c
index 724bd44fe64..5dd6c45b311 100644
--- a/src/mame/audio/cage.c
+++ b/src/mame/audio/cage.c
@@ -650,41 +650,41 @@ ADDRESS_MAP_END
MACHINE_CONFIG_FRAGMENT( cage )
/* basic machine hardware */
- MDRV_CPU_ADD("cage", TMS32031, 33868800)
- MDRV_CPU_CONFIG(cage_config)
- MDRV_CPU_PROGRAM_MAP(cage_map)
+ MCFG_CPU_ADD("cage", TMS32031, 33868800)
+ MCFG_CPU_CONFIG(cage_config)
+ MCFG_CPU_PROGRAM_MAP(cage_map)
- MDRV_TIMER_ADD("cage_dma_timer", dma_timer_callback)
- MDRV_TIMER_ADD("cage_timer0", cage_timer_callback)
- MDRV_TIMER_ADD("cage_timer1", cage_timer_callback)
+ MCFG_TIMER_ADD("cage_dma_timer", dma_timer_callback)
+ MCFG_TIMER_ADD("cage_timer0", cage_timer_callback)
+ MCFG_TIMER_ADD("cage_timer1", cage_timer_callback)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
#if (DAC_BUFFER_CHANNELS == 4)
- MDRV_SOUND_ADD("dac1", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MDRV_SOUND_ADD("dac2", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ADD("dac3", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ADD("dac3", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ADD("dac4", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("dac4", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
#else
- MDRV_SOUND_ADD("dac1", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("dac2", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
#endif
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( cage_seattle, cage )
- MDRV_CPU_MODIFY("cage")
- MDRV_CPU_PROGRAM_MAP(cage_map_seattle)
+ MCFG_CPU_MODIFY("cage")
+ MCFG_CPU_PROGRAM_MAP(cage_map_seattle)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/carnival.c b/src/mame/audio/carnival.c
index e27fbccf431..996588bf8d3 100644
--- a/src/mame/audio/carnival.c
+++ b/src/mame/audio/carnival.c
@@ -297,16 +297,16 @@ ADDRESS_MAP_END
MACHINE_CONFIG_FRAGMENT( carnival_audio )
- MDRV_CPU_ADD("audiocpu", I8039, 3579545)
- MDRV_CPU_PROGRAM_MAP(carnival_audio_map)
- MDRV_CPU_IO_MAP(carnival_audio_io_map)
+ MCFG_CPU_ADD("audiocpu", I8039, 3579545)
+ MCFG_CPU_PROGRAM_MAP(carnival_audio_map)
+ MCFG_CPU_IO_MAP(carnival_audio_io_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_SOUND_ADD("psg", AY8910, PSG_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("psg", AY8910, PSG_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(carnival_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(carnival_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/cinemat.c b/src/mame/audio/cinemat.c
index e4219cbef85..984df30117b 100644
--- a/src/mame/audio/cinemat.c
+++ b/src/mame/audio/cinemat.c
@@ -210,14 +210,14 @@ static MACHINE_RESET( spacewar )
}
MACHINE_CONFIG_FRAGMENT( spacewar_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(spacewar)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(spacewar)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(spacewar_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(spacewar_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -266,14 +266,14 @@ static MACHINE_RESET( barrier )
}
MACHINE_CONFIG_FRAGMENT( barrier_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(barrier)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(barrier)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(barrier_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(barrier_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -327,14 +327,14 @@ static MACHINE_RESET( speedfrk )
}
MACHINE_CONFIG_FRAGMENT( speedfrk_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(speedfrk)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(speedfrk)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(speedfrk_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(speedfrk_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -404,14 +404,14 @@ static MACHINE_RESET( starhawk )
}
MACHINE_CONFIG_FRAGMENT( starhawk_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(starhawk)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(starhawk)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(starhawk_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(starhawk_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -475,14 +475,14 @@ static MACHINE_RESET( sundance )
}
MACHINE_CONFIG_FRAGMENT( sundance_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(sundance)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(sundance)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(sundance_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(sundance_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -565,14 +565,14 @@ static MACHINE_RESET( tailg )
}
MACHINE_CONFIG_FRAGMENT( tailg_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(tailg)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(tailg)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(tailg_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(tailg_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -635,14 +635,14 @@ static MACHINE_RESET( warrior )
}
MACHINE_CONFIG_FRAGMENT( warrior_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(warrior)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(warrior)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(warrior_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(warrior_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -731,14 +731,14 @@ static MACHINE_RESET( armora )
}
MACHINE_CONFIG_FRAGMENT( armora_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(armora)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(armora)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(armora_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(armora_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -824,14 +824,14 @@ static MACHINE_RESET( ripoff )
}
MACHINE_CONFIG_FRAGMENT( ripoff_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(ripoff)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(ripoff)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(ripoff_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(ripoff_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -938,14 +938,14 @@ static MACHINE_RESET( starcas )
}
MACHINE_CONFIG_FRAGMENT( starcas_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(starcas)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(starcas)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(starcas_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(starcas_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -1075,14 +1075,14 @@ static MACHINE_RESET( solarq )
}
MACHINE_CONFIG_FRAGMENT( solarq_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(solarq)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(solarq)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(solarq_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(solarq_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -1211,14 +1211,14 @@ static MACHINE_RESET( boxingb )
}
MACHINE_CONFIG_FRAGMENT( boxingb_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(boxingb)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(boxingb)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(boxingb_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(boxingb_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -1325,14 +1325,14 @@ static MACHINE_RESET( wotw )
}
MACHINE_CONFIG_FRAGMENT( wotw_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(wotw)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(wotw)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(wotw_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(wotw_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -1439,14 +1439,14 @@ static MACHINE_RESET( wotwc )
}
MACHINE_CONFIG_FRAGMENT( wotwc_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(wotwc)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(wotwc)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(wotwc_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(wotwc_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -1588,29 +1588,29 @@ static const z80_daisy_config daisy_chain[] =
MACHINE_CONFIG_FRAGMENT( demon_sound )
/* basic machine hardware */
- MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_CONFIG(daisy_chain)
- MDRV_CPU_PROGRAM_MAP(demon_sound_map)
- MDRV_CPU_IO_MAP(demon_sound_ports)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545)
+ MCFG_CPU_CONFIG(daisy_chain)
+ MCFG_CPU_PROGRAM_MAP(demon_sound_map)
+ MCFG_CPU_IO_MAP(demon_sound_ports)
- MDRV_Z80CTC_ADD("ctc", 3579545 /* same as "audiocpu" */, demon_z80ctc_interface)
+ MCFG_Z80CTC_ADD("ctc", 3579545 /* same as "audiocpu" */, demon_z80ctc_interface)
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(demon_sound)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(demon_sound)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 3579545)
- MDRV_SOUND_CONFIG(demon_ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 3579545)
+ MCFG_SOUND_CONFIG(demon_ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay3", AY8910, 3579545)
- MDRV_SOUND_CONFIG(demon_ay8910_interface_3)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay3", AY8910, 3579545)
+ MCFG_SOUND_CONFIG(demon_ay8910_interface_3)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1640,5 +1640,5 @@ static MACHINE_RESET( qb3_sound )
MACHINE_CONFIG_DERIVED( qb3_sound, demon_sound )
- MDRV_MACHINE_RESET(qb3_sound)
+ MCFG_MACHINE_RESET(qb3_sound)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/crbaloon.c b/src/mame/audio/crbaloon.c
index deccbab5bf7..fe673803223 100644
--- a/src/mame/audio/crbaloon.c
+++ b/src/mame/audio/crbaloon.c
@@ -169,13 +169,13 @@ static const sn76477_interface crbaloon_sn76477_interface =
MACHINE_CONFIG_FRAGMENT( crbaloon_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76477, 0)
- MDRV_SOUND_CONFIG(crbaloon_sn76477_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
+ MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_SOUND_CONFIG(crbaloon_sn76477_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(crbaloon)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(crbaloon)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c
index f4a27ee4160..5587ed2e3b1 100644
--- a/src/mame/audio/dcs.c
+++ b/src/mame/audio/dcs.c
@@ -609,35 +609,35 @@ static const adsp21xx_config adsp_config =
/* Basic DCS system with ADSP-2105 and 2k of SRAM (T-unit, V-unit, Killer Instinct) */
MACHINE_CONFIG_FRAGMENT( dcs_audio_2k )
- MDRV_CPU_ADD("dcs", ADSP2105, XTAL_10MHz)
- MDRV_ADSP21XX_CONFIG(adsp_config)
- MDRV_CPU_PROGRAM_MAP(dcs_2k_program_map)
- MDRV_CPU_DATA_MAP(dcs_2k_data_map)
+ MCFG_CPU_ADD("dcs", ADSP2105, XTAL_10MHz)
+ MCFG_ADSP21XX_CONFIG(adsp_config)
+ MCFG_CPU_PROGRAM_MAP(dcs_2k_program_map)
+ MCFG_CPU_DATA_MAP(dcs_2k_data_map)
- MDRV_TIMER_ADD("dcs_reg_timer", dcs_irq)
- MDRV_TIMER_ADD("dcs_int_timer", internal_timer_callback)
+ MCFG_TIMER_ADD("dcs_reg_timer", dcs_irq)
+ MCFG_TIMER_ADD("dcs_int_timer", internal_timer_callback)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/* Basic DCS system with ADSP-2105 and 2k of SRAM, using a UART for communications (X-unit) */
MACHINE_CONFIG_DERIVED( dcs_audio_2k_uart, dcs_audio_2k )
- MDRV_CPU_MODIFY("dcs")
- MDRV_CPU_DATA_MAP(dcs_2k_uart_data_map)
+ MCFG_CPU_MODIFY("dcs")
+ MCFG_CPU_DATA_MAP(dcs_2k_uart_data_map)
MACHINE_CONFIG_END
/* Basic DCS system with ADSP-2105 and 8k of SRAM (Wolf-unit) */
MACHINE_CONFIG_DERIVED( dcs_audio_8k, dcs_audio_2k )
- MDRV_CPU_MODIFY("dcs")
- MDRV_CPU_PROGRAM_MAP(dcs_8k_program_map)
- MDRV_CPU_DATA_MAP(dcs_8k_data_map)
+ MCFG_CPU_MODIFY("dcs")
+ MCFG_CPU_PROGRAM_MAP(dcs_8k_program_map)
+ MCFG_CPU_DATA_MAP(dcs_8k_data_map)
MACHINE_CONFIG_END
@@ -649,31 +649,31 @@ MACHINE_CONFIG_END
*************************************/
MACHINE_CONFIG_FRAGMENT( dcs2_audio_2115 )
- MDRV_CPU_ADD("dcs2", ADSP2115, XTAL_16MHz)
- MDRV_ADSP21XX_CONFIG(adsp_config)
- MDRV_CPU_PROGRAM_MAP(dcs2_2115_program_map)
- MDRV_CPU_DATA_MAP(dcs2_2115_data_map)
+ MCFG_CPU_ADD("dcs2", ADSP2115, XTAL_16MHz)
+ MCFG_ADSP21XX_CONFIG(adsp_config)
+ MCFG_CPU_PROGRAM_MAP(dcs2_2115_program_map)
+ MCFG_CPU_DATA_MAP(dcs2_2115_data_map)
- MDRV_TIMER_ADD("dcs_reg_timer", dcs_irq)
- MDRV_TIMER_ADD("dcs_sport_timer", sport0_irq)
- MDRV_TIMER_ADD("dcs_int_timer", internal_timer_callback)
- MDRV_TIMER_ADD("dcs_hle_timer", transfer_watchdog_callback)
+ MCFG_TIMER_ADD("dcs_reg_timer", dcs_irq)
+ MCFG_TIMER_ADD("dcs_sport_timer", sport0_irq)
+ MCFG_TIMER_ADD("dcs_int_timer", internal_timer_callback)
+ MCFG_TIMER_ADD("dcs_hle_timer", transfer_watchdog_callback)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("dac1", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac2", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( dcs2_audio_2104, dcs2_audio_2115 )
- MDRV_CPU_REPLACE("dcs2", ADSP2104, XTAL_16MHz)
- MDRV_ADSP21XX_CONFIG(adsp_config)
- MDRV_CPU_PROGRAM_MAP(dcs2_2104_program_map)
- MDRV_CPU_DATA_MAP(dcs2_2104_data_map)
+ MCFG_CPU_REPLACE("dcs2", ADSP2104, XTAL_16MHz)
+ MCFG_ADSP21XX_CONFIG(adsp_config)
+ MCFG_CPU_PROGRAM_MAP(dcs2_2104_program_map)
+ MCFG_CPU_DATA_MAP(dcs2_2104_data_map)
MACHINE_CONFIG_END
@@ -685,19 +685,19 @@ MACHINE_CONFIG_END
*************************************/
MACHINE_CONFIG_FRAGMENT( dcs2_audio_dsio )
- MDRV_CPU_ADD("dsio", ADSP2181, XTAL_32MHz)
- MDRV_ADSP21XX_CONFIG(adsp_config)
- MDRV_CPU_PROGRAM_MAP(dsio_program_map)
- MDRV_CPU_DATA_MAP(dsio_data_map)
- MDRV_CPU_IO_MAP(dsio_io_map)
+ MCFG_CPU_ADD("dsio", ADSP2181, XTAL_32MHz)
+ MCFG_ADSP21XX_CONFIG(adsp_config)
+ MCFG_CPU_PROGRAM_MAP(dsio_program_map)
+ MCFG_CPU_DATA_MAP(dsio_data_map)
+ MCFG_CPU_IO_MAP(dsio_io_map)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("dac1", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac2", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MACHINE_CONFIG_END
@@ -709,31 +709,31 @@ MACHINE_CONFIG_END
*************************************/
MACHINE_CONFIG_FRAGMENT( dcs2_audio_denver )
- MDRV_CPU_ADD("denver", ADSP2181, XTAL_33_333MHz)
- MDRV_ADSP21XX_CONFIG(adsp_config)
- MDRV_CPU_PROGRAM_MAP(denver_program_map)
- MDRV_CPU_DATA_MAP(denver_data_map)
- MDRV_CPU_IO_MAP(denver_io_map)
+ MCFG_CPU_ADD("denver", ADSP2181, XTAL_33_333MHz)
+ MCFG_ADSP21XX_CONFIG(adsp_config)
+ MCFG_CPU_PROGRAM_MAP(denver_program_map)
+ MCFG_CPU_DATA_MAP(denver_data_map)
+ MCFG_CPU_IO_MAP(denver_io_map)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("dac1", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac2", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("dac3", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("dac3", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac4", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("dac4", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("dac5", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("dac5", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac6", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("dac6", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/depthch.c b/src/mame/audio/depthch.c
index 1ab9bf4f051..22e1e0e13d6 100644
--- a/src/mame/audio/depthch.c
+++ b/src/mame/audio/depthch.c
@@ -37,9 +37,9 @@ static const samples_interface depthch_samples_interface =
MACHINE_CONFIG_FRAGMENT( depthch_audio )
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(depthch_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(depthch_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c
index e0d6622b51c..47ef6cdaa72 100644
--- a/src/mame/audio/dkong.c
+++ b/src/mame/audio/dkong.c
@@ -1370,20 +1370,20 @@ const tms5110_interface tms_interface = {
MACHINE_CONFIG_FRAGMENT( dkong2b_audio )
- MDRV_SOUND_START( dkong )
+ MCFG_SOUND_START( dkong )
/* sound latches */
- MDRV_LATCH8_ADD("ls175.3d") /* sound cmd latch */
- MDRV_LATCH8_MASKOUT(0xf0)
- MDRV_LATCH8_INVERT(0x0F)
+ MCFG_LATCH8_ADD("ls175.3d") /* sound cmd latch */
+ MCFG_LATCH8_MASKOUT(0xf0)
+ MCFG_LATCH8_INVERT(0x0F)
- MDRV_LATCH8_ADD("ls259.6h")
- MDRV_LATCH8_DISCRETE_NODE("discrete", 0, DS_SOUND0_INP)
- MDRV_LATCH8_DISCRETE_NODE("discrete", 1, DS_SOUND1_INP)
- MDRV_LATCH8_DISCRETE_NODE("discrete", 2, DS_SOUND2_INP)
- MDRV_LATCH8_DISCRETE_NODE("discrete", 6, DS_SOUND6_INP)
- MDRV_LATCH8_DISCRETE_NODE("discrete", 7, DS_SOUND7_INP)
+ MCFG_LATCH8_ADD("ls259.6h")
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 0, DS_SOUND0_INP)
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 1, DS_SOUND1_INP)
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 2, DS_SOUND2_INP)
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 6, DS_SOUND6_INP)
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 7, DS_SOUND7_INP)
/* If P2.Bit7 -> is apparently an external signal decay or other output control
* If P2.Bit6 -> activates the external compressed sample ROM (not radarscp1)
@@ -1392,46 +1392,46 @@ MACHINE_CONFIG_FRAGMENT( dkong2b_audio )
* P2.Bit2-0 -> select the 256 byte bank for external ROM
*/
- MDRV_LATCH8_ADD( "virtual_p2" ) /* virtual latch for port B */
- MDRV_LATCH8_INVERT( 0x20 ) /* signal is inverted */
- MDRV_LATCH8_DEVREAD(5, "ls259.6h", latch8_r, 3)
- MDRV_LATCH8_DISCRETE_NODE("discrete", 7, DS_DISCHARGE_INV)
+ MCFG_LATCH8_ADD( "virtual_p2" ) /* virtual latch for port B */
+ MCFG_LATCH8_INVERT( 0x20 ) /* signal is inverted */
+ MCFG_LATCH8_DEVREAD(5, "ls259.6h", latch8_r, 3)
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 7, DS_DISCHARGE_INV)
- MDRV_CPU_ADD("soundcpu", MB8884, I8035_CLOCK)
- MDRV_CPU_PROGRAM_MAP(dkong_sound_map)
- MDRV_CPU_IO_MAP(dkong_sound_io_map)
+ MCFG_CPU_ADD("soundcpu", MB8884, I8035_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(dkong_sound_map)
+ MCFG_CPU_IO_MAP(dkong_sound_io_map)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(dkong2b)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(dkong2b)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( radarscp_audio, dkong2b_audio )
- MDRV_SOUND_MODIFY("discrete")
- MDRV_SOUND_CONFIG_DISCRETE(radarscp)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.7)
+ MCFG_SOUND_MODIFY("discrete")
+ MCFG_SOUND_CONFIG_DISCRETE(radarscp)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.7)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( radarscp1_audio, radarscp_audio )
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_IO_MAP(radarscp1_sound_io_map)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_IO_MAP(radarscp1_sound_io_map)
/* virtual_p2 is not read -see memory map-, all bits are output bits */
- MDRV_LATCH8_ADD( "virtual_p1" ) /* virtual latch for port A */
- MDRV_LATCH8_INVERT( 0x80 ) /* signal is inverted */
- MDRV_LATCH8_DEVREAD(7, "ls259.6h", latch8_r, 3)
- MDRV_LATCH8_DEVREAD(6, "tms", m58817_status_r, 0)
+ MCFG_LATCH8_ADD( "virtual_p1" ) /* virtual latch for port A */
+ MCFG_LATCH8_INVERT( 0x80 ) /* signal is inverted */
+ MCFG_LATCH8_DEVREAD(7, "ls259.6h", latch8_r, 3)
+ MCFG_LATCH8_DEVREAD(6, "tms", m58817_status_r, 0)
/* tms memory controller */
- MDRV_DEVICE_ADD("m58819", M58819, 0)
+ MCFG_DEVICE_ADD("m58819", M58819, 0)
- MDRV_SOUND_ADD("tms", M58817, XTAL_640kHz)
- MDRV_DEVICE_CONFIG(tms_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("tms", M58817, XTAL_640kHz)
+ MCFG_DEVICE_CONFIG(tms_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1439,62 +1439,62 @@ MACHINE_CONFIG_FRAGMENT( dkongjr_audio )
/* sound latches */
- MDRV_LATCH8_ADD("ls174.3d")
- MDRV_LATCH8_MASKOUT(0xE0)
+ MCFG_LATCH8_ADD("ls174.3d")
+ MCFG_LATCH8_MASKOUT(0xE0)
- MDRV_LATCH8_ADD( "ls259.6h")
- MDRV_LATCH8_DISCRETE_NODE("discrete", 0, DS_SOUND0_INP)
- MDRV_LATCH8_DISCRETE_NODE("discrete", 1, DS_SOUND1_INP)
- MDRV_LATCH8_DISCRETE_NODE("discrete", 2, DS_SOUND2_INP)
- MDRV_LATCH8_DISCRETE_NODE("discrete", 7, DS_SOUND7_INP)
+ MCFG_LATCH8_ADD( "ls259.6h")
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 0, DS_SOUND0_INP)
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 1, DS_SOUND1_INP)
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 2, DS_SOUND2_INP)
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 7, DS_SOUND7_INP)
- MDRV_LATCH8_ADD( "ls259.5h")
- MDRV_LATCH8_DISCRETE_NODE("discrete", 1, DS_SOUND9_INP)
+ MCFG_LATCH8_ADD( "ls259.5h")
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 1, DS_SOUND9_INP)
- MDRV_LATCH8_ADD( "ls259.4h")
+ MCFG_LATCH8_ADD( "ls259.4h")
- MDRV_LATCH8_ADD( "virtual_p2" ) /* virtual latch for port B */
- MDRV_LATCH8_INVERT( 0x70 ) /* all signals are inverted */
- MDRV_LATCH8_DEVREAD(6, "ls259.4h", latch8_r, 1)
- MDRV_LATCH8_DEVREAD(5, "ls259.6h", latch8_r, 3)
- MDRV_LATCH8_DEVREAD(4, "ls259.6h", latch8_r, 6)
- MDRV_LATCH8_DISCRETE_NODE("discrete", 7, DS_DISCHARGE_INV)
+ MCFG_LATCH8_ADD( "virtual_p2" ) /* virtual latch for port B */
+ MCFG_LATCH8_INVERT( 0x70 ) /* all signals are inverted */
+ MCFG_LATCH8_DEVREAD(6, "ls259.4h", latch8_r, 1)
+ MCFG_LATCH8_DEVREAD(5, "ls259.6h", latch8_r, 3)
+ MCFG_LATCH8_DEVREAD(4, "ls259.6h", latch8_r, 6)
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 7, DS_DISCHARGE_INV)
- MDRV_CPU_ADD("soundcpu", MB8884, I8035_CLOCK)
- MDRV_CPU_PROGRAM_MAP(dkong_sound_map)
- MDRV_CPU_IO_MAP(dkongjr_sound_io_map)
+ MCFG_CPU_ADD("soundcpu", MB8884, I8035_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(dkong_sound_map)
+ MCFG_CPU_IO_MAP(dkongjr_sound_io_map)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(dkongjr)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(dkongjr)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( dkong3_audio )
- MDRV_CPU_ADD("n2a03a", N2A03,N2A03_DEFAULTCLOCK)
- MDRV_CPU_PROGRAM_MAP(dkong3_sound1_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("n2a03a", N2A03,N2A03_DEFAULTCLOCK)
+ MCFG_CPU_PROGRAM_MAP(dkong3_sound1_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("n2a03b", N2A03,N2A03_DEFAULTCLOCK)
- MDRV_CPU_PROGRAM_MAP(dkong3_sound2_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("n2a03b", N2A03,N2A03_DEFAULTCLOCK)
+ MCFG_CPU_PROGRAM_MAP(dkong3_sound2_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* sound latches */
- MDRV_LATCH8_ADD( "latch1")
- MDRV_LATCH8_ADD( "latch2")
- MDRV_LATCH8_ADD( "latch3")
-
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("nes1", NES, N2A03_DEFAULTCLOCK)
- MDRV_SOUND_CONFIG(nes_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
-
- MDRV_SOUND_ADD("nes2", NES, N2A03_DEFAULTCLOCK)
- MDRV_SOUND_CONFIG(nes_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_LATCH8_ADD( "latch1")
+ MCFG_LATCH8_ADD( "latch2")
+ MCFG_LATCH8_ADD( "latch3")
+
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("nes1", NES, N2A03_DEFAULTCLOCK)
+ MCFG_SOUND_CONFIG(nes_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+
+ MCFG_SOUND_ADD("nes2", NES, N2A03_DEFAULTCLOCK)
+ MCFG_SOUND_CONFIG(nes_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c
index b863f031152..b38290ac28f 100644
--- a/src/mame/audio/exidy.c
+++ b/src/mame/audio/exidy.c
@@ -882,18 +882,18 @@ ADDRESS_MAP_END
MACHINE_CONFIG_FRAGMENT( venture_audio )
- MDRV_CPU_ADD("audiocpu", M6502, 3579545/4)
- MDRV_CPU_PROGRAM_MAP(venture_audio_map)
+ MCFG_CPU_ADD("audiocpu", M6502, 3579545/4)
+ MCFG_CPU_PROGRAM_MAP(venture_audio_map)
- MDRV_RIOT6532_ADD("riot", SH6532_CLOCK, r6532_interface)
+ MCFG_RIOT6532_ADD("riot", SH6532_CLOCK, r6532_interface)
- MDRV_PIA6821_ADD("pia0", venture_pia0_intf)
- MDRV_PIA6821_ADD("pia1", venture_pia1_intf)
+ MCFG_PIA6821_ADD("pia0", venture_pia0_intf)
+ MCFG_PIA6821_ADD("pia1", venture_pia1_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("custom", EXIDY_VENTURE, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("custom", EXIDY_VENTURE, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -950,13 +950,13 @@ ADDRESS_MAP_END
MACHINE_CONFIG_FRAGMENT( mtrap_cvsd_audio )
- MDRV_CPU_ADD("cvsdcpu", Z80, CVSD_Z80_CLOCK)
- MDRV_CPU_PROGRAM_MAP(cvsd_map)
- MDRV_CPU_IO_MAP(cvsd_iomap)
+ MCFG_CPU_ADD("cvsdcpu", Z80, CVSD_Z80_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(cvsd_map)
+ MCFG_CPU_IO_MAP(cvsd_iomap)
/* audio hardware */
- MDRV_SOUND_ADD("cvsd", MC3417, CVSD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("cvsd", MC3417, CVSD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -1121,17 +1121,17 @@ ADDRESS_MAP_END
MACHINE_CONFIG_FRAGMENT( victory_audio )
- MDRV_CPU_ADD("audiocpu", M6502, VICTORY_AUDIO_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(victory_audio_map)
+ MCFG_CPU_ADD("audiocpu", M6502, VICTORY_AUDIO_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(victory_audio_map)
- MDRV_RIOT6532_ADD("riot", SH6532_CLOCK, r6532_interface)
- MDRV_PIA6821_ADD("pia1", victory_pia1_intf)
+ MCFG_RIOT6532_ADD("riot", SH6532_CLOCK, r6532_interface)
+ MCFG_PIA6821_ADD("pia1", victory_pia1_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("custom", EXIDY_VICTORY, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("custom", EXIDY_VICTORY, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("tms", TMS5220, 640000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("tms", TMS5220, 640000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/exidy440.c b/src/mame/audio/exidy440.c
index 9297f231592..3452def8187 100644
--- a/src/mame/audio/exidy440.c
+++ b/src/mame/audio/exidy440.c
@@ -941,25 +941,25 @@ DEFINE_LEGACY_SOUND_DEVICE(EXIDY440, exidy440_sound);
MACHINE_CONFIG_FRAGMENT( exidy440_audio )
- MDRV_CPU_ADD("audiocpu", M6809, EXIDY440_AUDIO_CLOCK)
- MDRV_CPU_PROGRAM_MAP(exidy440_audio_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("audiocpu", M6809, EXIDY440_AUDIO_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(exidy440_audio_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("custom", EXIDY440, EXIDY440_MASTER_CLOCK/256)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("custom", EXIDY440, EXIDY440_MASTER_CLOCK/256)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
-// MDRV_SOUND_ADD("cvsd1", MC3418, EXIDY440_MC3418_CLOCK)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+// MCFG_SOUND_ADD("cvsd1", MC3418, EXIDY440_MC3418_CLOCK)
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
-// MDRV_SOUND_ADD("cvsd2", MC3418, EXIDY440_MC3418_CLOCK)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+// MCFG_SOUND_ADD("cvsd2", MC3418, EXIDY440_MC3418_CLOCK)
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
-// MDRV_SOUND_ADD("cvsd3", MC3417, EXIDY440_MC3417_CLOCK)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+// MCFG_SOUND_ADD("cvsd3", MC3417, EXIDY440_MC3417_CLOCK)
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
-// MDRV_SOUND_ADD("cvsd4", MC3417, EXIDY440_MC3417_CLOCK)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+// MCFG_SOUND_ADD("cvsd4", MC3417, EXIDY440_MC3417_CLOCK)
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/galaxian.c b/src/mame/audio/galaxian.c
index 86b2995156c..add7a17c7ee 100644
--- a/src/mame/audio/galaxian.c
+++ b/src/mame/audio/galaxian.c
@@ -481,20 +481,20 @@ WRITE8_DEVICE_HANDLER( galaxian_sound_w )
MACHINE_CONFIG_FRAGMENT( galaxian_audio )
- MDRV_SOUND_START(galaxian)
+ MCFG_SOUND_START(galaxian)
- MDRV_SOUND_ADD(GAL_AUDIO, DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(galaxian)
+ MCFG_SOUND_ADD(GAL_AUDIO, DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(galaxian)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( mooncrst_audio )
- MDRV_SOUND_START(galaxian)
+ MCFG_SOUND_START(galaxian)
- MDRV_SOUND_ADD(GAL_AUDIO, DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(mooncrst)
+ MCFG_SOUND_ADD(GAL_AUDIO, DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(mooncrst)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/gottlieb.c b/src/mame/audio/gottlieb.c
index cba512b1158..dab2c6d25c5 100644
--- a/src/mame/audio/gottlieb.c
+++ b/src/mame/audio/gottlieb.c
@@ -327,16 +327,16 @@ ADDRESS_MAP_END
*************************************/
MACHINE_CONFIG_FRAGMENT( gottlieb_soundrev1 )
- MDRV_SOUND_START(gottlieb1)
+ MCFG_SOUND_START(gottlieb1)
- MDRV_RIOT6532_ADD("riot", SOUND1_CLOCK/4, gottlieb_riot6532_intf)
+ MCFG_RIOT6532_ADD("riot", SOUND1_CLOCK/4, gottlieb_riot6532_intf)
- MDRV_CPU_ADD("audiocpu", M6502, SOUND1_CLOCK/4) /* the board can be set to /2 as well */
- MDRV_CPU_PROGRAM_MAP(gottlieb_sound1_map)
+ MCFG_CPU_ADD("audiocpu", M6502, SOUND1_CLOCK/4) /* the board can be set to /2 as well */
+ MCFG_CPU_PROGRAM_MAP(gottlieb_sound1_map)
/* sound hardware */
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -577,29 +577,29 @@ ADDRESS_MAP_END
MACHINE_CONFIG_FRAGMENT( gottlieb_soundrev2 )
/* audio CPUs */
- MDRV_CPU_ADD("audiocpu", M6502, SOUND2_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(gottlieb_audio2_map)
+ MCFG_CPU_ADD("audiocpu", M6502, SOUND2_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(gottlieb_audio2_map)
- MDRV_CPU_ADD("speech", M6502, SOUND2_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(gottlieb_speech2_map)
+ MCFG_CPU_ADD("speech", M6502, SOUND2_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(gottlieb_speech2_map)
/* sound hardware */
- MDRV_SOUND_START( gottlieb2 )
+ MCFG_SOUND_START( gottlieb2 )
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ay1", AY8913, SOUND2_CLOCK/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay1", AY8913, SOUND2_CLOCK/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ay2", AY8913, SOUND2_CLOCK/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay2", AY8913, SOUND2_CLOCK/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("spsnd", SP0250, SOUND2_SPEECH_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("spsnd", SP0250, SOUND2_SPEECH_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/hyprolyb.c b/src/mame/audio/hyprolyb.c
index f17ca509ded..deec070a242 100644
--- a/src/mame/audio/hyprolyb.c
+++ b/src/mame/audio/hyprolyb.c
@@ -126,14 +126,14 @@ static const msm5205_interface hyprolyb_msm5205_config =
};
MACHINE_CONFIG_FRAGMENT( hyprolyb_adpcm )
- MDRV_CPU_ADD("adpcm", M6802, XTAL_14_31818MHz/8) /* unknown clock */
- MDRV_CPU_PROGRAM_MAP(hyprolyb_adpcm_map)
+ MCFG_CPU_ADD("adpcm", M6802, XTAL_14_31818MHz/8) /* unknown clock */
+ MCFG_CPU_PROGRAM_MAP(hyprolyb_adpcm_map)
- MDRV_SOUND_ADD("hyprolyb_adpcm", HYPROLYB_ADPCM, 0)
+ MCFG_SOUND_ADD("hyprolyb_adpcm", HYPROLYB_ADPCM, 0)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(hyprolyb_msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(hyprolyb_msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
/*****************************************************************************
diff --git a/src/mame/audio/invinco.c b/src/mame/audio/invinco.c
index 961a5cf630b..64703994005 100644
--- a/src/mame/audio/invinco.c
+++ b/src/mame/audio/invinco.c
@@ -43,9 +43,9 @@ static const samples_interface invinco_samples_interface =
MACHINE_CONFIG_FRAGMENT( invinco_audio )
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(invinco_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(invinco_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/irem.c b/src/mame/audio/irem.c
index e9f4e8f67e2..949e52d220b 100644
--- a/src/mame/audio/irem.c
+++ b/src/mame/audio/irem.c
@@ -414,74 +414,74 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_FRAGMENT( irem_audio_base )
/* basic machine hardware */
- MDRV_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_IO_MAP(irem_sound_portmap)
+ MCFG_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_IO_MAP(irem_sound_portmap)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("irem_audio", IREM_AUDIO, 0)
+ MCFG_SOUND_ADD("irem_audio", IREM_AUDIO, 0)
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(irem_ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(irem_ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(irem_ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(irem_ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("msm1", MSM5205, XTAL_384kHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(irem_msm5205_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("msm1", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(irem_msm5205_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("msm2", MSM5205, XTAL_384kHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(irem_msm5205_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("msm2", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(irem_msm5205_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( m52_sound_c_audio )
/* basic machine hardware */
- MDRV_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_IO_MAP(irem_sound_portmap)
- MDRV_CPU_PROGRAM_MAP(m52_small_sound_map)
+ MCFG_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_IO_MAP(irem_sound_portmap)
+ MCFG_CPU_PROGRAM_MAP(m52_small_sound_map)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("irem_audio", IREM_AUDIO, 0)
+ MCFG_SOUND_ADD("irem_audio", IREM_AUDIO, 0)
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(irem_ay8910_interface_1)
- MDRV_SOUND_ROUTE_EX(0, "filtermix", 1.0, 0)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(irem_ay8910_interface_1)
+ MCFG_SOUND_ROUTE_EX(0, "filtermix", 1.0, 0)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(irem_ay8910_interface_2)
- MDRV_SOUND_ROUTE_EX(0, "filtermix", 1.0, 1)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(irem_ay8910_interface_2)
+ MCFG_SOUND_ROUTE_EX(0, "filtermix", 1.0, 1)
- MDRV_SOUND_ADD("msm1", MSM5205, XTAL_384kHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(irem_msm5205_interface_1)
- MDRV_SOUND_ROUTE_EX(0, "filtermix", 1.0, 2)
+ MCFG_SOUND_ADD("msm1", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(irem_msm5205_interface_1)
+ MCFG_SOUND_ROUTE_EX(0, "filtermix", 1.0, 2)
- MDRV_SOUND_ADD("filtermix", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(m52_sound_c)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("filtermix", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(m52_sound_c)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( m52_large_audio, irem_audio_base ) /* 10 yard fight */
/* basic machine hardware */
- MDRV_CPU_MODIFY("iremsound")
- MDRV_CPU_PROGRAM_MAP(m52_large_sound_map)
+ MCFG_CPU_MODIFY("iremsound")
+ MCFG_CPU_PROGRAM_MAP(m52_large_sound_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( m62_audio, irem_audio_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("iremsound")
- MDRV_CPU_PROGRAM_MAP(m62_sound_map)
+ MCFG_CPU_MODIFY("iremsound")
+ MCFG_CPU_PROGRAM_MAP(m62_sound_map)
MACHINE_CONFIG_END
/*****************************************************************************
diff --git a/src/mame/audio/jedi.c b/src/mame/audio/jedi.c
index d6196cbc6a3..e256d5b616b 100644
--- a/src/mame/audio/jedi.c
+++ b/src/mame/audio/jedi.c
@@ -202,29 +202,29 @@ ADDRESS_MAP_END
MACHINE_CONFIG_FRAGMENT( jedi_audio )
- MDRV_CPU_ADD("audiocpu", M6502, JEDI_AUDIO_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_ADD("audiocpu", M6502, JEDI_AUDIO_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(audio_map)
- MDRV_SOUND_START(jedi)
- MDRV_SOUND_RESET(jedi)
+ MCFG_SOUND_START(jedi)
+ MCFG_SOUND_RESET(jedi)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("pokey1", POKEY, JEDI_POKEY_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
+ MCFG_SOUND_ADD("pokey1", POKEY, JEDI_POKEY_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MDRV_SOUND_ADD("pokey2", POKEY, JEDI_POKEY_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
+ MCFG_SOUND_ADD("pokey2", POKEY, JEDI_POKEY_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MDRV_SOUND_ADD("pokey3", POKEY, JEDI_POKEY_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
+ MCFG_SOUND_ADD("pokey3", POKEY, JEDI_POKEY_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
- MDRV_SOUND_ADD("pokey4", POKEY, JEDI_POKEY_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
+ MCFG_SOUND_ADD("pokey4", POKEY, JEDI_POKEY_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MDRV_SOUND_ADD("tms", TMS5220, JEDI_TMS5220_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("tms", TMS5220, JEDI_TMS5220_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c
index 1c8f90cbd49..f42ff4fe1b7 100644
--- a/src/mame/audio/mario.c
+++ b/src/mame/audio/mario.c
@@ -634,36 +634,36 @@ static const ay8910_interface ay8910_config =
MACHINE_CONFIG_FRAGMENT( mario_audio )
#if USE_8039
- MDRV_CPU_ADD("audiocpu", I8039, I8035_CLOCK) /* 730 kHz */
+ MCFG_CPU_ADD("audiocpu", I8039, I8035_CLOCK) /* 730 kHz */
#else
- MDRV_CPU_ADD("audiocpu", M58715, I8035_CLOCK) /* 730 kHz */
+ MCFG_CPU_ADD("audiocpu", M58715, I8035_CLOCK) /* 730 kHz */
#endif
- MDRV_CPU_PROGRAM_MAP(mario_sound_map)
- MDRV_CPU_IO_MAP(mario_sound_io_map)
+ MCFG_CPU_PROGRAM_MAP(mario_sound_map)
+ MCFG_CPU_IO_MAP(mario_sound_io_map)
- MDRV_SOUND_START(mario)
- MDRV_SOUND_RESET(mario)
+ MCFG_SOUND_START(mario)
+ MCFG_SOUND_RESET(mario)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(mario)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(mario)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( masao_audio )
- MDRV_CPU_ADD("audiocpu", Z80, 24576000/16) /* ???? */
- MDRV_CPU_PROGRAM_MAP(masao_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 24576000/16) /* ???? */
+ MCFG_CPU_PROGRAM_MAP(masao_sound_map)
- MDRV_SOUND_START(mario)
- MDRV_SOUND_RESET(mario)
+ MCFG_SOUND_START(mario)
+ MCFG_SOUND_RESET(mario)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 14318000/6)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, 14318000/6)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/mcr.c b/src/mame/audio/mcr.c
index dde7699709b..168c8bb62f8 100644
--- a/src/mame/audio/mcr.c
+++ b/src/mame/audio/mcr.c
@@ -463,18 +463,18 @@ ADDRESS_MAP_END
/********* machine driver ***********/
MACHINE_CONFIG_FRAGMENT(mcr_ssio)
- MDRV_CPU_ADD("ssiocpu", Z80, SSIO_CLOCK/2/4)
- MDRV_CPU_PROGRAM_MAP(ssio_map)
- MDRV_CPU_PERIODIC_INT(ssio_14024_clock, SSIO_CLOCK/2/16/10)
-
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ssio.1", AY8910, SSIO_CLOCK/2/4)
- MDRV_SOUND_CONFIG(ssio_ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33)
-
- MDRV_SOUND_ADD("ssio.2", AY8910, SSIO_CLOCK/2/4)
- MDRV_SOUND_CONFIG(ssio_ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
+ MCFG_CPU_ADD("ssiocpu", Z80, SSIO_CLOCK/2/4)
+ MCFG_CPU_PROGRAM_MAP(ssio_map)
+ MCFG_CPU_PERIODIC_INT(ssio_14024_clock, SSIO_CLOCK/2/16/10)
+
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("ssio.1", AY8910, SSIO_CLOCK/2/4)
+ MCFG_SOUND_CONFIG(ssio_ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33)
+
+ MCFG_SOUND_ADD("ssio.2", AY8910, SSIO_CLOCK/2/4)
+ MCFG_SOUND_CONFIG(ssio_ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
MACHINE_CONFIG_END
@@ -594,25 +594,25 @@ static const pia6821_interface csdeluxe_pia_intf =
/********* machine driver ***********/
MACHINE_CONFIG_FRAGMENT(chip_squeak_deluxe)
- MDRV_CPU_ADD("csdcpu", M68000, CSDELUXE_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(csdeluxe_map)
+ MCFG_CPU_ADD("csdcpu", M68000, CSDELUXE_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(csdeluxe_map)
- MDRV_PIA6821_ADD("csdpia", csdeluxe_pia_intf)
+ MCFG_PIA6821_ADD("csdpia", csdeluxe_pia_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("csddac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("csddac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT(chip_squeak_deluxe_stereo)
- MDRV_CPU_ADD("csdcpu", M68000, CSDELUXE_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(csdeluxe_map)
+ MCFG_CPU_ADD("csdcpu", M68000, CSDELUXE_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(csdeluxe_map)
- MDRV_PIA6821_ADD("csdpia", csdeluxe_pia_intf)
+ MCFG_PIA6821_ADD("csdpia", csdeluxe_pia_intf)
- MDRV_SOUND_ADD("csddac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("csddac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -713,14 +713,14 @@ static const pia6821_interface soundsgood_pia_intf =
/********* machine driver ***********/
MACHINE_CONFIG_FRAGMENT(sounds_good)
- MDRV_CPU_ADD("sgcpu", M68000, SOUNDSGOOD_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(soundsgood_map)
+ MCFG_CPU_ADD("sgcpu", M68000, SOUNDSGOOD_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(soundsgood_map)
- MDRV_PIA6821_ADD("sgpia", soundsgood_pia_intf)
+ MCFG_PIA6821_ADD("sgpia", soundsgood_pia_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sgdac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("sgdac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -815,14 +815,14 @@ static const pia6821_interface turbocs_pia_intf =
/********* machine driver ***********/
MACHINE_CONFIG_FRAGMENT(turbo_chip_squeak)
- MDRV_CPU_ADD("tcscpu", M6809E, TURBOCS_CLOCK)
- MDRV_CPU_PROGRAM_MAP(turbocs_map)
+ MCFG_CPU_ADD("tcscpu", M6809E, TURBOCS_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(turbocs_map)
- MDRV_PIA6821_ADD("tcspia", turbocs_pia_intf)
+ MCFG_PIA6821_ADD("tcspia", turbocs_pia_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("tcsdac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("tcsdac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -976,16 +976,16 @@ static const pia6821_interface squawkntalk_pia1_intf =
/********* machine driver ***********/
MACHINE_CONFIG_FRAGMENT(squawk_n_talk)
- MDRV_CPU_ADD("sntcpu", M6802, SQUAWKTALK_CLOCK)
- MDRV_CPU_PROGRAM_MAP(squawkntalk_map)
+ MCFG_CPU_ADD("sntcpu", M6802, SQUAWKTALK_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(squawkntalk_map)
- MDRV_PIA6821_ADD("sntpia0", squawkntalk_pia0_intf)
- MDRV_PIA6821_ADD("sntpia1", squawkntalk_pia1_intf)
+ MCFG_PIA6821_ADD("sntpia0", squawkntalk_pia0_intf)
+ MCFG_PIA6821_ADD("sntpia1", squawkntalk_pia1_intf)
/* only used on Discs of Tron, which is stereo */
- MDRV_SOUND_ADD("sntspeech", TMS5200, 640000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("sntspeech", TMS5200, 640000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
/* the board also supports an AY-8912 and/or an 8-bit DAC, neither of */
/* which are populated on the Discs of Tron board */
diff --git a/src/mame/audio/mw8080bw.c b/src/mame/audio/mw8080bw.c
index 3e11dafaa0a..77586c18e8c 100644
--- a/src/mame/audio/mw8080bw.c
+++ b/src/mame/audio/mw8080bw.c
@@ -154,12 +154,12 @@ static const samples_interface seawolf_samples_interface =
MACHINE_CONFIG_FRAGMENT( seawolf_audio )
- MDRV_SOUND_START(samples)
+ MCFG_SOUND_START(samples)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(seawolf_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.6)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(seawolf_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.6)
MACHINE_CONFIG_END
@@ -215,17 +215,17 @@ static const samples_interface gunfight_samples_interface =
MACHINE_CONFIG_FRAGMENT( gunfight_audio )
- MDRV_SOUND_START(samples)
+ MCFG_SOUND_START(samples)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("samples1", SAMPLES, 0)
- MDRV_SOUND_CONFIG(gunfight_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ADD("samples1", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(gunfight_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ADD("samples2", SAMPLES, 0)
- MDRV_SOUND_CONFIG(gunfight_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("samples2", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(gunfight_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
@@ -324,10 +324,10 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( tornbase_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(tornbase)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(tornbase)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
MACHINE_CONFIG_END
@@ -368,7 +368,7 @@ WRITE8_DEVICE_HANDLER( tornbase_audio_w )
*************************************/
MACHINE_CONFIG_FRAGMENT( zzzap_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
MACHINE_CONFIG_END
@@ -570,10 +570,10 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( maze_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(maze)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(maze)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -816,11 +816,11 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( boothill_audio )
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(boothill)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(boothill)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1046,10 +1046,10 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( checkmat_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(checkmat)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(checkmat)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
MACHINE_CONFIG_END
@@ -1257,10 +1257,10 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( desertgu_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(desertgu)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(desertgu)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
MACHINE_CONFIG_END
@@ -1524,10 +1524,10 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( dplay_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(dplay)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(dplay)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
MACHINE_CONFIG_END
@@ -1573,17 +1573,17 @@ static const samples_interface gmissile_samples_interface =
MACHINE_CONFIG_FRAGMENT( gmissile_audio )
- MDRV_SOUND_START(samples)
+ MCFG_SOUND_START(samples)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("samples1", SAMPLES, 0)
- MDRV_SOUND_CONFIG(gmissile_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.9)
+ MCFG_SOUND_ADD("samples1", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(gmissile_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.9)
- MDRV_SOUND_ADD("samples2", SAMPLES, 0)
- MDRV_SOUND_CONFIG(gmissile_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.9)
+ MCFG_SOUND_ADD("samples2", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(gmissile_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.9)
MACHINE_CONFIG_END
@@ -1672,17 +1672,17 @@ static const samples_interface m4_samples_interface =
MACHINE_CONFIG_FRAGMENT( m4_audio )
- MDRV_SOUND_START(samples)
+ MCFG_SOUND_START(samples)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("samples1", SAMPLES, 0)
- MDRV_SOUND_CONFIG(m4_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1)
+ MCFG_SOUND_ADD("samples1", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(m4_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1)
- MDRV_SOUND_ADD("samples2", SAMPLES, 0)
- MDRV_SOUND_CONFIG(m4_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1)
+ MCFG_SOUND_ADD("samples2", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(m4_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1)
MACHINE_CONFIG_END
@@ -1934,17 +1934,17 @@ static const samples_interface clowns_samples_interface =
MACHINE_CONFIG_FRAGMENT( clowns_audio )
- MDRV_SOUND_START(samples)
+ MCFG_SOUND_START(samples)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(clowns_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(clowns_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(clowns)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(clowns)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2308,11 +2308,11 @@ DISCRETE_GAIN(NODE_RELATIVE(SPACWALK_SPRINGBOARD_HIT1_SND, _num - 1),
DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( spacwalk_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(spacwalk)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(spacwalk)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
WRITE8_DEVICE_HANDLER( spacwalk_audio_1_w )
@@ -2539,11 +2539,11 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( shuffle_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(shuffle)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(shuffle)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2604,10 +2604,10 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( dogpatch_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(dogpatch)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.3)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(dogpatch)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.3)
MACHINE_CONFIG_END
@@ -3137,15 +3137,15 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( spcenctr_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76477, 0)
- MDRV_SOUND_CONFIG(spcenctr_sn76477_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_SOUND_CONFIG(spcenctr_sn76477_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(spcenctr)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(spcenctr)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
@@ -3223,12 +3223,12 @@ static const samples_interface phantom2_samples_interface =
MACHINE_CONFIG_FRAGMENT( phantom2_audio )
- MDRV_SOUND_START(samples)
+ MCFG_SOUND_START(samples)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(phantom2_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(phantom2_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
MACHINE_CONFIG_END
@@ -3353,11 +3353,11 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( bowler_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(bowler)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(bowler)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
MACHINE_CONFIG_END
@@ -3504,17 +3504,17 @@ static const samples_interface invaders_samples_interface =
/* left in for all games that hack into invaders samples for audio */
MACHINE_CONFIG_FRAGMENT( invaders_samples_audio )
- MDRV_SOUND_START(samples)
+ MCFG_SOUND_START(samples)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76477, 0)
- MDRV_SOUND_CONFIG(invaders_sn76477_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_SOUND_CONFIG(invaders_sn76477_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(invaders_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(invaders_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4073,15 +4073,15 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( invaders_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76477, 0)
- MDRV_SOUND_CONFIG(invaders_sn76477_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_SOUND_CONFIG(invaders_sn76477_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(invaders)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(invaders)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -4483,10 +4483,10 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( blueshrk_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(blueshrk)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(blueshrk)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -4701,20 +4701,20 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( invad2ct_audio )
- MDRV_SPEAKER_STANDARD_STEREO("spk1", "spk2")
+ MCFG_SPEAKER_STANDARD_STEREO("spk1", "spk2")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(invad2ct)
- MDRV_SOUND_ROUTE(0, "spk1", 0.5)
- MDRV_SOUND_ROUTE(1, "spk2", 0.5)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(invad2ct)
+ MCFG_SOUND_ROUTE(0, "spk1", 0.5)
+ MCFG_SOUND_ROUTE(1, "spk2", 0.5)
- MDRV_SOUND_ADD("sn1", SN76477, 0)
- MDRV_SOUND_CONFIG(invad2ct_p1_sn76477_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "spk1", 0.3)
+ MCFG_SOUND_ADD("sn1", SN76477, 0)
+ MCFG_SOUND_CONFIG(invad2ct_p1_sn76477_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "spk1", 0.3)
- MDRV_SOUND_ADD("sn2", SN76477, 0)
- MDRV_SOUND_CONFIG(invad2ct_p2_sn76477_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "spk2", 0.3)
+ MCFG_SOUND_ADD("sn2", SN76477, 0)
+ MCFG_SOUND_CONFIG(invad2ct_p2_sn76477_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "spk2", 0.3)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/n8080.c b/src/mame/audio/n8080.c
index 9f03e7c13ed..30fcdb78c61 100644
--- a/src/mame/audio/n8080.c
+++ b/src/mame/audio/n8080.c
@@ -588,55 +588,55 @@ ADDRESS_MAP_END
MACHINE_CONFIG_FRAGMENT( spacefev_sound )
/* basic machine hardware */
- MDRV_CPU_ADD("audiocpu", I8035, 6000000)
- MDRV_CPU_PROGRAM_MAP(n8080_sound_cpu_map)
- MDRV_CPU_IO_MAP(n8080_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", I8035, 6000000)
+ MCFG_CPU_PROGRAM_MAP(n8080_sound_cpu_map)
+ MCFG_CPU_IO_MAP(n8080_sound_io_map)
- MDRV_TIMER_ADD_PERIODIC("vco_timer", spacefev_vco_voltage_timer, HZ(1000))
+ MCFG_TIMER_ADD_PERIODIC("vco_timer", spacefev_vco_voltage_timer, HZ(1000))
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("snsnd", SN76477, 0)
- MDRV_SOUND_CONFIG(spacefev_sn76477_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_SOUND_CONFIG(spacefev_sn76477_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( sheriff_sound )
/* basic machine hardware */
- MDRV_CPU_ADD("audiocpu", I8035, 6000000)
- MDRV_CPU_PROGRAM_MAP(n8080_sound_cpu_map)
- MDRV_CPU_IO_MAP(n8080_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", I8035, 6000000)
+ MCFG_CPU_PROGRAM_MAP(n8080_sound_cpu_map)
+ MCFG_CPU_IO_MAP(n8080_sound_io_map)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("snsnd", SN76477, 0)
- MDRV_SOUND_CONFIG(sheriff_sn76477_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_SOUND_CONFIG(sheriff_sn76477_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( helifire_sound )
/* basic machine hardware */
- MDRV_CPU_ADD("audiocpu", I8035, 6000000)
- MDRV_CPU_PROGRAM_MAP(n8080_sound_cpu_map)
- MDRV_CPU_IO_MAP(helifire_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", I8035, 6000000)
+ MCFG_CPU_PROGRAM_MAP(n8080_sound_cpu_map)
+ MCFG_CPU_IO_MAP(helifire_sound_io_map)
- MDRV_TIMER_ADD_PERIODIC("helifire_dac", helifire_dac_volume_timer, HZ(1000) )
+ MCFG_TIMER_ADD_PERIODIC("helifire_dac", helifire_dac_volume_timer, HZ(1000) )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/namco52.c b/src/mame/audio/namco52.c
index 804795646db..71a0aaf1f6f 100644
--- a/src/mame/audio/namco52.c
+++ b/src/mame/audio/namco52.c
@@ -183,8 +183,8 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_FRAGMENT( namco_52xx )
- MDRV_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
- MDRV_CPU_IO_MAP(namco_52xx_map_io)
+ MCFG_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
+ MCFG_CPU_IO_MAP(namco_52xx_map_io)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/namco52.h b/src/mame/audio/namco52.h
index 43fa2c1795b..251be86ee96 100644
--- a/src/mame/audio/namco52.h
+++ b/src/mame/audio/namco52.h
@@ -17,9 +17,9 @@ struct _namco_52xx_interface
};
-#define MDRV_NAMCO_52XX_ADD(_tag, _clock, _interface) \
- MDRV_DEVICE_ADD(_tag, NAMCO_52XX, _clock) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_NAMCO_52XX_ADD(_tag, _clock, _interface) \
+ MCFG_DEVICE_ADD(_tag, NAMCO_52XX, _clock) \
+ MCFG_DEVICE_CONFIG(_interface)
WRITE8_DEVICE_HANDLER( namco_52xx_write );
diff --git a/src/mame/audio/namco54.c b/src/mame/audio/namco54.c
index d542d1272c0..390fd0a31c0 100644
--- a/src/mame/audio/namco54.c
+++ b/src/mame/audio/namco54.c
@@ -147,8 +147,8 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_FRAGMENT( namco_54xx )
- MDRV_CPU_ADD("mcu", MB8844, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
- MDRV_CPU_IO_MAP(namco_54xx_map_io)
+ MCFG_CPU_ADD("mcu", MB8844, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
+ MCFG_CPU_IO_MAP(namco_54xx_map_io)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/namco54.h b/src/mame/audio/namco54.h
index 2343d6b0799..de0e9598552 100644
--- a/src/mame/audio/namco54.h
+++ b/src/mame/audio/namco54.h
@@ -13,10 +13,10 @@ struct _namco_54xx_config
};
-#define MDRV_NAMCO_54XX_ADD(_tag, _clock, _discrete, _firstnode) \
- MDRV_DEVICE_ADD(_tag, NAMCO_54XX, _clock) \
- MDRV_DEVICE_CONFIG_DATAPTR(namco_54xx_config, discrete, _discrete) \
- MDRV_DEVICE_CONFIG_DATA32(namco_54xx_config, firstnode, _firstnode)
+#define MCFG_NAMCO_54XX_ADD(_tag, _clock, _discrete, _firstnode) \
+ MCFG_DEVICE_ADD(_tag, NAMCO_54XX, _clock) \
+ MCFG_DEVICE_CONFIG_DATAPTR(namco_54xx_config, discrete, _discrete) \
+ MCFG_DEVICE_CONFIG_DATA32(namco_54xx_config, firstnode, _firstnode)
WRITE8_DEVICE_HANDLER( namco_54xx_write );
diff --git a/src/mame/audio/namcoc7x.h b/src/mame/audio/namcoc7x.h
index c352d94527d..f1ba9d7b915 100644
--- a/src/mame/audio/namcoc7x.h
+++ b/src/mame/audio/namcoc7x.h
@@ -33,22 +33,22 @@ void namcoc7x_set_host_ram(UINT32 *hostram);
ROM_LOAD( "pr1data.8k", 0x80000, 0x80000, BAD_DUMP CRC(2e5767a4) SHA1(390bf05c90044d841fe2dd4a427177fa1570b9a6) )
#define NAMCO_C7X_MCU(clock) \
- MDRV_CPU_ADD("mcu", M37702, clock) \
- MDRV_CPU_PROGRAM_MAP(namcoc7x_mcu_map) \
- MDRV_CPU_IO_MAP(namcoc7x_mcu_io) \
- MDRV_CPU_VBLANK_INT_HACK(namcoc7x_interrupt, 2)
+ MCFG_CPU_ADD("mcu", M37702, clock) \
+ MCFG_CPU_PROGRAM_MAP(namcoc7x_mcu_map) \
+ MCFG_CPU_IO_MAP(namcoc7x_mcu_io) \
+ MCFG_CPU_VBLANK_INT_HACK(namcoc7x_interrupt, 2)
#define NAMCO_C7X_MCU_SHARED(clock) \
- MDRV_CPU_ADD("mcu", M37702, clock) \
- MDRV_CPU_PROGRAM_MAP(namcoc7x_mcu_share_map) \
- MDRV_CPU_IO_MAP(namcoc7x_mcu_io) \
- MDRV_CPU_VBLANK_INT_HACK(namcoc7x_interrupt, 2)
+ MCFG_CPU_ADD("mcu", M37702, clock) \
+ MCFG_CPU_PROGRAM_MAP(namcoc7x_mcu_share_map) \
+ MCFG_CPU_IO_MAP(namcoc7x_mcu_io) \
+ MCFG_CPU_VBLANK_INT_HACK(namcoc7x_interrupt, 2)
#define NAMCO_C7X_SOUND(clock) \
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") \
- MDRV_SOUND_ADD("c352", C352, clock) \
- MDRV_SOUND_ROUTE(0, "rspeaker", 1.00) \
- MDRV_SOUND_ROUTE(1, "lspeaker", 1.00) \
- MDRV_SOUND_ROUTE(2, "rspeaker", 1.00) \
- MDRV_SOUND_ROUTE(3, "lspeaker", 1.00)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") \
+ MCFG_SOUND_ADD("c352", C352, clock) \
+ MCFG_SOUND_ROUTE(0, "rspeaker", 1.00) \
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.00) \
+ MCFG_SOUND_ROUTE(2, "rspeaker", 1.00) \
+ MCFG_SOUND_ROUTE(3, "lspeaker", 1.00)
diff --git a/src/mame/audio/pulsar.c b/src/mame/audio/pulsar.c
index 4b9a498a729..53ea04bbbd3 100644
--- a/src/mame/audio/pulsar.c
+++ b/src/mame/audio/pulsar.c
@@ -60,9 +60,9 @@ static const samples_interface pulsar_samples_interface =
MACHINE_CONFIG_FRAGMENT( pulsar_audio )
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(pulsar_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(pulsar_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/qix.c b/src/mame/audio/qix.c
index bc973bd5107..1f92bd3e4ef 100644
--- a/src/mame/audio/qix.c
+++ b/src/mame/audio/qix.c
@@ -240,30 +240,30 @@ static const pia6821_interface slithersnd_pia_0_intf =
*************************************/
MACHINE_CONFIG_FRAGMENT( qix_audio )
- MDRV_CPU_ADD("audiocpu", M6802, SOUND_CLOCK_OSC/2) /* 0.92 MHz */
- MDRV_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_ADD("audiocpu", M6802, SOUND_CLOCK_OSC/2) /* 0.92 MHz */
+ MCFG_CPU_PROGRAM_MAP(audio_map)
- MDRV_PIA6821_ADD("sndpia0", qixsnd_pia_0_intf)
- MDRV_PIA6821_ADD("sndpia1", qixsnd_pia_1_intf)
- MDRV_PIA6821_ADD("sndpia2", qixsnd_pia_2_intf)
+ MCFG_PIA6821_ADD("sndpia0", qixsnd_pia_0_intf)
+ MCFG_PIA6821_ADD("sndpia1", qixsnd_pia_1_intf)
+ MCFG_PIA6821_ADD("sndpia2", qixsnd_pia_2_intf)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(qix)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(qix)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( slither_audio )
- MDRV_PIA6821_ADD("sndpia0", slithersnd_pia_0_intf)
+ MCFG_PIA6821_ADD("sndpia0", slithersnd_pia_0_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76489, SLITHER_CLOCK_OSC/4/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn1", SN76489, SLITHER_CLOCK_OSC/4/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("sn2", SN76489, SLITHER_CLOCK_OSC/4/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn2", SN76489, SLITHER_CLOCK_OSC/4/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/redalert.c b/src/mame/audio/redalert.c
index 0a7bc922804..98ef9ba8b75 100644
--- a/src/mame/audio/redalert.c
+++ b/src/mame/audio/redalert.c
@@ -219,14 +219,14 @@ static SOUND_START( redalert )
static MACHINE_CONFIG_FRAGMENT( redalert_audio_m37b )
- MDRV_CPU_ADD("audiocpu", M6502, REDALERT_AUDIO_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(redalert_audio_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ)
-
- MDRV_SOUND_ADD("aysnd", AY8910, REDALERT_AY8910_CLOCK)
- MDRV_SOUND_CONFIG(redalert_ay8910_interface)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_CPU_ADD("audiocpu", M6502, REDALERT_AUDIO_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(redalert_audio_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ)
+
+ MCFG_SOUND_ADD("aysnd", AY8910, REDALERT_AY8910_CLOCK)
+ MCFG_SOUND_CONFIG(redalert_ay8910_interface)
+ MCFG_SOUND_ROUTE(0, "mono", 0.50)
+ MCFG_SOUND_ROUTE(1, "mono", 0.50)
/* channel C is used a noise source and is not connected to a speaker */
MACHINE_CONFIG_END
@@ -239,12 +239,12 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( redalert_audio_voice )
- MDRV_CPU_ADD("voice", I8085A, REDALERT_VOICE_CPU_CLOCK)
- MDRV_CPU_CONFIG(redalert_voice_i8085_config)
- MDRV_CPU_PROGRAM_MAP(redalert_voice_map)
+ MCFG_CPU_ADD("voice", I8085A, REDALERT_VOICE_CPU_CLOCK)
+ MCFG_CPU_CONFIG(redalert_voice_i8085_config)
+ MCFG_CPU_PROGRAM_MAP(redalert_voice_map)
- MDRV_SOUND_ADD("cvsd", HC55516, REDALERT_HC55516_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("cvsd", HC55516, REDALERT_HC55516_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
/*************************************
@@ -255,12 +255,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( redalert_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_FRAGMENT_ADD( redalert_audio_m37b )
- MDRV_FRAGMENT_ADD( redalert_audio_voice )
+ MCFG_FRAGMENT_ADD( redalert_audio_m37b )
+ MCFG_FRAGMENT_ADD( redalert_audio_voice )
- MDRV_SOUND_START( redalert )
+ MCFG_SOUND_START( redalert )
MACHINE_CONFIG_END
@@ -272,11 +272,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( ww3_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_FRAGMENT_ADD( redalert_audio_m37b )
+ MCFG_FRAGMENT_ADD( redalert_audio_m37b )
- MDRV_SOUND_START( redalert_audio )
+ MCFG_SOUND_START( redalert_audio )
MACHINE_CONFIG_END
@@ -407,20 +407,20 @@ static SOUND_START( demoneye )
MACHINE_CONFIG_FRAGMENT( demoneye_audio )
- MDRV_CPU_ADD("audiocpu", M6802, DEMONEYE_AUDIO_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(demoneye_audio_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ) /* guess */
+ MCFG_CPU_ADD("audiocpu", M6802, DEMONEYE_AUDIO_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(demoneye_audio_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ) /* guess */
- MDRV_PIA6821_ADD("sndpia", demoneye_pia_intf)
+ MCFG_PIA6821_ADD("sndpia", demoneye_pia_intf)
- MDRV_SOUND_START( demoneye )
+ MCFG_SOUND_START( demoneye )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, DEMONEYE_AY8910_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay1", AY8910, DEMONEYE_AY8910_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("ay2", AY8910, DEMONEYE_AY8910_CLOCK)
- MDRV_SOUND_CONFIG(demoneye_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay2", AY8910, DEMONEYE_AY8910_CLOCK)
+ MCFG_SOUND_CONFIG(demoneye_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/scramble.c b/src/mame/audio/scramble.c
index 05e8344db64..c83096b8d20 100644
--- a/src/mame/audio/scramble.c
+++ b/src/mame/audio/scramble.c
@@ -340,25 +340,25 @@ static const tms5110_interface ad2083_tms5110_interface =
MACHINE_CONFIG_FRAGMENT( ad2083_audio )
- MDRV_CPU_ADD("audiocpu", Z80, 14318000/8) /* 1.78975 MHz */
- MDRV_CPU_PROGRAM_MAP(ad2083_sound_map)
- MDRV_CPU_IO_MAP(ad2083_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 14318000/8) /* 1.78975 MHz */
+ MCFG_CPU_PROGRAM_MAP(ad2083_sound_map)
+ MCFG_CPU_IO_MAP(ad2083_sound_io_map)
- MDRV_DEVICE_ADD("tmsprom", TMSPROM, AD2083_TMS5110_CLOCK / 2) /* rom clock */
- MDRV_DEVICE_CONFIG(prom_intf)
+ MCFG_DEVICE_ADD("tmsprom", TMSPROM, AD2083_TMS5110_CLOCK / 2) /* rom clock */
+ MCFG_DEVICE_CONFIG(prom_intf)
- MDRV_SOUND_START(ad2083)
+ MCFG_SOUND_START(ad2083)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 14318000/8)
- MDRV_SOUND_CONFIG(ad2083_ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ay1", AY8910, 14318000/8)
+ MCFG_SOUND_CONFIG(ad2083_ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("ay2", AY8910, 14318000/8)
- MDRV_SOUND_CONFIG(ad2083_ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SOUND_ADD("ay2", AY8910, 14318000/8)
+ MCFG_SOUND_CONFIG(ad2083_ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MDRV_SOUND_ADD("tms", TMS5110A, AD2083_TMS5110_CLOCK)
- MDRV_SOUND_CONFIG(ad2083_tms5110_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("tms", TMS5110A, AD2083_TMS5110_CLOCK)
+ MCFG_SOUND_CONFIG(ad2083_tms5110_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/segag80r.c b/src/mame/audio/segag80r.c
index 90bf06ac5ba..ca641101270 100644
--- a/src/mame/audio/segag80r.c
+++ b/src/mame/audio/segag80r.c
@@ -210,12 +210,12 @@ static const samples_interface astrob_samples_interface =
MACHINE_CONFIG_FRAGMENT( astrob_sound_board )
- MDRV_SOUND_START(astrob)
+ MCFG_SOUND_START(astrob)
/* sound hardware */
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(astrob_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(astrob_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -438,17 +438,17 @@ static const ppi8255_interface ppi8255_005_intf =
MACHINE_CONFIG_FRAGMENT( 005_sound_board )
- MDRV_PPI8255_ADD( "ppi8255", ppi8255_005_intf )
+ MCFG_PPI8255_ADD( "ppi8255", ppi8255_005_intf )
/* sound hardware */
- MDRV_SOUND_START(sega005)
+ MCFG_SOUND_START(sega005)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(sega005_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(sega005_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("005", SEGA005, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("005", SEGA005, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -676,11 +676,11 @@ static const samples_interface spaceod_samples_interface =
MACHINE_CONFIG_FRAGMENT( spaceod_sound_board )
/* sound hardware */
- MDRV_SOUND_START(spaceod)
+ MCFG_SOUND_START(spaceod)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(spaceod_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(spaceod_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -842,27 +842,27 @@ static const ppi8255_interface monsterb_ppi_intf =
MACHINE_CONFIG_FRAGMENT( monsterb_sound_board )
- MDRV_PPI8255_ADD( "ppi8255", monsterb_ppi_intf )
+ MCFG_PPI8255_ADD( "ppi8255", monsterb_ppi_intf )
/* basic machine hardware */
- MDRV_CPU_ADD("audiocpu", N7751, 6000000)
- MDRV_CPU_IO_MAP(monsterb_7751_portmap)
+ MCFG_CPU_ADD("audiocpu", N7751, 6000000)
+ MCFG_CPU_IO_MAP(monsterb_7751_portmap)
- MDRV_I8243_ADD("audio_8243", NULL, n7751_rom_control_w)
+ MCFG_I8243_ADD("audio_8243", NULL, n7751_rom_control_w)
/* sound hardware */
- MDRV_SOUND_START(monsterb)
+ MCFG_SOUND_START(monsterb)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(monsterb_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(monsterb_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("music", TMS36XX, 247)
- MDRV_SOUND_CONFIG(monsterb_tms3617_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("music", TMS36XX, 247)
+ MCFG_SOUND_CONFIG(monsterb_tms3617_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/segasnd.c b/src/mame/audio/segasnd.c
index 567e9f01ea6..2dac64ebc8f 100644
--- a/src/mame/audio/segasnd.c
+++ b/src/mame/audio/segasnd.c
@@ -278,14 +278,14 @@ static const struct sp0250_interface sp0250_interface =
MACHINE_CONFIG_FRAGMENT( sega_speech_board )
/* CPU for the speech board */
- MDRV_CPU_ADD("audiocpu", I8035, SPEECH_MASTER_CLOCK) /* divide by 15 in CPU */
- MDRV_CPU_PROGRAM_MAP(speech_map)
- MDRV_CPU_IO_MAP(speech_portmap)
+ MCFG_CPU_ADD("audiocpu", I8035, SPEECH_MASTER_CLOCK) /* divide by 15 in CPU */
+ MCFG_CPU_PROGRAM_MAP(speech_map)
+ MCFG_CPU_IO_MAP(speech_portmap)
/* sound hardware */
- MDRV_SOUND_ADD("speech", SP0250, SPEECH_MASTER_CLOCK)
- MDRV_SOUND_CONFIG(sp0250_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("speech", SP0250, SPEECH_MASTER_CLOCK)
+ MCFG_SOUND_CONFIG(sp0250_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -918,21 +918,21 @@ ADDRESS_MAP_END
MACHINE_CONFIG_FRAGMENT( sega_universal_sound_board )
/* CPU for the usb board */
- MDRV_CPU_ADD("usbcpu", I8035, USB_MASTER_CLOCK) /* divide by 15 in CPU */
- MDRV_CPU_PROGRAM_MAP(usb_map)
- MDRV_CPU_IO_MAP(usb_portmap)
+ MCFG_CPU_ADD("usbcpu", I8035, USB_MASTER_CLOCK) /* divide by 15 in CPU */
+ MCFG_CPU_PROGRAM_MAP(usb_map)
+ MCFG_CPU_IO_MAP(usb_portmap)
- MDRV_TIMER_ADD_PERIODIC("usb_timer", increment_t1_clock, HZ(USB_2MHZ_CLOCK / 256))
+ MCFG_TIMER_ADD_PERIODIC("usb_timer", increment_t1_clock, HZ(USB_2MHZ_CLOCK / 256))
/* sound hardware */
- MDRV_SOUND_ADD("usbsnd", USB, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("usbsnd", USB, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( sega_universal_sound_board_rom, sega_universal_sound_board )
/* CPU for the usb board */
- MDRV_CPU_MODIFY("usbcpu")
- MDRV_CPU_PROGRAM_MAP(usb_map_rom)
+ MCFG_CPU_MODIFY("usbcpu")
+ MCFG_CPU_PROGRAM_MAP(usb_map_rom)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/seibu.h b/src/mame/audio/seibu.h
index cbac677df5c..bc7f035205b 100644
--- a/src/mame/audio/seibu.h
+++ b/src/mame/audio/seibu.h
@@ -77,92 +77,92 @@ extern const ym2203_interface seibu_ym2203_interface;
#define SEIBU_SOUND_SYSTEM_CPU(freq) \
- MDRV_CPU_ADD("audiocpu", Z80, freq) \
- MDRV_CPU_PROGRAM_MAP(seibu_sound_map) \
+ MCFG_CPU_ADD("audiocpu", Z80, freq) \
+ MCFG_CPU_PROGRAM_MAP(seibu_sound_map) \
#define SEIBU2_SOUND_SYSTEM_CPU(freq) \
- MDRV_CPU_ADD("audiocpu", Z80, freq) \
- MDRV_CPU_PROGRAM_MAP(seibu2_sound_map) \
+ MCFG_CPU_ADD("audiocpu", Z80, freq) \
+ MCFG_CPU_PROGRAM_MAP(seibu2_sound_map) \
#define SEIBU2_RAIDEN2_SOUND_SYSTEM_CPU(freq) \
- MDRV_CPU_ADD("audiocpu", Z80, freq) \
- MDRV_CPU_PROGRAM_MAP(seibu2_raiden2_sound_map) \
+ MCFG_CPU_ADD("audiocpu", Z80, freq) \
+ MCFG_CPU_PROGRAM_MAP(seibu2_raiden2_sound_map) \
#define SEIBU_NEWZEROTEAM_SOUND_SYSTEM_CPU(freq) \
- MDRV_CPU_ADD("audiocpu", Z80, freq) \
- MDRV_CPU_PROGRAM_MAP(seibu_newzeroteam_sound_map) \
+ MCFG_CPU_ADD("audiocpu", Z80, freq) \
+ MCFG_CPU_PROGRAM_MAP(seibu_newzeroteam_sound_map) \
#define SEIBU3_SOUND_SYSTEM_CPU(freq) \
- MDRV_CPU_ADD("audiocpu", Z80, freq) \
- MDRV_CPU_PROGRAM_MAP(seibu3_sound_map) \
+ MCFG_CPU_ADD("audiocpu", Z80, freq) \
+ MCFG_CPU_PROGRAM_MAP(seibu3_sound_map) \
#define SEIBU3A_SOUND_SYSTEM_CPU(freq) \
- MDRV_CPU_ADD("audiocpu", Z80, freq) \
- MDRV_CPU_PROGRAM_MAP(seibu3_adpcm_sound_map) \
+ MCFG_CPU_ADD("audiocpu", Z80, freq) \
+ MCFG_CPU_PROGRAM_MAP(seibu3_adpcm_sound_map) \
#define SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(freq1,freq2) \
- MDRV_SPEAKER_STANDARD_MONO("mono") \
+ MCFG_SPEAKER_STANDARD_MONO("mono") \
\
- MDRV_SOUND_ADD("ymsnd", YM3812, freq1) \
- MDRV_SOUND_CONFIG(seibu_ym3812_interface) \
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \
+ MCFG_SOUND_ADD("ymsnd", YM3812, freq1) \
+ MCFG_SOUND_CONFIG(seibu_ym3812_interface) \
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \
\
- MDRV_OKIM6295_ADD("oki", freq2, OKIM6295_PIN7_LOW) \
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
+ MCFG_OKIM6295_ADD("oki", freq2, OKIM6295_PIN7_LOW) \
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
#define SEIBU_SOUND_SYSTEM_YM3812_RAIDEN_INTERFACE(freq1,freq2) \
- MDRV_SPEAKER_STANDARD_MONO("mono") \
+ MCFG_SPEAKER_STANDARD_MONO("mono") \
\
- MDRV_SOUND_ADD("ymsnd", YM3812, freq1) \
- MDRV_SOUND_CONFIG(seibu_ym3812_interface) \
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \
+ MCFG_SOUND_ADD("ymsnd", YM3812, freq1) \
+ MCFG_SOUND_CONFIG(seibu_ym3812_interface) \
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \
\
- MDRV_OKIM6295_ADD("oki", freq2, OKIM6295_PIN7_HIGH) \
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \
+ MCFG_OKIM6295_ADD("oki", freq2, OKIM6295_PIN7_HIGH) \
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \
#define SEIBU_SOUND_SYSTEM_YM2151_INTERFACE(freq1,freq2) \
- MDRV_SPEAKER_STANDARD_MONO("mono") \
+ MCFG_SPEAKER_STANDARD_MONO("mono") \
\
- MDRV_SOUND_ADD("ymsnd", YM2151, freq1) \
- MDRV_SOUND_CONFIG(seibu_ym2151_interface) \
- MDRV_SOUND_ROUTE(0, "mono", 0.50) \
- MDRV_SOUND_ROUTE(1, "mono", 0.50) \
+ MCFG_SOUND_ADD("ymsnd", YM2151, freq1) \
+ MCFG_SOUND_CONFIG(seibu_ym2151_interface) \
+ MCFG_SOUND_ROUTE(0, "mono", 0.50) \
+ MCFG_SOUND_ROUTE(1, "mono", 0.50) \
\
- MDRV_OKIM6295_ADD("oki", freq2, OKIM6295_PIN7_LOW) \
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
+ MCFG_OKIM6295_ADD("oki", freq2, OKIM6295_PIN7_LOW) \
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
#define SEIBU_SOUND_SYSTEM_YM2151_RAIDEN2_INTERFACE(freq1,freq2,regiona, regionb) \
- MDRV_SPEAKER_STANDARD_MONO("mono") \
+ MCFG_SPEAKER_STANDARD_MONO("mono") \
\
- MDRV_SOUND_ADD("ymsnd", YM2151, freq1) \
- MDRV_SOUND_CONFIG(seibu_ym2151_interface) \
- MDRV_SOUND_ROUTE(0, "mono", 0.50) \
- MDRV_SOUND_ROUTE(1, "mono", 0.50) \
+ MCFG_SOUND_ADD("ymsnd", YM2151, freq1) \
+ MCFG_SOUND_CONFIG(seibu_ym2151_interface) \
+ MCFG_SOUND_ROUTE(0, "mono", 0.50) \
+ MCFG_SOUND_ROUTE(1, "mono", 0.50) \
\
- MDRV_OKIM6295_ADD("oki1", freq2, OKIM6295_PIN7_HIGH) \
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
+ MCFG_OKIM6295_ADD("oki1", freq2, OKIM6295_PIN7_HIGH) \
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
\
- MDRV_OKIM6295_ADD("oki2", freq2, OKIM6295_PIN7_HIGH) \
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
+ MCFG_OKIM6295_ADD("oki2", freq2, OKIM6295_PIN7_HIGH) \
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
#define SEIBU_SOUND_SYSTEM_YM2203_INTERFACE(freq) \
- MDRV_SPEAKER_STANDARD_MONO("mono") \
+ MCFG_SPEAKER_STANDARD_MONO("mono") \
\
- MDRV_SOUND_ADD("ym1", YM2203, freq) \
- MDRV_SOUND_CONFIG(seibu_ym2203_interface) \
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) \
+ MCFG_SOUND_ADD("ym1", YM2203, freq) \
+ MCFG_SOUND_CONFIG(seibu_ym2203_interface) \
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) \
\
- MDRV_SOUND_ADD("ym2", YM2203, freq) \
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) \
+ MCFG_SOUND_ADD("ym2", YM2203, freq) \
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) \
#define SEIBU_SOUND_SYSTEM_ADPCM_INTERFACE \
- MDRV_SOUND_ADD("adpcm1", SEIBU_ADPCM, 8000) \
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
+ MCFG_SOUND_ADD("adpcm1", SEIBU_ADPCM, 8000) \
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
\
- MDRV_SOUND_ADD("adpcm2", SEIBU_ADPCM, 8000) \
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
+ MCFG_SOUND_ADD("adpcm2", SEIBU_ADPCM, 8000) \
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
/**************************************************************************/
diff --git a/src/mame/audio/spacefb.c b/src/mame/audio/spacefb.c
index d0231b445bf..1d3e1e97300 100644
--- a/src/mame/audio/spacefb.c
+++ b/src/mame/audio/spacefb.c
@@ -87,12 +87,12 @@ static const samples_interface spacefb_samples_interface =
MACHINE_CONFIG_FRAGMENT( spacefb_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(spacefb_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(spacefb_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/spiders.c b/src/mame/audio/spiders.c
index ef8fcb5c9a9..533dc222d34 100644
--- a/src/mame/audio/spiders.c
+++ b/src/mame/audio/spiders.c
@@ -202,8 +202,8 @@ WRITE8_DEVICE_HANDLER( spiders_audio_ctrl_w )
MACHINE_CONFIG_FRAGMENT( spiders_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(spiders)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(spiders)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/taito_en.c b/src/mame/audio/taito_en.c
index b9957a95686..5865615734e 100644
--- a/src/mame/audio/taito_en.c
+++ b/src/mame/audio/taito_en.c
@@ -272,16 +272,16 @@ static const es5505_interface es5505_taito_f3_config =
};
MACHINE_CONFIG_FRAGMENT( taito_f3_sound )
- MDRV_TIMER_ADD("timer_68681", taito_en_timer_callback)
+ MCFG_TIMER_ADD("timer_68681", taito_en_timer_callback)
- MDRV_SOUND_RESET( taito_f3_soundsystem_reset )
+ MCFG_SOUND_RESET( taito_f3_soundsystem_reset )
- MDRV_CPU_ADD("audiocpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(f3_sound_map)
+ MCFG_CPU_ADD("audiocpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(f3_sound_map)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ensoniq", ES5505, 30476100/2)
- MDRV_SOUND_CONFIG(es5505_taito_f3_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("ensoniq", ES5505, 30476100/2)
+ MCFG_SOUND_CONFIG(es5505_taito_f3_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/taito_zm.c b/src/mame/audio/taito_zm.c
index 28c7f6a58b4..11db7a0044e 100644
--- a/src/mame/audio/taito_zm.c
+++ b/src/mame/audio/taito_zm.c
@@ -51,14 +51,14 @@ static const zsg2_interface zsg2_taito_config =
};
MACHINE_CONFIG_FRAGMENT( taito_zoom_sound )
- MDRV_CPU_ADD("mn10200", MN10200, 25000000/2)
- MDRV_CPU_PROGRAM_MAP(taitozoom_map)
- MDRV_CPU_IO_MAP(taitozoom_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_pulse)
+ MCFG_CPU_ADD("mn10200", MN10200, 25000000/2)
+ MCFG_CPU_PROGRAM_MAP(taitozoom_map)
+ MCFG_CPU_IO_MAP(taitozoom_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_pulse)
// we assume the parent machine has created lspeaker/rspeaker
- MDRV_SOUND_ADD("zsg2", ZSG2, 25000000/2)
- MDRV_SOUND_CONFIG(zsg2_taito_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("zsg2", ZSG2, 25000000/2)
+ MCFG_SOUND_CONFIG(zsg2_taito_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/taitosnd.h b/src/mame/audio/taitosnd.h
index 5e593ed37c1..8d4c0969a25 100644
--- a/src/mame/audio/taitosnd.h
+++ b/src/mame/audio/taitosnd.h
@@ -21,9 +21,9 @@ DECLARE_LEGACY_DEVICE(TC0140SYT, tc0140syt);
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_TC0140SYT_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, TC0140SYT, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_TC0140SYT_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, TC0140SYT, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
/***************************************************************************
DEVICE I/O FUNCTIONS
diff --git a/src/mame/audio/targ.c b/src/mame/audio/targ.c
index 01236dfd187..611057478d1 100644
--- a/src/mame/audio/targ.c
+++ b/src/mame/audio/targ.c
@@ -199,25 +199,25 @@ static const samples_interface targ_samples_interface =
MACHINE_CONFIG_FRAGMENT( spectar_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(spectar_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(spectar_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( targ_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(targ_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(targ_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/timeplt.c b/src/mame/audio/timeplt.c
index 926efbe6bbd..77ccdd89ddf 100644
--- a/src/mame/audio/timeplt.c
+++ b/src/mame/audio/timeplt.c
@@ -215,46 +215,46 @@ static const ay8910_interface timeplt_ay8910_interface =
MACHINE_CONFIG_FRAGMENT( timeplt_sound )
/* basic machine hardware */
- MDRV_CPU_ADD("tpsound",Z80,MASTER_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(timeplt_sound_map)
+ MCFG_CPU_ADD("tpsound",Z80,MASTER_CLOCK/8)
+ MCFG_CPU_PROGRAM_MAP(timeplt_sound_map)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("timeplt_audio", TIMEPLT_AUDIO, 0)
-
- MDRV_SOUND_ADD("ay1", AY8910, MASTER_CLOCK/8)
- MDRV_SOUND_CONFIG(timeplt_ay8910_interface)
- MDRV_SOUND_ROUTE(0, "filter.0.0", 0.60)
- MDRV_SOUND_ROUTE(1, "filter.0.1", 0.60)
- MDRV_SOUND_ROUTE(2, "filter.0.2", 0.60)
-
- MDRV_SOUND_ADD("ay2", AY8910, MASTER_CLOCK/8)
- MDRV_SOUND_ROUTE(0, "filter.1.0", 0.60)
- MDRV_SOUND_ROUTE(1, "filter.1.1", 0.60)
- MDRV_SOUND_ROUTE(2, "filter.1.2", 0.60)
-
- MDRV_SOUND_ADD("filter.0.0", FILTER_RC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("filter.0.1", FILTER_RC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("filter.0.2", FILTER_RC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
-
- MDRV_SOUND_ADD("filter.1.0", FILTER_RC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("filter.1.1", FILTER_RC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("filter.1.2", FILTER_RC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("timeplt_audio", TIMEPLT_AUDIO, 0)
+
+ MCFG_SOUND_ADD("ay1", AY8910, MASTER_CLOCK/8)
+ MCFG_SOUND_CONFIG(timeplt_ay8910_interface)
+ MCFG_SOUND_ROUTE(0, "filter.0.0", 0.60)
+ MCFG_SOUND_ROUTE(1, "filter.0.1", 0.60)
+ MCFG_SOUND_ROUTE(2, "filter.0.2", 0.60)
+
+ MCFG_SOUND_ADD("ay2", AY8910, MASTER_CLOCK/8)
+ MCFG_SOUND_ROUTE(0, "filter.1.0", 0.60)
+ MCFG_SOUND_ROUTE(1, "filter.1.1", 0.60)
+ MCFG_SOUND_ROUTE(2, "filter.1.2", 0.60)
+
+ MCFG_SOUND_ADD("filter.0.0", FILTER_RC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("filter.0.1", FILTER_RC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("filter.0.2", FILTER_RC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+
+ MCFG_SOUND_ADD("filter.1.0", FILTER_RC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("filter.1.1", FILTER_RC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("filter.1.2", FILTER_RC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( locomotn_sound, timeplt_sound )
/* basic machine hardware */
- MDRV_CPU_MODIFY("tpsound")
- MDRV_CPU_PROGRAM_MAP(locomotn_sound_map)
+ MCFG_CPU_MODIFY("tpsound")
+ MCFG_CPU_PROGRAM_MAP(locomotn_sound_map)
MACHINE_CONFIG_END
/*****************************************************************************
diff --git a/src/mame/audio/turbo.c b/src/mame/audio/turbo.c
index 61ed9df4af7..5e09357bc82 100644
--- a/src/mame/audio/turbo.c
+++ b/src/mame/audio/turbo.c
@@ -196,48 +196,48 @@ static const samples_interface turbo_samples_interface =
MACHINE_CONFIG_FRAGMENT( turbo_samples )
/* this is the cockpit speaker configuration */
- MDRV_SPEAKER_ADD("fspeaker", 0.0, 0.0, 1.0) /* front */
- MDRV_SPEAKER_ADD("bspeaker", 0.0, 0.0, -0.5) /* back */
- MDRV_SPEAKER_ADD("lspeaker", -0.2, 0.0, 1.0) /* left */
- MDRV_SPEAKER_ADD("rspeaker", 0.2, 0.0, 1.0) /* right */
+ MCFG_SPEAKER_ADD("fspeaker", 0.0, 0.0, 1.0) /* front */
+ MCFG_SPEAKER_ADD("bspeaker", 0.0, 0.0, -0.5) /* back */
+ MCFG_SPEAKER_ADD("lspeaker", -0.2, 0.0, 1.0) /* left */
+ MCFG_SPEAKER_ADD("rspeaker", 0.2, 0.0, 1.0) /* right */
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(turbo_samples_interface)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(turbo_samples_interface)
/* channel 0 = CRASH.S -> CRASH.S/SM */
- MDRV_SOUND_ROUTE(0, "fspeaker", 0.25)
+ MCFG_SOUND_ROUTE(0, "fspeaker", 0.25)
/* channel 1 = TRIG1-4 -> ALARM.M/F/R/L */
- MDRV_SOUND_ROUTE(1, "fspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "fspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.25)
/* channel 2 = SLIP/SPIN -> SKID.F/R/L/M */
- MDRV_SOUND_ROUTE(2, "fspeaker", 0.25)
- MDRV_SOUND_ROUTE(2, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(2, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(2, "fspeaker", 0.25)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(2, "lspeaker", 0.25)
/* channel 3 = CRASH.L -> CRASH.L/LM */
- MDRV_SOUND_ROUTE(3, "bspeaker", 0.25)
+ MCFG_SOUND_ROUTE(3, "bspeaker", 0.25)
/* channel 4 = AMBU -> AMBULANCE/AMBULANCE.M */
- MDRV_SOUND_ROUTE(4, "fspeaker", 0.25)
+ MCFG_SOUND_ROUTE(4, "fspeaker", 0.25)
/* channel 5 = ACCEL+BSEL -> MYCAR.F/W/M + MYCAR0.F/M + MYCAR1.F/M */
- MDRV_SOUND_ROUTE(5, "fspeaker", 0.25)
- MDRV_SOUND_ROUTE(5, "bspeaker", 0.25)
+ MCFG_SOUND_ROUTE(5, "fspeaker", 0.25)
+ MCFG_SOUND_ROUTE(5, "bspeaker", 0.25)
/* channel 6 = OSEL -> OCAR.F/FM */
- MDRV_SOUND_ROUTE(6, "fspeaker", 0.25)
+ MCFG_SOUND_ROUTE(6, "fspeaker", 0.25)
/* channel 7 = OSEL -> OCAR.L/LM */
- MDRV_SOUND_ROUTE(7, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(7, "lspeaker", 0.25)
/* channel 8 = OSEL -> OCAR.R/RM */
- MDRV_SOUND_ROUTE(8, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(8, "rspeaker", 0.25)
/* channel 9 = OSEL -> OCAR.W/WM */
- MDRV_SOUND_ROUTE(9, "bspeaker", 0.25)
+ MCFG_SOUND_ROUTE(9, "bspeaker", 0.25)
MACHINE_CONFIG_END
/*
@@ -452,42 +452,42 @@ static const samples_interface subroc3d_samples_interface =
MACHINE_CONFIG_FRAGMENT( subroc3d_samples )
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(subroc3d_samples_interface)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(subroc3d_samples_interface)
/* MISSILE in channels 0 and 1 */
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.25)
/* TORPEDO in channels 2 and 3 */
- MDRV_SOUND_ROUTE(2, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(3, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(2, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(3, "rspeaker", 0.25)
/* FIGHTER in channels 4 and 5 */
- MDRV_SOUND_ROUTE(4, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(5, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(4, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(5, "rspeaker", 0.25)
/* HIT in channels 6 and 7 */
- MDRV_SOUND_ROUTE(6, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(7, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(6, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(7, "rspeaker", 0.25)
/* FIRE sound in channel 8 */
- MDRV_SOUND_ROUTE(8, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(8, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(8, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(8, "rspeaker", 0.25)
/* SHIP EXP sound in channel 9 */
- MDRV_SOUND_ROUTE(9, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(9, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(9, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(9, "rspeaker", 0.25)
/* ALARM TRIG sound in channel 10 */
- MDRV_SOUND_ROUTE(10, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(10, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(10, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(10, "rspeaker", 0.25)
/* PROLOGUE sound in channel 11 */
- MDRV_SOUND_ROUTE(11, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(11, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(11, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(11, "rspeaker", 0.25)
MACHINE_CONFIG_END
@@ -607,10 +607,10 @@ static const samples_interface buckrog_samples_interface =
MACHINE_CONFIG_FRAGMENT( buckrog_samples )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(buckrog_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(buckrog_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/vicdual.c b/src/mame/audio/vicdual.c
index 20934a59a16..3bf7960bb1d 100644
--- a/src/mame/audio/vicdual.c
+++ b/src/mame/audio/vicdual.c
@@ -120,13 +120,13 @@ static const samples_interface frogs_samples_interface =
MACHINE_CONFIG_FRAGMENT( frogs_audio )
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(frogs_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(frogs_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(frogs)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(frogs)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -455,9 +455,9 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( headon_audio )
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(headon)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(headon)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
WRITE8_HANDLER( headon_audio_w )
diff --git a/src/mame/audio/williams.c b/src/mame/audio/williams.c
index 720730b1456..2a3eff21327 100644
--- a/src/mame/audio/williams.c
+++ b/src/mame/audio/williams.c
@@ -194,68 +194,68 @@ static const ym2151_interface adpcm_ym2151_interface =
****************************************************************************/
MACHINE_CONFIG_FRAGMENT( williams_cvsd_sound )
- MDRV_CPU_ADD("cvsdcpu", M6809E, CVSD_MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(williams_cvsd_map)
+ MCFG_CPU_ADD("cvsdcpu", M6809E, CVSD_MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(williams_cvsd_map)
- MDRV_PIA6821_ADD("cvsdpia", cvsd_pia_intf)
+ MCFG_PIA6821_ADD("cvsdpia", cvsd_pia_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, CVSD_FM_CLOCK)
- MDRV_SOUND_CONFIG(cvsd_ym2151_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("ymsnd", YM2151, CVSD_FM_CLOCK)
+ MCFG_SOUND_CONFIG(cvsd_ym2151_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("cvsd", HC55516, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("cvsd", HC55516, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( williams_narc_sound )
- MDRV_CPU_ADD("narc1cpu", M6809E, NARC_MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(williams_narc_master_map)
+ MCFG_CPU_ADD("narc1cpu", M6809E, NARC_MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(williams_narc_master_map)
- MDRV_CPU_ADD("narc2cpu", M6809E, NARC_MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(williams_narc_slave_map)
+ MCFG_CPU_ADD("narc2cpu", M6809E, NARC_MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(williams_narc_slave_map)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, NARC_FM_CLOCK)
- MDRV_SOUND_CONFIG(adpcm_ym2151_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
+ MCFG_SOUND_ADD("ymsnd", YM2151, NARC_FM_CLOCK)
+ MCFG_SOUND_CONFIG(adpcm_ym2151_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MDRV_SOUND_ADD("cvsd", HC55516, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("cvsd", HC55516, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( williams_adpcm_sound )
- MDRV_CPU_ADD("adpcm", M6809E, ADPCM_MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(williams_adpcm_map)
+ MCFG_CPU_ADD("adpcm", M6809E, ADPCM_MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(williams_adpcm_map)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, ADPCM_FM_CLOCK)
- MDRV_SOUND_CONFIG(adpcm_ym2151_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("ymsnd", YM2151, ADPCM_FM_CLOCK)
+ MCFG_SOUND_CONFIG(adpcm_ym2151_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_OKIM6295_ADD("oki", ADPCM_MASTER_CLOCK/8, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki", ADPCM_MASTER_CLOCK/8, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/zaxxon.c b/src/mame/audio/zaxxon.c
index 4f5d98c4e39..8f5c05c7e8b 100644
--- a/src/mame/audio/zaxxon.c
+++ b/src/mame/audio/zaxxon.c
@@ -98,9 +98,9 @@ static const samples_interface zaxxon_samples_interface =
MACHINE_CONFIG_FRAGMENT( zaxxon_samples )
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(zaxxon_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(zaxxon_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -210,9 +210,9 @@ static const samples_interface congo_samples_interface =
MACHINE_CONFIG_FRAGMENT( congo_samples )
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(congo_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(congo_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c
index 1534f6b7323..831804e8e3a 100644
--- a/src/mame/drivers/1942.c
+++ b/src/mame/drivers/1942.c
@@ -258,39 +258,39 @@ static MACHINE_RESET( 1942 )
static MACHINE_CONFIG_START( 1942, _1942_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(c1942_map)
- MDRV_TIMER_ADD_SCANLINE("scantimer", c1942_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(c1942_map)
+ MCFG_TIMER_ADD_SCANLINE("scantimer", c1942_scanline, "screen", 0, 1)
- MDRV_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK) /* 3 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,4*60)
+ MCFG_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK) /* 3 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60)
- MDRV_MACHINE_START(1942)
- MDRV_MACHINE_RESET(1942)
+ MCFG_MACHINE_START(1942)
+ MCFG_MACHINE_RESET(1942)
/* video hardware */
- MDRV_GFXDECODE(1942)
- MDRV_PALETTE_LENGTH(64*4+4*32*8+16*16)
+ MCFG_GFXDECODE(1942)
+ MCFG_PALETTE_LENGTH(64*4+4*32*8+16*16)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_PALETTE_INIT(1942)
- MDRV_VIDEO_START(1942)
- MDRV_VIDEO_UPDATE(1942)
+ MCFG_PALETTE_INIT(1942)
+ MCFG_VIDEO_START(1942)
+ MCFG_VIDEO_UPDATE(1942)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, AUDIO_CLOCK) /* 1.5 MHz */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, AUDIO_CLOCK) /* 1.5 MHz */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, AUDIO_CLOCK) /* 1.5 MHz */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, AUDIO_CLOCK) /* 1.5 MHz */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/1943.c b/src/mame/drivers/1943.c
index da0ef4d2e4d..e04a741de7b 100644
--- a/src/mame/drivers/1943.c
+++ b/src/mame/drivers/1943.c
@@ -259,44 +259,44 @@ static MACHINE_RESET( 1943 )
static MACHINE_CONFIG_START( 1943, _1943_state )
// basic machine hardware
- MDRV_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(c1943_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(c1943_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_24MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, 4*60)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/8) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, 4*60)
- MDRV_MACHINE_RESET(1943)
+ MCFG_MACHINE_RESET(1943)
// video hardware
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(1943)
- MDRV_PALETTE_LENGTH(32*4+16*16+16*16+16*16)
-
- MDRV_PALETTE_INIT(1943)
- MDRV_VIDEO_START(1943)
- MDRV_VIDEO_UPDATE(1943)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(1943)
+ MCFG_PALETTE_LENGTH(32*4+16*16+16*16+16*16)
+
+ MCFG_PALETTE_INIT(1943)
+ MCFG_VIDEO_START(1943)
+ MCFG_VIDEO_UPDATE(1943)
// sound hardware
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, XTAL_24MHz/16) /* verified on pcb */
- MDRV_SOUND_ROUTE(0, "mono", 0.15)
- MDRV_SOUND_ROUTE(1, "mono", 0.15)
- MDRV_SOUND_ROUTE(2, "mono", 0.15)
- MDRV_SOUND_ROUTE(3, "mono", 0.10)
-
- MDRV_SOUND_ADD("ym2", YM2203, XTAL_24MHz/16) /* verified on pcb */
- MDRV_SOUND_ROUTE(0, "mono", 0.15)
- MDRV_SOUND_ROUTE(1, "mono", 0.15)
- MDRV_SOUND_ROUTE(2, "mono", 0.15)
- MDRV_SOUND_ROUTE(3, "mono", 0.10)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL_24MHz/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_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)
MACHINE_CONFIG_END
/* ROMs */
diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c
index 76da29bd405..b50fe5ff369 100644
--- a/src/mame/drivers/1945kiii.c
+++ b/src/mame/drivers/1945kiii.c
@@ -251,32 +251,32 @@ static MACHINE_START( 1945kiii )
static MACHINE_CONFIG_START( k3, k3_state )
- MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(k3_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(k3_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_MACHINE_START(1945kiii)
+ MCFG_MACHINE_START(1945kiii)
- MDRV_GFXDECODE(1945kiii)
+ MCFG_GFXDECODE(1945kiii)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
- MDRV_PALETTE_LENGTH(0x800)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
+ MCFG_PALETTE_LENGTH(0x800)
- MDRV_VIDEO_START(k3)
- MDRV_VIDEO_UPDATE(k3)
+ MCFG_VIDEO_START(k3)
+ MCFG_VIDEO_UPDATE(k3)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki1", MASTER_CLOCK/16, OKIM6295_PIN7_HIGH) /* dividers? */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki1", MASTER_CLOCK/16, OKIM6295_PIN7_HIGH) /* dividers? */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki2", MASTER_CLOCK/16, OKIM6295_PIN7_HIGH) /* dividers? */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki2", MASTER_CLOCK/16, OKIM6295_PIN7_HIGH) /* dividers? */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c
index 6ee0bdeb8c4..9d49c9a83ba 100644
--- a/src/mame/drivers/20pacgal.c
+++ b/src/mame/drivers/20pacgal.c
@@ -351,28 +351,28 @@ static MACHINE_RESET( 20pacgal )
static MACHINE_CONFIG_START( 20pacgal, _20pacgal_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z180, MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(20pacgal_map)
- MDRV_CPU_IO_MAP(20pacgal_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) // assert breaks the inputs in 25pacman test mode
+ MCFG_CPU_ADD("maincpu", Z180, MAIN_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(20pacgal_map)
+ MCFG_CPU_IO_MAP(20pacgal_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) // assert breaks the inputs in 25pacman test mode
- MDRV_MACHINE_START(20pacgal)
- MDRV_MACHINE_RESET(20pacgal)
+ MCFG_MACHINE_START(20pacgal)
+ MCFG_MACHINE_RESET(20pacgal)
- MDRV_EEPROM_ADD("eeprom", _20pacgal_eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", _20pacgal_eeprom_intf)
/* video hardware */
- MDRV_FRAGMENT_ADD(20pacgal_video)
+ MCFG_FRAGMENT_ADD(20pacgal_video)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("namco", NAMCO, NAMCO_AUDIO_CLOCK)
- MDRV_SOUND_CONFIG(namco_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("namco", NAMCO, NAMCO_AUDIO_CLOCK)
+ MCFG_SOUND_CONFIG(namco_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c
index 23f4d540870..8a06246a2c6 100644
--- a/src/mame/drivers/2mindril.c
+++ b/src/mame/drivers/2mindril.c
@@ -444,33 +444,33 @@ static MACHINE_RESET( drill )
static MACHINE_CONFIG_START( drill, _2mindril_state )
- MDRV_CPU_ADD("maincpu", M68000, 16000000 )
- MDRV_CPU_PROGRAM_MAP(drill_map)
- MDRV_CPU_VBLANK_INT("screen", drill_interrupt)
- MDRV_GFXDECODE(2mindril)
-
- MDRV_MACHINE_START(drill)
- MDRV_MACHINE_RESET(drill)
-
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(128*16, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239-16)
- MDRV_PALETTE_LENGTH(0x1000)
-
- MDRV_VIDEO_START(drill)
- MDRV_VIDEO_UPDATE(drill)
-
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(2, "rspeaker", 1.0)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000 )
+ MCFG_CPU_PROGRAM_MAP(drill_map)
+ MCFG_CPU_VBLANK_INT("screen", drill_interrupt)
+ MCFG_GFXDECODE(2mindril)
+
+ MCFG_MACHINE_START(drill)
+ MCFG_MACHINE_RESET(drill)
+
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(128*16, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239-16)
+ MCFG_PALETTE_LENGTH(0x1000)
+
+ MCFG_VIDEO_START(drill)
+ MCFG_VIDEO_UPDATE(drill)
+
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2610, 16000000/2)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/39in1.c b/src/mame/drivers/39in1.c
index dd2b3ebd3cc..40505c07c28 100644
--- a/src/mame/drivers/39in1.c
+++ b/src/mame/drivers/39in1.c
@@ -1584,31 +1584,31 @@ static MACHINE_START(39in1)
static MACHINE_CONFIG_START( 39in1, _39in1_state )
- MDRV_CPU_ADD("maincpu", PXA255, 200000000)
- MDRV_CPU_PROGRAM_MAP(39in1_map)
- MDRV_CPU_VBLANK_INT("screen", pxa255_vblank_start)
+ MCFG_CPU_ADD("maincpu", PXA255, 200000000)
+ MCFG_CPU_PROGRAM_MAP(39in1_map)
+ MCFG_CPU_VBLANK_INT("screen", pxa255_vblank_start)
- MDRV_PALETTE_LENGTH(32768)
+ MCFG_PALETTE_LENGTH(32768)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(1024, 1024)
- MDRV_SCREEN_VISIBLE_AREA(0, 295, 0, 479)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(1024, 1024)
+ MCFG_SCREEN_VISIBLE_AREA(0, 295, 0, 479)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_MACHINE_START(39in1)
- MDRV_EEPROM_93C66B_ADD("eeprom")
+ MCFG_MACHINE_START(39in1)
+ MCFG_EEPROM_93C66B_ADD("eeprom")
- MDRV_VIDEO_UPDATE(39in1)
+ MCFG_VIDEO_UPDATE(39in1)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("dac1", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("dac2", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
ROM_START( 39in1 )
diff --git a/src/mame/drivers/3super8.c b/src/mame/drivers/3super8.c
index 4c75b0224e4..4b8a394dca0 100644
--- a/src/mame/drivers/3super8.c
+++ b/src/mame/drivers/3super8.c
@@ -66,29 +66,29 @@ GFXDECODE_END
static MACHINE_CONFIG_START( 3super8, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,24000000/4) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(map)
- //MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,24000000/4) /* 6 MHz */
+ MCFG_CPU_PROGRAM_MAP(map)
+ //MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-0-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-0-1)
- MDRV_GFXDECODE(3super8)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_GFXDECODE(3super8)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(3super8)
- MDRV_VIDEO_UPDATE(3super8)
+ MCFG_VIDEO_START(3super8)
+ MCFG_VIDEO_UPDATE(3super8)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c
index 330809f7666..81ea89ff02b 100644
--- a/src/mame/drivers/40love.c
+++ b/src/mame/drivers/40love.c
@@ -1065,116 +1065,116 @@ static MACHINE_RESET( undoukai )
static MACHINE_CONFIG_START( 40love, fortyl_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,8000000/2) /* OK */
- MDRV_CPU_PROGRAM_MAP(40love_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu",Z80,8000000/2) /* OK */
+ MCFG_CPU_PROGRAM_MAP(40love_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu",Z80,8000000/2) /* OK */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,2*60) /* source/number of IRQs is unknown */
+ MCFG_CPU_ADD("audiocpu",Z80,8000000/2) /* OK */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) /* source/number of IRQs is unknown */
- MDRV_CPU_ADD("mcu",M68705,18432000/6) /* OK */
- MDRV_CPU_PROGRAM_MAP(buggychl_mcu_map)
- MDRV_DEVICE_ADD("bmcu", BUGGYCHL_MCU, 0)
+ MCFG_CPU_ADD("mcu",M68705,18432000/6) /* OK */
+ MCFG_CPU_PROGRAM_MAP(buggychl_mcu_map)
+ MCFG_DEVICE_ADD("bmcu", BUGGYCHL_MCU, 0)
- MDRV_QUANTUM_TIME(HZ(6000)) /* high interleave to ensure proper synchronization of CPUs */
- MDRV_MACHINE_START(40love)
- MDRV_MACHINE_RESET(40love)
+ MCFG_QUANTUM_TIME(HZ(6000)) /* high interleave to ensure proper synchronization of CPUs */
+ MCFG_MACHINE_START(40love)
+ MCFG_MACHINE_RESET(40love)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(128,128+255, 2*8, 30*8-1)
- MDRV_GFXDECODE(40love)
- MDRV_PALETTE_LENGTH(1024)
-
- MDRV_PALETTE_INIT(fortyl)
- MDRV_VIDEO_START(fortyl)
- MDRV_VIDEO_UPDATE(fortyl)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(128,128+255, 2*8, 30*8-1)
+ MCFG_GFXDECODE(40love)
+ MCFG_PALETTE_LENGTH(1024)
+
+ MCFG_PALETTE_INIT(fortyl)
+ MCFG_VIDEO_START(fortyl)
+ MCFG_VIDEO_UPDATE(fortyl)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("aysnd", AY8910, 2000000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
-
- MDRV_SOUND_ADD("msm", MSM5232, 8000000/4)
- MDRV_SOUND_CONFIG(msm5232_config)
- MDRV_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
- MDRV_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
- MDRV_SOUND_ROUTE(2, "mono", 1.0) // pin 30 8'-1
- MDRV_SOUND_ROUTE(3, "mono", 1.0) // pin 31 16'-1
- MDRV_SOUND_ROUTE(4, "mono", 1.0) // pin 36 2'-2
- MDRV_SOUND_ROUTE(5, "mono", 1.0) // pin 35 4'-2
- MDRV_SOUND_ROUTE(6, "mono", 1.0) // pin 34 8'-2
- MDRV_SOUND_ROUTE(7, "mono", 1.0) // pin 33 16'-2
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+
+ MCFG_SOUND_ADD("msm", MSM5232, 8000000/4)
+ MCFG_SOUND_CONFIG(msm5232_config)
+ MCFG_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
+ MCFG_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
+ MCFG_SOUND_ROUTE(2, "mono", 1.0) // pin 30 8'-1
+ MCFG_SOUND_ROUTE(3, "mono", 1.0) // pin 31 16'-1
+ MCFG_SOUND_ROUTE(4, "mono", 1.0) // pin 36 2'-2
+ MCFG_SOUND_ROUTE(5, "mono", 1.0) // pin 35 4'-2
+ MCFG_SOUND_ROUTE(6, "mono", 1.0) // pin 34 8'-2
+ MCFG_SOUND_ROUTE(7, "mono", 1.0) // pin 33 16'-2
// pin 1 SOLO 8' not mapped
// pin 2 SOLO 16' not mapped
// pin 22 Noise Output not mapped
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( undoukai, fortyl_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(undoukai_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu",Z80,8000000/2)
+ MCFG_CPU_PROGRAM_MAP(undoukai_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu",Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,2*60) /* source/number of IRQs is unknown */
+ MCFG_CPU_ADD("audiocpu",Z80,8000000/2)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) /* source/number of IRQs is unknown */
-// MDRV_CPU_ADD("mcu",M68705,18432000/6)
-// MDRV_CPU_PROGRAM_MAP(buggychl_mcu_map)
-// MDRV_DEVICE_ADD("bmcu", BUGGYCHL_MCU, 0)
+// MCFG_CPU_ADD("mcu",M68705,18432000/6)
+// MCFG_CPU_PROGRAM_MAP(buggychl_mcu_map)
+// MCFG_DEVICE_ADD("bmcu", BUGGYCHL_MCU, 0)
- MDRV_MACHINE_START(undoukai)
- MDRV_MACHINE_RESET(undoukai) /* init machine */
+ MCFG_MACHINE_START(undoukai)
+ MCFG_MACHINE_RESET(undoukai) /* init machine */
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(128,128+255, 2*8, 30*8-1)
- MDRV_GFXDECODE(40love)
- MDRV_PALETTE_LENGTH(1024)
-
- MDRV_PALETTE_INIT(fortyl)
- MDRV_VIDEO_START(fortyl)
- MDRV_VIDEO_UPDATE(fortyl)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(128,128+255, 2*8, 30*8-1)
+ MCFG_GFXDECODE(40love)
+ MCFG_PALETTE_LENGTH(1024)
+
+ MCFG_PALETTE_INIT(fortyl)
+ MCFG_VIDEO_START(fortyl)
+ MCFG_VIDEO_UPDATE(fortyl)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("aysnd", AY8910, 2000000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
-
- MDRV_SOUND_ADD("msm", MSM5232, 8000000/4)
- MDRV_SOUND_CONFIG(msm5232_config)
- MDRV_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
- MDRV_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
- MDRV_SOUND_ROUTE(2, "mono", 1.0) // pin 30 8'-1
- MDRV_SOUND_ROUTE(3, "mono", 1.0) // pin 31 16'-1
- MDRV_SOUND_ROUTE(4, "mono", 1.0) // pin 36 2'-2
- MDRV_SOUND_ROUTE(5, "mono", 1.0) // pin 35 4'-2
- MDRV_SOUND_ROUTE(6, "mono", 1.0) // pin 34 8'-2
- MDRV_SOUND_ROUTE(7, "mono", 1.0) // pin 33 16'-2
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+
+ MCFG_SOUND_ADD("msm", MSM5232, 8000000/4)
+ MCFG_SOUND_CONFIG(msm5232_config)
+ MCFG_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
+ MCFG_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
+ MCFG_SOUND_ROUTE(2, "mono", 1.0) // pin 30 8'-1
+ MCFG_SOUND_ROUTE(3, "mono", 1.0) // pin 31 16'-1
+ MCFG_SOUND_ROUTE(4, "mono", 1.0) // pin 36 2'-2
+ MCFG_SOUND_ROUTE(5, "mono", 1.0) // pin 35 4'-2
+ MCFG_SOUND_ROUTE(6, "mono", 1.0) // pin 34 8'-2
+ MCFG_SOUND_ROUTE(7, "mono", 1.0) // pin 33 16'-2
// pin 1 SOLO 8' not mapped
// pin 2 SOLO 16' not mapped
// pin 22 Noise Output not mapped
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
/*******************************************************************************/
diff --git a/src/mame/drivers/4enraya.c b/src/mame/drivers/4enraya.c
index a1e7b3fea5e..ff982ef806d 100644
--- a/src/mame/drivers/4enraya.c
+++ b/src/mame/drivers/4enraya.c
@@ -176,33 +176,33 @@ static PALETTE_INIT( 4enraya )
static MACHINE_CONFIG_START( 4enraya, _4enraya_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_portmap)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,4*60) // unknown timing
+ MCFG_CPU_ADD("maincpu",Z80,8000000/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) // unknown timing
- MDRV_MACHINE_START(4enraya)
- MDRV_MACHINE_RESET(4enraya)
+ MCFG_MACHINE_START(4enraya)
+ MCFG_MACHINE_RESET(4enraya)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(4enraya)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(4enraya)
- MDRV_PALETTE_INIT(4enraya)
- MDRV_PALETTE_LENGTH(8)
+ MCFG_PALETTE_INIT(4enraya)
+ MCFG_PALETTE_LENGTH(8)
- MDRV_VIDEO_START(4enraya)
- MDRV_VIDEO_UPDATE(4enraya)
+ MCFG_VIDEO_START(4enraya)
+ MCFG_VIDEO_UPDATE(4enraya)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 8000000/4) /* guess */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, 8000000/4) /* guess */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/4roses.c b/src/mame/drivers/4roses.c
index d400ee3da66..0ddc36f686a 100644
--- a/src/mame/drivers/4roses.c
+++ b/src/mame/drivers/4roses.c
@@ -372,36 +372,36 @@ static const mc6845_interface mc6845_intf =
static MACHINE_CONFIG_START( 4roses, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz, guess */
- MDRV_CPU_PROGRAM_MAP(4roses_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz, guess */
+ MCFG_CPU_PROGRAM_MAP(4roses_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
-// MDRV_NVRAM_ADD_0FILL("nvram")
+// MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE((124+1)*4, (30+1)*8) /* guess. taken from funworld games */
- MDRV_SCREEN_VISIBLE_AREA(0*4, 96*4-1, 0*8, 29*8-1) /* guess. taken from funworld games */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE((124+1)*4, (30+1)*8) /* guess. taken from funworld games */
+ MCFG_SCREEN_VISIBLE_AREA(0*4, 96*4-1, 0*8, 29*8-1) /* guess. taken from funworld games */
- MDRV_GFXDECODE(4roses)
+ MCFG_GFXDECODE(4roses)
- MDRV_PALETTE_LENGTH(0x1000)
- MDRV_PALETTE_INIT(funworld)
- MDRV_VIDEO_START(funworld)
- MDRV_VIDEO_UPDATE(funworld)
+ MCFG_PALETTE_LENGTH(0x1000)
+ MCFG_PALETTE_INIT(funworld)
+ MCFG_VIDEO_START(funworld)
+ MCFG_VIDEO_UPDATE(funworld)
- MDRV_MC6845_ADD("crtc", MC6845, MASTER_CLOCK/8, mc6845_intf) /* 2MHz, guess */
+ MCFG_MC6845_ADD("crtc", MC6845, MASTER_CLOCK/8, mc6845_intf) /* 2MHz, guess */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* 2MHz, guess */
- MDRV_SOUND_CONFIG(ay8910_intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.5)
+ MCFG_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* 2MHz, guess */
+ MCFG_SOUND_CONFIG(ay8910_intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.5)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/5clown.c b/src/mame/drivers/5clown.c
index 1c7e5a310f7..c6c2601401a 100644
--- a/src/mame/drivers/5clown.c
+++ b/src/mame/drivers/5clown.c
@@ -1031,44 +1031,44 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( fclown, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8) /* guess, seems ok */
- MDRV_CPU_PROGRAM_MAP(fclown_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8) /* guess, seems ok */
+ MCFG_CPU_PROGRAM_MAP(fclown_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("audiocpu", M6502, MASTER_CLOCK/8) /* guess, seems ok */
- MDRV_CPU_PROGRAM_MAP(fcaudio_map)
+ MCFG_CPU_ADD("audiocpu", M6502, MASTER_CLOCK/8) /* guess, seems ok */
+ MCFG_CPU_PROGRAM_MAP(fcaudio_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_PIA6821_ADD("pia0", fclown_pia0_intf)
- MDRV_PIA6821_ADD("pia1", fclown_pia1_intf)
+ MCFG_PIA6821_ADD("pia0", fclown_pia0_intf)
+ MCFG_PIA6821_ADD("pia1", fclown_pia1_intf)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE((39+1)*8, (31+1)*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE((39+1)*8, (31+1)*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(fclown)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(fclown)
+ MCFG_GFXDECODE(fclown)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(fclown)
- MDRV_VIDEO_START(fclown)
- MDRV_VIDEO_UPDATE(fclown)
+ MCFG_VIDEO_START(fclown)
+ MCFG_VIDEO_UPDATE(fclown)
- MDRV_MC6845_ADD("crtc", MC6845, MASTER_CLOCK/16, mc6845_intf) /* guess */
+ MCFG_MC6845_ADD("crtc", MC6845, MASTER_CLOCK/16, mc6845_intf) /* guess */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* guess, seems ok */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* guess, seems ok */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MDRV_OKIM6295_ADD("oki6295", MASTER_CLOCK/12, OKIM6295_PIN7_LOW) /* guess, seems ok; pin7 guessed, seems ok */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.20)
+ MCFG_OKIM6295_ADD("oki6295", MASTER_CLOCK/12, OKIM6295_PIN7_LOW) /* guess, seems ok; pin7 guessed, seems ok */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.20)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c
index af31c3269d3..3ac8711580d 100644
--- a/src/mame/drivers/8080bw.c
+++ b/src/mame/drivers/8080bw.c
@@ -382,22 +382,22 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( invadpt2, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(invadpt2_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(invadpt2_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* 60 Hz signal clocks two LS161. Ripple carry will */
/* reset circuit, if LS161 not cleared before. */
- MDRV_WATCHDOG_VBLANK_INIT(255)
+ MCFG_WATCHDOG_VBLANK_INIT(255)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(invadpt2)
+ MCFG_VIDEO_UPDATE(invadpt2)
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_CONFIG_END
@@ -440,19 +440,19 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( spcewars, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(spcewars_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(spcewars_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
/* extra audio channel */
- MDRV_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -514,8 +514,8 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( astropal, invaders )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(astropal_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(astropal_io_map)
MACHINE_CONFIG_END
@@ -563,16 +563,16 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( cosmo, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(cosmo_map)
- MDRV_CPU_IO_MAP(cosmo_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(cosmo_map)
+ MCFG_CPU_IO_MAP(cosmo_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* video hardware */
- MDRV_VIDEO_UPDATE(cosmo)
+ MCFG_VIDEO_UPDATE(cosmo)
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_CONFIG_END
@@ -685,14 +685,14 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( invrvnge, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(invrvnge_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(invrvnge_io_map)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_CONFIG_END
@@ -790,26 +790,26 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( lrescue, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(lrescue_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(lrescue_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(invadpt2)
+ MCFG_VIDEO_UPDATE(invadpt2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(lrescue_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(lrescue_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
/* extra audio channel */
- MDRV_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -938,18 +938,18 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( rollingc, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(rollingc_map)
- MDRV_CPU_IO_MAP(rollingc_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(rollingc_map)
+ MCFG_CPU_IO_MAP(rollingc_io_map)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(rollingc)
+ MCFG_VIDEO_UPDATE(rollingc)
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_CONFIG_END
@@ -1052,29 +1052,29 @@ static MACHINE_RESET( schaser )
static MACHINE_CONFIG_DERIVED( schaser, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu",I8080,1996800) /* 19.968MHz / 10 */
- MDRV_CPU_PROGRAM_MAP(schaser_map)
- MDRV_CPU_IO_MAP(schaser_io_map)
- MDRV_WATCHDOG_VBLANK_INIT(255)
- MDRV_MACHINE_START(schaser)
- MDRV_MACHINE_RESET(schaser)
+ MCFG_CPU_REPLACE("maincpu",I8080,1996800) /* 19.968MHz / 10 */
+ MCFG_CPU_PROGRAM_MAP(schaser_map)
+ MCFG_CPU_IO_MAP(schaser_io_map)
+ MCFG_WATCHDOG_VBLANK_INIT(255)
+ MCFG_MACHINE_START(schaser)
+ MCFG_MACHINE_RESET(schaser)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(schaser)
+ MCFG_VIDEO_UPDATE(schaser)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76477, 0)
- MDRV_SOUND_CONFIG(schaser_sn76477_interface)
- MDRV_SOUND_ROUTE_EX(0, "discrete", 1.0, 0)
+ MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_SOUND_CONFIG(schaser_sn76477_interface)
+ MCFG_SOUND_ROUTE_EX(0, "discrete", 1.0, 0)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(schaser)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(schaser)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1122,22 +1122,22 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( schasercv, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(schaser_map)
- MDRV_CPU_IO_MAP(schasercv_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(schaser_map)
+ MCFG_CPU_IO_MAP(schasercv_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(schasercv)
+ MCFG_VIDEO_UPDATE(schasercv)
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
- MDRV_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1213,16 +1213,16 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( sflush, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu",M6800,2000000) /* ?? */
- MDRV_CPU_PROGRAM_MAP(sflush_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_pulse,2)
- MDRV_MACHINE_START(sflush)
+ MCFG_CPU_REPLACE("maincpu",M6800,2000000) /* ?? */
+ MCFG_CPU_PROGRAM_MAP(sflush_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_pulse,2)
+ MCFG_MACHINE_START(sflush)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(sflush)
+ MCFG_VIDEO_UPDATE(sflush)
MACHINE_CONFIG_END
@@ -1320,37 +1320,37 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( lupin3, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(lupin3_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(lupin3_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(indianbt)
+ MCFG_VIDEO_UPDATE(indianbt)
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( lupin3a, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(schaser_map)
- MDRV_CPU_IO_MAP(lupin3_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(schaser_map)
+ MCFG_CPU_IO_MAP(lupin3_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(lupin3)
+ MCFG_VIDEO_UPDATE(lupin3)
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_CONFIG_END
@@ -1456,25 +1456,25 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( polaris, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu",I8080,1996800) /* 19.968MHz / 10 */
- MDRV_CPU_PROGRAM_MAP(schaser_map)
- MDRV_CPU_IO_MAP(polaris_io_map)
- MDRV_WATCHDOG_VBLANK_INIT(255)
- MDRV_CPU_VBLANK_INT("screen", polaris_interrupt)
- MDRV_MACHINE_START(polaris)
+ MCFG_CPU_REPLACE("maincpu",I8080,1996800) /* 19.968MHz / 10 */
+ MCFG_CPU_PROGRAM_MAP(schaser_map)
+ MCFG_CPU_IO_MAP(polaris_io_map)
+ MCFG_WATCHDOG_VBLANK_INIT(255)
+ MCFG_CPU_VBLANK_INT("screen", polaris_interrupt)
+ MCFG_MACHINE_START(polaris)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(polaris)
+ MCFG_VIDEO_UPDATE(polaris)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(polaris)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(polaris)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1581,18 +1581,18 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( ballbomb, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(ballbomb_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(ballbomb_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(ballbomb)
+ MCFG_VIDEO_UPDATE(ballbomb)
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_CONFIG_END
@@ -1657,13 +1657,13 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( yosakdon, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(yosakdon_map)
- MDRV_CPU_IO_MAP(yosakdon_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(yosakdon_map)
+ MCFG_CPU_IO_MAP(yosakdon_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_CONFIG_END
@@ -1754,22 +1754,22 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_DERIVED( indianbt, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(indianbt_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(indianbt_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(indianbt)
+ MCFG_VIDEO_UPDATE(indianbt)
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(indianbt)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(indianbt)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1827,18 +1827,18 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( steelwkr, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(steelwkr_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(steelwkr_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(invadpt2)
+ MCFG_VIDEO_UPDATE(invadpt2)
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_CONFIG_END
@@ -1962,18 +1962,18 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_DERIVED( shuttlei, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(shuttlei_map)
- MDRV_CPU_IO_MAP(shuttlei_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(shuttlei_map)
+ MCFG_CPU_IO_MAP(shuttlei_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 24*8-1)
- MDRV_VIDEO_UPDATE(shuttlei)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 24*8-1)
+ MCFG_VIDEO_UPDATE(shuttlei)
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_CONFIG_END
@@ -2071,13 +2071,13 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( darthvdr, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(darthvdr_map)
- MDRV_CPU_IO_MAP(darthvdr_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(darthvdr_map)
+ MCFG_CPU_IO_MAP(darthvdr_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(darthvdr)
- MDRV_MACHINE_RESET(darthvdr)
+ MCFG_MACHINE_START(darthvdr)
+ MCFG_MACHINE_RESET(darthvdr)
MACHINE_CONFIG_END
@@ -2143,20 +2143,20 @@ INPUT_PORTS_END
MACHINE_CONFIG_DERIVED( vortex, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(vortex_io_map)
- MDRV_MACHINE_START(extra_8080bw)
- MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(vortex_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
+ MCFG_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
/* video hardware */
// TODO: replace with modified invaders color renderer code allowing midscanline color writes
- MDRV_VIDEO_UPDATE(invaders)
+ MCFG_VIDEO_UPDATE(invaders)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* audio hardware */
- MDRV_FRAGMENT_ADD(invaders_audio)
+ MCFG_FRAGMENT_ADD(invaders_audio)
MACHINE_CONFIG_END
@@ -2349,8 +2349,8 @@ ADDRESS_MAP_END
MACHINE_CONFIG_DERIVED( modelr, invaders )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(modelr_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(modelr_io_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/86lions.c b/src/mame/drivers/86lions.c
index b4ec94182e5..51f8c86ab27 100644
--- a/src/mame/drivers/86lions.c
+++ b/src/mame/drivers/86lions.c
@@ -342,34 +342,34 @@ static PALETTE_INIT( lions )
static MACHINE_CONFIG_START( lions, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, MAIN_CLOCK/4) /* 3 MHz.(guess) */
- MDRV_CPU_PROGRAM_MAP(lions_map)
- MDRV_CPU_VBLANK_INT("screen", lions_irq )
+ MCFG_CPU_ADD("maincpu", M6809, MAIN_CLOCK/4) /* 3 MHz.(guess) */
+ MCFG_CPU_PROGRAM_MAP(lions_map)
+ MCFG_CPU_VBLANK_INT("screen", lions_irq )
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(304, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 304-1, 0, 216-1) /* from the crtc registers... updated by crtc */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(304, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 304-1, 0, 216-1) /* from the crtc registers... updated by crtc */
- MDRV_GFXDECODE(lions)
- MDRV_PALETTE_LENGTH(64)
- MDRV_PALETTE_INIT(lions)
+ MCFG_GFXDECODE(lions)
+ MCFG_PALETTE_LENGTH(64)
+ MCFG_PALETTE_INIT(lions)
- MDRV_VIDEO_START(lions)
- MDRV_VIDEO_UPDATE(lions)
+ MCFG_VIDEO_START(lions)
+ MCFG_VIDEO_UPDATE(lions)
- MDRV_VIA6522_ADD("via6522_0", MAIN_CLOCK/12, via_interface) /* 1 MHz.(only 1 or 2 MHz.are valid) */
+ MCFG_VIA6522_ADD("via6522_0", MAIN_CLOCK/12, via_interface) /* 1 MHz.(only 1 or 2 MHz.are valid) */
- MDRV_MC6845_ADD("crtc", MC6845, MAIN_CLOCK/8, mc6845_intf) /* 1.5 MHz.(logical guess to get a decent 59.6374 Hz.) */
+ MCFG_MC6845_ADD("crtc", MC6845, MAIN_CLOCK/8, mc6845_intf) /* 1.5 MHz.(logical guess to get a decent 59.6374 Hz.) */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, MAIN_CLOCK/8) /* 1.5 MHz.(guess) */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("aysnd", AY8910, MAIN_CLOCK/8) /* 1.5 MHz.(guess) */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c
index d2aa97c5dc5..7fa42a1aa57 100644
--- a/src/mame/drivers/88games.c
+++ b/src/mame/drivers/88games.c
@@ -379,47 +379,47 @@ static const k051316_interface _88games_k051316_intf =
static MACHINE_CONFIG_START( 88games, _88games_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", k88games_interrupt)
+ MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", k88games_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(88games)
- MDRV_MACHINE_RESET(88games)
+ MCFG_MACHINE_START(88games)
+ MCFG_MACHINE_RESET(88games)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(13*8, (64-13)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(13*8, (64-13)*8-1, 2*8, 30*8-1 )
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_K052109_ADD("k052109", _88games_k052109_intf)
- MDRV_K051960_ADD("k051960", _88games_k051960_intf)
- MDRV_K051316_ADD("k051316", _88games_k051316_intf)
+ MCFG_K052109_ADD("k052109", _88games_k052109_intf)
+ MCFG_K051960_ADD("k051960", _88games_k051960_intf)
+ MCFG_K051316_ADD("k051316", _88games_k051316_intf)
- MDRV_VIDEO_UPDATE(88games)
+ MCFG_VIDEO_UPDATE(88games)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_ROUTE(0, "mono", 0.75)
- MDRV_SOUND_ROUTE(1, "mono", 0.75)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_ROUTE(0, "mono", 0.75)
+ MCFG_SOUND_ROUTE(1, "mono", 0.75)
- MDRV_SOUND_ADD("upd1", UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("upd1", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("upd2", UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("upd2", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ace.c b/src/mame/drivers/ace.c
index aaeb497a189..78743edd2fc 100644
--- a/src/mame/drivers/ace.c
+++ b/src/mame/drivers/ace.c
@@ -344,25 +344,25 @@ static MACHINE_RESET( ace )
static MACHINE_CONFIG_START( ace, ace_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8080, MASTER_CLOCK/9) /* 2 MHz ? */
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK/9) /* 2 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_START(ace)
- MDRV_MACHINE_RESET(ace)
+ MCFG_MACHINE_START(ace)
+ MCFG_MACHINE_RESET(ace)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(4*8, 32*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(ace)
- MDRV_PALETTE_LENGTH(2)
-
- MDRV_PALETTE_INIT(ace)
- MDRV_VIDEO_START(ace)
- MDRV_VIDEO_UPDATE(ace)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(4*8, 32*8-1, 2*8, 32*8-1)
+ MCFG_GFXDECODE(ace)
+ MCFG_PALETTE_LENGTH(2)
+
+ MCFG_PALETTE_INIT(ace)
+ MCFG_VIDEO_START(ace)
+ MCFG_VIDEO_UPDATE(ace)
/* sound hardware */
/* ???? */
diff --git a/src/mame/drivers/acefruit.c b/src/mame/drivers/acefruit.c
index ec4b8f52687..c9f7e9979a9 100644
--- a/src/mame/drivers/acefruit.c
+++ b/src/mame/drivers/acefruit.c
@@ -551,26 +551,26 @@ GFXDECODE_END
static MACHINE_CONFIG_START( acefruit, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 2500000) /* 2.5MHz */
- MDRV_CPU_PROGRAM_MAP(acefruit_map)
- MDRV_CPU_IO_MAP(acefruit_io)
- MDRV_GFXDECODE(acefruit)
- MDRV_CPU_VBLANK_INT("screen", acefruit_vblank)
+ MCFG_CPU_ADD("maincpu", Z80, 2500000) /* 2.5MHz */
+ MCFG_CPU_PROGRAM_MAP(acefruit_map)
+ MCFG_CPU_IO_MAP(acefruit_io)
+ MCFG_GFXDECODE(acefruit)
+ MCFG_CPU_VBLANK_INT("screen", acefruit_vblank)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 511, 0, 255)
- MDRV_PALETTE_LENGTH(16)
-
- MDRV_NVRAM_ADD_0FILL("nvram")
-
- MDRV_PALETTE_INIT(acefruit)
- MDRV_VIDEO_START(acefruit)
- MDRV_VIDEO_UPDATE(acefruit)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 255)
+ MCFG_PALETTE_LENGTH(16)
+
+ MCFG_NVRAM_ADD_0FILL("nvram")
+
+ MCFG_PALETTE_INIT(acefruit)
+ MCFG_VIDEO_START(acefruit)
+ MCFG_VIDEO_UPDATE(acefruit)
/* sound hardware */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c
index fde0c9ea8a9..c2e38a3b00a 100644
--- a/src/mame/drivers/acommand.c
+++ b/src/mame/drivers/acommand.c
@@ -568,33 +568,33 @@ static TIMER_DEVICE_CALLBACK( acommand_scanline )
static MACHINE_CONFIG_START( acommand, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,12000000)
- MDRV_CPU_PROGRAM_MAP(acommand_map)
- MDRV_TIMER_ADD_SCANLINE("scantimer", acommand_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu",M68000,12000000)
+ MCFG_CPU_PROGRAM_MAP(acommand_map)
+ MCFG_TIMER_ADD_SCANLINE("scantimer", acommand_scanline, "screen", 0, 1)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(acommand)
- MDRV_PALETTE_LENGTH(0x4000)
-
- MDRV_VIDEO_START(acommand)
- MDRV_VIDEO_UPDATE(acommand)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(acommand)
+ MCFG_PALETTE_LENGTH(0x4000)
+
+ MCFG_VIDEO_START(acommand)
+ MCFG_VIDEO_UPDATE(acommand)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki1", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki1", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki2", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki2", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c
index 110fcdbd560..fd5927b4252 100644
--- a/src/mame/drivers/actfancr.c
+++ b/src/mame/drivers/actfancr.c
@@ -319,91 +319,91 @@ static MACHINE_RESET( triothep )
static MACHINE_CONFIG_START( actfancr, actfancr_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",H6280,21477200/3) /* Should be accurate */
- MDRV_CPU_PROGRAM_MAP(actfan_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* VBL */
+ MCFG_CPU_ADD("maincpu",H6280,21477200/3) /* Should be accurate */
+ MCFG_CPU_PROGRAM_MAP(actfan_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* VBL */
- MDRV_CPU_ADD("audiocpu",M6502, 1500000) /* Should be accurate */
- MDRV_CPU_PROGRAM_MAP(dec0_s_map)
+ MCFG_CPU_ADD("audiocpu",M6502, 1500000) /* Should be accurate */
+ MCFG_CPU_PROGRAM_MAP(dec0_s_map)
- MDRV_MACHINE_START(actfancr)
- MDRV_MACHINE_RESET(actfancr)
+ MCFG_MACHINE_START(actfancr)
+ MCFG_MACHINE_RESET(actfancr)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(actfan)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
+ MCFG_GFXDECODE(actfan)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_VIDEO_START(actfancr)
- MDRV_VIDEO_UPDATE(actfancr)
+ MCFG_VIDEO_START(actfancr)
+ MCFG_VIDEO_UPDATE(actfancr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 1500000)
- MDRV_SOUND_ROUTE(0, "mono", 0.90)
- MDRV_SOUND_ROUTE(1, "mono", 0.90)
- MDRV_SOUND_ROUTE(2, "mono", 0.90)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
+ MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ 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)
- MDRV_SOUND_ADD("ym2", YM3812, 3000000)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
+ MCFG_SOUND_ADD("ym2", YM3812, 3000000)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_OKIM6295_ADD("oki", 1024188, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
+ MCFG_OKIM6295_ADD("oki", 1024188, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( triothep, actfancr_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",H6280,XTAL_21_4772MHz/3) /* XIN=21.4772Mhz, verified on pcb */
- MDRV_CPU_PROGRAM_MAP(triothep_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* VBL */
+ MCFG_CPU_ADD("maincpu",H6280,XTAL_21_4772MHz/3) /* XIN=21.4772Mhz, verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(triothep_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* VBL */
- MDRV_CPU_ADD("audiocpu",M6502, XTAL_12MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(dec0_s_map)
+ MCFG_CPU_ADD("audiocpu",M6502, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(dec0_s_map)
- MDRV_MACHINE_START(triothep)
- MDRV_MACHINE_RESET(triothep)
+ MCFG_MACHINE_START(triothep)
+ MCFG_MACHINE_RESET(triothep)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(triothep)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
+ MCFG_GFXDECODE(triothep)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_VIDEO_START(triothep)
- MDRV_VIDEO_UPDATE(triothep)
+ MCFG_VIDEO_START(triothep)
+ MCFG_VIDEO_UPDATE(triothep)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8) /* verified on pcb */
- MDRV_SOUND_ROUTE(0, "mono", 0.90)
- MDRV_SOUND_ROUTE(1, "mono", 0.90)
- MDRV_SOUND_ROUTE(2, "mono", 0.90)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz/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)
- MDRV_SOUND_ADD("ym2", YM3812, XTAL_12MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
+ MCFG_SOUND_ADD("ym2", YM3812, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
+ MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
MACHINE_CONFIG_END
/******************************************************************************/
diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c
index ba32dac2c51..f895b88d4d2 100644
--- a/src/mame/drivers/adp.c
+++ b/src/mame/drivers/adp.c
@@ -632,116 +632,116 @@ static const hd63484_interface skattva_hd63484_intf = { 1 }; // skattva hd63484
static MACHINE_CONFIG_START( quickjac, adp_state )
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(quickjac_mem)
-// MDRV_CPU_VBLANK_INT("screen", adp_int)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(quickjac_mem)
+// MCFG_CPU_VBLANK_INT("screen", adp_int)
- MDRV_MACHINE_START(skattv)
- MDRV_MACHINE_RESET(skattv)
+ MCFG_MACHINE_START(skattv)
+ MCFG_MACHINE_RESET(skattv)
- MDRV_DUART68681_ADD( "duart68681", XTAL_8_664MHz / 2, skattv_duart68681_config )
+ MCFG_DUART68681_ADD( "duart68681", XTAL_8_664MHz / 2, skattv_duart68681_config )
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(384, 280)
- MDRV_SCREEN_VISIBLE_AREA(0, 384-1, 0, 280-1)
- MDRV_PALETTE_LENGTH(0x10)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(384, 280)
+ MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 280-1)
+ MCFG_PALETTE_LENGTH(0x10)
- MDRV_PALETTE_INIT(adp)
- MDRV_VIDEO_START(adp)
- MDRV_VIDEO_UPDATE(adp)
+ MCFG_PALETTE_INIT(adp)
+ MCFG_VIDEO_START(adp)
+ MCFG_VIDEO_UPDATE(adp)
- MDRV_HD63484_ADD("hd63484", adp_hd63484_intf)
+ MCFG_HD63484_ADD("hd63484", adp_hd63484_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 3686400/2)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, 3686400/2)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( skattv, adp_state )
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(skattv_mem)
-// MDRV_CPU_VBLANK_INT("screen", adp_int)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(skattv_mem)
+// MCFG_CPU_VBLANK_INT("screen", adp_int)
- MDRV_MACHINE_START(skattv)
- MDRV_MACHINE_RESET(skattv)
+ MCFG_MACHINE_START(skattv)
+ MCFG_MACHINE_RESET(skattv)
- MDRV_DUART68681_ADD( "duart68681", XTAL_8_664MHz / 2, skattv_duart68681_config )
+ MCFG_DUART68681_ADD( "duart68681", XTAL_8_664MHz / 2, skattv_duart68681_config )
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(384, 280)
- MDRV_SCREEN_VISIBLE_AREA(0, 384-1, 0, 280-1)
- MDRV_PALETTE_LENGTH(0x10)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(384, 280)
+ MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 280-1)
+ MCFG_PALETTE_LENGTH(0x10)
- MDRV_PALETTE_INIT(adp)
- MDRV_VIDEO_START(adp)
- MDRV_VIDEO_UPDATE(adp)
+ MCFG_PALETTE_INIT(adp)
+ MCFG_VIDEO_START(adp)
+ MCFG_VIDEO_UPDATE(adp)
- MDRV_HD63484_ADD("hd63484", adp_hd63484_intf)
+ MCFG_HD63484_ADD("hd63484", adp_hd63484_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 3686400/2)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, 3686400/2)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( skattva, skattv )
- MDRV_DEVICE_REMOVE("hd63484")
- MDRV_HD63484_ADD("hd63484", skattva_hd63484_intf)
+ MCFG_DEVICE_REMOVE("hd63484")
+ MCFG_HD63484_ADD("hd63484", skattva_hd63484_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( backgamn, adp_state )
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(backgamn_mem)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(backgamn_mem)
- MDRV_DUART68681_ADD( "duart68681", XTAL_8_664MHz / 2, skattv_duart68681_config )
+ MCFG_DUART68681_ADD( "duart68681", XTAL_8_664MHz / 2, skattv_duart68681_config )
- MDRV_MACHINE_START(skattv)
- MDRV_MACHINE_RESET(skattv)
+ MCFG_MACHINE_START(skattv)
+ MCFG_MACHINE_RESET(skattv)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
- MDRV_PALETTE_LENGTH(0x10)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
+ MCFG_PALETTE_LENGTH(0x10)
-// MDRV_PALETTE_INIT(adp)
- MDRV_VIDEO_START(adp)
- MDRV_VIDEO_UPDATE(adp)
+// MCFG_PALETTE_INIT(adp)
+ MCFG_VIDEO_START(adp)
+ MCFG_VIDEO_UPDATE(adp)
- MDRV_HD63484_ADD("hd63484", adp_hd63484_intf)
+ MCFG_HD63484_ADD("hd63484", adp_hd63484_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 3686400/2)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, 3686400/2)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( funland, skattv )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(funland_mem)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(funland_mem)
- MDRV_PALETTE_LENGTH(0x100)
- MDRV_PALETTE_INIT(all_black)
+ MCFG_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_INIT(all_black)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( fstation, skattv )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(fstation_mem)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(fstation_mem)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/aeroboto.c b/src/mame/drivers/aeroboto.c
index f70afcd48ff..86ae9443862 100644
--- a/src/mame/drivers/aeroboto.c
+++ b/src/mame/drivers/aeroboto.c
@@ -255,42 +255,42 @@ static MACHINE_RESET( formatz )
static MACHINE_CONFIG_START( formatz, aeroboto_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, XTAL_10MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", aeroboto_interrupt)
+ MCFG_CPU_ADD("maincpu", M6809, XTAL_10MHz/8) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", aeroboto_interrupt)
- MDRV_CPU_ADD("audiocpu", M6809, XTAL_10MHz/16) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("audiocpu", M6809, XTAL_10MHz/16) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(formatz)
- MDRV_MACHINE_RESET(formatz)
+ MCFG_MACHINE_START(formatz)
+ MCFG_MACHINE_RESET(formatz)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(aeroboto)
+ MCFG_GFXDECODE(aeroboto)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(aeroboto)
- MDRV_VIDEO_UPDATE(aeroboto)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(aeroboto)
+ MCFG_VIDEO_UPDATE(aeroboto)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_10MHz/8) /* verified on pcb */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_10MHz/8) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_10MHz/16) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_10MHz/16) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c
index 4a218105d2f..eac311fe459 100644
--- a/src/mame/drivers/aerofgt.c
+++ b/src/mame/drivers/aerofgt.c
@@ -1330,67 +1330,67 @@ static MACHINE_RESET( aerofgt )
static MACHINE_CONFIG_START( pspikes, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(pspikes_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
+ MCFG_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(pspikes_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
- MDRV_CPU_ADD("audiocpu",Z80,XTAL_20MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(turbofrc_sound_portmap)
+ MCFG_CPU_ADD("audiocpu",Z80,XTAL_20MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(turbofrc_sound_portmap)
/* IRQs are triggered by the YM2610 */
- MDRV_MACHINE_START(aerofgt)
- MDRV_MACHINE_RESET(aerofgt)
+ MCFG_MACHINE_START(aerofgt)
+ MCFG_MACHINE_RESET(aerofgt)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(61.31) /* verified on pcb */
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8+4, 44*8+4-1, 0*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(61.31) /* verified on pcb */
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8+4, 44*8+4-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(pspikes)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(pspikes)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(pspikes)
- MDRV_VIDEO_UPDATE(pspikes)
+ MCFG_VIDEO_START(pspikes)
+ MCFG_VIDEO_UPDATE(pspikes)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(2, "rspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( spikes91, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(spikes91_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
+ MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(spikes91_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
/* + Z80 for sound */
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 320-1, 0*8+4, 224+4-1)
- MDRV_GFXDECODE(spikes91)
- MDRV_PALETTE_LENGTH(2048)
-
- MDRV_VIDEO_START(pspikes)
- MDRV_VIDEO_UPDATE(spikes91)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 320-1, 0*8+4, 224+4-1)
+ MCFG_GFXDECODE(spikes91)
+ MCFG_PALETTE_LENGTH(2048)
+
+ MCFG_VIDEO_START(pspikes)
+ MCFG_VIDEO_UPDATE(spikes91)
/* sound hardware */
/* the sound hardware is completely different on this:
@@ -1404,361 +1404,361 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( pspikesb, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(pspikesb_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
+ MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(pspikesb_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8+4, 44*8+4-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(pspikesb)
- MDRV_PALETTE_LENGTH(2048)
-
- MDRV_VIDEO_START(pspikes)
- MDRV_VIDEO_UPDATE(pspikesb)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8+4, 44*8+4-1, 0*8, 30*8-1)
+ MCFG_GFXDECODE(pspikesb)
+ MCFG_PALETTE_LENGTH(2048)
+
+ MCFG_VIDEO_START(pspikes)
+ MCFG_VIDEO_UPDATE(pspikesb)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( pspikesc, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(pspikesc_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
+ MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(pspikesc_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8+4, 44*8+4-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(pspikes)
- MDRV_PALETTE_LENGTH(2048)
-
- MDRV_VIDEO_START(pspikes)
- MDRV_VIDEO_UPDATE(pspikes)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8+4, 44*8+4-1, 0*8, 30*8-1)
+ MCFG_GFXDECODE(pspikes)
+ MCFG_PALETTE_LENGTH(2048)
+
+ MCFG_VIDEO_START(pspikes)
+ MCFG_VIDEO_UPDATE(pspikes)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( karatblz, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(karatblz_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(karatblz_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(turbofrc_sound_portmap)
+ MCFG_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(turbofrc_sound_portmap)
/* IRQs are triggered by the YM2610 */
- MDRV_MACHINE_START(aerofgt)
- MDRV_MACHINE_RESET(aerofgt)
+ MCFG_MACHINE_START(aerofgt)
+ MCFG_MACHINE_RESET(aerofgt)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(1*8, 45*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(turbofrc)
- MDRV_PALETTE_LENGTH(1024)
-
- MDRV_VIDEO_START(karatblz)
- MDRV_VIDEO_UPDATE(karatblz)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 45*8-1, 0*8, 30*8-1)
+ MCFG_GFXDECODE(turbofrc)
+ MCFG_PALETTE_LENGTH(1024)
+
+ MCFG_VIDEO_START(karatblz)
+ MCFG_VIDEO_UPDATE(karatblz)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz ) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(2, "rspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz ) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( spinlbrk, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(spinlbrk_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* there are vectors for 3 and 4 too */
+ MCFG_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(spinlbrk_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* there are vectors for 3 and 4 too */
- MDRV_CPU_ADD("audiocpu",Z80,XTAL_20MHz/4) /* 5mhz verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(turbofrc_sound_portmap)
+ MCFG_CPU_ADD("audiocpu",Z80,XTAL_20MHz/4) /* 5mhz verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(turbofrc_sound_portmap)
/* IRQs are triggered by the YM2610 */
- MDRV_MACHINE_START(aerofgt)
- MDRV_MACHINE_RESET(aerofgt)
+ MCFG_MACHINE_START(aerofgt)
+ MCFG_MACHINE_RESET(aerofgt)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(1*8, 45*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(turbofrc)
- MDRV_PALETTE_LENGTH(1024)
-
- MDRV_VIDEO_START(spinlbrk)
- MDRV_VIDEO_UPDATE(spinlbrk)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(1*8, 45*8-1, 0*8, 30*8-1)
+ MCFG_GFXDECODE(turbofrc)
+ MCFG_PALETTE_LENGTH(1024)
+
+ MCFG_VIDEO_START(spinlbrk)
+ MCFG_VIDEO_UPDATE(spinlbrk)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(2, "rspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( turbofrc, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(turbofrc_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
+ MCFG_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(turbofrc_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
- MDRV_CPU_ADD("audiocpu",Z80,XTAL_5MHz) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(turbofrc_sound_portmap)
+ MCFG_CPU_ADD("audiocpu",Z80,XTAL_5MHz) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(turbofrc_sound_portmap)
/* IRQs are triggered by the YM2610 */
- MDRV_MACHINE_START(aerofgt)
- MDRV_MACHINE_RESET(aerofgt)
+ MCFG_MACHINE_START(aerofgt)
+ MCFG_MACHINE_RESET(aerofgt)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(61.31) /* verified on pcb */
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 44*8-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(turbofrc)
- MDRV_PALETTE_LENGTH(1024)
-
- MDRV_VIDEO_START(turbofrc)
- MDRV_VIDEO_UPDATE(turbofrc)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(61.31) /* verified on pcb */
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 44*8-1, 0*8, 30*8-1)
+ MCFG_GFXDECODE(turbofrc)
+ MCFG_PALETTE_LENGTH(1024)
+
+ MCFG_VIDEO_START(turbofrc)
+ MCFG_VIDEO_UPDATE(turbofrc)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(2, "rspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( aerofgtb, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(aerofgtb_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
+ MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(aerofgtb_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
- MDRV_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(aerofgt_sound_portmap)
+ MCFG_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(aerofgt_sound_portmap)
/* IRQs are triggered by the YM2610 */
- MDRV_MACHINE_START(aerofgt)
- MDRV_MACHINE_RESET(aerofgt)
+ MCFG_MACHINE_START(aerofgt)
+ MCFG_MACHINE_RESET(aerofgt)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(500))
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(500))
/* wrong but improves sprite-background synchronization */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8+12, 40*8-1+12, 0*8, 28*8-1)
- MDRV_GFXDECODE(aerofgtb)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8+12, 40*8-1+12, 0*8, 28*8-1)
+ MCFG_GFXDECODE(aerofgtb)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(turbofrc)
- MDRV_VIDEO_UPDATE(turbofrc)
+ MCFG_VIDEO_START(turbofrc)
+ MCFG_VIDEO_UPDATE(turbofrc)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(2, "rspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( aerofgt, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(aerofgt_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
+ MCFG_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(aerofgt_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
- MDRV_CPU_ADD("audiocpu",Z80,XTAL_20MHz/4) /* 5 MHz verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(aerofgt_sound_portmap)
+ MCFG_CPU_ADD("audiocpu",Z80,XTAL_20MHz/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 */
- MDRV_MACHINE_START(aerofgt)
- MDRV_MACHINE_RESET(aerofgt)
+ MCFG_MACHINE_START(aerofgt)
+ MCFG_MACHINE_RESET(aerofgt)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(61.31) /* verified on pcb */
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(400))
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(61.31) /* verified on pcb */
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(400))
/* wrong but improves sprite-background synchronization */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
- MDRV_GFXDECODE(aerofgt)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
+ MCFG_GFXDECODE(aerofgt)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(turbofrc)
- MDRV_VIDEO_UPDATE(aerofgt)
+ MCFG_VIDEO_START(turbofrc)
+ MCFG_VIDEO_UPDATE(aerofgt)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(2, "rspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( aerfboot, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(aerfboot_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(aerfboot_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(aerfboot_sound_map)
+ MCFG_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(aerfboot_sound_map)
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(500))
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(500))
/* wrong but improves sprite-background synchronization */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8+12, 40*8-1+12, 0*8, 28*8-1)
- MDRV_GFXDECODE(aerfboot)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8+12, 40*8-1+12, 0*8, 28*8-1)
+ MCFG_GFXDECODE(aerfboot)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(turbofrc)
- MDRV_VIDEO_UPDATE(aerfboot)
+ MCFG_VIDEO_START(turbofrc)
+ MCFG_VIDEO_UPDATE(aerfboot)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( aerfboo2, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(aerfboo2_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(aerfboo2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(500))
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(500))
/* wrong but improves sprite-background synchronization */
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8+12, 40*8-1+12, 0*8, 28*8-1)
- MDRV_GFXDECODE(aerfboo2)
- MDRV_PALETTE_LENGTH(1024)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8+12, 40*8-1+12, 0*8, 28*8-1)
+ MCFG_GFXDECODE(aerfboo2)
+ MCFG_PALETTE_LENGTH(1024)
- MDRV_VIDEO_START(turbofrc)
- MDRV_VIDEO_UPDATE(aerfboo2)
+ MCFG_VIDEO_START(turbofrc)
+ MCFG_VIDEO_UPDATE(aerfboo2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( wbbc97, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(wbbc97_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
+ MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(wbbc97_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
- MDRV_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(wbbc97_sound_map)
+ MCFG_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(wbbc97_sound_map)
/* IRQs are triggered by the YM3812 */
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8+14, 44*8-1+4, 0*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8+14, 44*8-1+4, 0*8, 30*8-1)
- MDRV_GFXDECODE(wbbc97)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(wbbc97)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(wbbc97)
- MDRV_VIDEO_UPDATE(wbbc97)
+ MCFG_VIDEO_START(wbbc97)
+ MCFG_VIDEO_UPDATE(wbbc97)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 3579545)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 3579545)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c
index ca5682b81b0..3b0f4428c75 100644
--- a/src/mame/drivers/airbustr.c
+++ b/src/mame/drivers/airbustr.c
@@ -633,59 +633,59 @@ static const kaneko_pandora_interface airbustr_pandora_config =
static MACHINE_CONFIG_START( airbustr, airbustr_state )
/* basic machine hardware */
- MDRV_CPU_ADD("master", Z80, 6000000) // ???
- MDRV_CPU_PROGRAM_MAP(master_map)
- MDRV_CPU_IO_MAP(master_io_map)
- MDRV_CPU_VBLANK_INT_HACK(master_interrupt, 2) // nmi caused by sub cpu?, ?
-
- MDRV_CPU_ADD("slave", Z80, 6000000) // ???
- MDRV_CPU_PROGRAM_MAP(slave_map)
- MDRV_CPU_IO_MAP(slave_io_map)
- MDRV_CPU_VBLANK_INT_HACK(slave_interrupt, 2) // nmi caused by main cpu, ?
-
- MDRV_CPU_ADD("audiocpu", Z80, 6000000) // ???
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) // nmi are caused by sub cpu writing a sound command
-
- MDRV_QUANTUM_TIME(HZ(6000)) // Palette RAM is filled by sub cpu with data supplied by main cpu
+ MCFG_CPU_ADD("master", Z80, 6000000) // ???
+ MCFG_CPU_PROGRAM_MAP(master_map)
+ MCFG_CPU_IO_MAP(master_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(master_interrupt, 2) // nmi caused by sub cpu?, ?
+
+ MCFG_CPU_ADD("slave", Z80, 6000000) // ???
+ MCFG_CPU_PROGRAM_MAP(slave_map)
+ MCFG_CPU_IO_MAP(slave_io_map)
+ MCFG_CPU_VBLANK_INT_HACK(slave_interrupt, 2) // nmi caused by main cpu, ?
+
+ MCFG_CPU_ADD("audiocpu", Z80, 6000000) // ???
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) // nmi are caused by sub cpu writing a sound command
+
+ MCFG_QUANTUM_TIME(HZ(6000)) // Palette RAM is filled by sub cpu with data supplied by main cpu
// Maybe a high value is safer in order to avoid glitches
- MDRV_MACHINE_START(airbustr)
- MDRV_MACHINE_RESET(airbustr)
- MDRV_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
+ MCFG_MACHINE_START(airbustr)
+ MCFG_MACHINE_RESET(airbustr)
+ MCFG_WATCHDOG_TIME_INIT(SEC(3)) /* a guess, and certainly wrong */
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(airbustr)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(airbustr)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_KANEKO_PANDORA_ADD("pandora", airbustr_pandora_config)
+ MCFG_KANEKO_PANDORA_ADD("pandora", airbustr_pandora_config)
- MDRV_VIDEO_START(airbustr)
- MDRV_VIDEO_UPDATE(airbustr)
- MDRV_VIDEO_EOF(airbustr)
+ MCFG_VIDEO_START(airbustr)
+ MCFG_VIDEO_UPDATE(airbustr)
+ MCFG_VIDEO_EOF(airbustr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 3000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.25)
- MDRV_SOUND_ROUTE(1, "mono", 0.25)
- MDRV_SOUND_ROUTE(2, "mono", 0.25)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.25)
+ MCFG_SOUND_ROUTE(1, "mono", 0.25)
+ MCFG_SOUND_ROUTE(2, "mono", 0.25)
+ MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_OKIM6295_ADD("oki", 12000000/4, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_OKIM6295_ADD("oki", 12000000/4, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( airbustrb, airbustr )
- MDRV_WATCHDOG_TIME_INIT(SEC(0)) // no protection device or watchdog
+ MCFG_WATCHDOG_TIME_INIT(SEC(0)) // no protection device or watchdog
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c
index 3e30f9a3273..3168aaf3d1c 100644
--- a/src/mame/drivers/ajax.c
+++ b/src/mame/drivers/ajax.c
@@ -208,57 +208,57 @@ static const k051316_interface ajax_k051316_intf =
static MACHINE_CONFIG_START( ajax, ajax_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* 12/4 MHz*/
- MDRV_CPU_PROGRAM_MAP(ajax_main_map)
- MDRV_CPU_VBLANK_INT("screen", ajax_interrupt) /* IRQs triggered by the 051960 */
+ MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* 12/4 MHz*/
+ MCFG_CPU_PROGRAM_MAP(ajax_main_map)
+ MCFG_CPU_VBLANK_INT("screen", ajax_interrupt) /* IRQs triggered by the 051960 */
- MDRV_CPU_ADD("sub", M6809, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(ajax_sub_map)
+ MCFG_CPU_ADD("sub", M6809, 3000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(ajax_sub_map)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545) /* 3.58 MHz */
- MDRV_CPU_PROGRAM_MAP(ajax_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* 3.58 MHz */
+ MCFG_CPU_PROGRAM_MAP(ajax_sound_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_MACHINE_RESET(ajax)
- MDRV_MACHINE_START(ajax)
+ MCFG_MACHINE_RESET(ajax)
+ MCFG_MACHINE_START(ajax)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(ajax)
- MDRV_VIDEO_UPDATE(ajax)
+ MCFG_VIDEO_START(ajax)
+ MCFG_VIDEO_UPDATE(ajax)
- MDRV_K052109_ADD("k052109", ajax_k052109_intf)
- MDRV_K051960_ADD("k051960", ajax_k051960_intf)
- MDRV_K051316_ADD("k051316", ajax_k051316_intf)
+ MCFG_K052109_ADD("k052109", ajax_k052109_intf)
+ MCFG_K051960_ADD("k051960", ajax_k051960_intf)
+ MCFG_K051316_ADD("k051316", ajax_k051316_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
-
- MDRV_SOUND_ADD("k007232_1", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_interface_1)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.20)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.20)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.20)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.20)
-
- MDRV_SOUND_ADD("k007232_2", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_interface_2)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
+
+ MCFG_SOUND_ADD("k007232_1", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_interface_1)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.20)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.20)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.20)
+
+ MCFG_SOUND_ADD("k007232_2", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_interface_2)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/albazc.c b/src/mame/drivers/albazc.c
index f69f0720bfa..ca58252f769 100644
--- a/src/mame/drivers/albazc.c
+++ b/src/mame/drivers/albazc.c
@@ -259,31 +259,31 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( hanaroku, albazc_state )
- MDRV_CPU_ADD("maincpu", Z80,6000000) /* ? MHz */
- MDRV_CPU_PROGRAM_MAP(hanaroku_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,6000000) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(hanaroku_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 48*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 48*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(hanaroku)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_GFXDECODE(hanaroku)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_PALETTE_INIT(hanaroku)
- MDRV_VIDEO_START(hanaroku)
- MDRV_VIDEO_UPDATE(hanaroku)
+ MCFG_PALETTE_INIT(hanaroku)
+ MCFG_VIDEO_START(hanaroku)
+ MCFG_VIDEO_UPDATE(hanaroku)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 1500000) /* ? MHz */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, 1500000) /* ? MHz */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/albazg.c b/src/mame/drivers/albazg.c
index 72d2f3de428..a6078434aff 100644
--- a/src/mame/drivers/albazg.c
+++ b/src/mame/drivers/albazg.c
@@ -396,42 +396,42 @@ static MACHINE_RESET( yumefuda )
static MACHINE_CONFIG_START( yumefuda, albazg_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80 , MASTER_CLOCK/2) /* xtal is 12 Mhz, unknown divider*/
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(port_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80 , MASTER_CLOCK/2) /* xtal is 12 Mhz, unknown divider*/
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(port_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(yumefuda)
- MDRV_MACHINE_RESET(yumefuda)
+ MCFG_MACHINE_START(yumefuda)
+ MCFG_MACHINE_RESET(yumefuda)
- MDRV_EEPROM_93C46_ADD("eeprom")
+ MCFG_EEPROM_93C46_ADD("eeprom")
- MDRV_WATCHDOG_VBLANK_INIT(8) // timing is unknown
+ MCFG_WATCHDOG_VBLANK_INIT(8) // timing is unknown
- MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf )
+ MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf )
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 32*8-1)
- MDRV_MC6845_ADD("crtc", H46505, MASTER_CLOCK/16, mc6845_intf) /* hand tuned to get ~60 fps */
+ MCFG_MC6845_ADD("crtc", H46505, MASTER_CLOCK/16, mc6845_intf) /* hand tuned to get ~60 fps */
- MDRV_GFXDECODE( yumefuda )
- MDRV_PALETTE_LENGTH(0x80)
+ MCFG_GFXDECODE( yumefuda )
+ MCFG_PALETTE_LENGTH(0x80)
- MDRV_VIDEO_START( yumefuda )
- MDRV_VIDEO_UPDATE( yumefuda )
+ MCFG_VIDEO_START( yumefuda )
+ MCFG_VIDEO_UPDATE( yumefuda )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/16) /* guessed to use the same xtal as the crtc */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/16) /* guessed to use the same xtal as the crtc */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
/***************************************************************************************/
diff --git a/src/mame/drivers/aleck64.c b/src/mame/drivers/aleck64.c
index 6ac4e3ceb69..f663dae5443 100644
--- a/src/mame/drivers/aleck64.c
+++ b/src/mame/drivers/aleck64.c
@@ -570,35 +570,35 @@ static INTERRUPT_GEN( n64_vblank )
static MACHINE_CONFIG_START( aleck64, _n64_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", VR4300BE, 93750000)
- MDRV_CPU_CONFIG(vr4300_config)
- MDRV_CPU_PROGRAM_MAP(n64_map)
- MDRV_CPU_VBLANK_INT("screen", n64_vblank)
-
- MDRV_CPU_ADD("rsp", RSP, 62500000)
- MDRV_CPU_CONFIG(n64_rsp_config)
- MDRV_CPU_PROGRAM_MAP(rsp_map)
-
- MDRV_MACHINE_START( n64 )
- MDRV_MACHINE_RESET( n64 )
-
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(640, 525)
- MDRV_SCREEN_VISIBLE_AREA(0, 639, 0, 239)
- MDRV_PALETTE_LENGTH(0x1000)
-
- MDRV_VIDEO_START(n64)
- MDRV_VIDEO_UPDATE(n64)
-
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("dac1", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("dac2", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_CPU_ADD("maincpu", VR4300BE, 93750000)
+ MCFG_CPU_CONFIG(vr4300_config)
+ MCFG_CPU_PROGRAM_MAP(n64_map)
+ MCFG_CPU_VBLANK_INT("screen", n64_vblank)
+
+ MCFG_CPU_ADD("rsp", RSP, 62500000)
+ MCFG_CPU_CONFIG(n64_rsp_config)
+ MCFG_CPU_PROGRAM_MAP(rsp_map)
+
+ MCFG_MACHINE_START( n64 )
+ MCFG_MACHINE_RESET( n64 )
+
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(640, 525)
+ MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 239)
+ MCFG_PALETTE_LENGTH(0x1000)
+
+ MCFG_VIDEO_START(n64)
+ MCFG_VIDEO_UPDATE(n64)
+
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
static DRIVER_INIT( aleck64 )
diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c
index f6ddd2c3dff..400749b9a81 100644
--- a/src/mame/drivers/alg.c
+++ b/src/mame/drivers/alg.c
@@ -429,64 +429,64 @@ static const mos6526_interface cia_1_intf =
static MACHINE_CONFIG_START( alg_r1, alg_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, AMIGA_68000_NTSC_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map_r1)
+ MCFG_CPU_ADD("maincpu", M68000, AMIGA_68000_NTSC_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(main_map_r1)
- MDRV_MACHINE_START(alg)
- MDRV_MACHINE_RESET(alg)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_START(alg)
+ MCFG_MACHINE_RESET(alg)
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_LASERDISC_ADD("laserdisc", SONY_LDP1450, "screen", "ldsound")
- MDRV_LASERDISC_OVERLAY(amiga, 512*2, 262, BITMAP_FORMAT_INDEXED16)
- MDRV_LASERDISC_OVERLAY_CLIP((129-8)*2, (449+8-1)*2, 44-8, 244+8-1)
+ MCFG_LASERDISC_ADD("laserdisc", SONY_LDP1450, "screen", "ldsound")
+ MCFG_LASERDISC_OVERLAY(amiga, 512*2, 262, BITMAP_FORMAT_INDEXED16)
+ MCFG_LASERDISC_OVERLAY_CLIP((129-8)*2, (449+8-1)*2, 44-8, 244+8-1)
/* video hardware */
- MDRV_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(59.997)
- MDRV_SCREEN_SIZE(512*2, 262)
- MDRV_SCREEN_VISIBLE_AREA((129-8)*2, (449+8-1)*2, 44-8, 244+8-1)
+ MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(59.997)
+ MCFG_SCREEN_SIZE(512*2, 262)
+ MCFG_SCREEN_VISIBLE_AREA((129-8)*2, (449+8-1)*2, 44-8, 244+8-1)
- MDRV_PALETTE_LENGTH(4097)
- MDRV_PALETTE_INIT(amiga)
+ MCFG_PALETTE_LENGTH(4097)
+ MCFG_PALETTE_INIT(amiga)
- MDRV_VIDEO_START(alg)
+ MCFG_VIDEO_START(alg)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("amiga", AMIGA, 3579545)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(2, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(3, "lspeaker", 0.25)
+ MCFG_SOUND_ADD("amiga", AMIGA, 3579545)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(3, "lspeaker", 0.25)
- MDRV_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
/* cia */
- MDRV_MOS8520_ADD("cia_0", AMIGA_68000_NTSC_CLOCK / 10, cia_0_intf)
- MDRV_MOS8520_ADD("cia_1", AMIGA_68000_NTSC_CLOCK / 10, cia_1_intf)
+ MCFG_MOS8520_ADD("cia_0", AMIGA_68000_NTSC_CLOCK / 10, cia_0_intf)
+ MCFG_MOS8520_ADD("cia_1", AMIGA_68000_NTSC_CLOCK / 10, cia_1_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( alg_r2, alg_r1 )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(main_map_r2)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(main_map_r2)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( picmatic, alg_r1 )
/* adjust for PAL specs */
- MDRV_CPU_REPLACE("maincpu", M68000, AMIGA_68000_PAL_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map_picmatic)
+ MCFG_CPU_REPLACE("maincpu", M68000, AMIGA_68000_PAL_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(main_map_picmatic)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_REFRESH_RATE(50)
- MDRV_SCREEN_SIZE(512*2, 312)
- MDRV_SCREEN_VISIBLE_AREA((129-8)*2, (449+8-1)*2, 44-8, 300+8-1)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_REFRESH_RATE(50)
+ MCFG_SCREEN_SIZE(512*2, 312)
+ MCFG_SCREEN_VISIBLE_AREA((129-8)*2, (449+8-1)*2, 44-8, 300+8-1)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c
index a35407380e7..34b957ee885 100644
--- a/src/mame/drivers/aliens.c
+++ b/src/mame/drivers/aliens.c
@@ -267,46 +267,46 @@ static MACHINE_CONFIG_START( aliens, aliens_state )
/* external clock should be 12MHz probably, CPU internal divider and precise cycle timings */
/* are unknown though. 3MHz is too low, sprites flicker in the pseudo-3D levels */
- MDRV_CPU_ADD("maincpu", KONAMI, 6000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(aliens_map)
- MDRV_CPU_VBLANK_INT("screen", aliens_interrupt)
+ MCFG_CPU_ADD("maincpu", KONAMI, 6000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(aliens_map)
+ MCFG_CPU_VBLANK_INT("screen", aliens_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(aliens_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545)
+ MCFG_CPU_PROGRAM_MAP(aliens_sound_map)
- MDRV_MACHINE_START(aliens)
- MDRV_MACHINE_RESET(aliens)
+ MCFG_MACHINE_START(aliens)
+ MCFG_MACHINE_RESET(aliens)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(512)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_VIDEO_START(aliens)
- MDRV_VIDEO_UPDATE(aliens)
+ MCFG_VIDEO_START(aliens)
+ MCFG_VIDEO_UPDATE(aliens)
- MDRV_K052109_ADD("k052109", aliens_k052109_intf)
- MDRV_K051960_ADD("k051960", aliens_k051960_intf)
+ MCFG_K052109_ADD("k052109", aliens_k052109_intf)
+ MCFG_K051960_ADD("k051960", aliens_k051960_intf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.60)
- MDRV_SOUND_ROUTE(1, "mono", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.60)
+ MCFG_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_SOUND_ADD("k007232", K007232, 3579545)
- MDRV_SOUND_CONFIG(k007232_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.20)
- MDRV_SOUND_ROUTE(1, "mono", 0.20)
+ MCFG_SOUND_ADD("k007232", K007232, 3579545)
+ MCFG_SOUND_CONFIG(k007232_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.20)
+ MCFG_SOUND_ROUTE(1, "mono", 0.20)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c
index d6f14256b57..b672747022b 100644
--- a/src/mame/drivers/alpha68k.c
+++ b/src/mame/drivers/alpha68k.c
@@ -1948,381 +1948,381 @@ static MACHINE_START( alpha68k_II )
static MACHINE_CONFIG_START( sstingry, alpha68k_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */
- MDRV_CPU_PROGRAM_MAP(kyros_map)
- MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */
+ MCFG_CPU_PROGRAM_MAP(kyros_map)
+ MCFG_CPU_VBLANK_INT_HACK(alpha68k_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(sstingry_sound_map)
- MDRV_CPU_IO_MAP(kyros_sound_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545)
+ MCFG_CPU_PROGRAM_MAP(sstingry_sound_map)
+ MCFG_CPU_IO_MAP(kyros_sound_portmap)
//AT
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 2)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 4000)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 2)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse, 4000)
//ZT
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(sstingry)
- MDRV_PALETTE_LENGTH(256 + 1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(sstingry)
+ MCFG_PALETTE_LENGTH(256 + 1)
//AT
- MDRV_PALETTE_INIT(kyros)
+ MCFG_PALETTE_INIT(kyros)
//ZT
- MDRV_VIDEO_UPDATE(sstingry)
+ MCFG_VIDEO_UPDATE(sstingry)
/* sound hardware */
//AT
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 3000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("ym1", YM2203, 3000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD("ym2", YM2203, 3000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("ym2", YM2203, 3000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD("ym3", YM2203, 3000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ym3", YM2203, 3000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
//ZT
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( kyros, alpha68k_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* Verified on bootleg PCB */
- MDRV_CPU_PROGRAM_MAP(kyros_map)
- MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt,2)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* Verified on bootleg PCB */
+ MCFG_CPU_PROGRAM_MAP(kyros_map)
+ MCFG_CPU_VBLANK_INT_HACK(alpha68k_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) /* Verified on bootleg PCB */
- MDRV_CPU_PROGRAM_MAP(kyros_sound_map)
- MDRV_CPU_IO_MAP(kyros_sound_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/6) /* Verified on bootleg PCB */
+ MCFG_CPU_PROGRAM_MAP(kyros_sound_map)
+ MCFG_CPU_IO_MAP(kyros_sound_portmap)
//AT
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 2)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 4000)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 2)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse, 4000)
//ZT
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(kyros)
- MDRV_PALETTE_LENGTH(256 + 1)
-
- MDRV_PALETTE_INIT(kyros)
- MDRV_VIDEO_UPDATE(kyros)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(kyros)
+ MCFG_PALETTE_LENGTH(256 + 1)
+
+ MCFG_PALETTE_INIT(kyros)
+ MCFG_VIDEO_UPDATE(kyros)
/* sound hardware */
//AT
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, XTAL_24MHz/12) /* Verified on bootleg PCB */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL_24MHz/12) /* Verified on bootleg PCB */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD("ym2", YM2203, XTAL_24MHz/12) /* Verified on bootleg PCB */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("ym2", YM2203, XTAL_24MHz/12) /* Verified on bootleg PCB */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD("ym3", YM2203, XTAL_24MHz/12) /* Verified on bootleg PCB */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
+ MCFG_SOUND_ADD("ym3", YM2203, XTAL_24MHz/12) /* Verified on bootleg PCB */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
//ZT
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( jongbou, alpha68k_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(kyros_map)
- MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt,17) // must be at least 4 for the controls to be smooth
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(kyros_map)
+ MCFG_CPU_VBLANK_INT_HACK(alpha68k_interrupt,17) // must be at least 4 for the controls to be smooth
- MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(jongbou_sound_map)
- MDRV_CPU_IO_MAP(jongbou_sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 160) // guess, controls sound speed
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(jongbou_sound_map)
+ MCFG_CPU_IO_MAP(jongbou_sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold, 160) // guess, controls sound speed
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(jongbou)
- MDRV_PALETTE_LENGTH(256 + 1)
-
- MDRV_PALETTE_INIT(kyros)
- MDRV_VIDEO_UPDATE(kyros)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(jongbou)
+ MCFG_PALETTE_LENGTH(256 + 1)
+
+ MCFG_PALETTE_INIT(kyros)
+ MCFG_VIDEO_UPDATE(kyros)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 2000000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
+ MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( alpha68k_I, alpha68k_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */
- MDRV_CPU_PROGRAM_MAP(alpha68k_I_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */
+ MCFG_CPU_PROGRAM_MAP(alpha68k_I_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* VBL */
- MDRV_CPU_ADD("audiocpu", Z80, 4000000) // 4Mhz seems to yield the correct tone
- MDRV_CPU_PROGRAM_MAP(alpha68k_I_s_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000) // 4Mhz seems to yield the correct tone
+ MCFG_CPU_PROGRAM_MAP(alpha68k_I_s_map)
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(paddle)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(paddle)
//AT
- MDRV_PALETTE_LENGTH(1024)
- MDRV_PALETTE_INIT(paddlem)
+ MCFG_PALETTE_LENGTH(1024)
+ MCFG_PALETTE_INIT(paddlem)
//ZT
- MDRV_VIDEO_UPDATE(alpha68k_I)
+ MCFG_VIDEO_UPDATE(alpha68k_I)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( alpha68k_II, alpha68k_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* Correct */
- MDRV_CPU_PROGRAM_MAP(alpha68k_II_map)
- MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* Correct */
+ MCFG_CPU_PROGRAM_MAP(alpha68k_II_map)
+ MCFG_CPU_VBLANK_INT("screen", irq3_line_hold)/* VBL */
- MDRV_CPU_ADD("audiocpu", Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 7500) //AT
+ MCFG_CPU_ADD("audiocpu", Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse, 7500) //AT
- MDRV_MACHINE_START(alpha68k_II)
- MDRV_MACHINE_RESET(alpha68k_II)
+ MCFG_MACHINE_START(alpha68k_II)
+ MCFG_MACHINE_RESET(alpha68k_II)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(alpha68k_II)
- MDRV_PALETTE_LENGTH(2048)
-
- MDRV_VIDEO_START(alpha68k)
- MDRV_VIDEO_UPDATE(alpha68k_II)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(alpha68k_II)
+ MCFG_PALETTE_LENGTH(2048)
+
+ MCFG_VIDEO_START(alpha68k)
+ MCFG_VIDEO_UPDATE(alpha68k_II)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 3000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
+ MCFG_SOUND_ADD("ym1", YM2203, 3000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
- MDRV_SOUND_ADD("ym2", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ym2", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( btlfieldb, alpha68k_II )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt,2)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_VBLANK_INT_HACK(alpha68k_interrupt,2)
MACHINE_CONFIG_END
//AT
static MACHINE_CONFIG_START( alpha68k_II_gm, alpha68k_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(alpha68k_II_map)
- MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt, 4)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(alpha68k_II_map)
+ MCFG_CPU_VBLANK_INT_HACK(alpha68k_interrupt, 4)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000*2)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 7500)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000*2)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse, 7500)
- MDRV_MACHINE_START(alpha68k_II)
- MDRV_MACHINE_RESET(alpha68k_II)
+ MCFG_MACHINE_START(alpha68k_II)
+ MCFG_MACHINE_RESET(alpha68k_II)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(alpha68k_II)
- MDRV_PALETTE_LENGTH(2048)
-
- MDRV_VIDEO_START(alpha68k)
- MDRV_VIDEO_UPDATE(alpha68k_II)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(alpha68k_II)
+ MCFG_PALETTE_LENGTH(2048)
+
+ MCFG_VIDEO_START(alpha68k)
+ MCFG_VIDEO_UPDATE(alpha68k_II)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 3000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
+ MCFG_SOUND_ADD("ym1", YM2203, 3000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
- MDRV_SOUND_ADD("ym2", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ym2", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
//ZT
static MACHINE_CONFIG_START( alpha68k_V, alpha68k_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(alpha68k_V_map)
- MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(alpha68k_V_map)
+ MCFG_CPU_VBLANK_INT("screen", irq3_line_hold)/* VBL */
- MDRV_CPU_ADD("audiocpu", Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 8500) //AT
+ MCFG_CPU_ADD("audiocpu", Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse, 8500) //AT
- MDRV_MACHINE_START(alpha68k_V)
- MDRV_MACHINE_RESET(alpha68k_V)
+ MCFG_MACHINE_START(alpha68k_V)
+ MCFG_MACHINE_RESET(alpha68k_V)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(alpha68k_V)
- MDRV_PALETTE_LENGTH(4096)
-
- MDRV_VIDEO_START(alpha68k)
- MDRV_VIDEO_UPDATE(alpha68k_V)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(alpha68k_V)
+ MCFG_PALETTE_LENGTH(4096)
+
+ MCFG_VIDEO_START(alpha68k)
+ MCFG_VIDEO_UPDATE(alpha68k_V)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 3000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
+ MCFG_SOUND_ADD("ym1", YM2203, 3000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
- MDRV_SOUND_ADD("ym2", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ym2", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( alpha68k_V_sb, alpha68k_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 10000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(alpha68k_V_map)
- MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000, 10000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(alpha68k_V_map)
+ MCFG_CPU_VBLANK_INT("screen", irq3_line_hold)/* VBL */
- MDRV_CPU_ADD("audiocpu", Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 8500) //AT
+ MCFG_CPU_ADD("audiocpu", Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse, 8500) //AT
- MDRV_MACHINE_START(alpha68k_V)
- MDRV_MACHINE_RESET(alpha68k_V)
+ MCFG_MACHINE_START(alpha68k_V)
+ MCFG_MACHINE_RESET(alpha68k_V)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(alpha68k_V)
- MDRV_PALETTE_LENGTH(4096)
-
- MDRV_VIDEO_START(alpha68k)
- MDRV_VIDEO_UPDATE(alpha68k_V_sb)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(alpha68k_V)
+ MCFG_PALETTE_LENGTH(4096)
+
+ MCFG_VIDEO_START(alpha68k)
+ MCFG_VIDEO_UPDATE(alpha68k_V_sb)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 3000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
+ MCFG_SOUND_ADD("ym1", YM2203, 3000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
- MDRV_SOUND_ADD("ym2", YM2413, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ym2", YM2413, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( tnextspc, alpha68k_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 9000000) /* Confirmed 18 MHz/2 */
- MDRV_CPU_PROGRAM_MAP(tnextspc_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* VBL */
+ MCFG_CPU_ADD("maincpu", M68000, 9000000) /* Confirmed 18 MHz/2 */
+ MCFG_CPU_PROGRAM_MAP(tnextspc_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* VBL */
- MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(tnextspc_sound_map)
- MDRV_CPU_IO_MAP(tnextspc_sound_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(tnextspc_sound_map)
+ MCFG_CPU_IO_MAP(tnextspc_sound_portmap)
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(tnextspc)
-
- MDRV_PALETTE_LENGTH(1024)
- MDRV_PALETTE_INIT(paddlem)
- MDRV_VIDEO_UPDATE(alpha68k_I)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(tnextspc)
+
+ MCFG_PALETTE_LENGTH(1024)
+ MCFG_PALETTE_INIT(paddlem)
+ MCFG_VIDEO_UPDATE(alpha68k_I)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/amaticmg.c b/src/mame/drivers/amaticmg.c
index f0a3877c1b1..9076ddea4ce 100644
--- a/src/mame/drivers/amaticmg.c
+++ b/src/mame/drivers/amaticmg.c
@@ -612,44 +612,44 @@ GFXDECODE_END
static MACHINE_CONFIG_START( amaticmg, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* WRONG! */
- MDRV_CPU_PROGRAM_MAP(amaticmg_map)
- MDRV_CPU_IO_MAP(amaticmg_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* WRONG! */
+ MCFG_CPU_PROGRAM_MAP(amaticmg_map)
+ MCFG_CPU_IO_MAP(amaticmg_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
-// MDRV_NVRAM_ADD_0FILL("nvram")
+// MCFG_NVRAM_ADD_0FILL("nvram")
/* 3x 8255 */
-// MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
-// MDRV_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
-// MDRV_PPI8255_ADD( "ppi8255_2", ppi8255_intf[2] )
+// MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
+// MCFG_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
+// MCFG_PPI8255_ADD( "ppi8255_2", ppi8255_intf[2] )
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
-// MDRV_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf)
+// MCFG_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf)
- MDRV_GFXDECODE(amaticmg)
+ MCFG_GFXDECODE(amaticmg)
- MDRV_PALETTE_INIT(amaticmg)
- MDRV_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(amaticmg)
- MDRV_VIDEO_UPDATE(amaticmg)
+ MCFG_PALETTE_INIT(amaticmg)
+ MCFG_PALETTE_LENGTH(0x100)
+ MCFG_VIDEO_START(amaticmg)
+ MCFG_VIDEO_UPDATE(amaticmg)
/* sound hardware */
-// MDRV_SPEAKER_STANDARD_MONO("mono")
+// MCFG_SPEAKER_STANDARD_MONO("mono")
-// MDRV_SOUND_ADD("ymsnd", YM3812, SND_CLOCK)
-// MDRV_SOUND_CONFIG(ym3812_config)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+// MCFG_SOUND_ADD("ymsnd", YM3812, SND_CLOCK)
+// MCFG_SOUND_CONFIG(ym3812_config)
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
-// MDRV_SOUND_ADD("dac", DAC, 0) /* Y3014B */
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+// MCFG_SOUND_ADD("dac", DAC, 0) /* Y3014B */
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ambush.c b/src/mame/drivers/ambush.c
index d08b639fb31..0f4dd94576b 100644
--- a/src/mame/drivers/ambush.c
+++ b/src/mame/drivers/ambush.c
@@ -229,34 +229,34 @@ static const ay8910_interface ay8910_interface_2 =
static MACHINE_CONFIG_START( ambush, ambush_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 4000000) /* 4.00 MHz??? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4.00 MHz??? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-3) /* The -3 makes the cocktail mode perfect */
- MDRV_GFXDECODE(ambush)
- MDRV_PALETTE_LENGTH(256)
-
- MDRV_PALETTE_INIT(ambush)
- MDRV_VIDEO_UPDATE(ambush)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-3) /* The -3 makes the cocktail mode perfect */
+ MCFG_GFXDECODE(ambush)
+ MCFG_PALETTE_LENGTH(256)
+
+ MCFG_PALETTE_INIT(ambush)
+ MCFG_VIDEO_UPDATE(ambush)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 1500000)
- MDRV_SOUND_CONFIG(ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_SOUND_CONFIG(ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c
index 72c0ff5b2d3..a65f5b97519 100644
--- a/src/mame/drivers/ampoker2.c
+++ b/src/mame/drivers/ampoker2.c
@@ -1166,36 +1166,36 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( ampoker2, ampoker2_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK/2) /* 3 MHz */
- MDRV_CPU_PROGRAM_MAP(ampoker2_map)
- MDRV_CPU_IO_MAP(ampoker2_io_map)
- MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 1536)
- MDRV_WATCHDOG_TIME_INIT(MSEC(200)) /* 200 ms, measured */
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/2) /* 3 MHz */
+ MCFG_CPU_PROGRAM_MAP(ampoker2_map)
+ MCFG_CPU_IO_MAP(ampoker2_io_map)
+ MCFG_CPU_PERIODIC_INT(nmi_line_pulse, 1536)
+ MCFG_WATCHDOG_TIME_INIT(MSEC(200)) /* 200 ms, measured */
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
/* if VBLANK is used, the watchdog timer stop to work.
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
*/
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(20*8, 56*8-1, 2*8, 32*8-1)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(20*8, 56*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(ampoker2)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_GFXDECODE(ampoker2)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(ampoker2)
- MDRV_VIDEO_START(ampoker2)
- MDRV_VIDEO_UPDATE(ampoker2)
+ MCFG_PALETTE_INIT(ampoker2)
+ MCFG_VIDEO_START(ampoker2)
+ MCFG_VIDEO_UPDATE(ampoker2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910,MASTER_CLOCK/4) /* 1.5 MHz, measured */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910,MASTER_CLOCK/4) /* 1.5 MHz, measured */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sigma2k, ampoker2 )
@@ -1203,8 +1203,8 @@ static MACHINE_CONFIG_DERIVED( sigma2k, ampoker2 )
/* basic machine hardware */
/* video hardware */
- MDRV_GFXDECODE(sigma2k)
- MDRV_VIDEO_START(sigma2k)
+ MCFG_GFXDECODE(sigma2k)
+ MCFG_VIDEO_START(sigma2k)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c
index 0705d9700d9..70190238cbd 100644
--- a/src/mame/drivers/amspdwy.c
+++ b/src/mame/drivers/amspdwy.c
@@ -274,37 +274,37 @@ static MACHINE_RESET( amspdwy )
static MACHINE_CONFIG_START( amspdwy, amspdwy_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,3000000)
- MDRV_CPU_PROGRAM_MAP(amspdwy_map)
- MDRV_CPU_IO_MAP(amspdwy_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* IRQ: 60Hz, NMI: retn */
+ MCFG_CPU_ADD("maincpu", Z80,3000000)
+ MCFG_CPU_PROGRAM_MAP(amspdwy_map)
+ MCFG_CPU_IO_MAP(amspdwy_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* IRQ: 60Hz, NMI: retn */
- MDRV_CPU_ADD("audiocpu", Z80,3000000) /* Can't be disabled: the YM2151 timers must work */
- MDRV_CPU_PROGRAM_MAP(amspdwy_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80,3000000) /* Can't be disabled: the YM2151 timers must work */
+ MCFG_CPU_PROGRAM_MAP(amspdwy_sound_map)
- MDRV_MACHINE_START(amspdwy)
- MDRV_MACHINE_RESET(amspdwy)
+ MCFG_MACHINE_START(amspdwy)
+ MCFG_MACHINE_RESET(amspdwy)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
- MDRV_GFXDECODE(amspdwy)
- MDRV_PALETTE_LENGTH(32)
-
- MDRV_VIDEO_START(amspdwy)
- MDRV_VIDEO_UPDATE(amspdwy)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
+ MCFG_GFXDECODE(amspdwy)
+ MCFG_PALETTE_LENGTH(32)
+
+ MCFG_VIDEO_START(amspdwy)
+ MCFG_VIDEO_UPDATE(amspdwy)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3000000)
- MDRV_SOUND_CONFIG(amspdwy_ym2151_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3000000)
+ MCFG_SOUND_CONFIG(amspdwy_ym2151_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c
index b5445ceaf29..01f4e27775e 100644
--- a/src/mame/drivers/angelkds.c
+++ b/src/mame/drivers/angelkds.c
@@ -606,47 +606,47 @@ static MACHINE_RESET( angelkds )
static MACHINE_CONFIG_START( angelkds, angelkds_state )
- MDRV_CPU_ADD("maincpu", Z80, 8000000) /* 8MHz? 6 seems too slow? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, 8000000) /* 8MHz? 6 seems too slow? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("sub", Z80, 4000000) /* 8 MHz? */
- MDRV_CPU_PROGRAM_MAP(sub_map)
- MDRV_CPU_IO_MAP(sub_portmap)
+ MCFG_CPU_ADD("sub", Z80, 4000000) /* 8 MHz? */
+ MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_CPU_IO_MAP(sub_portmap)
- MDRV_MACHINE_START(angelkds)
- MDRV_MACHINE_RESET(angelkds)
+ MCFG_MACHINE_START(angelkds)
+ MCFG_MACHINE_RESET(angelkds)
- MDRV_QUANTUM_TIME(HZ(6000))
+ MCFG_QUANTUM_TIME(HZ(6000))
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(angelkds)
- MDRV_PALETTE_LENGTH(0x100)
-
- MDRV_VIDEO_START(angelkds)
- MDRV_VIDEO_UPDATE(angelkds)
-
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, 4000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.65)
- MDRV_SOUND_ROUTE(1, "mono", 0.65)
- MDRV_SOUND_ROUTE(2, "mono", 0.65)
- MDRV_SOUND_ROUTE(3, "mono", 0.45)
-
- MDRV_SOUND_ADD("ym2", YM2203, 4000000)
- MDRV_SOUND_ROUTE(0, "mono", 0.65)
- MDRV_SOUND_ROUTE(1, "mono", 0.65)
- MDRV_SOUND_ROUTE(2, "mono", 0.65)
- MDRV_SOUND_ROUTE(3, "mono", 0.45)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
+ MCFG_GFXDECODE(angelkds)
+ MCFG_PALETTE_LENGTH(0x100)
+
+ MCFG_VIDEO_START(angelkds)
+ MCFG_VIDEO_UPDATE(angelkds)
+
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, 4000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ 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, 4000000)
+ 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)
MACHINE_CONFIG_END
/*** Rom Loading
diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c
index ffb21932df8..2c89d87ccc9 100644
--- a/src/mame/drivers/appoooh.c
+++ b/src/mame/drivers/appoooh.c
@@ -424,65 +424,65 @@ static MACHINE_RESET( appoooh )
static MACHINE_CONFIG_START( appoooh_common, appoooh_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,18432000/6) /* ??? the main xtal is 18.432 MHz */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_portmap)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", Z80,18432000/6) /* ??? the main xtal is 18.432 MHz */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_MACHINE_START(appoooh)
- MDRV_MACHINE_RESET(appoooh)
+ MCFG_MACHINE_START(appoooh)
+ MCFG_MACHINE_RESET(appoooh)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76489, 18432000/6)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("sn1", SN76489, 18432000/6)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("sn2", SN76489, 18432000/6)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("sn2", SN76489, 18432000/6)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("sn3", SN76489, 18432000/6)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("sn3", SN76489, 18432000/6)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( appoooh, appoooh_common )
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(appoooh)
- MDRV_PALETTE_LENGTH(32*8+32*8)
-
- MDRV_PALETTE_INIT(appoooh)
- MDRV_VIDEO_START(appoooh)
- MDRV_VIDEO_UPDATE(appoooh)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(appoooh)
+ MCFG_PALETTE_LENGTH(32*8+32*8)
+
+ MCFG_PALETTE_INIT(appoooh)
+ MCFG_VIDEO_START(appoooh)
+ MCFG_VIDEO_UPDATE(appoooh)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( robowres, appoooh_common )
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(robowres)
- MDRV_PALETTE_LENGTH(32*8+32*8)
-
- MDRV_PALETTE_INIT(robowres)
- MDRV_VIDEO_START(appoooh)
- MDRV_VIDEO_UPDATE(robowres)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(robowres)
+ MCFG_PALETTE_LENGTH(32*8+32*8)
+
+ MCFG_PALETTE_INIT(robowres)
+ MCFG_VIDEO_START(appoooh)
+ MCFG_VIDEO_UPDATE(robowres)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c
index d901277a37e..470af9640c4 100644
--- a/src/mame/drivers/aquarium.c
+++ b/src/mame/drivers/aquarium.c
@@ -362,41 +362,41 @@ static MACHINE_RESET( aquarium )
static MACHINE_CONFIG_START( aquarium, aquarium_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 32000000/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 32000000/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 6000000)
- MDRV_CPU_PROGRAM_MAP(snd_map)
- MDRV_CPU_IO_MAP(snd_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80, 6000000)
+ MCFG_CPU_PROGRAM_MAP(snd_map)
+ MCFG_CPU_IO_MAP(snd_portmap)
- MDRV_MACHINE_START(aquarium)
- MDRV_MACHINE_RESET(aquarium)
+ MCFG_MACHINE_START(aquarium)
+ MCFG_MACHINE_RESET(aquarium)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(2*8, 42*8-1, 2*8, 34*8-1)
- MDRV_GFXDECODE(aquarium)
- MDRV_PALETTE_LENGTH(0x1000/2)
-
- MDRV_VIDEO_START(aquarium)
- MDRV_VIDEO_UPDATE(aquarium)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(2*8, 42*8-1, 2*8, 34*8-1)
+ MCFG_GFXDECODE(aquarium)
+ MCFG_PALETTE_LENGTH(0x1000/2)
+
+ MCFG_VIDEO_START(aquarium)
+ MCFG_VIDEO_UPDATE(aquarium)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.45)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.45)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MDRV_OKIM6295_ADD("oki", 1122000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
+ MCFG_OKIM6295_ADD("oki", 1122000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
MACHINE_CONFIG_END
ROM_START( aquarium )
diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c
index 4fdca1fdaa0..fdf407613b5 100644
--- a/src/mame/drivers/arabian.c
+++ b/src/mame/drivers/arabian.c
@@ -365,36 +365,36 @@ static MACHINE_RESET( arabian )
static MACHINE_CONFIG_START( arabian, arabian_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MAIN_OSC/4)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MAIN_OSC/4)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("mcu", MB8841, MAIN_OSC/3/2)
- MDRV_CPU_IO_MAP(mcu_io_map)
+ MCFG_CPU_ADD("mcu", MB8841, MAIN_OSC/3/2)
+ MCFG_CPU_IO_MAP(mcu_io_map)
- MDRV_MACHINE_START(arabian)
- MDRV_MACHINE_RESET(arabian)
+ MCFG_MACHINE_START(arabian)
+ MCFG_MACHINE_RESET(arabian)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(256, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 255, 11, 244)
- MDRV_PALETTE_LENGTH(256*32)
-
- MDRV_PALETTE_INIT(arabian)
- MDRV_VIDEO_START(arabian)
- MDRV_VIDEO_UPDATE(arabian)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(256, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 255, 11, 244)
+ MCFG_PALETTE_LENGTH(256*32)
+
+ MCFG_PALETTE_INIT(arabian)
+ MCFG_VIDEO_START(arabian)
+ MCFG_VIDEO_UPDATE(arabian)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, MAIN_OSC/4/2)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, MAIN_OSC/4/2)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/arcadecl.c b/src/mame/drivers/arcadecl.c
index d8eab94a1d8..b01ccd819ba 100644
--- a/src/mame/drivers/arcadecl.c
+++ b/src/mame/drivers/arcadecl.c
@@ -326,33 +326,33 @@ GFXDECODE_END
static MACHINE_CONFIG_START( arcadecl, rampart_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
+ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", atarigen_video_int_gen)
- MDRV_MACHINE_START(arcadecl)
- MDRV_MACHINE_RESET(arcadecl)
- MDRV_NVRAM_ADD_1FILL("eeprom")
+ MCFG_MACHINE_START(arcadecl)
+ MCFG_MACHINE_RESET(arcadecl)
+ MCFG_NVRAM_ADD_1FILL("eeprom")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_GFXDECODE(arcadecl)
- MDRV_PALETTE_LENGTH(512)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_GFXDECODE(arcadecl)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
/* note: these parameters are from published specs, not derived */
/* the board uses an SOS-2 chip to generate video signals */
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 456, 0+12, 336+12, 262, 0, 240)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 456, 0+12, 336+12, 262, 0, 240)
- MDRV_VIDEO_START(arcadecl)
- MDRV_VIDEO_UPDATE(arcadecl)
+ MCFG_VIDEO_START(arcadecl)
+ MCFG_VIDEO_UPDATE(arcadecl)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", MASTER_CLOCK/4/3, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", MASTER_CLOCK/4/3, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c
index 92c086f28cd..9acfb7cf1b1 100644
--- a/src/mame/drivers/arcadia.c
+++ b/src/mame/drivers/arcadia.c
@@ -299,39 +299,39 @@ static const mos6526_interface cia_1_intf =
static MACHINE_CONFIG_START( arcadia, arcadia_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, AMIGA_68000_NTSC_CLOCK)
- MDRV_CPU_PROGRAM_MAP(amiga_map)
+ MCFG_CPU_ADD("maincpu", M68000, AMIGA_68000_NTSC_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(amiga_map)
- MDRV_MACHINE_RESET(amiga)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_MACHINE_RESET(amiga)
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(59.997)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512*2, 262)
- MDRV_SCREEN_VISIBLE_AREA((129-8)*2, (449+8-1)*2, 44-8, 244+8-1)
- MDRV_PALETTE_LENGTH(4096)
- MDRV_PALETTE_INIT(amiga)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(59.997)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512*2, 262)
+ MCFG_SCREEN_VISIBLE_AREA((129-8)*2, (449+8-1)*2, 44-8, 244+8-1)
+ MCFG_PALETTE_LENGTH(4096)
+ MCFG_PALETTE_INIT(amiga)
- MDRV_VIDEO_START(amiga)
- MDRV_VIDEO_UPDATE(amiga)
+ MCFG_VIDEO_START(amiga)
+ MCFG_VIDEO_UPDATE(amiga)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("amiga", AMIGA, 3579545)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.50)
- MDRV_SOUND_ROUTE(2, "rspeaker", 0.50)
- MDRV_SOUND_ROUTE(3, "lspeaker", 0.50)
+ MCFG_SOUND_ADD("amiga", AMIGA, 3579545)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 0.50)
+ MCFG_SOUND_ROUTE(3, "lspeaker", 0.50)
/* cia */
- MDRV_MOS8520_ADD("cia_0", AMIGA_68000_NTSC_CLOCK / 10, cia_0_intf)
- MDRV_MOS8520_ADD("cia_1", AMIGA_68000_NTSC_CLOCK / 10, cia_1_intf)
+ MCFG_MOS8520_ADD("cia_0", AMIGA_68000_NTSC_CLOCK / 10, cia_0_intf)
+ MCFG_MOS8520_ADD("cia_1", AMIGA_68000_NTSC_CLOCK / 10, cia_1_intf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c
index f795fad1cb0..5e481f82cff 100644
--- a/src/mame/drivers/argus.c
+++ b/src/mame/drivers/argus.c
@@ -532,149 +532,149 @@ GFXDECODE_END
static MACHINE_CONFIG_START( argus, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 5000000) /* 4 MHz */
- MDRV_CPU_PROGRAM_MAP(argus_map)
- MDRV_CPU_VBLANK_INT_HACK(argus_interrupt,2)
+ MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 4 MHz */
+ MCFG_CPU_PROGRAM_MAP(argus_map)
+ MCFG_CPU_VBLANK_INT_HACK(argus_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, 5000000)
- MDRV_CPU_PROGRAM_MAP(sound_map_a)
+ MCFG_CPU_ADD("audiocpu", Z80, 5000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map_a)
#if 0
- MDRV_CPU_IO_MAP(sound_portmap_1)
+ MCFG_CPU_IO_MAP(sound_portmap_1)
#else
- MDRV_CPU_IO_MAP(sound_portmap_2)
+ MCFG_CPU_IO_MAP(sound_portmap_2)
#endif
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(54)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* This value is refered to psychic5 driver */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(32*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(54)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* This value is refered to psychic5 driver */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(32*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(argus)
- MDRV_PALETTE_LENGTH(896)
+ MCFG_GFXDECODE(argus)
+ MCFG_PALETTE_LENGTH(896)
- MDRV_VIDEO_START(argus)
- MDRV_VIDEO_RESET(argus)
- MDRV_VIDEO_UPDATE(argus)
+ MCFG_VIDEO_START(argus)
+ MCFG_VIDEO_RESET(argus)
+ MCFG_VIDEO_UPDATE(argus)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
#if 0
- MDRV_SOUND_ADD("ym1", YM2203, 6000000 / 4)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.15)
- MDRV_SOUND_ROUTE(1, "mono", 0.15)
- MDRV_SOUND_ROUTE(2, "mono", 0.15)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
+ MCFG_SOUND_ADD("ym1", YM2203, 6000000 / 4)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ 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.50)
#else
- MDRV_SOUND_ADD("ym1", YM2203, 6000000 / 4)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.15)
- MDRV_SOUND_ROUTE(1, "mono", 0.15)
- MDRV_SOUND_ROUTE(2, "mono", 0.15)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
-
- MDRV_SOUND_ADD("ym2", YM2203, 6000000 / 4)
- MDRV_SOUND_ROUTE(0, "mono", 0.15)
- MDRV_SOUND_ROUTE(1, "mono", 0.15)
- MDRV_SOUND_ROUTE(2, "mono", 0.15)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
+ MCFG_SOUND_ADD("ym1", YM2203, 6000000 / 4)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ 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.50)
+
+ MCFG_SOUND_ADD("ym2", YM2203, 6000000 / 4)
+ 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.50)
#endif
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( valtric, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 5000000) /* 5 MHz */
- MDRV_CPU_PROGRAM_MAP(valtric_map)
- MDRV_CPU_VBLANK_INT_HACK(argus_interrupt,2)
+ MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5 MHz */
+ MCFG_CPU_PROGRAM_MAP(valtric_map)
+ MCFG_CPU_VBLANK_INT_HACK(argus_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, 5000000)
- MDRV_CPU_PROGRAM_MAP(sound_map_a)
- MDRV_CPU_IO_MAP(sound_portmap_2)
+ MCFG_CPU_ADD("audiocpu", Z80, 5000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map_a)
+ MCFG_CPU_IO_MAP(sound_portmap_2)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(54)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* This value is refered to psychic5 driver */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(32*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(54)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* This value is refered to psychic5 driver */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(32*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(valtric)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_GFXDECODE(valtric)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_VIDEO_START(valtric)
- MDRV_VIDEO_RESET(valtric)
- MDRV_VIDEO_UPDATE(valtric)
+ MCFG_VIDEO_START(valtric)
+ MCFG_VIDEO_RESET(valtric)
+ MCFG_VIDEO_UPDATE(valtric)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, 6000000 / 4)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.15)
- MDRV_SOUND_ROUTE(1, "mono", 0.15)
- MDRV_SOUND_ROUTE(2, "mono", 0.15)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
-
- MDRV_SOUND_ADD("ym2", YM2203, 6000000 / 4)
- MDRV_SOUND_ROUTE(0, "mono", 0.15)
- MDRV_SOUND_ROUTE(1, "mono", 0.15)
- MDRV_SOUND_ROUTE(2, "mono", 0.15)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, 6000000 / 4)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ 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.50)
+
+ MCFG_SOUND_ADD("ym2", YM2203, 6000000 / 4)
+ 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.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( butasan, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 5000000) /* 5 MHz */
- MDRV_CPU_PROGRAM_MAP(butasan_map)
- MDRV_CPU_VBLANK_INT_HACK(argus_interrupt,2)
+ MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5 MHz */
+ MCFG_CPU_PROGRAM_MAP(butasan_map)
+ MCFG_CPU_VBLANK_INT_HACK(argus_interrupt,2)
- MDRV_CPU_ADD("audiocpu", Z80, 5000000)
- MDRV_CPU_PROGRAM_MAP(sound_map_b)
- MDRV_CPU_IO_MAP(sound_portmap_2)
+ MCFG_CPU_ADD("audiocpu", Z80, 5000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map_b)
+ MCFG_CPU_IO_MAP(sound_portmap_2)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(54)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* This value is taken from psychic5 driver */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(32*16, 32*16)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(54)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0) /* This value is taken from psychic5 driver */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(32*16, 32*16)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(butasan)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_GFXDECODE(butasan)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_VIDEO_START(butasan)
- MDRV_VIDEO_RESET(butasan)
- MDRV_VIDEO_UPDATE(butasan)
+ MCFG_VIDEO_START(butasan)
+ MCFG_VIDEO_RESET(butasan)
+ MCFG_VIDEO_UPDATE(butasan)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, 6000000 / 4)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.30)
- MDRV_SOUND_ROUTE(1, "mono", 0.30)
- MDRV_SOUND_ROUTE(2, "mono", 0.30)
- MDRV_SOUND_ROUTE(3, "mono", 1.0)
-
- MDRV_SOUND_ADD("ym2", YM2203, 6000000 / 4)
- MDRV_SOUND_ROUTE(0, "mono", 0.30)
- MDRV_SOUND_ROUTE(1, "mono", 0.30)
- MDRV_SOUND_ROUTE(2, "mono", 0.30)
- MDRV_SOUND_ROUTE(3, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, 6000000 / 4)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.30)
+ MCFG_SOUND_ROUTE(1, "mono", 0.30)
+ MCFG_SOUND_ROUTE(2, "mono", 0.30)
+ MCFG_SOUND_ROUTE(3, "mono", 1.0)
+
+ MCFG_SOUND_ADD("ym2", YM2203, 6000000 / 4)
+ MCFG_SOUND_ROUTE(0, "mono", 0.30)
+ MCFG_SOUND_ROUTE(1, "mono", 0.30)
+ MCFG_SOUND_ROUTE(2, "mono", 0.30)
+ MCFG_SOUND_ROUTE(3, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/aristmk4.c b/src/mame/drivers/aristmk4.c
index b996ee363a9..743468d393c 100644
--- a/src/mame/drivers/aristmk4.c
+++ b/src/mame/drivers/aristmk4.c
@@ -1199,48 +1199,48 @@ static MACHINE_RESET( aristmk4 )
static MACHINE_CONFIG_START( aristmk4, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, MAIN_CLOCK/8) // 1.5mhz (goldenc needs a bit faster for some reason)
- MDRV_CPU_PROGRAM_MAP(aristmk4_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(aristmk4)
- MDRV_MACHINE_RESET(aristmk4 )
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_CPU_ADD("maincpu", M6809, MAIN_CLOCK/8) // 1.5mhz (goldenc needs a bit faster for some reason)
+ MCFG_CPU_PROGRAM_MAP(aristmk4_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_MACHINE_START(aristmk4)
+ MCFG_MACHINE_RESET(aristmk4 )
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(320, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 304-1, 0, 216-1) /* from the crtc registers... updated by crtc */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(320, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 304-1, 0, 216-1) /* from the crtc registers... updated by crtc */
- MDRV_GFXDECODE(aristmk4)
- MDRV_PALETTE_LENGTH(512)
- MDRV_PALETTE_INIT(aristmk4)
+ MCFG_GFXDECODE(aristmk4)
+ MCFG_PALETTE_LENGTH(512)
+ MCFG_PALETTE_INIT(aristmk4)
- MDRV_VIDEO_START(aristmk4)
- MDRV_VIDEO_UPDATE(aristmk4)
+ MCFG_VIDEO_START(aristmk4)
+ MCFG_VIDEO_UPDATE(aristmk4)
- MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf1 )
- MDRV_VIA6522_ADD("via6522_0", 0, via_interface) /* 1 MHz.(only 1 or 2 MHz.are valid) */
- MDRV_PIA6821_ADD("pia6821_0", aristmk4_pia1_intf)
- MDRV_MC6845_ADD("crtc", MC6845, MAIN_CLOCK/8, mc6845_intf)
- MDRV_MC146818_ADD("rtc", MC146818_IGNORE_CENTURY)
+ MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf1 )
+ MCFG_VIA6522_ADD("via6522_0", 0, via_interface) /* 1 MHz.(only 1 or 2 MHz.are valid) */
+ MCFG_PIA6821_ADD("pia6821_0", aristmk4_pia1_intf)
+ MCFG_MC6845_ADD("crtc", MC6845, MAIN_CLOCK/8, mc6845_intf)
+ MCFG_MC146818_ADD("rtc", MC146818_IGNORE_CENTURY)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
// the Mark IV has X 2 AY8910 sound chips which are tied to the VIA
- MDRV_SOUND_ADD("ay1", AY8910 , MAIN_CLOCK/8)
- MDRV_SOUND_CONFIG(ay8910_config1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ay1", AY8910 , MAIN_CLOCK/8)
+ MCFG_SOUND_CONFIG(ay8910_config1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("ay2", AY8910 , MAIN_CLOCK/8)
- MDRV_SOUND_CONFIG(ay8910_config2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("ay2", AY8910 , MAIN_CLOCK/8)
+ MCFG_SOUND_CONFIG(ay8910_config2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(meter_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(meter_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/aristmk5.c b/src/mame/drivers/aristmk5.c
index 793e3c40973..dd1479ebb90 100644
--- a/src/mame/drivers/aristmk5.c
+++ b/src/mame/drivers/aristmk5.c
@@ -274,50 +274,50 @@ static const i2cmem_interface i2cmem_interface =
#endif
static MACHINE_CONFIG_START( aristmk5, driver_device )
- MDRV_CPU_ADD("maincpu", ARM, 10000000) // ?
- MDRV_CPU_PROGRAM_MAP(aristmk5_map)
+ MCFG_CPU_ADD("maincpu", ARM, 10000000) // ?
+ MCFG_CPU_PROGRAM_MAP(aristmk5_map)
- MDRV_MACHINE_START( aristmk5 )
- MDRV_MACHINE_RESET( aristmk5 )
+ MCFG_MACHINE_START( aristmk5 )
+ MCFG_MACHINE_RESET( aristmk5 )
-// MDRV_I2CMEM_ADD("i2cmem",i2cmem_interface)
+// MCFG_I2CMEM_ADD("i2cmem",i2cmem_interface)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(1280, 1024) //TODO: proper max size?
- MDRV_SCREEN_VISIBLE_AREA(0, 1280-1, 0, 1024-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(1280, 1024) //TODO: proper max size?
+ MCFG_SCREEN_VISIBLE_AREA(0, 1280-1, 0, 1024-1)
- MDRV_PALETTE_LENGTH(0x200)
+ MCFG_PALETTE_LENGTH(0x200)
- MDRV_VIDEO_START(archimds_vidc)
- MDRV_VIDEO_UPDATE(archimds_vidc)
+ MCFG_VIDEO_START(archimds_vidc)
+ MCFG_VIDEO_UPDATE(archimds_vidc)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac0", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("dac0", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ADD("dac3", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ADD("dac3", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ADD("dac4", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ADD("dac4", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ADD("dac5", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ADD("dac5", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ADD("dac6", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ADD("dac6", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
- MDRV_SOUND_ADD("dac7", DAC, 0)
- MDRV_SOUND_ROUTE(0, "mono", 0.10)
+ MCFG_SOUND_ADD("dac7", DAC, 0)
+ MCFG_SOUND_ROUTE(0, "mono", 0.10)
MACHINE_CONFIG_END
#define ARISTOCRAT_MK5_BIOS \
diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c
index e919c80c069..7c87cc6b1d1 100644
--- a/src/mame/drivers/arkanoid.c
+++ b/src/mame/drivers/arkanoid.c
@@ -960,81 +960,81 @@ static MACHINE_RESET( arkanoid )
static MACHINE_CONFIG_START( arkanoid, arkanoid_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(arkanoid_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(arkanoid_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("mcu", M68705, XTAL_12MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_CPU_ADD("mcu", M68705, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(mcu_map)
- MDRV_QUANTUM_TIME(HZ(6000)) // 100 CPU slices per second to synchronize between the MCU and the main CPU
+ MCFG_QUANTUM_TIME(HZ(6000)) // 100 CPU slices per second to synchronize between the MCU and the main CPU
- MDRV_MACHINE_START(arkanoid)
- MDRV_MACHINE_RESET(arkanoid)
+ MCFG_MACHINE_START(arkanoid)
+ MCFG_MACHINE_RESET(arkanoid)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(arkanoid)
- MDRV_PALETTE_LENGTH(512)
-
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(arkanoid)
- MDRV_VIDEO_UPDATE(arkanoid)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(arkanoid)
+ MCFG_PALETTE_LENGTH(512)
+
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(arkanoid)
+ MCFG_VIDEO_UPDATE(arkanoid)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", YM2149, XTAL_12MHz/4/2) /* YM2149 clock is 3mhz, pin 26 is low so 3mhz/2 */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
+ MCFG_SOUND_ADD("aysnd", YM2149, XTAL_12MHz/4/2) /* YM2149 clock is 3mhz, pin 26 is low so 3mhz/2 */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( hexa, arkanoid_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* Imported from arkanoid - correct? */
- MDRV_CPU_PROGRAM_MAP(hexa_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* Imported from arkanoid - correct? */
+ MCFG_CPU_PROGRAM_MAP(hexa_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(arkanoid)
- MDRV_MACHINE_RESET(arkanoid)
+ MCFG_MACHINE_START(arkanoid)
+ MCFG_MACHINE_RESET(arkanoid)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(hexa)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_GFXDECODE(hexa)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(arkanoid)
- MDRV_VIDEO_UPDATE(hexa)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(arkanoid)
+ MCFG_VIDEO_UPDATE(hexa)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, XTAL_12MHz/4/2) /* Imported from arkanoid - correct? */
- MDRV_SOUND_CONFIG(hexa_ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL_12MHz/4/2) /* Imported from arkanoid - correct? */
+ MCFG_SOUND_CONFIG(hexa_ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bootleg, arkanoid )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(bootleg_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(bootleg_map)
- MDRV_DEVICE_REMOVE("mcu")
+ MCFG_DEVICE_REMOVE("mcu")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c
index 81da104b6eb..6974bce66a6 100644
--- a/src/mame/drivers/armedf.c
+++ b/src/mame/drivers/armedf.c
@@ -794,314 +794,314 @@ static MACHINE_RESET( armedf )
static MACHINE_CONFIG_START( terraf, armedf_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(terraf_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
+ MCFG_CPU_PROGRAM_MAP(terraf_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
+ MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
- MDRV_MACHINE_START(armedf)
- MDRV_MACHINE_RESET(armedf)
+ MCFG_MACHINE_START(armedf)
+ MCFG_MACHINE_RESET(armedf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(armedf)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 1*8, 31*8-1 )
+ MCFG_GFXDECODE(armedf)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_EOF(armedf)
- MDRV_VIDEO_START(armedf)
- MDRV_VIDEO_UPDATE(armedf)
+ MCFG_VIDEO_EOF(armedf)
+ MCFG_VIDEO_START(armedf)
+ MCFG_VIDEO_UPDATE(armedf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( terrafb, armedf_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(terrafb_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
+ MCFG_CPU_PROGRAM_MAP(terrafb_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
+ MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
- MDRV_CPU_ADD("extra", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(terrafb_extraz80_map)
- MDRV_CPU_IO_MAP(terrafb_extraz80_portmap)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
+ MCFG_CPU_ADD("extra", Z80, 3072000) /* 3.072 MHz???? */
+ MCFG_CPU_PROGRAM_MAP(terrafb_extraz80_map)
+ MCFG_CPU_IO_MAP(terrafb_extraz80_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
- MDRV_MACHINE_START(armedf)
- MDRV_MACHINE_RESET(armedf)
+ MCFG_MACHINE_START(armedf)
+ MCFG_MACHINE_RESET(armedf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(armedf)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 1*8, 31*8-1 )
+ MCFG_GFXDECODE(armedf)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_EOF(armedf)
- MDRV_VIDEO_START(armedf)
- MDRV_VIDEO_UPDATE(armedf)
+ MCFG_VIDEO_EOF(armedf)
+ MCFG_VIDEO_START(armedf)
+ MCFG_VIDEO_UPDATE(armedf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( kodure, armedf_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(kodure_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
+ MCFG_CPU_PROGRAM_MAP(kodure_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
+ MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
- MDRV_MACHINE_START(armedf)
- MDRV_MACHINE_RESET(armedf)
+ MCFG_MACHINE_START(armedf)
+ MCFG_MACHINE_RESET(armedf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_GFXDECODE(armedf)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ MCFG_GFXDECODE(armedf)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_EOF(armedf)
- MDRV_VIDEO_START(armedf)
- MDRV_VIDEO_UPDATE(armedf)
+ MCFG_VIDEO_EOF(armedf)
+ MCFG_VIDEO_START(armedf)
+ MCFG_VIDEO_UPDATE(armedf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( armedf, armedf_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(armedf_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
+ MCFG_CPU_PROGRAM_MAP(armedf_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
+ MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
- MDRV_MACHINE_START(armedf)
- MDRV_MACHINE_RESET(armedf)
+ MCFG_MACHINE_START(armedf)
+ MCFG_MACHINE_RESET(armedf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(57)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 1*8, 31*8-1 )
- MDRV_GFXDECODE(armedf)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(57)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 1*8, 31*8-1 )
+ MCFG_GFXDECODE(armedf)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_EOF(armedf)
- MDRV_VIDEO_START(armedf)
- MDRV_VIDEO_UPDATE(armedf)
+ MCFG_VIDEO_EOF(armedf)
+ MCFG_VIDEO_START(armedf)
+ MCFG_VIDEO_UPDATE(armedf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( cclimbr2, armedf_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(cclimbr2_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
+ MCFG_CPU_PROGRAM_MAP(cclimbr2_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(cclimbr2_soundmap)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
+ MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
+ MCFG_CPU_PROGRAM_MAP(cclimbr2_soundmap)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
- MDRV_MACHINE_START(armedf)
- MDRV_MACHINE_RESET(armedf)
+ MCFG_MACHINE_START(armedf)
+ MCFG_MACHINE_RESET(armedf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_GFXDECODE(armedf)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ MCFG_GFXDECODE(armedf)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_EOF(armedf)
- MDRV_VIDEO_START(armedf)
- MDRV_VIDEO_UPDATE(armedf)
+ MCFG_VIDEO_EOF(armedf)
+ MCFG_VIDEO_START(armedf)
+ MCFG_VIDEO_UPDATE(armedf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( legion, armedf_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(legion_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
+ MCFG_CPU_PROGRAM_MAP(legion_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(cclimbr2_soundmap)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
+ MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
+ MCFG_CPU_PROGRAM_MAP(cclimbr2_soundmap)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
- MDRV_MACHINE_START(armedf)
- MDRV_MACHINE_RESET(armedf)
+ MCFG_MACHINE_START(armedf)
+ MCFG_MACHINE_RESET(armedf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_GFXDECODE(armedf)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ MCFG_GFXDECODE(armedf)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_EOF(armedf)
- MDRV_VIDEO_START(armedf)
- MDRV_VIDEO_UPDATE(armedf)
+ MCFG_VIDEO_EOF(armedf)
+ MCFG_VIDEO_START(armedf)
+ MCFG_VIDEO_UPDATE(armedf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( legiono, armedf_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
- MDRV_CPU_PROGRAM_MAP(legiono_map)
- MDRV_CPU_VBLANK_INT("screen", irq2_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz?? */
+ MCFG_CPU_PROGRAM_MAP(legiono_map)
+ MCFG_CPU_VBLANK_INT("screen", irq2_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
- MDRV_CPU_PROGRAM_MAP(cclimbr2_soundmap)
- MDRV_CPU_IO_MAP(sound_portmap)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
+ MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz???? */
+ MCFG_CPU_PROGRAM_MAP(cclimbr2_soundmap)
+ MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_hold,128)
- MDRV_MACHINE_START(armedf)
- MDRV_MACHINE_RESET(armedf)
+ MCFG_MACHINE_START(armedf)
+ MCFG_MACHINE_RESET(armedf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_GFXDECODE(armedf)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ MCFG_GFXDECODE(armedf)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_EOF(armedf)
- MDRV_VIDEO_START(armedf)
- MDRV_VIDEO_UPDATE(armedf)
+ MCFG_VIDEO_EOF(armedf)
+ MCFG_VIDEO_START(armedf)
+ MCFG_VIDEO_UPDATE(armedf)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM3812, 4000000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/artmagic.c b/src/mame/drivers/artmagic.c
index 5c6f5910572..21979ee71a3 100644
--- a/src/mame/drivers/artmagic.c
+++ b/src/mame/drivers/artmagic.c
@@ -843,68 +843,68 @@ INPUT_PORTS_END
static MACHINE_CONFIG_START( artmagic, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK_25MHz/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_25MHz/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_ADD("tms", TMS34010, MASTER_CLOCK_40MHz)
- MDRV_CPU_CONFIG(tms_config)
- MDRV_CPU_PROGRAM_MAP(tms_map)
+ MCFG_CPU_ADD("tms", TMS34010, MASTER_CLOCK_40MHz)
+ MCFG_CPU_CONFIG(tms_config)
+ MCFG_CPU_PROGRAM_MAP(tms_map)
- MDRV_MACHINE_START(artmagic)
- MDRV_MACHINE_RESET(artmagic)
- MDRV_QUANTUM_TIME(HZ(6000))
- MDRV_NVRAM_ADD_1FILL("nvram")
+ MCFG_MACHINE_START(artmagic)
+ MCFG_MACHINE_RESET(artmagic)
+ MCFG_QUANTUM_TIME(HZ(6000))
+ MCFG_NVRAM_ADD_1FILL("nvram")
/* video hardware */
- MDRV_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
+ MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
- MDRV_VIDEO_START(artmagic)
- MDRV_VIDEO_UPDATE(tms340x0)
+ MCFG_VIDEO_START(artmagic)
+ MCFG_VIDEO_UPDATE(tms340x0)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(MASTER_CLOCK_40MHz/6, 428, 0, 320, 313, 0, 256)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK_40MHz/6, 428, 0, 320, 313, 0, 256)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", MASTER_CLOCK_40MHz/3/10, OKIM6295_PIN7_LOW)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
+ MCFG_OKIM6295_ADD("oki", MASTER_CLOCK_40MHz/3/10, OKIM6295_PIN7_LOW)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cheesech, artmagic )
- MDRV_SOUND_MODIFY("oki")
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_MODIFY("oki")
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( stonebal, artmagic )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(stonebal_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(stonebal_map)
- MDRV_CPU_MODIFY("tms")
- MDRV_CPU_PROGRAM_MAP(stonebal_tms_map)
+ MCFG_CPU_MODIFY("tms")
+ MCFG_CPU_PROGRAM_MAP(stonebal_tms_map)
- MDRV_SOUND_MODIFY("oki")
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
+ MCFG_SOUND_MODIFY("oki")
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( shtstar, artmagic )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(shtstar_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(shtstar_map)
/* sub cpu*/
- MDRV_CPU_ADD("subcpu", M68000, MASTER_CLOCK_25MHz/2)
- MDRV_CPU_PROGRAM_MAP(shtstar_subcpu_map)
+ MCFG_CPU_ADD("subcpu", M68000, MASTER_CLOCK_25MHz/2)
+ MCFG_CPU_PROGRAM_MAP(shtstar_subcpu_map)
/*gun board cpu*/
- MDRV_CPU_ADD("guncpu", I80C31, 6000000)
- MDRV_CPU_IO_MAP(shtstar_guncpu_io_map)
- MDRV_CPU_PROGRAM_MAP(shtstar_guncpu_map)
+ MCFG_CPU_ADD("guncpu", I80C31, 6000000)
+ MCFG_CPU_IO_MAP(shtstar_guncpu_io_map)
+ MCFG_CPU_PROGRAM_MAP(shtstar_guncpu_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c
index 190b1fa89c8..144a3c8e723 100644
--- a/src/mame/drivers/ashnojoe.c
+++ b/src/mame/drivers/ashnojoe.c
@@ -354,41 +354,41 @@ static MACHINE_RESET( ashnojoe )
static MACHINE_CONFIG_START( ashnojoe, ashnojoe_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(ashnojoe_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(ashnojoe_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, 4000000)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(sound_portmap)
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(sound_portmap)
- MDRV_MACHINE_START(ashnojoe)
- MDRV_MACHINE_RESET(ashnojoe)
+ MCFG_MACHINE_START(ashnojoe)
+ MCFG_MACHINE_RESET(ashnojoe)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 512)
- MDRV_SCREEN_VISIBLE_AREA(14*8, 50*8-1, 3*8, 29*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 512)
+ MCFG_SCREEN_VISIBLE_AREA(14*8, 50*8-1, 3*8, 29*8-1)
- MDRV_GFXDECODE(ashnojoe)
- MDRV_PALETTE_LENGTH(0x1000/2)
+ MCFG_GFXDECODE(ashnojoe)
+ MCFG_PALETTE_LENGTH(0x1000/2)
- MDRV_VIDEO_START(ashnojoe)
- MDRV_VIDEO_UPDATE(ashnojoe)
+ MCFG_VIDEO_START(ashnojoe)
+ MCFG_VIDEO_UPDATE(ashnojoe)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2203, 4000000)
- MDRV_SOUND_CONFIG(ym2203_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.1)
+ MCFG_SOUND_ADD("ymsnd", YM2203, 4000000)
+ MCFG_SOUND_CONFIG(ym2203_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.1)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
ROM_START( scessjoe )
diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c
index 2b943951978..81822c4d092 100644
--- a/src/mame/drivers/asterix.c
+++ b/src/mame/drivers/asterix.c
@@ -297,45 +297,45 @@ static MACHINE_RESET( asterix )
static MACHINE_CONFIG_START( asterix, asterix_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M68000, 12000000)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", asterix_interrupt)
+ MCFG_CPU_ADD("maincpu", M68000, 12000000)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", asterix_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 8000000)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 8000000)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(asterix)
- MDRV_MACHINE_RESET(asterix)
+ MCFG_MACHINE_START(asterix)
+ MCFG_MACHINE_RESET(asterix)
- MDRV_EEPROM_ADD("eeprom", eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", eeprom_intf)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_UPDATE(asterix)
+ MCFG_VIDEO_UPDATE(asterix)
- MDRV_K056832_ADD("k056832", asterix_k056832_intf)
- MDRV_K053244_ADD("k053244", asterix_k05324x_intf)
- MDRV_K053251_ADD("k053251")
+ MCFG_K056832_ADD("k056832", asterix_k056832_intf)
+ MCFG_K053244_ADD("k053244", asterix_k05324x_intf)
+ MCFG_K053251_ADD("k053251")
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, 4000000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 4000000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MDRV_SOUND_ADD("k053260", K053260, 4000000)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.75)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.75)
+ MCFG_SOUND_ADD("k053260", K053260, 4000000)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/asteroid.c b/src/mame/drivers/asteroid.c
index 094d21450b5..42369ba1d9e 100644
--- a/src/mame/drivers/asteroid.c
+++ b/src/mame/drivers/asteroid.c
@@ -612,75 +612,75 @@ static const pokey_interface pokey_config =
static MACHINE_CONFIG_START( asteroid, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(asteroid_map)
- MDRV_CPU_PERIODIC_INT(asteroid_interrupt, (double)MASTER_CLOCK/4096/12)
+ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
+ MCFG_CPU_PROGRAM_MAP(asteroid_map)
+ MCFG_CPU_PERIODIC_INT(asteroid_interrupt, (double)MASTER_CLOCK/4096/12)
- MDRV_MACHINE_RESET(asteroid)
+ MCFG_MACHINE_RESET(asteroid)
/* video hardware */
- MDRV_SCREEN_ADD("screen", VECTOR)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_SIZE(400,300)
- MDRV_SCREEN_VISIBLE_AREA(522, 1566, 394, 1182)
+ MCFG_SCREEN_ADD("screen", VECTOR)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_SIZE(400,300)
+ MCFG_SCREEN_VISIBLE_AREA(522, 1566, 394, 1182)
- MDRV_VIDEO_START(dvg)
- MDRV_VIDEO_UPDATE(vector)
+ MCFG_VIDEO_START(dvg)
+ MCFG_VIDEO_UPDATE(vector)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(asteroid)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.4)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(asteroid)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.4)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( asterock, asteroid )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PERIODIC_INT(asterock_interrupt, (double)MASTER_CLOCK/4096/12)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PERIODIC_INT(asterock_interrupt, (double)MASTER_CLOCK/4096/12)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( astdelux, asteroid )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(astdelux_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(astdelux_map)
- MDRV_ATARIVGEAROM_ADD("earom")
+ MCFG_ATARIVGEAROM_ADD("earom")
/* sound hardware */
- MDRV_SOUND_REPLACE("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(astdelux)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_REPLACE("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(astdelux)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("pokey", POKEY, MASTER_CLOCK/8)
- MDRV_SOUND_CONFIG(pokey_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("pokey", POKEY, MASTER_CLOCK/8)
+ MCFG_SOUND_CONFIG(pokey_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( llander, asteroid )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(llander_map)
- MDRV_CPU_PERIODIC_INT(llander_interrupt, (double)MASTER_CLOCK/4096/12)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(llander_map)
+ MCFG_CPU_PERIODIC_INT(llander_interrupt, (double)MASTER_CLOCK/4096/12)
- MDRV_MACHINE_RESET(avgdvg)
+ MCFG_MACHINE_RESET(avgdvg)
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_REFRESH_RATE(40)
- MDRV_SCREEN_VISIBLE_AREA(522, 1566, 270, 1070)
- MDRV_VIDEO_START(dvg)
- MDRV_VIDEO_UPDATE(vector)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_REFRESH_RATE(40)
+ MCFG_SCREEN_VISIBLE_AREA(522, 1566, 270, 1070)
+ MCFG_VIDEO_START(dvg)
+ MCFG_VIDEO_UPDATE(vector)
/* sound hardware */
- MDRV_SOUND_REPLACE("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(llander)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_REPLACE("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(llander)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c
index bc27811fd1d..cf095cde7a7 100644
--- a/src/mame/drivers/astinvad.c
+++ b/src/mame/drivers/astinvad.c
@@ -587,67 +587,67 @@ static const samples_interface astinvad_samples_interface =
static MACHINE_CONFIG_START( kamikaze, astinvad_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(kamikaze_map)
- MDRV_CPU_IO_MAP(kamikaze_portmap)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(kamikaze_map)
+ MCFG_CPU_IO_MAP(kamikaze_portmap)
- MDRV_MACHINE_START(kamikaze)
- MDRV_MACHINE_RESET(kamikaze)
+ MCFG_MACHINE_START(kamikaze)
+ MCFG_MACHINE_RESET(kamikaze)
- MDRV_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
- MDRV_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
+ MCFG_PPI8255_ADD( "ppi8255_0", ppi8255_intf[0] )
+ MCFG_PPI8255_ADD( "ppi8255_1", ppi8255_intf[1] )
/* video hardware */
- MDRV_VIDEO_UPDATE(astinvad)
+ MCFG_VIDEO_UPDATE(astinvad)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_RAW_PARAMS(VIDEO_CLOCK, 320, 0, 256, 256, 32, 256)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK, 320, 0, 256, 256, 32, 256)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(astinvad_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(astinvad_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( spcking2, kamikaze )
/* basic machine hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_RAW_PARAMS(VIDEO_CLOCK, 320, 0, 256, 256, 16, 240)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK, 320, 0, 256, 256, 16, 240)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( spaceint, astinvad_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* a guess */
- MDRV_CPU_PROGRAM_MAP(spaceint_map)
- MDRV_CPU_IO_MAP(spaceint_portmap)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* a guess */
+ MCFG_CPU_PROGRAM_MAP(spaceint_map)
+ MCFG_CPU_IO_MAP(spaceint_portmap)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(spaceint)
- MDRV_MACHINE_RESET(spaceint)
+ MCFG_MACHINE_START(spaceint)
+ MCFG_MACHINE_RESET(spaceint)
/* video hardware */
- MDRV_VIDEO_START(spaceint)
- MDRV_VIDEO_UPDATE(spaceint)
+ MCFG_VIDEO_START(spaceint)
+ MCFG_VIDEO_UPDATE(spaceint)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
- MDRV_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
+ MCFG_SCREEN_REFRESH_RATE(60)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(astinvad_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(astinvad_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c
index 06383d74a2f..4385a46cd7b 100644
--- a/src/mame/drivers/astrocde.c
+++ b/src/mame/drivers/astrocde.c
@@ -1274,59 +1274,59 @@ static const z80_daisy_config tenpin_daisy_chain[] =
static MACHINE_CONFIG_START( astrocade_base, astrocde_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, ASTROCADE_CLOCK/4)
+ MCFG_CPU_ADD("maincpu", Z80, ASTROCADE_CLOCK/4)
/* each game has its own map */
- MDRV_MACHINE_START(astrocde)
+ MCFG_MACHINE_START(astrocde)
/* video hardware */
- MDRV_PALETTE_LENGTH(512)
+ MCFG_PALETTE_LENGTH(512)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_RAW_PARAMS(ASTROCADE_CLOCK, 455, 0, 352, 262, 0, 240)
- MDRV_SCREEN_DEFAULT_POSITION(1.1, 0.0, 1.18, -0.018) /* clip out borders */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_RAW_PARAMS(ASTROCADE_CLOCK, 455, 0, 352, 262, 0, 240)
+ MCFG_SCREEN_DEFAULT_POSITION(1.1, 0.0, 1.18, -0.018) /* clip out borders */
- MDRV_PALETTE_INIT(astrocde)
- MDRV_VIDEO_START(astrocde)
- MDRV_VIDEO_UPDATE(astrocde)
+ MCFG_PALETTE_INIT(astrocde)
+ MCFG_VIDEO_START(astrocde)
+ MCFG_VIDEO_UPDATE(astrocde)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( astrocade_16color_base, astrocade_base )
/* basic machine hardware */
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_PALETTE_LENGTH(4096)
+ MCFG_PALETTE_LENGTH(4096)
- MDRV_PALETTE_INIT(profpac)
- MDRV_VIDEO_START(profpac)
- MDRV_VIDEO_UPDATE(profpac)
+ MCFG_PALETTE_INIT(profpac)
+ MCFG_VIDEO_START(profpac)
+ MCFG_VIDEO_UPDATE(profpac)
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( astrocade_mono_sound )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("astrocade1", ASTROCADE, ASTROCADE_CLOCK/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("astrocade1", ASTROCADE, ASTROCADE_CLOCK/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( astrocade_stereo_sound )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("astrocade1", ASTROCADE, ASTROCADE_CLOCK/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("astrocade1", ASTROCADE, ASTROCADE_CLOCK/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("astrocade2", ASTROCADE, ASTROCADE_CLOCK/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("astrocade2", ASTROCADE, ASTROCADE_CLOCK/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1340,147 +1340,147 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( seawolf2, astrocade_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(seawolf2_map)
- MDRV_CPU_IO_MAP(port_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(seawolf2_map)
+ MCFG_CPU_IO_MAP(port_map)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(seawolf2_samples_interface)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(2, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(3, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(4, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(5, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(6, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(7, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(8, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(9, "rspeaker", 0.25)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(seawolf2_samples_interface)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(2, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(3, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(4, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(5, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(6, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(7, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(8, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(9, "rspeaker", 0.25)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ebases, astrocade_base )
- MDRV_FRAGMENT_ADD(astrocade_mono_sound)
+ MCFG_FRAGMENT_ADD(astrocade_mono_sound)
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(ebases_map)
- MDRV_CPU_IO_MAP(port_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(ebases_map)
+ MCFG_CPU_IO_MAP(port_map)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( spacezap, astrocade_base )
- MDRV_FRAGMENT_ADD(astrocade_mono_sound)
+ MCFG_FRAGMENT_ADD(astrocade_mono_sound)
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(spacezap_map)
- MDRV_CPU_IO_MAP(port_map_mono_pattern)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(spacezap_map)
+ MCFG_CPU_IO_MAP(port_map_mono_pattern)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( wow, astrocade_base )
- MDRV_FRAGMENT_ADD(astrocade_stereo_sound)
+ MCFG_FRAGMENT_ADD(astrocade_stereo_sound)
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(wow_map)
- MDRV_CPU_IO_MAP(port_map_stereo_pattern)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(wow_map)
+ MCFG_CPU_IO_MAP(port_map_stereo_pattern)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_DEFAULT_POSITION(1.0, 0.0, 1.0, 0.0) /* adjusted to match screenshots */
-// MDRV_SCREEN_DEFAULT_POSITION(1.066, -0.004, 1.048, -0.026) /* adjusted to match flyer */
+ MCFG_SCRE